diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index ca4b25bd..01022680 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -1,4 +1,6 @@
 @inject IInstallationService InstallationService
+@inject IJSRuntime JSRuntime
+@inject SiteState SiteState
 
 @if (_initialized)
 {
@@ -20,21 +22,35 @@
         {
             <div class="app-alert">
                 @_installation.Message
-            </div> 
+            </div>
         }
     }
 }
 
 @code {
-    private Installation _installation;
-    private bool _initialized;
+    private bool _initialized = false;
+    private Installation _installation = new Installation { Success = false, Message = "" };
 
     private PageState PageState { get; set; }
 
-    protected override async Task OnParametersSetAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        _installation = await InstallationService.IsInstalled();
-        _initialized = true;
+        if (firstRender && !_initialized)
+        {
+            var interop = new Interop(JSRuntime);
+            SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
+            _installation = await InstallationService.IsInstalled();
+            if (_installation.Alias != null)
+            {
+                SiteState.Alias = _installation.Alias;
+            }
+            else
+            {
+                _installation.Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name";
+            }
+            _initialized = true;
+            StateHasChanged();
+        }
     }
 
     private void ChangeState(PageState pageState)
diff --git a/Oqtane.Client/AssemblyInfo.cs b/Oqtane.Client/AssemblyInfo.cs
index d598bfb9..159ad127 100644
--- a/Oqtane.Client/AssemblyInfo.cs
+++ b/Oqtane.Client/AssemblyInfo.cs
@@ -1,3 +1,5 @@
-using Microsoft.Extensions.Localization;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Localization;
 
 [assembly: RootNamespace("Oqtane")]
+[assembly: InternalsVisibleTo("Oqtane.Server")]
diff --git a/Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs b/Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs
new file mode 100644
index 00000000..8bb5372a
--- /dev/null
+++ b/Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs
@@ -0,0 +1,22 @@
+namespace Microsoft.Extensions.Localization
+{
+    public static class OqtaneLocalizationExtensions
+    {
+        /// <summary>
+        /// Gets the string resource for the specified key and returns the value if the resource does not exist
+        /// </summary>
+        /// <param name="localizer"></param>
+        /// <param name="key">the static key used to identify the string resource</param>
+        /// <param name="value">the default value if the resource for the static key does not exist</param>
+        /// <returns></returns>
+        public static string GetString(this IStringLocalizer localizer, string key, string value)
+        {
+            string localizedValue = localizer[key];
+            if (localizedValue == key && !string.IsNullOrEmpty(value)) // not localized
+            {
+                localizedValue = value;
+            }
+            return localizedValue;
+        }
+    }
+}
diff --git a/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs
new file mode 100644
index 00000000..40db5da5
--- /dev/null
+++ b/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -0,0 +1,54 @@
+using Microsoft.AspNetCore.Components.Authorization;
+using Oqtane.Providers;
+using Oqtane.Services;
+using Oqtane.Shared;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class OqtaneServiceCollectionExtensions
+    {
+        public static IServiceCollection AddOqtaneAuthorization(this IServiceCollection services)
+        {
+            services.AddAuthorizationCore();
+            services.AddScoped<IdentityAuthenticationStateProvider>();
+            services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
+
+            return services;
+        }
+
+        internal static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
+        {
+            services.AddScoped<SiteState>();
+            services.AddScoped<IInstallationService, InstallationService>();
+            services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
+            services.AddScoped<IThemeService, ThemeService>();
+            services.AddScoped<IAliasService, AliasService>();
+            services.AddScoped<ITenantService, TenantService>();
+            services.AddScoped<ISiteService, SiteService>();
+            services.AddScoped<IPageService, PageService>();
+            services.AddScoped<IModuleService, ModuleService>();
+            services.AddScoped<IPageModuleService, PageModuleService>();
+            services.AddScoped<IUserService, UserService>();
+            services.AddScoped<IProfileService, ProfileService>();
+            services.AddScoped<IRoleService, RoleService>();
+            services.AddScoped<IUserRoleService, UserRoleService>();
+            services.AddScoped<ISettingService, SettingService>();
+            services.AddScoped<IPackageService, PackageService>();
+            services.AddScoped<ILogService, LogService>();
+            services.AddScoped<IJobService, JobService>();
+            services.AddScoped<IJobLogService, JobLogService>();
+            services.AddScoped<INotificationService, NotificationService>();
+            services.AddScoped<IFolderService, FolderService>();
+            services.AddScoped<IFileService, FileService>();
+            services.AddScoped<ISiteTemplateService, SiteTemplateService>();
+            services.AddScoped<ISqlService, SqlService>();
+            services.AddScoped<ISystemService, SystemService>();
+            services.AddScoped<ILocalizationService, LocalizationService>();
+            services.AddScoped<ILanguageService, LanguageService>();
+            services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<ISyncService, SyncService>();
+
+            return services;
+        }
+    }
+}
diff --git a/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
index ac46bb69..012d6fdb 100644
--- a/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
+++ b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
 @inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @{
     foreach (var field in _connectionStringFields)
@@ -10,7 +11,7 @@
         {
             var isVisible = "";
             var fieldType = (field.Name == "Pwd") ? "password" : "text";
-            if ((field.Name == "Uid" || field.Name == "Pwd") )
+            if ((field.Name == "Uid" || field.Name == "Pwd"))
             {
                 var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity");
                 if (intSecurityField != null)
@@ -20,7 +21,7 @@
             }
 
             field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-            
+
             <tr style="@isVisible">
                 <td>
                     <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@@ -38,8 +39,8 @@
                 </td>
                 <td>
                     <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                        <option value="true" selected>@Localizer["True"]</option>
-                        <option value="false">@Localizer["False"]</option>
+                        <option value="true" selected>@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
                     </select>
                 </td>
             </tr>
@@ -50,13 +51,13 @@
 @code {
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
-        new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},
-        new() {Name = "Port", FriendlyName = "Port", Value = "5432", HelpText="Enter the port used to connect to the server"},
-        new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"},
-        new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"},
-        new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"},
-        new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"}
-    };
+            new() { Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText = "Enter the database server" },
+            new() { Name = "Port", FriendlyName = "Port", Value = "5432", HelpText = "Enter the port used to connect to the server" },
+            new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" },
+            new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" },
+            new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
+            new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
+        };
 
     public string GetConnectionString()
     {
@@ -69,7 +70,7 @@
         var userId = _connectionStringFields[4].Value;
         var password = _connectionStringFields[5].Value;
 
-        if (!String.IsNullOrEmpty(server)  && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port))
+        if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port))
         {
             connectionString = $"Server={server};Port={port};Database={database};";
         }
diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
index 302959f9..25ddd0ab 100644
--- a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
+++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
 @inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @{
     foreach (var field in _connectionStringFields)
@@ -10,7 +11,7 @@
         {
             var isVisible = "";
             var fieldType = (field.Name == "Pwd") ? "password" : "text";
-            if ((field.Name == "Uid" || field.Name == "Pwd") )
+            if ((field.Name == "Uid" || field.Name == "Pwd"))
             {
                 var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity");
                 if (intSecurityField != null)
@@ -20,7 +21,7 @@
             }
 
             field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
-            
+
             <tr style="@isVisible">
                 <td>
                     <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@@ -38,8 +39,8 @@
                 </td>
                 <td>
                     <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                        <option value="true" selected>@Localizer["True"]</option>
-                        <option value="false">@Localizer["False"]</option>
+                        <option value="true" selected>@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
                     </select>
                 </td>
             </tr>
@@ -50,12 +51,12 @@
 @code {
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
-        new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"},
-        new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"},
-        new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"},
-        new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"},
-        new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"}
-    };
+            new() { Name = "Server", FriendlyName = "Server", Value = ".", HelpText = "Enter the database server" },
+            new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" },
+            new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" },
+            new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
+            new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
+        };
 
     public string GetConnectionString()
     {
@@ -67,7 +68,7 @@
         var userId = _connectionStringFields[3].Value;
         var password = _connectionStringFields[4].Value;
 
-        if (!String.IsNullOrEmpty(server)  && !String.IsNullOrEmpty(database))
+        if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
         {
             connectionString = $"Data Source={server};Initial Catalog={database};";
         }
diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor
index 968c582e..e0a1ac71 100644
--- a/Oqtane.Client/Installer/Installer.razor
+++ b/Oqtane.Client/Installer/Installer.razor
@@ -7,18 +7,19 @@
 @inject IDatabaseService DatabaseService
 @inject IJSRuntime JSRuntime
 @inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
             <img src="oqtane-black.png" />
-            <div style="font-weight: bold">@Localizer["Version:"] @Constants.Version</div>
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version</div>
         </div>
     </div>
     <hr class="app-rule" />
     <div class="row justify-content-center">
         <div class="col text-center">
-            <h2>@Localizer["Database Configuration"]</h2><br />
+            <h2>@Localizer["DatabaseConfig"]</h2><br />
             <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
@@ -31,7 +32,14 @@
                                 {
                                     foreach (var database in _databases)
                                     {
-                                        <option value="@database.Name">@Localizer[@database.Name]</option>
+                                        if (database.IsDefault)
+                                        {
+                                            <option value="@database.Name" selected>@Localizer[@database.Name]</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="@database.Name">@Localizer[@database.Name]</option>
+                                        }
                                     }
                                 }
                             </select>
@@ -47,7 +55,7 @@
             </table>
         </div>
         <div class="col text-center">
-            <h2>@Localizer["Application Administrator"]</h2><br />
+            <h2>@Localizer["ApplicationAdmin"]</h2><br />
             <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
@@ -89,11 +97,16 @@
     <hr class="app-rule" />
     <div class="row">
         <div class="mx-auto text-center">
-            <button type="button" class="btn btn-success" @onclick="Install">@Localizer["Install Now"]</button><br /><br />
+            <button type="button" class="btn btn-success" @onclick="Install">@Localizer["InstallNow"]</button><br /><br />
             <ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
         </div>
         <div class="app-progress-indicator" style="@_loadingDisplay"></div>
     </div>
+    <div class="row">
+        <div class="mx-auto text-center">
+            <input type="checkbox" @bind="@_register" /> @Localizer["Register"]
+        </div>
+    </div>
 </div>
 
 @code {
@@ -107,6 +120,7 @@
     private string _hostPassword = string.Empty;
     private string _confirmPassword = string.Empty;
     private string _hostEmail = string.Empty;
+    private bool _register = true;
     private string _message = string.Empty;
     private string _loadingDisplay = "display: none;";
 
@@ -126,7 +140,7 @@
         }
         catch
         {
-            _message = Localizer["Error loading Database Configuration Control"];
+            _message = Localizer["Error.DbConfig.Load"];
         }
     }
 
@@ -162,13 +176,13 @@
             connectionString = databaseConfigControl.GetConnectionString();
         }
 
-        if (connectionString != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "")
+        if (connectionString != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "" && _hostEmail.Contains("@"))
         {
             _loadingDisplay = "";
             StateHasChanged();
 
             Uri uri = new Uri(NavigationManager.Uri);
-            
+
             var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 
             var config = new InstallConfig
@@ -181,7 +195,8 @@
                 HostName = UserNames.Host,
                 TenantName = TenantNames.Master,
                 IsNewTenant = true,
-                SiteName = Constants.DefaultSite
+                SiteName = Constants.DefaultSite,
+                Register = _register
             };
 
             var installation = await InstallationService.Install(config);
@@ -197,7 +212,7 @@
         }
         else
         {
-            _message = Localizer["Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length"];
+            _message = Localizer["Message.Require.DbInfo"];
         }
     }
 
diff --git a/Oqtane.Client/Localization/SharedResources.cs b/Oqtane.Client/Localization/SharedResources.cs
deleted file mode 100644
index 77cb9d36..00000000
--- a/Oqtane.Client/Localization/SharedResources.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Oqtane
-{
-    public class SharedResources
-    {
-        public static readonly string UserLogin = "User Login";
-
-        public static readonly string UserRegistration = "User Registration";
-
-        public static readonly string PasswordReset = "Password Reset";
-
-        public static readonly string UserProfile = "User Profile";
-
-        public static readonly string AdminDashboard = "Admin Dashboard";
-
-        public static readonly string SiteSettings = "Site Settings";
-
-        public static readonly string PageManagement = "Page Management";
-
-        public static readonly string UserManagement = "User Management";
-
-        public static readonly string ProfileManagement = "Profile Management";
-
-        public static readonly string RoleManagement = "Role Management";
-
-        public static readonly string FileManagement = "File Management";
-
-        public static readonly string RecycleBin = "Recycle Bin";
-
-        public static readonly string EventLog = "Event Log";
-
-        public static readonly string SiteManagement = "Site Management";
-
-        public static readonly string ModuleManagement = "Module Management";
-
-        public static readonly string ThemeManagement = "Theme Management";
-
-        public static readonly string LanguageManagement = "Language Management";
-
-        public static readonly string ScheduledJobs = "Scheduled Jobs";
-
-        public static readonly string SqlManagement = "Sql Management";
-
-        public static readonly string SystemInfo = "System Info";
-
-        public static readonly string SystemUpdate = "System Update";
-    }
-}
diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index 0c7cd842..6c665ba2 100644
--- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -2,7 +2,7 @@
 @inherits ModuleBase
 @inject IPageService PageService
 @inject IUserService UserService
-@inject IStringLocalizer<SharedResources> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row">
     @foreach (var p in _pages)
@@ -12,7 +12,7 @@
             string url = NavigateUrl(p.Path);
             <div class="col-md-2 mx-auto text-center">
                 <NavLink class="nav-link" href="@url" Match="NavLinkMatch.All">
-                    <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@Localizer[p.Name]
+                    <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
                 </NavLink>
             </div>
         }
diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor
index 381665ae..0e085ab9 100644
--- a/Oqtane.Client/Modules/Admin/Error/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Error/Index.razor
@@ -11,7 +11,7 @@
         Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            string message = Localizer["A Problem Was Encountered Loading Module {0}", module.ModuleDefinitionName];
+            string message = string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName);
             AddModuleMessage(message, MessageType.Error);
         }
 
diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor
index a848ee19..727c0bcf 100644
--- a/Oqtane.Client/Modules/Admin/Files/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Add.razor
@@ -5,6 +5,7 @@
 @inject IFileService FileService
 @inject IFolderService FolderService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Upload" Heading="Upload Files" ResourceKey="UploadFiles">
@@ -18,7 +19,7 @@
                 </td>
             </tr>
         </table>
-        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     </TabPanel>
     <TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles">
         @if (_folders != null)
@@ -37,8 +38,8 @@
                         <Label For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
                     </td>
                     <td>
-                        <select id="folder" class="form-control" @bind="@_folderId">
-                            <option value="-1">&lt;@Localizer["Select Folder"]&gt;</option>
+                        <select id="folder" class="form-select" @bind="@_folderId">
+                            <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
                             @foreach (Folder folder in _folders)
                             {
                                 <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
@@ -47,8 +48,8 @@
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-success" @onclick="Download">@Localizer["Download"]</button>
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+            <button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         }
     </TabPanel>
 </TabStrip>
@@ -74,7 +75,7 @@
     {
         if (url == string.Empty || _folderId == -1)
         {
-            AddModuleMessage(Localizer["You Must Enter A Url And Select A Folder"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning);
             return;
         }
 
@@ -83,13 +84,13 @@
         if (!Constants.UploadableFiles.Split(',')
                 .Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
         {
-            AddModuleMessage(Localizer["File Could Not Be Downloaded From Url Due To Its File Extension"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning);
             return;
         }
 
         if (!filename.IsPathOrFileValid())
         {
-            AddModuleMessage(Localizer["You Must Enter A Url With A Valid File Name"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning);
             return;
         }
 
@@ -97,12 +98,12 @@
         {
             await FileService.UploadFileAsync(url, _folderId);
             await logger.LogInformation("File Downloaded Successfully From Url {Url}", url);
-            AddModuleMessage(Localizer["File Downloaded Successfully From Url"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message);
-            AddModuleMessage(Localizer["Error Downloading File From Url. Please Verify That The Url Is Valid."], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor
index 93bd73a8..44e7e3a2 100644
--- a/Oqtane.Client/Modules/Admin/Files/Details.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Details.razor
@@ -4,12 +4,13 @@
 @inject IFolderService FolderService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Details> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_folders != null)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label for="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
             </td>
             <td>
@@ -21,7 +22,7 @@
                 <Label For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
             </td>
             <td>
-                <select id="parent" class="form-control" @bind="@_folderId">
+                <select id="parent" class="form-select" @bind="@_folderId">
                     @foreach (Folder folder in _folders)
                     {
                         <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
@@ -38,8 +39,8 @@
             </td>
         </tr>
     </table>
-    <button type="button" class="btn btn-success" @onclick="SaveFile">@Localizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveFile">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     <br />
     <br />
     <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
@@ -81,7 +82,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading File {FileId} {Error}", _fileId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading File"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
         }
     }
 
@@ -100,13 +101,13 @@
             }
             else
             {
-                AddModuleMessage(Localizer["File Name Not Valid"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message);
-            AddModuleMessage(Localizer["Error Saving File"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index 4f6054db..48d5ef79 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -4,19 +4,20 @@
 @inject IFileService FileService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_folders != null)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
             </td>
             <td>
-                <select id="parent" class="form-control" @bind="@_parentId">
+                <select id="parent" class="form-select" @bind="@_parentId">
                     @if (PageState.QueryString.ContainsKey("id"))
                     {
-                        <option value="-1">&lt;@Localizer["No Parent"]&gt;</option>
+                        <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
                     }
                     @foreach (Folder folder in _folders)
                     {
@@ -44,7 +45,7 @@
                 }
                 else
                 {
-                    <select id="type" class="form-control" @bind="@_type">
+                    <select id="type" class="form-select" @bind="@_type">
                         <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
                         <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
                     </select>
@@ -60,11 +61,13 @@
     </table>
     @if (!_isSystem)
     {
-        <button type="button" class="btn btn-success" @onclick="SaveFolder">@Localizer["Save"]</button>
+        <button type="button" class="btn btn-success" @onclick="SaveFolder">@SharedLocalizer["Save"]</button>
+        @((MarkupString)"&nbsp;")
     }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     @if (!_isSystem && PageState.QueryString.ContainsKey("id"))
     {
+        @((MarkupString)"&nbsp;")
         <ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
     <br />
@@ -128,7 +131,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Folder"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Folder.Load"], MessageType.Error);
         }
     }
 
@@ -136,13 +139,13 @@
     {
         if (_name == string.Empty || _parentId == -1)
         {
-            AddModuleMessage(Localizer["Folders Must Have A Parent And A Name"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning);
             return;
         }
 
         if (!_name.IsPathOrFileValid())
         {
-            AddModuleMessage(Localizer["Folder Name Not Valid."], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
             return;
         }
 
@@ -191,13 +194,13 @@
             }
             else
             {
-                AddModuleMessage(Localizer["An Error Was Encountered Saving The Folder"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Folder"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
         }
     }
 
@@ -225,18 +228,18 @@
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Folder Has Files And Cannot Be Deleted"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["Folder Has Subfolders And Cannot Be Deleted"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Folder.Subfolders.InvalidDelete"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Folder"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Folder.Delete"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index bd670d21..e119515c 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -4,16 +4,17 @@
 @inject IFolderService FolderService
 @inject IFileService FileService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_files != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">@Localizer["Folder:"] </label>
+                <label class="control-label">@Localizer["Folder"] </label>
             </td>
             <td>
-                <select class="form-control" @onchange="(e => FolderChanged(e))">
+                <select class="form-select" @onchange="(e => FolderChanged(e))">
                     @foreach (Folder folder in _folders)
                     {
                         <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
@@ -31,23 +32,23 @@
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Modified"]</th>
             <th>@Localizer["Type"]</th>
             <th>@Localizer["Size"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
-            <td><ActionDialog Header="Delete File" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
+            <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
             <td><a href="@context.Url" target="_new">@context.Name</a></td>
             <td>@context.ModifiedOn</td>
-            <td>@context.Extension.ToUpper() @Localizer["File"]</td>
+            <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
             <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
         </Row>
     </Pager>
     @if (_files.Count == 0)
     {
-        <div class="text-center">@Localizer["No Files Exist In Selected Folder"]</div>
+        <div class="text-center">@Localizer["NoFiles"]</div>
     }
 }
 
@@ -63,7 +64,7 @@
         try
         {
             _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
-            
+
             if (_folderId == -1 && _folders.Count > 0)
             {
                 _folderId = _folders[0].FolderId;
@@ -73,7 +74,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Files"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
         }
     }
 
@@ -93,7 +94,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Files"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
         }
     }
 
@@ -103,14 +104,14 @@
         {
             await FileService.DeleteFileAsync(file.FileId);
             await logger.LogInformation("File Deleted {File}", file.Name);
-            AddModuleMessage(Localizer["File {0} Deleted", file.Name], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.File.Delete"], file.Name), MessageType.Success);
             await GetFiles();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting File {File} {Error}", file.Name, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting File {0}", file.Name], MessageType.Error);
+            AddModuleMessage(string.Format(Localizer["Error.File.Delete"], file.Name), MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 9a436b6d..31d982c3 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -3,10 +3,11 @@
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
@@ -26,9 +27,9 @@
             <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
         </td>
         <td>
-            <select id="enabled" class="form-control" @bind="@_isEnabled">
-                <option value="True">@Localizer["Yes"]</option>
-                <option value="False">@Localizer["No"]</option>
+            <select id="enabled" class="form-select" @bind="@_isEnabled">
+                <option value="True">@SharedLocalizer["Yes"]</option>
+                <option value="False">@SharedLocalizer["No"]</option>
             </select>
         </td>
     </tr>
@@ -38,7 +39,7 @@
         </td>
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
-            <select id="runs-every" class="form-control" @bind="@_frequency">
+            <select id="runs-every" class="form-select" @bind="@_frequency">
                 <option value="m">@Localizer["Minute(s)"]</option>
                 <option value="H">@Localizer["Hour(s)"]</option>
                 <option value="d">@Localizer["Day(s)"]</option>
@@ -79,8 +80,11 @@
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveJob">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+<br />
+<br />
+<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
 
 @code {
     private int _jobId;
@@ -93,6 +97,10 @@
     private string _endDate = string.Empty;
     private string _retentionHistory = string.Empty;
     private string _nextExecution = string.Empty;
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -113,12 +121,16 @@
                 _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
                 _retentionHistory = job.RetentionHistory.ToString();
                 _nextExecution = job.NextExecution.ToString();
+                createdby = job.CreatedBy;
+                createdon = job.CreatedOn;
+                modifiedby = job.ModifiedBy;
+                modifiedon = job.ModifiedOn;
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Job"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
         }
     }
 
@@ -171,12 +183,12 @@
             catch (Exception ex)
             {
                 await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message);
-                AddModuleMessage(Localizer["Error Updating Job"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Job.Update"], MessageType.Error);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["You Must Provide The Job Name, Type, Frequency, and Retention"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 5aefdcbe..1996d62b 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -2,10 +2,11 @@
 @inherits ModuleBase
 @inject IJobService JobService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_jobs == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -19,10 +20,10 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
-            <th>@Localizer["Status"]</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Status"]</th>
             <th>@Localizer["Frequency"]</th>
-            <th>@Localizer["Next Execution"]</th>
+            <th>@Localizer["NextExecution"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
@@ -118,7 +119,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Job"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Job.Delete"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
index b0049db7..23b605c2 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
@@ -2,46 +2,47 @@
 @inherits ModuleBase
 @inject IJobLogService JobLogService
 @inject IStringLocalizer<Log> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_jobLogs == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-<Pager Items="@_jobLogs">
-    <Header>
-        <th>@Localizer["Name"]</th>
-        <th>@Localizer["Status"]</th>
-        <th>@Localizer["Started"]</th>
-        <th>@Localizer["Finished"]</th>
-    </Header>
-    <Row>
-        <td>@context.Job.Name</td>
-        <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
-        <td>@context.StartDate</td>
-        <td>@context.FinishDate</td>
-    </Row>
-    <Detail>
-        <td colspan="4">@((MarkupString)context.Notes)</td>
-    </Detail>
-</Pager>
+    <Pager Items="@_jobLogs">
+        <Header>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Status"]</th>
+            <th>@Localizer["Started"]</th>
+            <th>@Localizer["Finished"]</th>
+        </Header>
+        <Row>
+            <td>@context.Job.Name</td>
+            <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
+            <td>@context.StartDate</td>
+            <td>@context.FinishDate</td>
+        </Row>
+        <Detail>
+            <td colspan="4">@((MarkupString)context.Notes)</td>
+        </Detail>
+    </Pager>
 }
 
 @code {
     private List<JobLog> _jobLogs;
-    
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
         _jobLogs = await JobLogService.GetJobLogsAsync();
-        
+
         if (PageState.QueryString.ContainsKey("id"))
         {
             _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList();
         }
-        
+
         _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList();
     }
 
@@ -63,7 +64,7 @@ else
                 status = Localizer["Failed"];
             }
         }
-        
+
         return status;
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index aecb372c..636305aa 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -7,10 +7,11 @@
 @inject ILanguageService LanguageService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_supportedCultures == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -22,75 +23,92 @@ else
             }
             else
             {
-            <table class="table table-borderless">
+                <table class="table table-borderless">
+                    <tr>
+                        <td width="30%">
+                            <Label For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
+                        </td>
+                        <td>
+                            <select id="_code" class="form-select" @bind="@_code">
+                                @foreach (var culture in _availableCultures)
+                                {
+                                    <option value="@culture.Name">@culture.DisplayName</option>
+                                }
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
+                        </td>
+                        <td>
+                            <select id="default" class="form-select" @bind="@_isDefault">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </td>
+                    </tr>
+                </table>
+                <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
+            }
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </TabPanel>
+        <TabPanel Name="Download" ResourceKey="Download" Security="SecurityAccessLevel.Host">
+            <ModuleMessage Type="MessageType.Info" Message="Download one or more translations from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+
+            <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
                 <tr>
                     <td>
-                        <Label For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
+                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
                     </td>
                     <td>
-                        <select id="_code" class="form-control" @bind="@_code">
-                            @foreach (var culture in _availableCultures)
-                            {
-                                <option value="@culture.Name">@culture.DisplayName</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
-                    </td>
-                    <td>
-                        <select id="default" class="form-control" @bind="@_isDefault">
-                            <option value="True">@Localizer["Yes"]</option>
-                            <option value="False">@Localizer["No"]</option>
-                        </select>
+                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
+                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-success" @onclick="SaveLanguage">@Localizer["Save"]</button>
-            }
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-        </TabPanel>
-        <TabPanel Name="Download" ResourceKey="Download" Security="SecurityAccessLevel.Host">
-            @if (_packages != null && _packages.Count > 0)
+
+            @if (_packages != null)
             {
-                <ModuleMessage Type="MessageType.Info" Message="Download one or more language packages from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-                <Pager Items="@_packages">
-                    <Header>
-                        <th>@Localizer["Name"]</th>
-                        <th>@Localizer["Version"]</th>
-                        <th style="width: 1px"></th>
-                    </Header>
-                    <Row>
-                        <td>@context.Name</td>
-                        <td>@context.Version</td>
-                        <td>
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadLanguage(context.PackageId, context.Version))>@Localizer["Download"]</button>
-                        </td>
-                    </Row>
-                </Pager>
-                <button type="button" class="btn btn-success" @onclick="InstallLanguages">@Localizer["Install"]</button>
-                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-            }
-            else
-            {
-                <ModuleMessage Type="MessageType.Info" Message="No Language Packages Are Available To Download"></ModuleMessage>
+                @if (_packages.Count > 0)
+                {
+                    <Pager Items="@_packages">
+                        <Row>
+                            <td>
+                                <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                                @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                                <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
+                            </td>
+                            <td style="vertical-align: middle;">
+                                <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadLanguage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                            </td>
+                        </Row>
+                    </Pager>
+                }
+                else
+                {
+                    <br />
+                    <div class="mx-auto text-center">
+                        @Localizer["Search.NoResults"]
+                    </div>
+                }
+                <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
             }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label HelpText="Upload one or more language packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
+                        <Label HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
                     </td>
                     <td>
                         <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-success" @onclick="InstallLanguages">@Localizer["Install"]</button>
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+            <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         </TabPanel>
     </TabStrip>
 }
@@ -102,6 +120,7 @@ else
     private IEnumerable<Culture> _supportedCultures;
     private IEnumerable<Culture> _availableCultures;
     private List<Package> _packages;
+    private string _search = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -113,15 +132,45 @@ else
         _supportedCultures = await LocalizationService.GetCulturesAsync();
         _availableCultures = _supportedCultures
             .Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
-        _packages = await PackageService.GetPackagesAsync("language");
+        await LoadTranslations();
 
         if (_supportedCultures.Count() == 1)
         {
-            _message = Localizer["The Only Installed Language Is English"];
+            _message = Localizer["OnlyEnglish"];
         }
         else if (_availableCultures.Count() == 0)
         {
-            _message = Localizer["All The Installed Languages Have Been Added."];
+            _message = Localizer["AllLanguages"];
+        }
+    }
+
+    private async Task LoadTranslations()
+    {
+        _packages = await PackageService.GetPackagesAsync("translation", _search);
+    }
+
+    private async Task Search()
+    {
+        try
+        {
+            await LoadTranslations();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
+
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadTranslations();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
         }
     }
 
@@ -151,7 +200,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message);
-            AddModuleMessage(Localizer["Error Adding Language"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error);
         }
     }
 
@@ -160,11 +209,11 @@ else
         try
         {
             await PackageService.InstallPackagesAsync();
-            AddModuleMessage(Localizer["Language Packages Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Installing Language Package");
+            await logger.LogError(ex, "Error Installing Translations");
         }
     }
 
@@ -174,13 +223,13 @@ else
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Packages");
             await logger.LogInformation("Language Paclage {Name} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Language Package Downloaded Successfully. Click Install To Complete Installation."], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Language Package {Name} {Version}", packageid, version);
-            AddModuleMessage(Localizer["Error Downloading Language Package"], MessageType.Error);
+            await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Languages/Index.razor b/Oqtane.Client/Modules/Admin/Languages/Index.razor
index eef0c6af..b8a3d21d 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Index.razor
@@ -4,10 +4,11 @@
 @inject ILocalizationService LocalizationService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_languages == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -16,21 +17,21 @@ else
     <Pager Items="@_languages">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Code"]</th>
-            <th>@Localizer["Default?"]</th>
+            <th>@Localizer["Default"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionDialog Header="Delete Langauge" Message="@Localizer["Are You Sure You Wish To Delete The {0} Language From This Site?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
+            <td><ActionDialog Header="Delete Language" Message="@string.Format(Localizer["Confirm.Language.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
             <td>@context.Name</td>
             <td>@context.Code</td>
             <td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
             <td>
                 @if (UpgradeAvailable(context.Code))
-                {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@Localizer["Upgrade"]</button>
-                }
+                    {
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
+                    }
             </td>
         </Row>
     </Pager>
@@ -48,13 +49,13 @@ else
 
         var cultures = await LocalizationService.GetCulturesAsync();
         var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
-        
+
         // Adds English as default language
         _languages.Insert(0, new Language { Name = culture.DisplayName, Code = culture.Name, IsDefault = !_languages.Any(l => l.IsDefault) });
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            _packages = await PackageService.GetPackagesAsync("language");
+            _packages = await PackageService.GetPackagesAsync("translation");
         }
     }
 
@@ -71,7 +72,7 @@ else
         {
             await logger.LogError(ex, "Error Deleting Language {Language} {Error}", language, ex.Message);
 
-            AddModuleMessage(Localizer["Error Deleting Language"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Language.Delete"], MessageType.Error);
         }
     }
 
@@ -97,15 +98,15 @@ else
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
                 await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + code, Constants.Version, "Packages");
-                await logger.LogInformation("Language Package Downloaded {Code} {Version}", code, Constants.Version);
+                await logger.LogInformation("Translation Downloaded {Code} {Version}", code, Constants.Version);
                 await PackageService.InstallPackagesAsync();
-                AddModuleMessage(Localizer["Language Package Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+                AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
             }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Language Package {Code} {Version} {Error}", code, Constants.Version, ex.Message);
-            AddModuleMessage(Localizer["Error Downloading Language Package"], MessageType.Error);
+            await logger.LogError(ex, "Error Downloading Translation {Code} {Version} {Error}", code, Constants.Version, ex.Message);
+            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 3da1c2ea..868031fd 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -3,7 +3,9 @@
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IServiceProvider ServiceProvider
+@inject SiteState SiteState
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_message != string.Empty)
 {
@@ -14,29 +16,29 @@
         <text>...</text>
     </Authorizing>
     <Authorized>
-        <ModuleMessage Message="@Localizer["You Are Already Signed In"]" Type="MessageType.Info" />
+        <ModuleMessage Message="@Localizer["Info.SignedIn"]" Type="MessageType.Info" />
     </Authorized>
     <NotAuthorized>
         <form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
             <div class="container Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
                 <div class="form-group">
-                    <label for="Username" class="control-label">@Localizer["Username:"] </label>
+                    <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
                     <input type="text" @ref="username" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" required />
                 </div>
                 <div class="form-group">
-                    <label for="Password" class="control-label">@Localizer["Password:"] </label>
+                    <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
                     <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" required />
                 </div>
                 <div class="form-group">
                     <div class="form-check form-check-inline">
-                        <label class="form-check-label" for="Remember">@Localizer["Remember Me?"]</label>&nbsp;
+                        <label class="form-check-label" for="Remember">@Localizer["RememberMe"]</label>&nbsp;
                         <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
                     </div>
                 </div>
-                <button type="button" class="btn btn-primary" @onclick="Login">@Localizer["Login"]</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+                <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                 <br /><br />
-                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["Forgot Password"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
             </div>
         </form>
     </NotAuthorized>
@@ -57,7 +59,7 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     public override List<Resource> Resources => new List<Resource>()
-    {
+{
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
@@ -82,11 +84,11 @@
 
             if (user != null)
             {
-                _message = Localizer["User Account Verified Successfully. You Can Now Login With Your Username And Password Below."];
+                _message = Localizer["Success.Account.Verified"];
             }
             else
             {
-                _message = Localizer["User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions."];
+                _message = Localizer["Message.Account.NotVerfied"];
                 _type = MessageType.Warning;
             }
         }
@@ -108,7 +110,6 @@
         {
             if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
             {
-                // server-side Blazor
                 var user = new User();
                 user.SiteId = PageState.Site.SiteId;
                 user.Username = _username;
@@ -118,16 +119,15 @@
                 if (user.IsAuthenticated)
                 {
                     await logger.LogInformation("Login Successful For Username {Username}", _username);
-                    // complete the login on the server so that the cookies are set correctly 
-                    string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-                    var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+                    // server-side Blazor needs to post to the Login page so that the cookies are set correctly
+                    var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
                     string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
                     await interop.SubmitForm(url, fields);
                 }
                 else
                 {
                     await logger.LogInformation("Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error);
+                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
                 }
             }
             else
@@ -143,18 +143,18 @@
                     await logger.LogInformation("Login Successful For Username {Username}", _username);
                     var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                     authstateprovider.NotifyAuthenticationChanged();
-                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload"));
+                    NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
                 }
                 else
                 {
                     await logger.LogInformation("Login Failed For Username {Username}", _username);
-                    AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error);
+                    AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);
                 }
             }
         }
         else
         {
-            AddModuleMessage(Localizer["Please Provide Your Username And Password"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 481a9636..65fa7a2c 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -6,11 +6,12 @@
 @inject IPageService PageService
 @inject IPageModuleService PageModuleService
 @inject IUserService UserService
-@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<Detail> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
         </td>
         <td>
@@ -134,7 +135,7 @@
         </td>
     </tr>
 </table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private int _logId;
@@ -207,7 +208,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Log"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index cbd355db..02bd9d62 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,11 +1,12 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
-@inject IStringLocalizer<Index> Localizer 
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_logs == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -13,8 +14,8 @@ else
         <tr>
             <td>
                 <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-                <select id="level" class="form-control" @onchange="(e => LevelChanged(e))">
-                    <option value="-">&lt;@Localizer["All Levels"]&gt;</option>
+                <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
+                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
                     <option value="Trace">@Localizer["Trace"]</option>
                     <option value="Debug">@Localizer["Debug"]</option>
                     <option value="Information">@Localizer["Information"]</option>
@@ -25,19 +26,19 @@ else
             </td>
             <td>
                 <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-                <select id="function" class="form-control" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;@Localizer["All Functions"]&gt;</option>
+                <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
+                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
                     <option value="Create">@Localizer["Create"]</option>
                     <option value="Read">@Localizer["Read"]</option>
-                    <option value="Update">@Localizer["Update"]</option>
-                    <option value="Delete">@Localizer["Delete"]</option>
+                    <option value="Update">@SharedLocalizer["Update"]</option>
+                    <option value="Delete">@SharedLocalizer["Delete"]</option>
                     <option value="Security">@Localizer["Security"]</option>
                     <option value="Other">@Localizer["Other"]</option>
                 </select>
             </td>
             <td>
                 <Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
-                <select id="rows" class="form-control" @onchange="(e => RowsChanged(e))">
+                <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
                     <option value="10">10</option>
                     <option value="50">50</option>
                     <option value="100">100</option>
@@ -67,7 +68,7 @@ else
     }
     else
     {
-        <p><em>@Localizer["No Logs Match The Criteria Specified"]</em></p>
+        <p><em>@Localizer["NoLogs"]</em></p>
     }
 }
 
@@ -88,7 +89,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -103,7 +104,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -118,7 +119,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -134,7 +135,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index bd29e7ca..a6ac643b 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -6,12 +6,13 @@
 @inject IModuleService ModuleService
 @inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (string.IsNullOrEmpty(_moduledefinitionname) && _templates != null)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
             </td>
             <td>
@@ -39,8 +40,8 @@
                 <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
             </td>
             <td>
-                <select id="template" class="form-control" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
+                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
                         <option value="@template.Name">@template.Title</option>
@@ -53,7 +54,7 @@
                 <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
             </td>
             <td>
-                <select id="reference" class="form-control" @bind="@_reference">
+                <select id="reference" class="form-select" @bind="@_reference">
                     @foreach (string version in _versions)
                     {
                         if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
@@ -61,7 +62,7 @@
                             <option value="@(version)">@(version)</option>
                         }
                     }
-                    <option value="local">@Localizer["Local Version"]</option>
+                    <option value="local">@SharedLocalizer["LocalVersion"]</option>
                 </select>
             </td>
         </tr>
@@ -77,11 +78,11 @@
             </tr>
         }
     </table>
-    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Create Module"]</button>
+    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Module.Create"]</button>
 }
 else
 {
-    <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Activate Module"]</button>
+    <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Module.Activate"]</button>
 }
 
 @code {
@@ -108,11 +109,11 @@ else
 
             if (string.IsNullOrEmpty(_moduledefinitionname))
             {
-                AddModuleMessage(Localizer["Please Note That The Module Creator Is Only Intended To Be Used In A Development Environment"], MessageType.Info);
+                AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
             }
             else
             {
-                AddModuleMessage(Localizer["Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below"], MessageType.Info);
+                AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
             }
         }
         catch (Exception ex)
@@ -136,11 +137,11 @@ else
 
                 GetLocation();
 
-                AddModuleMessage(Localizer["The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+                AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 36b41591..400ec49b 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -5,50 +5,70 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+
+        <table class="table table-borderless" style="margin: auto; width: 50% !important;">
+            <tr>
+                <td>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                </td>
+                <td>
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                </td>
+            </tr>
+        </table>
+
+        @if (_packages != null)
         {
-            <TabPanel Name="Download" ResourceKey="Download">
-                <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+            if (_packages.Count > 0)
+            {
                 <Pager Items="@_packages">
-                    <Header>
-                        <th>@Localizer["Name"]</th>
-                        <th>@Localizer["Version"]</th>
-                        <th style="width: 1px"></th>
-                    </Header>
                     <Row>
-                        <td>@context.Name</td>
-                        <td>@context.Version</td>
                         <td>
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@Localizer["Download"]</button>
+                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
+                        </td>
+                        <td style="vertical-align: middle;">
+                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
                         </td>
                     </Row>
                 </Pager>
-            </TabPanel>
+            }
+            else
+            {
+                <br />
+                <div class="mx-auto text-center">
+                    @Localizer["Search.NoResults"]
+                </div>
+            }
         }
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
-                    </td>
-                </tr>
-            </table>
-        </TabPanel>
-    </TabStrip>
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
+<button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private List<Package> _packages;
+    private string _search = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -56,9 +76,22 @@
     {
         try
         {
-            var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+        }
+    }
 
+    private async Task LoadModuleDefinitions()
+    {
+        var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+        _packages = await PackageService.GetPackagesAsync("module", _search);
+
+        if (_packages != null)
+        {
             foreach (Package package in _packages.ToArray())
             {
                 if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
@@ -67,10 +100,30 @@
                 }
             }
         }
+    }
+
+    private async Task Search()
+    {
+        try
+        {
+            await LoadModuleDefinitions();
+        }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Packages"], MessageType.Error);
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
+
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
         }
     }
 
@@ -79,7 +132,7 @@
         try
         {
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-            AddModuleMessage(Localizer["Module Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
@@ -93,13 +146,13 @@
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Packages");
             await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Modules Downloaded Successfully. Click Install To Complete Installation."], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version);
-            AddModuleMessage(Localizer["Error Downloading Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
index 98324f3a..c4fae60b 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
@@ -5,13 +5,14 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IModuleService ModuleService
 @inject ISettingService SettingService
-@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<Create> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_templates != null)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
             </td>
             <td>
@@ -39,8 +40,8 @@
                 <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
             </td>
             <td>
-                <select id="template" class="form-control" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
+                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
                         <option value="@template.Name">@template.Title</option>
@@ -53,7 +54,7 @@
                 <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
             </td>
             <td>
-                <select id="reference" class="form-control" @bind="@_reference">
+                <select id="reference" class="form-select" @bind="@_reference">
                     @foreach (string version in _versions)
                     {
                         if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
@@ -61,7 +62,7 @@
                             <option value="@(version)">@(version)</option>
                         }
                     }
-                    <option value="local">@Localizer["Local Version"]</option>
+                    <option value="local">@SharedLocalizer["LocalVersion"]</option>
                 </select>
             </td>
         </tr>
@@ -77,8 +78,8 @@
             </tr>
         }
     </table>
-    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Create Module"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["CreateModule"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
@@ -100,7 +101,7 @@
         {
             _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Please Note That The Module Creator Is Only Intended To Be Used In A Development Environment"], MessageType.Info);
+            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
         }
         catch (Exception ex)
         {
@@ -117,11 +118,11 @@
                 var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
                 moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
                 GetLocation();
-                AddModuleMessage(Localizer["The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must <a href=\"{0}\">Restart</a> Your Application To Activate The Module.", NavigateUrl("admin/system")], MessageType.Success);
+                AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 70310bd4..604a5904 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -3,12 +3,13 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Definition" ResourceKey="Definition">
         <table class="table table-borderless">
             <tr>
-                <td>
+                <td width="30%">
                     <Label For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
                 </td>
                 <td>
@@ -35,7 +36,7 @@
         <Section Name="Information" ResourceKey="Information">
             <table class="table table-borderless">
                 <tr>
-                    <td>
+                    <td width="30%">
                         <Label For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
                     </td>
                     <td>
@@ -103,8 +104,8 @@
         </table>
     </TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 <br />
 <br />
 <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
@@ -161,7 +162,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
         }
     }
 
@@ -190,7 +191,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index c9c47456..70a3abba 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -4,23 +4,24 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_moduleDefinitions == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
     @((MarkupString)"&nbsp;")
-    <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" />
+    <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary" />
 
     <Pager Items="@_moduleDefinitions">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
-            <th>@Localizer["Version"]</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Version"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
@@ -28,7 +29,7 @@ else
             <td>
                 @if (context.AssemblyName != "Oqtane.Client")
                     {
-                    <ActionDialog Header="Delete Module" Message="@Localizer["Are You Sure You Wish To Delete The {0} Module?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
+                    <ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete", context.Name])" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
                     }
             </td>
             <td>@context.Name</td>
@@ -36,7 +37,7 @@ else
             <td>
                 @if (UpgradeAvailable(context.PackageName, context.Version))
                     {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@Localizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
                     }
             </td>
         </Row>
@@ -61,7 +62,7 @@ else
             if (_moduleDefinitions == null)
             {
                 await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
-                AddModuleMessage(Localizer["Error Loading Modules"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
             }
         }
     }
@@ -88,12 +89,12 @@ else
             await PackageService.DownloadPackageAsync(packagename, version, "Packages");
             await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-            AddModuleMessage(Localizer["Module Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
-            AddModuleMessage(Localizer["Error Downloading Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
         }
     }
 
@@ -102,13 +103,13 @@ else
         try
         {
             await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
-            AddModuleMessage(Localizer["Module Deleted Successfully"], MessageType.Success);
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
+            AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor
index fd1aa71c..41c7d73b 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Export.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor
@@ -3,11 +3,12 @@
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
 @inject IStringLocalizer<Export> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tbody>
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
             </td>
             <td>
@@ -17,7 +18,7 @@
     </tbody>
 </table>
 <button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor
index 423361f6..833dbefc 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Import.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor
@@ -3,11 +3,12 @@
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
 @inject IStringLocalizer<Import> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tbody>
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
             </td>
             <td>
@@ -17,7 +18,7 @@
     </tbody>
 </table>
 <button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 
 @code {
@@ -35,22 +36,22 @@
                 bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content);
                 if (success)
                 {
-                    AddModuleMessage(Localizer["Content Imported Successfully"], MessageType.Success);
+                    AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success);
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["A Problem Was Encountered Importing Content. Please Ensure The Content Is Formatted Correctly For The Module."], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning);
                 }
             }
             catch (Exception ex)
             {
                 await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
-                AddModuleMessage(Localizer["Error Importing Module"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["You Must Enter Some Content To Import"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index 5d75d71b..7fc04462 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -6,6 +6,7 @@
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
 @inject IStringLocalizer<Settings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
@@ -13,7 +14,7 @@
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
+                    <td width="30%">
                         <Label For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
                     </td>
                     <td>
@@ -25,7 +26,7 @@
                         <Label For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
                     </td>
                     <td>
-                        <select id="container" class="form-control" @bind="@_containerType">
+                        <select id="container" class="form-select" @bind="@_containerType">
                             @foreach (var container in _containers)
                             {
                                 <option value="@container.TypeName">@container.Name</option>
@@ -38,9 +39,9 @@
                         <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
                     </td>
                     <td>
-                        <select id="allpages" class="form-control" @bind="@_allPages">
-                            <option value="True">@Localizer["Yes"]</option>
-                            <option value="False">@Localizer["No"]</option>
+                        <select id="allpages" class="form-select" @bind="@_allPages">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
                         </select>
                     </td>
                 </tr>
@@ -49,7 +50,7 @@
                         <Label For="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
                     </td>
                     <td>
-                        <select id="page" class="form-control" @bind="@_pageId">
+                        <select id="page" class="form-select" @bind="@_pageId">
                             @foreach (Page p in PageState.Pages)
                             {
                                 if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
@@ -88,8 +89,11 @@
         </TabPanel>
     }
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModule">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+<br />
+<br />
+<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
@@ -111,6 +115,10 @@
     private Type _containerSettingsType;
     private object _containerSettings;
     private RenderFragment ContainerSettingsComponent { get; set; }
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
 
     protected override async Task OnInitializedAsync()
     {
@@ -122,6 +130,10 @@
         _permissions = ModuleState.Permissions;
         _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
         _pageId = ModuleState.PageId.ToString();
+        createdby = ModuleState.CreatedBy;
+        createdon = ModuleState.CreatedOn;
+        modifiedby = ModuleState.ModifiedBy;
+        modifiedon = ModuleState.ModifiedOn;
 
         if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
         {
@@ -212,7 +224,7 @@
         }
         else
         {
-            AddModuleMessage(Localizer["You Must Provide A Title For The Module"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 0c97da2c..91a2f391 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -4,6 +4,7 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip Refresh="@_refresh">
     <TabPanel Name="Settings" ResourceKey="Settings">
@@ -11,7 +12,7 @@
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
+                    <td width="30%">
                         <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                     </td>
                     <td>
@@ -23,8 +24,8 @@
                         <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                     </td>
                     <td>
-                        <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;@Localizer["Site Root"]&gt;</option>
+                        <select id="Parent" class="form-select" @onchange="(e => ParentChanged(e))">
+                            <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
                             @foreach (Page page in _pageList)
                             {
                                 <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
@@ -37,19 +38,19 @@
                         <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
                     </td>
                     <td>
-                        <select id="Insert" class="form-control" @bind="@_insert">
-                            <option value="<<">@Localizer["At Beginning"]</option>
+                        <select id="Insert" class="form-select" @bind="@_insert">
+                            <option value="<<">@Localizer["AtBeginning"]</option>
                             @if (_children != null && _children.Count > 0)
                             {
                                 <option value="<">@Localizer["Before"]</option>
                                 <option value=">">@Localizer["After"]</option>
                             }
-                            <option value=">>">@Localizer["At End"]</option>
+                            <option value=">>">@Localizer["AtEnd"]</option>
                         </select>
                         @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
-                            <select class="form-control" @bind="@_childid">
-                                <option value="-1">&lt;@Localizer["Select Page"]&gt;</option>
+                            <select class="form-select" @bind="@_childid">
+                                <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
                                 @foreach (Page page in _children)
                                 {
                                     <option value="@(page.PageId)">@(page.Name)</option>
@@ -60,12 +61,23 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                        <Label For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
                     </td>
                     <td>
-                        <select id="Navigation" class="form-control" @bind="@_isnavigation">
-                            <option value="True">@Localizer["Yes"]</option>
-                            <option value="False">@Localizer["No"]</option>
+                        <select id="navigation" class="form-select" @bind="@_isnavigation">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                    </td>
+                    <td>
+                        <select id="clickable" class="form-select" @bind="@_isclickable">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
                         </select>
                     </td>
                 </tr>
@@ -89,7 +101,7 @@
             <Section Name="Appearance" ResourceKey="Appearance">
                 <table class="table table-borderless">
                     <tr>
-                        <td>
+                        <td width="30%">
                             <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                         </td>
                         <td>
@@ -101,7 +113,7 @@
                             <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
-                            <select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
+                            <select id="Theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
                                 @foreach (var theme in _themes)
                                 {
                                     <option value="@theme.TypeName">@theme.Name</option>
@@ -114,8 +126,8 @@
                             <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
                         </td>
                         <td>
-                            <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                                <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
+                            <select id="defaultContainer" class="form-select" @bind="@_containertype">
+                                <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
                                 @foreach (var container in _containers)
                                 {
                                     <option value="@container.TypeName">@container.Name</option>
@@ -136,9 +148,9 @@
                             <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
                         </td>
                         <td>
-                            <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
-                                <option value="True">@Localizer["Yes"]</option>
-                                <option value="False">@Localizer["No"]</option>
+                            <select id="Personalizable" class="form-select" @bind="@_ispersonalizable">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
                             </select>
                         </td>
                     </tr>
@@ -162,8 +174,8 @@
         </TabPanel>
     }
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SavePage">@Localizer["Save"]</button>
-<button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+<button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@@ -180,6 +192,7 @@
     private List<Page> _children;
     private int _childid = -1;
     private string _isnavigation = "True";
+    private string _isclickable = "True";
     private string _url;
     private string _ispersonalizable = "False";
     private string _themetype = string.Empty;
@@ -209,7 +222,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Initializing Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
         }
     }
 
@@ -244,7 +257,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Child Pages For Parent"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
         }
     }
 
@@ -261,7 +274,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
         }
     }
 
@@ -327,7 +340,7 @@
 
                 if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
                 {
-                    AddModuleMessage(Localizer["A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.", _path], MessageType.Warning);
+                    AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
                     return;
                 }
 
@@ -351,6 +364,7 @@
                 }
 
                 page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+                page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
                 page.Url = _url;
                 page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
                 if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
@@ -382,14 +396,14 @@
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide Page Name, Theme, and Container"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
             }
 
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index d012f87f..3e1c964a 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -5,6 +5,7 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip Refresh="@_refresh">
     <TabPanel Name="Settings" ResourceKey="Settings">
@@ -12,7 +13,7 @@
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
+                    <td width="30%">
                         <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                     </td>
                     <td>
@@ -24,8 +25,8 @@
                         <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                     </td>
                     <td>
-                        <select id="Parent" class="form-control" value="@_parentid" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;@Localizer["Site Root"]&gt;</option>
+                        <select id="Parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))">
+                            <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
                             @foreach (Page page in _pageList)
                             {
                                 if (page.PageId != _pageId)
@@ -41,23 +42,23 @@
                         <Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages" ResourceKey="Move">Move: </Label>
                     </td>
                     <td>
-                        <select id="Move" class="form-control" @bind="@_insert">
+                        <select id="Move" class="form-select" @bind="@_insert">
                             @if (_parentid == _currentparentid)
                             {
-                                <option value="=">&lt;@Localizer["Maintain Current Location"]&gt;</option>
+                                <option value="=">&lt;@Localizer["ThisLocation.Keep"]&gt;</option>
                             }
-                            <option value="<<">@Localizer["To Beginning"]</option>
+                            <option value="<<">@Localizer["ToBeginning"]</option>
                             @if (_children != null && _children.Count > 0)
                             {
                                 <option value="<">@Localizer["Before"]</option>
                                 <option value=">">@Localizer["After"]</option>
                             }
-                            <option value=">>">@Localizer["To End"]</option>
+                            <option value=">>">@Localizer["ToEnd"]</option>
                         </select>
                         @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
-                            <select class="form-control" @bind="@_childid">
-                                <option value="-1">&lt;@Localizer["Select Page"]&gt;</option>
+                            <select class="form-select" @bind="@_childid">
+                                <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
                                 @foreach (Page page in _children)
                                 {
                                     <option value="@(page.PageId)">@(page.Name)</option>
@@ -71,9 +72,20 @@
                         <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
                     </td>
                     <td>
-                        <select id="Navigation" class="form-control" @bind="@_isnavigation">
-                            <option value="True">@Localizer["Yes"]</option>
-                            <option value="False">@Localizer["No"]</option>
+                        <select id="Navigation" class="form-select" @bind="@_isnavigation">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Clickablen" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                    </td>
+                    <td>
+                        <select id="Navigation" class="form-select" @bind="@_isclickable">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
                         </select>
                     </td>
                 </tr>
@@ -97,7 +109,7 @@
             <Section Name="Appearance" ResourceKey="Appearance">
                 <table class="table table-borderless">
                     <tr>
-                        <td>
+                        <td width="30%">
                             <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                         </td>
                         <td>
@@ -109,7 +121,7 @@
                             <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
-                            <select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
+                            <select id="Theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
                                 @foreach (var theme in _themes)
                                 {
                                     <option value="@theme.TypeName">@theme.Name</option>
@@ -122,8 +134,8 @@
                             <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
                         </td>
                         <td>
-                            <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                                <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
+                            <select id="defaultContainer" class="form-select" @bind="@_containertype">
+                                <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
                                 @foreach (var container in _containers)
                                 {
                                     <option value="@container.TypeName">@container.Name</option>
@@ -144,9 +156,9 @@
                             <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
                         </td>
                         <td>
-                            <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
-                                <option value="True">@Localizer["Yes"]</option>
-                                <option value="False">@Localizer["No"]</option>
+                            <select id="Personalizable" class="form-select" @bind="@_ispersonalizable">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
                             </select>
                         </td>
                     </tr>
@@ -175,8 +187,8 @@
         </TabPanel>
     }
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SavePage">@Localizer["Save"]</button>
-<button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+<button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@@ -195,6 +207,7 @@
     private List<Page> _children;
     private int _childid = -1;
     private string _isnavigation;
+    private string _isclickable;
     private string _url;
     private string _ispersonalizable;
     private string _themetype;
@@ -247,6 +260,7 @@
 
                 _currentparentid = _parentid;
                 _isnavigation = page.IsNavigation.ToString();
+                _isclickable = page.IsClickable.ToString();
                 _url = page.Url;
                 _ispersonalizable = page.IsPersonalizable.ToString();
                 _themetype = page.ThemeType;
@@ -275,7 +289,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
         }
     }
 
@@ -318,7 +332,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Child Pages For Parent"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
         }
     }
 
@@ -335,7 +349,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
         }
     }
 
@@ -401,7 +415,7 @@
 
                 if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList))
                 {
-                    AddModuleMessage(Localizer["A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.", _path], MessageType.Warning);
+                    AddModuleMessage(string.Format(Localizer["Mesage.Page.PathExists"], _path), MessageType.Warning);
                     return;
                 }
 
@@ -427,6 +441,7 @@
                     }
                 }
                 page.IsNavigation = (_isnavigation == null || Boolean.Parse(_isnavigation));
+                page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
                 page.Url = _url;
                 page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
                 if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
@@ -481,13 +496,13 @@
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide Page Name, Theme, and Container"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index fef67427..0b772dae 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -2,7 +2,8 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
-@inject IStringLocalizer<Index> Localizer 
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.Pages != null)
 {
@@ -12,11 +13,11 @@
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
-            <td><ActionDialog Header="Delete Page" Message="@Localizer["Are You Sure You Wish To Delete The {0} Page?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+            <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
         </Row>
     </Pager>
@@ -30,7 +31,7 @@
         try
         {
             page.IsDeleted = true;
-            
+
             await PageService.UpdatePageAsync(page);
             await logger.LogInformation("Page Deleted {Page}", page);
             NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
@@ -38,7 +39,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
index 86a71c8c..5249172b 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
@@ -3,10 +3,11 @@
 @inject NavigationManager NavigationManager
 @inject IProfileService ProfileService
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
         </td>
         <td>
@@ -74,9 +75,9 @@
             <Label For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
         </td>
         <td>
-            <select id="required" class="form-control" @bind="@_isrequired">
-                <option value="True">@Localizer["Yes"]</option>
-                <option value="False">@Localizer["No"]</option>
+            <select id="required" class="form-select" @bind="@_isrequired">
+                <option value="True">@SharedLocalizer["Yes"]</option>
+                <option value="False">@SharedLocalizer["No"]</option>
             </select>
         </td>
     </tr>
@@ -85,15 +86,21 @@
             <Label For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
         </td>
         <td>
-            <select id="private" class="form-control" @bind="@_isprivate">
-                <option value="True">@Localizer["Yes"]</option>
-                <option value="False">@Localizer["No"]</option>
+            <select id="private" class="form-select" @bind="@_isprivate">
+                <option value="True">@SharedLocalizer["Yes"]</option>
+                <option value="False">@SharedLocalizer["No"]</option>
             </select>
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveProfile">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+@if (PageState.QueryString.ContainsKey("id"))
+{
+    <br />
+    <br />
+    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
+}
 
 @code {
     private int _profileid = -1;
@@ -107,6 +114,10 @@
     private string _options = string.Empty;
     private string _isrequired = "False";
     private string _isprivate = "False";
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -132,13 +143,17 @@
                     _options = profile.Options;
                     _isrequired = profile.IsRequired.ToString();
                     _isprivate = profile.IsPrivate.ToString();
+                    createdby = profile.CreatedBy;
+                    createdon = profile.CreatedOn;
+                    modifiedby = profile.ModifiedBy;
+                    modifiedon = profile.ModifiedOn;
                 }
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
         }
     }
 
@@ -182,7 +197,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index 4705b290..1bbfb6b9 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -2,10 +2,11 @@
 @inherits ModuleBase
 @inject IProfileService ProfileService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_profiles == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -15,11 +16,11 @@ else
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.Name]" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
+            <td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -42,7 +43,7 @@ else
             await ProfileService.DeleteProfileAsync(profileId);
             await logger.LogInformation("Profile Deleted {ProfileId}", profileId);
 
-            AddModuleMessage(Localizer["Profile Deleted"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Profile.Delete"], MessageType.Success);
 
             await GetProfilesAsync();
 
@@ -51,7 +52,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Delete"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 47e2a47a..e70165b9 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -5,13 +5,14 @@
 @inject IModuleService ModuleService
 @inject IPageService PageService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Pages" ResourceKey="Pages">
         @if (_pages == null)
         {
             <br />
-            <p>@Localizer["No Deleted Pages"]</p>
+            <p>@Localizer["NoPage.Deleted"]</p>
         }
         else
         {
@@ -19,13 +20,13 @@
                 <Header>
                     <th style="width: 1px;">&nbsp;</th>
                     <th style="width: 1px;">&nbsp;</th>
-                    <th>@Localizer["Name"]</th>
-                    <th>@Localizer["Deleted By"]</th>
-                    <th>@Localizer["Deleted On"]</th>
+                    <th>@SharedLocalizer["Name"]</th>
+                    <th>@Localizer["DeletedBy"]</th>
+                    <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
                     <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Page" Message="@Localizer["Are You Sure You Wish To Permanently Delete The {0} Page?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+                    <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
                     <td>@context.Name</td>
                     <td>@context.DeletedBy</td>
                     <td>@context.DeletedOn</td>
@@ -43,7 +44,7 @@
         @if (_modules == null)
         {
             <br />
-            <p>@Localizer["No Deleted Modules"]</p>
+            <p>@Localizer["NoModule.Deleted"]</p>
         }
         else
         {
@@ -53,12 +54,12 @@
                     <th style="width: 1px;">&nbsp;</th>
                     <th>@Localizer["Page"]</th>
                     <th>@Localizer["Module"]</th>
-                    <th>@Localizer["Deleted By"]</th>
-                    <th>@Localizer["Deleted On"]</th>
+                    <th>@Localizer["DeletedBy"]</th>
+                    <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
                     <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
-                    <td><ActionDialog Header="Delete Module" Message="@Localizer["Are You Sure You Wish To Permanently Delete The {0} Module?", context.Title]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+                    <td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
                     <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
                     <td>@context.Title</td>
                     <td>@context.DeletedBy</td>
@@ -91,7 +92,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Deleted Pages Or Modules"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.DeletedModulePage.Load"], MessageType.Error);
         }
     }
 
@@ -118,7 +119,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage(Localizer["Error Restoring Deleted Page"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Restore"], MessageType.Error);
         }
     }
 
@@ -175,7 +176,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message);
-            AddModuleMessage(Localizer["Error Restoring Deleted Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Restore"], MessageType.Error);
         }
     }
 
@@ -199,7 +200,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message);
-            AddModuleMessage(Localizer["Error Permanently Deleting Module"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
         }
     }
 
@@ -226,7 +227,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Permanently Deleting Modules"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index e78e4c7c..f942eb84 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -3,6 +3,7 @@
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.Site.AllowRegistration)
 {
@@ -11,41 +12,62 @@
             <text>...</text>
         </Authorizing>
         <Authorized>
-            <ModuleMessage Message="@Localizer["You Are Already Registered"]" Type="MessageType.Info" />            
+            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
         </Authorized>
         <NotAuthorized>
-            <ModuleMessage Message="@Localizer["Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity"]" Type="MessageType.Info" />
+            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
 
-            <div class="container">
-                <div class="form-group">
-                    <label for="Username" class="control-label">@Localizer["Username:"] </label>
-                    <input type="text" class="form-control" placeholder="Username" @bind="@_username" id="Username" />
-                </div>
-                <div class="form-group">
-                    <label for="Password" class="control-label">@Localizer["Password:"] </label>
-                    <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
-                </div>
-                <div class="form-group">
-                    <label for="Confirm" class="control-label">@Localizer["Confirm Password:"] </label>
-                    <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" />
-                </div>
-                <div class="form-group">
-                    <label for="Email" class="control-label">@Localizer["Email:"] </label>
-                    <input type="text" class="form-control" placeholder="Email" @bind="@_email" id="Email" />
-                </div>
-                <div class="form-group">
-                    <label for="DisplayName" class="control-label">@Localizer["Full Name:"] </label>
-                    <input type="text" class="form-control" placeholder="Full Name" @bind="@_displayName" id="DisplayName" />
-                </div>
-                <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
-            </div>
+            <table class="table table-borderless">
+                <tr>
+                    <td width="30%">
+                        <Label For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                    </td>
+                    <td>
+                        <input id="username" class="form-control" @bind="@_username" readonly />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
+                    </td>
+                    <td>
+                        <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
+                    </td>
+                    <td>
+                        <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
+                    </td>
+                    <td>
+                        <input id="email" class="form-control" @bind="@_email" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
+                    </td>
+                    <td>
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
+                    </td>
+                </tr>
+            </table>
+
+            <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
         </NotAuthorized>
     </AuthorizeView>
 }
 else
 {
-    <ModuleMessage Message="@Localizer["Registration is Disabled For This Site"]" Type="MessageType.Info" />
+    <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
 }
 
 @code {
@@ -53,7 +75,7 @@ else
     private string _password = string.Empty;
     private string _confirm = string.Empty;
     private string _email = string.Empty;
-    private string _displayName = string.Empty;
+    private string _displayname = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
@@ -71,7 +93,7 @@ else
                     {
                         SiteId = PageState.Site.SiteId,
                         Username = _username,
-                        DisplayName = (_displayName == string.Empty ? _username : _displayName),
+                        DisplayName = (_displayname == string.Empty ? _username : _displayname),
                         Email = _email,
                         Password = _password
                     };
@@ -80,28 +102,28 @@ else
                     if (user != null)
                     {
                         await logger.LogInformation("User Created {Username} {Email}", _username, _email);
-                        AddModuleMessage(Localizer["User Account Created. Please Check Your Email For Verification Instructions."], MessageType.Info);
+                        AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
                     }
                     else
                     {
                         await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
-                        AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use."], MessageType.Error);
+                        AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Username, Password, and Email Address"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
-            AddModuleMessage(Localizer["Error Adding User"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index 4ee8ed15..64acc352 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -3,22 +3,23 @@
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="container">
     <div class="form-group">
-        <label for="Username" class="control-label">@Localizer["Username:"] </label>
-        <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username"/>
+        <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
+        <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
     </div>
     <div class="form-group">
-        <label for="Password" class="control-label">@Localizer["Password:"] </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password"/>
+        <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
+        <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
     </div>
     <div class="form-group">
-        <label for="Confirm" class="control-label">@Localizer["Confirm Password:"] </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm"/>
+        <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
+        <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" />
     </div>
-    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Reset Password"]</button>
-    <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </div>
 
 @code {
@@ -35,7 +36,7 @@
             _username = PageState.QueryString["name"];
         }
         else
-        { 
+        {
             NavigationManager.NavigateTo(NavigateUrl(string.Empty));
         }
     }
@@ -64,23 +65,23 @@
                     else
                     {
                         await logger.LogError("Error Resetting User Password {Username}", _username);
-                        AddModuleMessage(Localizer["Error Resetting User Password. Please Ensure Password Meets Complexity Requirements."], MessageType.Error);
+                        AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Username, Password, and Email Address"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
-            AddModuleMessage(Localizer["Error Resetting User Password"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index c5bc2a38..905d8061 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -3,40 +3,46 @@
 @inject NavigationManager NavigationManager
 @inject IRoleService RoleService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
-        </td>
-        <td>
-            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
-        </td>
-        <td>
-            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
-                <option value="True">@Localizer["Yes"]</option>
-                <option value="False">@Localizer["No"]</option>
-            </select>
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveRole">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <table class="table table-borderless">
+        <tr>
+            <td width="30%">
+                <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            </td>
+            <td>
+                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            </td>
+            <td>
+                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            </td>
+            <td>
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+    <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+</form>
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
+
     private string _name = string.Empty;
     private string _description = string.Empty;
     private string _isautoassigned = "False";
@@ -45,24 +51,33 @@
 
     private async Task SaveRole()
     {
-        var role = new Role();
-        role.SiteId = PageState.Page.SiteId;
-        role.Name = _name;
-        role.Description = _description;
-        role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
-        role.IsSystem = false;
-
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            role = await RoleService.AddRoleAsync(role);
-            await logger.LogInformation("Role Added {Role}", role);
+            var role = new Role();
+            role.SiteId = PageState.Page.SiteId;
+            role.Name = _name;
+            role.Description = _description;
+            role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
+            role.IsSystem = false;
 
-            NavigationManager.NavigateTo(NavigateUrl());
+            try
+            {
+                role = await RoleService.AddRoleAsync(role);
+                await logger.LogInformation("Role Added {Role}", role);
+
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message);
+                AddModuleMessage(Localizer["Error.AddRole"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage(Localizer["Error Adding Role"], MessageType.Error);
+            AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
index bac812c9..54d1bb0f 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
@@ -3,44 +3,56 @@
 @inject NavigationManager NavigationManager
 @inject IRoleService RoleService
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
-        </td>
-        <td>
-            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
-        </td>
-        <td>
-            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
-                <option value="True">@Localizer["Yes"]</option>
-                <option value="False">@Localizer["No"]</option>
-            </select>
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveRole">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <table class="table table-borderless">
+        <tr>
+            <td width="30%">
+                <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            </td>
+            <td>
+                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            </td>
+            <td>
+                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            </td>
+            <td>
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+    <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br /><br />
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+</form>
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
+
     private int _roleid;
     private string _name = string.Empty;
     private string _description = string.Empty;
     private string _isautoassigned = "False";
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -55,33 +67,46 @@
                 _name = role.Name;
                 _description = role.Description;
                 _isautoassigned = role.IsAutoAssigned.ToString();
+                _createdby = role.CreatedBy;
+                _createdon = role.CreatedOn;
+                _modifiedby = role.ModifiedBy;
+                _modifiedon = role.ModifiedOn;
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Role {RoleId} {Error}", _roleid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Role"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.LoadRole"], MessageType.Error);
         }
     }
 
     private async Task SaveRole()
     {
-        var role = await RoleService.GetRoleAsync(_roleid);
-        role.Name = _name;
-        role.Description = _description;
-        role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
-        role.IsSystem = false;
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            var role = await RoleService.GetRoleAsync(_roleid);
+            role.Name = _name;
+            role.Description = _description;
+            role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
+            role.IsSystem = false;
 
-        try
-        {
-            role = await RoleService.UpdateRoleAsync(role);
-            await logger.LogInformation("Role Saved {Role}", role);
-            NavigationManager.NavigateTo(NavigateUrl());
+            try
+            {
+                role = await RoleService.UpdateRoleAsync(role);
+                await logger.LogInformation("Role Saved {Role}", role);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message);
+                AddModuleMessage(Localizer["Error.SaveRole"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Role"], MessageType.Error);
+            AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 0bfadcc1..40bc1a86 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -2,10 +2,11 @@
 @inherits ModuleBase
 @inject IRoleService RoleService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_roles == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -16,11 +17,11 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@Localizer["Are You Sure You Wish To Delete The {0} Role?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
             <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
@@ -33,6 +34,27 @@ else
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
+    {
+        await GetRoles();
+    }
+
+    private async Task DeleteRole(Role role)
+    {
+        try
+        {
+            await RoleService.DeleteRoleAsync(role.RoleId);
+            await logger.LogInformation("Role Deleted {Role}", role);
+            await GetRoles();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message);
+            AddModuleMessage(Localizer["Error.DeleteRole"], MessageType.Error);
+        }
+    }
+
+    private async Task GetRoles()
     {
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
@@ -44,19 +66,4 @@ else
             _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
         }
     }
-
-    private async Task DeleteRole(Role role)
-    {
-        try
-        {
-            await RoleService.DeleteRoleAsync(role.RoleId);
-            await logger.LogInformation("Role Deleted {Role}", role);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Role"], MessageType.Error);
-        }
-    }
 }
diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor
index c8049b18..4732c9f5 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Users.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor
@@ -3,16 +3,17 @@
 @inject IRoleService RoleService
 @inject IUserRoleService UserRoleService
 @inject IStringLocalizer<Users> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (userroles == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label>
             </td>
             <td>
@@ -24,8 +25,8 @@ else
                 <Label For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
             </td>
             <td>
-                <select id="user" class="form-control" @bind="@userid">
-                    <option value="-1">&lt;@Localizer["Select User"]&gt;</option>
+                <select id="user" class="form-select" @bind="@userid">
+                    <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
                     @foreach (UserRole userrole in users)
                     {
                         <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
@@ -50,8 +51,8 @@ else
             </td>
         </tr>
     </table>
-    <button type="button" class="btn btn-success" @onclick="SaveUserRole">@Localizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
     <hr class="app-rule" />
     <p align="center">
@@ -67,7 +68,7 @@ else
                 <td>@context.EffectiveDate</td>
                 <td>@context.ExpiryDate</td>
                 <td>
-                    <ActionDialog Header="Remove User" Message="@Localizer["Are You Sure You Wish To Remove {0} From This Role?", context.User.DisplayName]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned)" ResourceKey="DeleteUserRole" />
+                    <ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" />
                 </td>
             </Row>
         </Pager>
@@ -102,7 +103,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Users"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
@@ -116,7 +117,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading User Roles"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.LoadRole"], MessageType.Error);
         }
     }
 
@@ -145,19 +146,19 @@ else
                 }
 
                 await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
-                AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success);
+                AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
                 await GetUserRoles();
                 StateHasChanged();
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Select A User"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage(Localizer["Error Saving User Roles"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error);
         }
     }
 
@@ -167,14 +168,14 @@ else
         {
             await UserRoleService.DeleteUserRoleAsync(UserRoleId);
             await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
-            AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success);
+            AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success);
             await GetUserRoles();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
-            AddModuleMessage(Localizer["Error Removing User From Role"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 91630ccf..328c039b 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -3,17 +3,19 @@
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
+@inject IDatabaseService DatabaseService
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject INotificationService NotificationService
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_initialized)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="name" HelpText="Enter the site name" ResourceKey="Name">Name: </Label>
             </td>
             <td>
@@ -22,28 +24,28 @@
         </tr>
         <tr>
             <td>
-                <Label For="tenant" HelpText="Enter the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+                <Label For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
             </td>
             <td>
-                <input id="tenant" class="form-control" @bind="@_tenant" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label>
-            </td>
-            <td>
-                <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
+                @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
+                }
+                else
+                {
+                    <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea>
+                }
             </td>
         </tr>
+
         <tr>
             <td>
                 <Label For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
             </td>
             <td>
-                <select id="allowRegister" class="form-control" @bind="@_allowregistration">
-                    <option value="True">@Localizer["Yes"]</option>
-                    <option value="False">@Localizer["No"]</option>
+                <select id="allowRegister" class="form-select" @bind="@_allowregistration">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
                 </select>
             </td>
         </tr>
@@ -52,9 +54,9 @@
                 <Label For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
             </td>
             <td>
-                <select id="isDeleted" class="form-control" @bind="@_isdeleted">
-                    <option value="True">@Localizer["Yes"]</option>
-                    <option value="False">@Localizer["No"]</option>
+                <select id="isDeleted" class="form-select" @bind="@_isdeleted">
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
                 </select>
             </td>
         </tr>
@@ -62,7 +64,7 @@
     <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
         <table class="table table-borderless">
             <tr>
-                <td>
+                <td width="30%">
                     <Label For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                 </td>
                 <td>
@@ -82,8 +84,8 @@
                     <Label For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
                 </td>
                 <td>
-                    <select id="defaultTheme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
-                        <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
+                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
+                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
                         @foreach (var theme in _themes)
                         {
                             <option value="@theme.TypeName">@theme.Name</option>
@@ -96,8 +98,8 @@
                     <Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
                 </td>
                 <td>
-                    <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                        <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype">
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
                         @foreach (var container in _containers)
                         {
                             <option value="@container.TypeName">@container.Name</option>
@@ -110,9 +112,9 @@
                     <Label For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
                 </td>
                 <td>
-                    <select id="defaultAdminContainer" class="form-control" @bind="@_admincontainertype">
-                        <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
-                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["Default Admin Container"]&gt;</option>
+                    <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype">
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
                         @foreach (var container in _containers)
                         {
                             <option value="@container.TypeName">@container.Name</option>
@@ -125,8 +127,9 @@
     <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
         <table class="table table-borderless">
             <tr>
-                <td colspan="2">
-                    <strong>@Localizer["Please Note That SMTP Requires The Notification Job To Be Enabled In Scheduled Jobs"]</strong>
+                <td width="30%">&nbsp;</td>
+                <td>
+                    <strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br />
                 </td>
             </tr>
             <tr>
@@ -150,9 +153,9 @@
                     <Label For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
                 </td>
                 <td>
-                    <select id="enabledSSl" class="form-control" @bind="@_smtpssl">
-                        <option value="True">@Localizer["Yes"]</option>
-                        <option value="False">@Localizer["No"]</option>
+                    <select id="enabledSSl" class="form-select" @bind="@_smtpssl">
+                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="False">@SharedLocalizer["No"]</option>
                     </select>
                 </td>
             </tr>
@@ -181,19 +184,19 @@
                 </td>
             </tr>
         </table>
-        <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Test SMTP Configuration"]</button>
+        <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
         <br /><br />
     </Section>
     <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings">
         <table class="table table-borderless">
             <tr>
-                <td>
+                <td width="30%">
                     <Label For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)" ResourceKey="EnablePWA">Is Enabled? </Label>
                 </td>
                 <td>
-                    <select id="isEnabled" class="form-control" @bind="@_pwaisenabled">
-                        <option value="True">@Localizer["Yes"]</option>
-                        <option value="False">@Localizer["No"]</option>
+                    <select id="isEnabled" class="form-select" @bind="@_pwaisenabled">
+                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="False">@SharedLocalizer["No"]</option>
                     </select>
                 </td>
             </tr>
@@ -215,10 +218,40 @@
             </tr>
         </table>
     </Section>
-
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+    {
+        <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation">
+            <table class="table table-borderless">
+                <tr>
+                    <td width="30%">
+                        <Label For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+                    </td>
+                    <td>
+                        <input id="tenant" class="form-control" @bind="@_tenant" readonly />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
+                    </td>
+                    <td>
+                        <input id="database" class="form-control" @bind="@_database" readonly />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
+                    </td>
+                    <td>
+                        <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
+                    </td>
+                </tr>
+            </table>
+        </Section>
+    }
     <br />
-    <button type="button" class="btn btn-success" @onclick="SaveSite">@Localizer["Save"]</button>
-    <ActionDialog Header="Delete Site" Message="@Localizer["Are You Sure You Wish To Delete This Site?"]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteSite())" ResourceKey="DeleteSite" />
+    <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button>
+    <ActionDialog Header="Delete Site" Message="@Localizer["Confirm.DeleteSite"]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteSite())" ResourceKey="DeleteSite" />
     <br />
     <br />
     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
@@ -230,8 +263,6 @@
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
     private string _name = string.Empty;
-    private List<Tenant> _tenantList;
-    private string _tenant = string.Empty;
     private List<Alias> _aliasList;
     private string _urls = string.Empty;
     private int _logofileid = -1;
@@ -253,6 +284,9 @@
     private FileManager _pwaappiconfilemanager;
     private int _pwasplashiconfileid = -1;
     private FileManager _pwasplashiconfilemanager;
+    private string _tenant = string.Empty;
+    private string _database = string.Empty;
+    private string _connectionstring = string.Empty;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
@@ -268,18 +302,24 @@
         try
         {
             _themeList = await ThemeService.GetThemesAsync();
-            _aliasList = await AliasService.GetAliasesAsync();
             Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
             if (site != null)
             {
                 _name = site.Name;
-                _tenantList = await TenantService.GetTenantsAsync();
-                _tenant = _tenantList.Find(item => item.TenantId == site.TenantId).Name;
-                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                _allowregistration = site.AllowRegistration.ToString();
+                _isdeleted = site.IsDeleted.ToString();
+
+                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
-                    _urls += alias.Name + ",";
+                    _aliasList = await AliasService.GetAliasesAsync();
+                    foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                    {
+                        _urls += alias.Name + ",";
+                    }
+                    _urls = _urls.Substring(0, _urls.Length - 1);
+
                 }
-                _urls = _urls.Substring(0, _urls.Length - 1);
+
                 if (site.LogoFileId != null)
                 {
                     _logofileid = site.LogoFileId.Value;
@@ -295,7 +335,6 @@
                 _containers = ThemeService.GetContainerControls(_themeList, _themetype);
                 _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
                 _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
-                _allowregistration = site.AllowRegistration.ToString();
 
                 var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
                 _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
@@ -327,13 +366,25 @@
                     _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
                 }
 
+                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    var tenants = await TenantService.GetTenantsAsync();
+                    var _databases = await DatabaseService.GetDatabasesAsync();
+                    var tenant = tenants.Find(item => item.TenantId == site.TenantId);
+                    if (tenant != null)
+                    {
+                        _tenant = tenant.Name;
+                        _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+                        _connectionstring = tenant.DBConnectionString;
+                    }
+                }
+
                 _createdby = site.CreatedBy;
                 _createdon = site.CreatedOn;
                 _modifiedby = site.ModifiedBy;
                 _modifiedon = site.ModifiedOn;
                 _deletedby = site.DeletedBy;
                 _deletedon = site.DeletedOn;
-                _isdeleted = site.IsDeleted.ToString();
 
                 _initialized = true;
             }
@@ -365,7 +416,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
         }
     }
 
@@ -376,11 +427,14 @@
             if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
             {
                 var unique = true;
-                foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
-                    if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+                    foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                     {
-                        unique = false;
+                        if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+                        {
+                            unique = false;
+                        }
                     }
                 }
 
@@ -392,34 +446,30 @@
                         bool refresh = (site.DefaultThemeType != _themetype || site.DefaultContainerType != _containertype);
 
                         site.Name = _name;
+                        site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration));
+                        site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
+
                         site.LogoFileId = null;
                         var logofileid = _logofilemanager.GetFileId();
                         if (logofileid != -1)
                         {
                             site.LogoFileId = logofileid;
                         }
-
-
                         var faviconFieldId = _faviconfilemanager.GetFileId();
                         if (faviconFieldId != -1)
                         {
                             site.FaviconFileId = faviconFieldId;
                         }
-
                         site.DefaultThemeType = _themetype;
                         site.DefaultContainerType = _containertype;
                         site.AdminContainerType = _admincontainertype;
-                        site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration));
-                        site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
                         site.PwaIsEnabled = (_pwaisenabled == null ? true : Boolean.Parse(_pwaisenabled));
-
                         var pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
                         if (pwaappiconfileid != -1)
                         {
                             site.PwaAppIconFileId = pwaappiconfileid;
                         }
-
                         var pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
                         if (pwasplashiconfileid != -1)
                         {
@@ -428,27 +478,6 @@
 
                         site = await SiteService.UpdateSiteAsync(site);
 
-                        var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                        foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                        {
-                            if (!names.Contains(alias.Name))
-                            {
-                                await AliasService.DeleteAliasAsync(alias.AliasId);
-                            }
-                        }
-
-                        foreach (string name in names)
-                        {
-                            if (!_aliasList.Exists(item => item.Name == name))
-                            {
-                                Alias alias = new Alias();
-                                alias.Name = name;
-                                alias.TenantId = site.TenantId;
-                                alias.SiteId = site.SiteId;
-                                await AliasService.AddAliasAsync(alias);
-                            }
-                        }
-
                         var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
                         SettingService.SetSetting(settings, "SMTPHost", _smtphost);
                         SettingService.SetSetting(settings, "SMTPPort", _smtpport);
@@ -458,31 +487,56 @@
                         SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
                         await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
+                        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                        {
+                            var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                            foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                            {
+                                if (!names.Contains(alias.Name))
+                                {
+                                    await AliasService.DeleteAliasAsync(alias.AliasId);
+                                }
+                            }
+
+                            foreach (string name in names)
+                            {
+                                if (!_aliasList.Exists(item => item.Name == name))
+                                {
+                                    Alias alias = new Alias();
+                                    alias.Name = name;
+                                    alias.TenantId = site.TenantId;
+                                    alias.SiteId = site.SiteId;
+                                    await AliasService.AddAliasAsync(alias);
+                                }
+                            }
+                        }
+
                         await logger.LogInformation("Site Settings Saved {Site}", site);
+
                         if (refresh)
                         {
                             NavigationManager.NavigateTo(NavigateUrl()); // refresh to show new theme or container
                         }
                         else
                         {
-                            AddModuleMessage(Localizer["Site Settings Saved"], MessageType.Success);
+                            AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
                         }
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["An Alias Specified Has Already Been Used For Another Site"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Site Name, Alias, And Default Theme/Container"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(Localizer["Error Saving Site"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
         }
     }
 
@@ -497,7 +551,7 @@
                 await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
                 var aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId))
+                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
                 {
                     await AliasService.DeleteAliasAsync(a.AliasId);
                 }
@@ -506,13 +560,13 @@
             }
             else
             {
-                AddModuleMessage(Localizer["You Are Not Authorized To Delete The Site"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Site"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
         }
     }
 
@@ -533,18 +587,17 @@
                 await logger.LogInformation("Site SMTP Settings Saved");
 
                 await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-                AddModuleMessage(Localizer["SMTP Settings Saved And A Message Has Been Sent To The Email Address Associated To Your User Account... Please Wait A Few Minutes For Delivery. If You Do Not Receive The Email Please Review The Notification Job In Scheduled Jobs For Any Log Details."], MessageType.Info);
+                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
             }
             catch (Exception ex)
             {
                 await logger.LogError(ex, "Error Testing SMTP Configuration");
-                AddModuleMessage(Localizer["Error Testing SMTP Configuration"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["You Must Specify The SMTP Host, Port, And Sender"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
         }
-
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 832f1b33..016ff9d4 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -11,16 +11,17 @@
 @inject IInstallationService InstallationService
 @inject IDatabaseService DatabaseService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_tenants == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label>
             </td>
             <td>
@@ -40,8 +41,8 @@ else
                 <Label For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
             </td>
             <td>
-                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
+                <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))">
+                    <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
                     @foreach (var theme in _themes)
                     {
                         <option value="@theme.TypeName">@theme.Name</option>
@@ -54,8 +55,8 @@ else
                 <Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
             </td>
             <td>
-                <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                    <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
+                <select id="defaultContainer" class="form-select" @bind="@_containertype">
+                    <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
                     @foreach (var container in _containers)
                     {
                         <option value="@container.TypeName">@container.Name</option>
@@ -68,9 +69,9 @@ else
                 <Label For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label>
             </td>
             <td>
-                <select id="adminContainer" class="form-control" @bind="@_admincontainertype">
-                    <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
-                    <option value="">&lt;@Localizer["Default Admin Container"]&gt;</option>
+                <select id="adminContainer" class="form-select" @bind="@_admincontainertype">
+                    <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                    <option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option>
                     @foreach (var container in _containers)
                     {
                         <option value="@container.TypeName">@container.Name</option>
@@ -83,8 +84,8 @@ else
                 <Label For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
             </td>
             <td>
-                <select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype">
-                    <option value="-">&lt;@Localizer["Select Site Template"]&gt;</option>
+                <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype">
+                    <option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option>
                     @foreach (SiteTemplate siteTemplate in _siteTemplates)
                     {
                         <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
@@ -97,9 +98,9 @@ else
                 <Label For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
             </td>
             <td>
-                <select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))">
-                    <option value="-">&lt;@Localizer["Select Tenant"]&gt;</option>
-                    <option value="+">&lt;@Localizer["Create New Tenant"]&gt;</option>
+                <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))">
+                    <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
+                    <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
                     @foreach (Tenant tenant in _tenants)
                     {
                         <option value="@tenant.TenantId">@tenant.Name</option>
@@ -127,10 +128,17 @@ else
                     <Label For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
                 </td>
                 <td>
-                    <select id="databaseType" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
+                    <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
                         @foreach (var database in _databases)
                         {
-                            <option value="@database.Name">@Localizer[@database.Name]</option>
+                            if (database.IsDefault)
+                            {
+                                <option value="@database.Name" selected>@Localizer[@database.Name]</option>
+                            }
+                            else
+                            {
+                                <option value="@database.Name">@Localizer[@database.Name]</option>
+                            }
                         }
                     </select>
                 </td>
@@ -157,8 +165,8 @@ else
             </tr>
         }
     </table>
-    <button type="button" class="btn btn-success" @onclick="SaveSite">@Localizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
@@ -211,7 +219,7 @@ else
         }
         catch
         {
-            AddModuleMessage(Localizer["Error loading Database Configuration Control"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
         }
     }
 
@@ -260,7 +268,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Containers For Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
         }
     }
 
@@ -313,17 +321,17 @@ else
                             }
                             else
                             {
-                                AddModuleMessage(Localizer["You Must Specify A Server And Database"], MessageType.Error);
+                                AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error);
                             }
                         }
                         else
                         {
-                            AddModuleMessage(Localizer["Invalid Host Password"], MessageType.Error);
+                            AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error);
                         }
                     }
                     else
                     {
-                        AddModuleMessage(Localizer["Tenant Name Is Missing Or Already Exists"], MessageType.Error);
+                        AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error);
                     }
                 }
                 else
@@ -365,12 +373,12 @@ else
             }
             else
             {
-                AddModuleMessage(Localizer["{0} Already Used For Another Site", string.Join(", ", duplicates.ToArray())], MessageType.Warning);
+                AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage(Localizer["You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template"], MessageType.Warning);
+            AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index f0927b1a..f6d829a4 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -4,6 +4,7 @@
 @inject IAliasService AliasService
 @inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_sites == null)
 {
@@ -16,11 +17,13 @@ else
     <Pager Items="@_sites">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><NavLink class="btn btn-primary" href="@(_scheme + context.Name +"/admin/site")">@Localizer["Edit"]</NavLink></td>
-            <td><a href="@(_scheme + context.Name +"?reload")">@context.Name</a></td>
+            <td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td>
+            <td><button type="button" class="btn btn-secondary" @onclick="@(async () => Browse(context.Name))">@Localizer["Browse"]</button></td>
+            <td>@context.Name</td>
         </Row>
     </Pager>
 }
@@ -46,4 +49,14 @@ else
             }
         }
     }
+
+    private void Edit(string name)
+    {
+        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+    }
+
+    private void Browse(string name)
+    {
+        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+    }
 }
diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor
index 5edd39ab..a74d8d54 100644
--- a/Oqtane.Client/Modules/Admin/Sql/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor
@@ -2,23 +2,25 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
+@inject IDatabaseService DatabaseService
 @inject ISqlService SqlService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_tenants == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label>
             </td>
             <td>
-                <select id="teneant" class="form-control" @bind="_tenantid">
-                    <option value="-1">&lt;@Localizer["Select Tenant"]&gt;</option>
+                <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
+                    <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
                     @foreach (Tenant tenant in _tenants)
                     {
                         <option value="@tenant.TenantId">@tenant.Name</option>
@@ -26,14 +28,33 @@ else
                 </select>
             </td>
         </tr>
-        <tr>
-            <td>
-                <Label For="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </Label>
-            </td>
-            <td>
-                <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="5"></textarea>
-            </td>
-        </tr>
+        @if (_tenantid != "-1")
+        {
+            <tr>
+                <td>
+                    <Label For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
+                </td>
+                <td>
+                    <input id="database" class="form-control" @bind="@_database" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
+                </td>
+                <td>
+                    <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </Label>
+                </td>
+                <td>
+                    <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="5"></textarea>
+                </td>
+            </tr>
+        }
     </table>
     <button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
     <br />
@@ -47,6 +68,8 @@ else
 @code {
     private List<Tenant> _tenants;
     private string _tenantid = "-1";
+    private string _database = string.Empty;
+    private string _connectionstring = string.Empty;
     private string _sql = string.Empty;
     private string _results = string.Empty;
 
@@ -54,20 +77,59 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        _tenants = await TenantService.GetTenantsAsync();
+        try
+        {
+            _tenants = await TenantService.GetTenantsAsync();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    private async void TenantChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _tenantid = (string)e.Value;
+            var tenants = await TenantService.GetTenantsAsync();
+            var _databases = await DatabaseService.GetDatabasesAsync();
+            var tenant = tenants.Find(item => item.TenantId == int.Parse(_tenantid));
+            if (tenant != null)
+            {
+                _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+                _connectionstring = tenant.DBConnectionString;
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", _tenantid, ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
     }
 
     private async Task Execute()
     {
-        if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
+        try
         {
-            var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
-            sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
-            _results = DisplayResults(sqlquery.Results);
+            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
+            {
+                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
+                sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
+                _results = DisplayResults(sqlquery.Results);
+                AddModuleMessage(Localizer["Success.QueryExecuted"], MessageType.Success);
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
+            }
         }
-        else
+        catch (Exception ex)
         {
-            AddModuleMessage(Localizer["You Must Select A Tenant And Provide A SQL Query"], MessageType.Warning);
+            await logger.LogError(ex, "Error Executing SQL Query {SQL} {Error}", _sql, ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -105,7 +167,7 @@ else
         }
         else
         {
-            table = Localizer["No Results Returned"];
+            table = Localizer["Return.NoResult"];
         }
 
         return table;
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 0cd12dcd..1d8771d3 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -3,92 +3,206 @@
 @inject ISystemService SystemService
 @inject IInstallationService InstallationService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
-        </td>
-        <td>
-            <input id="version" class="form-control" @bind="@_version" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
-        </td>
-        <td>
-            <input id="runtime" class="form-control" @bind="@_runtime" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="rendermode" HelpText="Blazor Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
-        </td>
-        <td>
-            <input id="rendermode" class="form-control" @bind="@_rendermode" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="ClrVerion">CLR Version: </Label>
-        </td>
-        <td>
-            <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="osversion" HelpText="Operating System Version" ResourceKey="OsVersion">OS Version: </Label>
-        </td>
-        <td>
-            <input id="osversion" class="form-control" @bind="@_osversion" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
-        </td>
-        <td>
-            <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
-        </td>
-        <td>
-            <input id="servertime" class="form-control" @bind="@_servertime" readonly />
-        </td>
-    </tr>
-</table>
-<a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access Framework API"]</a>&nbsp;
-<ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+<TabStrip>
+    <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
+        <table class="table table-borderless">
+            <tr>
+                <td width="30%">
+                    <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
+                </td>
+                <td>
+                    <input id="version" class="form-control" @bind="@_version" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
+                </td>
+                <td>
+                    <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
+                </td>
+                <td>
+                    <input id="osversion" class="form-control" @bind="@_osversion" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
+                </td>
+                <td>
+                    <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                </td>
+                <td>
+                    <input id="servertime" class="form-control" @bind="@_servertime" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
+                </td>
+                <td>
+                    <input id="installationid" class="form-control" @bind="@_installationid" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"]
+                </td>
+            </tr>
+        </table>
+        <br /><br />
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+    <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
+        <table class="table table-borderless">
+            <tr>
+                <td width="30%">
+                    <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
+                </td>
+                <td>
+                    <select id="runtime" class="form-select" @bind="@_runtime">
+                        <option value="Server">@Localizer["Server"]</option>
+                        <option value="WebAssembly">@Localizer["WebAssembly"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
+                </td>
+                <td>
+                    <select id="rendermode" class="form-select" @bind="@_rendermode">
+                        <option value="Server">@Localizer["Server"]</option>
+                        <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
+                </td>
+                <td>
+                    <select id="detailederrors" class="form-select" @bind="@_detailederrors">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
+                </td>
+                <td>
+                    <select id="logginglevel" class="form-select" @bind="@_logginglevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
+                </td>
+                <td>
+                    <select id="swagger" class="form-select" @bind="@_swagger">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label>
+                </td>
+                <td>
+                    <select id="packageservice" class="form-select" @bind="@_packageservice">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
+        </table>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp;
+        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+</TabStrip>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     private string _version = string.Empty;
-    private string _runtime = string.Empty;
-    private string _rendermode = string.Empty;
     private string _clrversion = string.Empty;
     private string _osversion = string.Empty;
     private string _serverpath = string.Empty;
     private string _servertime = string.Empty;
+    private string _installationid = string.Empty;
+
+    private string _runtime = string.Empty;
+    private string _rendermode = string.Empty;
+    private string _detailederrors = string.Empty;
+    private string _logginglevel = string.Empty;
+    private string _swagger = string.Empty;
+    private string _packageservice = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         _version = Constants.Version;
-        _runtime = PageState.Runtime.ToString();
 
         Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
         if (systeminfo != null)
         {
-            _rendermode = systeminfo["rendermode"];
             _clrversion = systeminfo["clrversion"];
             _osversion = systeminfo["osversion"];
             _serverpath = systeminfo["serverpath"];
             _servertime = systeminfo["servertime"];
+            _installationid = systeminfo["installationid"];
+
+            _runtime = systeminfo["runtime"];
+            _rendermode = systeminfo["rendermode"];
+            _detailederrors = systeminfo["detailederrors"];
+            _logginglevel = systeminfo["logginglevel"];
+            _swagger = systeminfo["swagger"];
+            _packageservice = systeminfo["packageservice"];
+        }
+    }
+
+    private async Task SaveConfig()
+    {
+        try
+        {
+            var settings = new Dictionary<string, string>();
+            settings.Add("runtime", _runtime);
+            settings.Add("rendermode", _rendermode);
+            settings.Add("detailederrors", _detailederrors);
+            settings.Add("logginglevel", _logginglevel);
+            settings.Add("swagger", _swagger);
+            settings.Add("packageservice", _packageservice);
+            await SystemService.UpdateSystemInfoAsync(settings);
+            AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Configuration");
+            AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
         }
     }
 
@@ -98,7 +212,7 @@
         {
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(""), 10);
+            await interop.RedirectBrowser(NavigateUrl(""), 20);
             await InstallationService.RestartAsync();
         }
         catch (Exception ex)
@@ -106,4 +220,20 @@
             await logger.LogError(ex, "Error Restarting Application");
         }
     }
+
+    private async Task RegisterChecked(ChangeEventArgs e)
+    {
+        try
+        {
+            if ((bool)e.Value)
+            {
+                await InstallationService.RegisterAsync(PageState.User.Email);
+                AddModuleMessage(Localizer["Success.Register"], MessageType.Success);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Register");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 175ed65d..41dbace0 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -5,50 +5,70 @@
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+
+        <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
+            <tr>
+                <td>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                </td>
+                <td>
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                </td>
+            </tr>
+        </table>
+
+        @if (_packages != null)
         {
-            <TabPanel Name="Download" ResourceKey="Download">
-                <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+            if (_packages.Count > 0)
+            {
                 <Pager Items="@_packages">
-                    <Header>
-                        <th>@Localizer["Name"]</th>
-                        <th>@Localizer["Version"]</th>
-                        <th style="width: 1px;"></th>
-                    </Header>
                     <Row>
-                        <td>@context.Name</td>
-                        <td>@context.Version</td>
                         <td>
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@Localizer["Download"]</button>
+                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
+                        </td>
+                        <td style="vertical-align: middle;">
+                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
                         </td>
                     </Row>
                 </Pager>
-            </TabPanel>
+            }
+            else
+            {
+                <br />
+                <div class="mx-auto text-center">
+                    @Localizer["Search.NoResults"]
+                </div>
+            }
         }
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
-                    </td>
-                </tr>
-            </table>
-        </TabPanel>
-    </TabStrip>
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallThemes">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
+<button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private List<Package> _packages;
+    private string _search = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -56,9 +76,22 @@
     {
         try
         {
-            var themes = await ThemeService.GetThemesAsync();
-            _packages = await PackageService.GetPackagesAsync("theme");
+            await LoadThemes();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+        }
+    }
 
+    private async Task LoadThemes()
+    {
+        var themes = await ThemeService.GetThemesAsync();
+        _packages = await PackageService.GetPackagesAsync("theme", _search);
+
+        if (_packages != null)
+        {
             foreach (Package package in _packages.ToArray())
             {
                 if (themes.Exists(item => item.PackageName == package.PackageId))
@@ -67,10 +100,30 @@
                 }
             }
         }
+    }
+
+    private async Task Search()
+    {
+        try
+        {
+            await LoadThemes();
+        }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Packages"], MessageType.Error);
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
+
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadThemes();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
         }
     }
 
@@ -79,7 +132,7 @@
         try
         {
             await ThemeService.InstallThemesAsync();
-            AddModuleMessage(Localizer["Theme Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
@@ -93,13 +146,13 @@
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Packages");
             await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage(Localizer["Themes Downloaded Successfully. Click Install To Complete Installation."], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version);
-            AddModuleMessage(Localizer["Error Downloading Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Themes/Create.razor b/Oqtane.Client/Modules/Admin/Themes/Create.razor
index 491bf746..ba3c1930 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Create.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Create.razor
@@ -6,13 +6,14 @@
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
 @inject ISettingService SettingService
-@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<Create> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_templates != null)
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
             </td>
             <td>
@@ -32,8 +33,8 @@
                 <Label For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
             </td>
             <td>
-                <select id="template" class="form-control" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
+                <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+                    <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
                         <option value="@template.Name">@template.Title</option>
@@ -46,7 +47,7 @@
                 <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
             </td>
             <td>
-                <select id="reference" class="form-control" @bind="@_reference">
+                <select id="reference" class="form-select" @bind="@_reference">
                     @foreach (string version in _versions)
                     {
                         if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
@@ -54,7 +55,7 @@
                             <option value="@(version)">@(version)</option>
                         }
                     }
-                    <option value="local">@Localizer["Local Version"]</option>
+                    <option value="local">@SharedLocalizer["LocalVersion"]</option>
                 </select>
             </td>
         </tr>
@@ -70,8 +71,8 @@
             </tr>
         }
     </table>
-    <button type="button" class="btn btn-success" @onclick="CreateTheme">@Localizer["Create Theme"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="CreateTheme">@Localizer["Theme.Create"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 }
 
 @code {
@@ -92,7 +93,7 @@
         {
             _templates = await ThemeService.GetThemeTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Please Note That The Theme Creator Is Only Intended To Be Used In A Development Environment"], MessageType.Info);
+            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
         }
         catch (Exception ex)
         {
@@ -109,11 +110,11 @@
                 var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference };
                 theme = await ThemeService.CreateThemeAsync(theme);
                 GetLocation();
-                AddModuleMessage(Localizer["The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must <a href=\"{0}\">Restart</a> Your Application To Activate The Module.", NavigateUrl("admin/system")], MessageType.Success);
+                AddModuleMessage(string.Format(Localizer["Success.Theme.Create"], NavigateUrl("admin/system")), MessageType.Success);
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Valid Owner Name And Theme Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.ValidName"], MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index fc13417f..a2a3932e 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -5,23 +5,24 @@
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_themes == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <ActionLink Action="Add" Text="Install Theme" />
     @((MarkupString)"&nbsp;")
-    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" />
+    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
 
     <Pager Items="@_themes">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th scope="col">@Localizer["Name"]</th>
-            <th scope="col">@Localizer["Version"]</th>
+            <th scope="col">@SharedLocalizer["Name"]</th>
+            <th scope="col">@SharedLocalizer["Version"]</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
@@ -29,7 +30,7 @@ else
             <td>
                 @if (context.AssemblyName != "Oqtane.Client")
                     {
-                    <ActionDialog Header="Delete Theme" Message="@Localizer["Are You Sure You Wish To Delete The {0} Theme?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
+                    <ActionDialog Header="Delete Theme" Message="@string.Format(Localizer["Confirm.Theme.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
                     }
             </td>
             <td>@context.Name</td>
@@ -37,7 +38,7 @@ else
             <td>
                 @if (UpgradeAvailable(context.PackageName, context.Version))
                     {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@Localizer["Upgrade"]</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
                     }
             </td>
             <td></td>
@@ -63,7 +64,7 @@ else
             if (_themes == null)
             {
                 await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message);
-                AddModuleMessage(Localizer["Error Loading Themes"], MessageType.Error);
+                AddModuleMessage(Localizer["Error.Theme.Load"], MessageType.Error);
             }
         }
     }
@@ -89,12 +90,12 @@ else
             await PackageService.DownloadPackageAsync(packagename, version, "Packages");
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
             await ThemeService.InstallThemesAsync();
-            AddModuleMessage(Localizer["Theme Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", packagename, version, ex.Message);
-            AddModuleMessage(Localizer["Error Downloading Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
         }
     }
 
@@ -103,13 +104,13 @@ else
         try
         {
             await ThemeService.DeleteThemeAsync(Theme.ThemeName);
-            AddModuleMessage(Localizer["Theme Deleted Successfully"], MessageType.Success);
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
+            AddModuleMessage(Localizer["Success.Theme.Delete"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message);
-            AddModuleMessage(Localizer["Error Deleting Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.Delete"], MessageType.Error);
         }
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor
index d6d4b4de..a9bb2281 100644
--- a/Oqtane.Client/Modules/Admin/Themes/View.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/View.razor
@@ -4,10 +4,11 @@
 @inject IThemeService ThemeService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<View> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
         </td>
         <td>
@@ -63,7 +64,7 @@
         </td>
     </tr>
 </table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private string _themeName = "";
@@ -96,7 +97,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message);
-            AddModuleMessage(Localizer["Error Loading Theme"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Theme.Loading"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index b1fc04d8..73679d5b 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -5,38 +5,36 @@
 @inject IPackageService PackageService
 @inject IInstallationService InstallationService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_package != null)
-{
-    <TabStrip>
-        <TabPanel Name="Download" ResourceKey="Download">
-            @if (_upgradeavailable)
-            {
-                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
-                <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Download"] @_package.Version</button>
-                <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
-            }
-            else
-            {
-                <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
-            }
-        </TabPanel>
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
-                    </td>
-                </tr>
-            </table>
-            <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
-        </TabPanel>
-    </TabStrip>
-}
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        @if (_package != null && _upgradeavailable)
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+            <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+            <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+        }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
+        }
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
+                </td>
+            </tr>
+        </table>
+        <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+    </TabPanel>
+</TabStrip>
 
 @code {
     private Package _package;
@@ -72,16 +70,16 @@
     {
         try
         {
-            AddModuleMessage(Localizer["Please Be Patient While The Upgrade Is In Progress..."], MessageType.Info);
+            AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(), 30);
+            await interop.RedirectBrowser(NavigateUrl(), 20);
             await InstallationService.Upgrade();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Executing Upgrade"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Upgrade.Execute"], MessageType.Error);
         }
     }
 
@@ -91,12 +89,12 @@
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Packages");
             await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, "Packages");
-            AddModuleMessage(Localizer["Framework Downloaded Successfully... Please Select Upgrade To Complete the Process"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Downloading Framework Package {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Downloading Framework Package"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Framework.Download"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
index 48959e80..a10e0c3a 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -1,73 +1,74 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
 @inject INotificationService NotificationService
-@inject IStringLocalizer<Add> Localizer
-
-@if (PageState.User != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
-            </td>
-            <td>
-                <input id="to" class="form-control" @bind="@username" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
-            </td>
-            <td>
-                <input id="subject" class="form-control" @bind="@subject" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="Enter the message" ResourceKey="Message">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-primary" @onclick="Send">@Localizer["Send"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
-
-@code {
-    private string username = "";
-    private string subject = "";
-    private string body = "";
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
-
-    public override string Title => "Send Notification";
-
-    private async Task Send()
-    {
-        try
-        {
-            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-            if (user != null)
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (PageState.User != null)
+{
+    <table class="table table-borderless">
+        <tr>
+            <td width="30%">
+                <Label For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
+            </td>
+            <td>
+                <input id="to" class="form-control" @bind="@username" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
+            </td>
+            <td>
+                <input id="subject" class="form-control" @bind="@subject" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="message" HelpText="Enter the message" ResourceKey="Message">Message: </Label>
+            </td>
+            <td>
+                <textarea id="message" class="form-control" @bind="@body" rows="5" />
+            </td>
+        </tr>
+    </table>
+    <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+}
+
+@code {
+    private string username = "";
+    private string subject = "";
+    private string body = "";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+
+    public override string Title => "Send Notification";
+
+    private async Task Send()
+    {
+        try
+        {
+            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
+            if (user != null)
             {
                 var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, null);
-                notification = await NotificationService.AddNotificationAsync(notification);
-                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                AddModuleMessage(Localizer["User Does Not Exist. Please Verify That The Username Provided Is Correct."], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Adding Notification"], MessageType.Error);
-        }
-    }
-
-}
+                notification = await NotificationService.AddNotificationAsync(notification);
+                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Notification.Add"], MessageType.Error);
+        }
+    }
+
+}
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 9c15f010..54e2d398 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -7,6 +7,7 @@
 @inject INotificationService NotificationService
 @inject IFileService FileService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.User != null && photo != null)
 {
@@ -22,56 +23,56 @@ else
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
-                        <label for="Name" class="control-label">@Localizer["Username:"] </label>
+                    <td width="30%">
+                        <Label For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@username" readonly />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label for="Name" class="control-label">@Localizer["Password:"] </label>
+                        <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@password" autocomplete="new-password" />
+                        <input id ="password" type="password" class="form-control" @bind="@password" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label for="Name" class="control-label">@Localizer["Confirm Password:"] </label>
+                        <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                        <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label for="Name" class="control-label">@Localizer["Email:"] </label>
+                        <Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@email" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label for="Name" class="control-label">@Localizer["Full Name:"] </label>
+                        <Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@displayname" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label for="Name" class="control-label">@Localizer["Photo:"] </label>
+                        <Label For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
                     </td>
                     <td>
                         <FileManager FileId="@photofileid" @ref="filemanager" />
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-primary" @onclick="Save">@Localizer["Save"]</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+            <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
         }
     </TabPanel>
     <TabPanel Name="Profile" ResourceKey="Profile">
@@ -93,13 +94,13 @@ else
                             category = p.Category;
                         }
                         <tr>
-                            <td>
+                            <td width="30%">
                                 <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
                             </td>
                             <td>
                                 @if (!string.IsNullOrEmpty(p.Options))
                                 {
-                                    <select id="@p.Name" class="form-control" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                    <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
                                             @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
@@ -129,8 +130,8 @@ else
                     }
                 }
             </table>
-            <button type="button" class="btn btn-primary" @onclick="Save">@Localizer["Save"]</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
+            <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
         }
     </TabPanel>
     <TabPanel Name="Notifications" ResourceKey="Notifications">
@@ -205,9 +206,9 @@ else
                 </Pager>
             }
             <br /><hr />
-            <select class="form-control" @onchange="(e => FilterChanged(e))">
+            <select class="form-select" @onchange="(e => FilterChanged(e))">
                 <option value="to">@Localizer["Inbox"]</option>
-                <option value="from">@Localizer["Sent Items"]</option>
+                <option value="from">@Localizer["Items.Sent"]</option>
             </select>
         }
     </TabPanel>
@@ -258,13 +259,13 @@ else
             }
             else
             {
-                AddModuleMessage(Localizer["Current User Is Not Logged In"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.User.NoLogIn"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading User Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
         }
     }
 
@@ -304,18 +305,18 @@ else
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.Invalid"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Username and Email Address As Well As All Required Profile Information"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving User Profile {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Saving User Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 263a0345..555190c1 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -1,201 +1,202 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
 @inject INotificationService NotificationService
-@inject IStringLocalizer<View> Localizer
-
-@if (PageState.User != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label class="control-label">@Localizer["Title:"] </label>
-            </td>
-            @if (title == "From")
-            {
-                <td>
-                    <input class="form-control" @bind="@username" readonly />
-                </td>
-            }
-            @if (title == "To")
-            {
-                <td>
-                    <input class="form-control" @bind="@username" />
-                </td>
-            }
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">@Localizer["Subject:"] </label>
-            </td>
-            @if (title == "From")
-            {
-                <td>
-                    <input class="form-control" @bind="@subject" readonly />
-                </td>
-            }
-            @if (title == "To")
-            {
-                <td>
-                    <input class="form-control" @bind="@subject" />
-                </td>
-            }
-        </tr>
-        @if (title == "From")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Date:"] </label>
-                </td>
-                <td>
-                    <input class="form-control" @bind="@createdon" readonly />
-                </td>
-            </tr>
-        }
-        @if (title == "From")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Message:"] </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@body" rows="5" readonly />
-                </td>
-            </tr>
-        }
-        @if (title == "To")
-        {
-            <tr>
-                <td>
-                    <label class="control-label">@Localizer["Message:"] </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@body" rows="5" />
-                </td>
-            </tr>
-        }
-    </table>
-
-
-    @if (reply != string.Empty)
-    {
-        <button type="button" class="btn btn-primary" @onclick="Send">@Localizer["Send"]</button>
-    }
-    else
-    {
-        if (title == "From")
-        {
+@inject IStringLocalizer<View> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (PageState.User != null)
+{
+    <table class="table table-borderless">
+        <tr>
+            <td width="30%">
+                <label class="control-label">@Localizer["Title"] </label>
+            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" readonly />
+                </td>
+            }
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" />
+                </td>
+            }
+        </tr>
+        <tr>
+            <td>
+                <label class="control-label">@Localizer["Subject"] </label>
+            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" readonly />
+                </td>
+            }
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" />
+                </td>
+            }
+        </tr>
+        @if (title == "From")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">@Localizer["Date"] </label>
+                </td>
+                <td>
+                    <input class="form-control" @bind="@createdon" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "From")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">@Localizer["Message"] </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "To")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">@Localizer["Message"] </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" />
+                </td>
+            </tr>
+        }
+    </table>
+
+
+    @if (reply != string.Empty)
+    {
+        <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+    }
+    else
+    {
+        if (title == "From")
+        {
             <button type="button" class="btn btn-primary" @onclick="Reply">@Localizer["Reply"]</button>
-        }
-    }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-    <br />
-    <br />
-    @if (title == "To")
-    {
-        <div class="control-group">
-            <label class="control-label">@Localizer["Original Message"] </label>
-            <textarea class="form-control" @bind="@reply" rows="5" readonly />
-        </div>
-    }
-}
-
-@code {
-    private int notificationid;
-    private string title = string.Empty;
-    private string username = "";
-    private string subject = string.Empty;
-    private string createdon = string.Empty;
-    private string body = string.Empty;
-    private string reply = string.Empty;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
-    public override string Title => "View Notification";
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            notificationid = Int32.Parse(PageState.QueryString["id"]);
-            Notification notification = await NotificationService.GetNotificationAsync(notificationid);
-            if (notification != null)
-            {
-                int userid = -1;
-                if (notification.ToUserId == PageState.User.UserId)
-                {
-                    title = "From";
-                    if (notification.FromUserId != null)
-                    {
-                        userid = notification.FromUserId.Value;
-                    }
-                }
-                else
-                {
-                    title = "To";
-                    if (notification.ToUserId != null)
-                    {
-                        userid = notification.ToUserId.Value;
-                    }
-                }
-                if (userid != -1)
-                {
-                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-                    if (user != null)
-                    {
-                        username = user.Username;
-                    }
-                }
-                if (username == "")
-                {
-                    username = "System";
-                }
-                subject = notification.Subject;
-                createdon = notification.CreatedOn.ToString();
-                body = notification.Body;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Users"], MessageType.Error);
-        }
-    }
-
-    private void Reply()
-    {
-        title = "To";
-        if (!subject.Contains("RE:"))
-        {
-            subject = "RE: " + subject;
-        }
-        reply = body;
-        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
-        StateHasChanged();
-    }
-
-    private async Task Send()
-    {
-        try
-        {
-            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-            if (user != null)
+        }
+    }
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br />
+    <br />
+    @if (title == "To")
+    {
+        <div class="control-group">
+            <label class="control-label">@Localizer["OriginalMessage"] </label>
+            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+        </div>
+    }
+}
+
+@code {
+    private int notificationid;
+    private string title = string.Empty;
+    private string username = "";
+    private string subject = string.Empty;
+    private string createdon = string.Empty;
+    private string body = string.Empty;
+    private string reply = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+    public override string Title => "View Notification";
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            notificationid = Int32.Parse(PageState.QueryString["id"]);
+            Notification notification = await NotificationService.GetNotificationAsync(notificationid);
+            if (notification != null)
+            {
+                int userid = -1;
+                if (notification.ToUserId == PageState.User.UserId)
+                {
+                    title = "From";
+                    if (notification.FromUserId != null)
+                    {
+                        userid = notification.FromUserId.Value;
+                    }
+                }
+                else
+                {
+                    title = "To";
+                    if (notification.ToUserId != null)
+                    {
+                        userid = notification.ToUserId.Value;
+                    }
+                }
+                if (userid != -1)
+                {
+                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                    if (user != null)
+                    {
+                        username = user.Username;
+                    }
+                }
+                if (username == "")
+                {
+                    username = "System";
+                }
+                subject = notification.Subject;
+                createdon = notification.CreatedOn.ToString();
+                body = notification.Body;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+        }
+    }
+
+    private void Reply()
+    {
+        title = "To";
+        if (!subject.Contains("RE:"))
+        {
+            subject = "RE: " + subject;
+        }
+        reply = body;
+        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        StateHasChanged();
+    }
+
+    private async Task Send()
+    {
+        try
+        {
+            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
+            if (user != null)
             {
                 var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, notificationid);
-                notification = await NotificationService.AddNotificationAsync(notification);
-                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                AddModuleMessage(Localizer["User Does Not Exist. Please Verify That The Username Provided Is Correct."], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Adding Notification"], MessageType.Error);
-        }
-    }
-}
-
+                notification = await NotificationService.AddNotificationAsync(notification);
+                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Notification.Add"], MessageType.Error);
+        }
+    }
+}
+
diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor
index 176050d3..386bd1b0 100644
--- a/Oqtane.Client/Modules/Admin/Users/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Add.razor
@@ -5,6 +5,7 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 @inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
     <TabPanel Name="Identity" ResourceKey="Identity">
@@ -12,43 +13,43 @@
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
-                        <label class="control-label">@Localizer["Username:"] </label>
+                    <td width="30%">
+                        <Label For="username" HelpText="A unique username for a user. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@username" />
+                        <input id="username" class="form-control" @bind="@username" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Password:"] </label>
+                        <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@password" />
+                        <input id="password" type="password" class="form-control" @bind="@password" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Confirm Password:"] </label>
+                        <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@confirm" />
+                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Email:"] </label>
+                        <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@email" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Full Name:"] </label>
+                        <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@displayname" />
                     </td>
                 </tr>
             </table>
@@ -71,7 +72,7 @@
                         category = p.Category;
                     }
                     <tr>
-                        <td>
+                        <td width="30%">
                             <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
                         </td>
                         <td>
@@ -91,8 +92,8 @@
     </TabPanel>
 </TabStrip>
 
-<button type="button" class="btn btn-primary" @onclick="SaveUser">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private string username = string.Empty;
@@ -116,7 +117,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading User Profile"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
         }
     }
 
@@ -153,28 +154,28 @@
                         else
                         {
                             await logger.LogError("Error Adding User {Username} {Email}", username, email);
-                            AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username And Email Are Not Already In Use."], MessageType.Error);
+                            AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
                         }
                     }
                     else
                     {
-                        AddModuleMessage(Localizer["Username Already Exists"], MessageType.Warning);
+                        AddModuleMessage(Localizer["Message.Username.Exists"], MessageType.Warning);
                     }
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Username, Password, Email Address And All Required Profile Information"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", username, email, ex.Message);
-            AddModuleMessage(Localizer["Error Adding User"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor
index 19254613..5f53e756 100644
--- a/Oqtane.Client/Modules/Admin/Users/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor
@@ -6,6 +6,7 @@
 @inject ISettingService SettingService
 @inject IFileService FileService
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.User != null && photo != null)
 {
@@ -21,48 +22,48 @@ else
         {
             <table class="table table-borderless">
                 <tr>
-                    <td>
-                        <label class="control-label">@Localizer["Username:"] </label>
+                    <td width="30%">
+                        <Label For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@username" readonly />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Password:"] </label>
+                        <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@password" />
+                        <input id="password" type="password" class="form-control" @bind="@password" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Confirm Password:"] </label>
+                        <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@confirm" />
+                        <input id="confirm" type="password" class="form-control" @bind="@confirm" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Email:"] </label>
+                        <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@email" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Full Name:"] </label>
+                        <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
                     </td>
                     <td>
-                        <input class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@displayname" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Photo:"] </label>
+                        <Label For="@photofileid.ToString()" HelpText="A photo of the user" ResourceKey="Photo"></Label>
                     </td>
                     <td>
                         <FileManager FileId="@photofileid" @ref="filemanager" />
@@ -70,12 +71,12 @@ else
                 </tr>
                 <tr>
                     <td>
-                        <label class="control-label">@Localizer["Is Deleted?"] </label>
+                        <Label For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
                     </td>
                     <td>
-                        <select class="form-control" @bind="@isdeleted">
-                            <option value="True">@Localizer["Yes"]</option>
-                            <option value="False">@Localizer["No"]</option>
+                        <select id="isdeleted" class="form-select" @bind="@isdeleted">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
                         </select>
                     </td>
                 </tr>
@@ -99,7 +100,7 @@ else
                         category = p.Category;
                     }
                     <tr>
-                        <td>
+                        <td width="30%">
                             <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
                         </td>
                         <td>
@@ -119,8 +120,8 @@ else
     </TabPanel>
 </TabStrip>
 
-<button type="button" class="btn btn-primary" @onclick="SaveUser">@Localizer["Save"]</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 <br />
 <br />
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
@@ -152,39 +153,42 @@ else
     {
         try
         {
-            profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-
-            userid = Int32.Parse(PageState.QueryString["id"]);
-            var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-            if (user != null)
+            // OnParametersSetAsync is called when the edit modal is closed - in which case there is no id parameter
+            if (PageState.QueryString.ContainsKey("id"))
             {
-                username = user.Username;
-                email = user.Email;
-                displayname = user.DisplayName;
-                if (user.PhotoFileId != null)
+                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+                userid = Int32.Parse(PageState.QueryString["id"]);
+                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                if (user != null)
                 {
-                    photofileid = user.PhotoFileId.Value;
-                    photo = await FileService.GetFileAsync(photofileid);
+                    username = user.Username;
+                    email = user.Email;
+                    displayname = user.DisplayName;
+                    if (user.PhotoFileId != null)
+                    {
+                        photofileid = user.PhotoFileId.Value;
+                        photo = await FileService.GetFileAsync(photofileid);
+                    }
+                    else
+                    {
+                        photofileid = -1;
+                        photo = null;
+                    }
+                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
+                    createdby = user.CreatedBy;
+                    createdon = user.CreatedOn;
+                    modifiedby = user.ModifiedBy;
+                    modifiedon = user.ModifiedOn;
+                    deletedby = user.DeletedBy;
+                    deletedon = user.DeletedOn;
+                    isdeleted = user.IsDeleted.ToString();
                 }
-                else
-                {
-                    photofileid = -1;
-                    photo = null;
-                }
-                settings = await SettingService.GetUserSettingsAsync(user.UserId);
-                createdby = user.CreatedBy;
-                createdon = user.CreatedOn;
-                modifiedby = user.ModifiedBy;
-                modifiedon = user.ModifiedOn;
-                deletedby = user.DeletedBy;
-                deletedon = user.DeletedOn;
-                isdeleted = user.IsDeleted.ToString();
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading User"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
@@ -222,18 +226,18 @@ else
                 }
                 else
                 {
-                    AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Provide A Username, Password, Email Address, And All Required Profile Information"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message);
-            AddModuleMessage(Localizer["Error Saving User"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Save"], MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 4245c649..e14dc97d 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -4,39 +4,43 @@
 @inject IUserService UserService
 @inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (userroles == null)
 {
     <p>
-        <em>@Localizer["Loading..."]</em>
+        <em>@SharedLocalizer["Loading"]</em>
     </p>
 }
 else
 {
-    <div class="form-row">
-        <div class="col">
-            <ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" />
-        </div>
-        <div class="col">
-            <div class="input-group flex-nowrap">
-                <input class="form-control" @bind="@_search" />&nbsp;<button class="btn btn-secondary" @onclick="OnSearch">@Localizer["Search"]</button>
-            </div>
-        </div>
-    </div>
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <div><ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" /></div>
+            </td>
+            <td>
+                <input class="form-control" @bind="@_search" />
+            </td>
+            <td>
+                <button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
+            </td>
+        </tr>
+    </table>
 
     <Pager Items="@userroles">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td>
                 <ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
             </td>
             <td>
-                <ActionDialog Header="Delete User" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.User.DisplayName]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.Role.Name == RoleNames.Host)"  ResourceKey="DeleteUser" />
+                <ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.Role.Name == RoleNames.Host)" ResourceKey="DeleteUser" />
             </td>
             <td>
                 <ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
@@ -66,7 +70,7 @@ else
 
         if (string.IsNullOrEmpty(_search))
         {
-            results = results.Where(item => 
+            results = results.Where(item =>
                 (
                     item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
                     item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||
diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor
index 13c4e780..260ecb12 100644
--- a/Oqtane.Client/Modules/Admin/Users/Roles.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor
@@ -4,16 +4,17 @@
 @inject IUserService UserService
 @inject IUserRoleService UserRoleService
 @inject IStringLocalizer<Roles> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (userroles == null)
 {
-    <p><em>@Localizer["Loading..."]</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
-            <td>
+            <td width="30%">
                 <Label For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label>
             </td>
             <td>
@@ -25,8 +26,8 @@ else
                 <Label For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
             </td>
             <td>
-                <select id="role" class="form-control" @bind="@roleid">
-                    <option value="-1">&lt;@Localizer["Select Role"]&gt;</option>
+                <select id="role" class="form-select" @bind="@roleid">
+                    <option value="-1">&lt;@Localizer["Role.Select"]&gt;</option>
                     @foreach (Role role in roles)
                     {
                         <option value="@(role.RoleId)">@role.Name</option>
@@ -51,8 +52,8 @@ else
             </td>
         </tr>
     </table>
-    <button type="button" class="btn btn-success" @onclick="SaveUserRole">@Localizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
     <hr class="app-rule" />
     <p align="center">
@@ -68,7 +69,7 @@ else
                 <td>@context.EffectiveDate</td>
                 <td>@context.ExpiryDate</td>
                 <td>
-                    <ActionDialog Header="Remove Role" Message="@Localizer["Are You Sure You Wish To Remove This User From The {0} Role?", context.Role.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
+                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
                 </td>
             </Row>
         </Pager>
@@ -107,7 +108,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Roles {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Loading Roles"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.LoadRole"], MessageType.Error);
         }
     }
 
@@ -121,7 +122,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Roles {UserId} {Error}", userid, ex.Message);
-            AddModuleMessage(Localizer["Error Loading User Roles"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.LoadRole"], MessageType.Error);
         }
     }
 
@@ -181,19 +182,19 @@ else
                 }
 
                 await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
-                AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success);
+                AddModuleMessage(Localizer["Success.User.AssignRole"], MessageType.Success);
                 await GetUserRoles();
                 StateHasChanged();
             }
             else
             {
-                AddModuleMessage(Localizer["You Must Select A Role"], MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.Role"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving User Roles {UserId} {Error}", userid, ex.Message);
-            AddModuleMessage(Localizer["Error Saving User Roles"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error);
         }
     }
 
@@ -203,14 +204,14 @@ else
         {
             await UserRoleService.DeleteUserRoleAsync(UserRoleId);
             await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
-            AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success);
+            AddModuleMessage(Localizer["Success.User.Remove"], MessageType.Success);
             await GetUserRoles();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
-            AddModuleMessage(Localizer["Error Removing User From Role"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 43d6e0af..5cda1386 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -9,7 +9,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">@Header</h5>
-                        <button type="button" class="close" @onclick="DisplayModal" aria-label="Close">&times;</button>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="DisplayModal"></button>
                     </div>
                     <div class="modal-body">
                         <p>@Message</p>
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index aa2cf790..1584fd6e 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -44,12 +44,12 @@
 
             if (!String.IsNullOrEmpty(CreatedBy))
             {
-                _text += $" {Localizer["by"]} <b>{CreatedBy}</b>";
+                _text += $" {Localizer["By"]} <b>{CreatedBy}</b>";
             }
 
             if (CreatedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
             }
 
             _text += "</p>";
@@ -57,7 +57,7 @@
 
         if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn.HasValue)
         {
-            _text += $"<p style=\"{Style}\">{Localizer["Last modified"]} ";
+            _text += $"<p style=\"{Style}\">{Localizer["LastModified"]} ";
 
             if (!String.IsNullOrEmpty(ModifiedBy))
             {
@@ -78,12 +78,12 @@
 
             if (!String.IsNullOrEmpty(DeletedBy))
             {
-                _text += $" {Localizer["by"]} <b>{DeletedBy}</b>";
+                _text += $" {Localizer["By"]} <b>{DeletedBy}</b>";
             }
 
             if (DeletedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
             }
 
             _text += "</p>";
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index df468bbe..9628ff48 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -3,6 +3,7 @@
 @inject IFolderService FolderService
 @inject IFileService FileService
 @inject IStringLocalizer<FileManager> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_folders != null)
 {
@@ -12,10 +13,10 @@
                 @if (ShowFolders || FolderId <= 0)
                 {
                     <div>
-                        <select class="form-control" value="@FolderId" @onchange="(e => FolderChanged(e))">
+                        <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
                             @if (string.IsNullOrEmpty(Folder))
                             {
-                                <option value="-1">&lt;@Localizer["Select Folder"]&gt;</option>
+                                <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
                             }
                             @foreach (Folder folder in _folders)
                             {
@@ -27,8 +28,8 @@
                 @if (ShowFiles)
                 {
                     <div>
-                        <select class="form-control" value="@FileId" @onchange="(e => FileChanged(e))">
-                            <option value="-1">&lt;@Localizer["Select File"]&gt;</option>
+                        <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
+                            <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
                             @foreach (File file in _files)
                             {
                                 <option value="@(file.FileId)">@(file.Name)</option>
@@ -48,11 +49,11 @@
                             <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
                         }
                         <span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
-                        <span class="float-right">
-                            <button type="button" class="btn btn-success" @onclick="UploadFile">@Localizer["Upload"]</button>
+                        <span class="float-end">
+                            <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
                             @if (ShowFiles && GetFileId() != -1)
                             {
-                                <button type="button" class="btn btn-danger" @onclick="DeleteFile">@Localizer["Delete"]</button>
+                                <button type="button" class="btn btn-danger" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
                             }
                         </span>
                     </div>
@@ -208,7 +209,7 @@
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
 
-            _message = Localizer["Error Loading Files"];
+            _message = Localizer["Error.File.Load"];
             _messagetype = MessageType.Error;
         }
     }
@@ -268,7 +269,7 @@
                 {
                     await logger.LogInformation("File Upload Succeeded {Files}", upload);
 
-                    _message = Localizer["File Upload Succeeded"];
+                    _message = Localizer["Success.File.Upload"];
                     _messagetype = MessageType.Success;
 
                     await GetFiles();
@@ -288,7 +289,7 @@
                 {
                     await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
 
-                    _message = Localizer["File Upload Failed"];
+                    _message = Localizer["Error.File.Upload"];
                     _messagetype = MessageType.Error;
                 }
             }
@@ -296,13 +297,13 @@
             {
                 await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
 
-                _message = Localizer["File Upload Failed"];
+                _message = Localizer["Error.File.Upload"];
                 _messagetype = MessageType.Error;
             }
         }
         else
         {
-            _message = Localizer["You Have Not Selected A File To Upload"];
+            _message = Localizer["Message.File.NotSelected"];
             _messagetype = MessageType.Warning;
         }
     }
@@ -315,7 +316,7 @@
             await FileService.DeleteFileAsync(FileId);
             await logger.LogInformation("File Deleted {File}", FileId);
 
-            _message = Localizer["File Deleted"];
+            _message = Localizer["Success.File.Delete"];
             _messagetype = MessageType.Success;
 
             await GetFiles();
@@ -327,7 +328,7 @@
         {
             await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
 
-            _message = Localizer["Error Deleting File"];
+            _message = Localizer["Error.File.Delete"];
             _messagetype = MessageType.Error;
         }
     }
diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor
index b67143cb..f237d5f3 100644
--- a/Oqtane.Client/Modules/Controls/Label.razor
+++ b/Oqtane.Client/Modules/Controls/Label.razor
@@ -30,6 +30,11 @@ else
     {
         base.OnParametersSet();
 
+        if (string.IsNullOrEmpty(Class))
+        {
+            Class = "form-label";
+        }
+
         _openLabel = "<label";
         if (!string.IsNullOrEmpty(For))
         {
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 04a1056e..976b1aa8 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -4,12 +4,13 @@
 
 @if (!string.IsNullOrEmpty(_message))
 {
-    <div class="@_classname" role="alert">
+    <div class="@_classname alert-dismissible fade show" role="alert">
         @((MarkupString)_message)
         @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             @((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink>
         }
+        <button type="button" class="btn-close" aria-label="Close" @onclick="DismissModal"></button>
     </div>
     <br />
 }
@@ -54,4 +55,10 @@
 
         return classname;
     }
+
+    private void DismissModal()
+    {
+        _message = "";
+        StateHasChanged();
+    }
 }
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index c89b1301..c0b285b7 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -8,15 +8,15 @@
         <div class="mx-auto text-center">
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
             }
             @if (_page > _maxPages)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
                 @for (int i = _startPage; i <= _endPage; i++)
                 {
                     var pager = i;
@@ -24,15 +24,15 @@
                         @pager
                     </button>
                 }
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
             }
             @if (_endPage < _pages)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
+                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
             }
             @if (_endPage > 1)
             {
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index a35a5209..cca00dc5 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -2,12 +2,13 @@
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
-@inject IStringLocalizer<PermissionGrid> Localizer 
+@inject IStringLocalizer<PermissionGrid> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_permissions != null)
 {
     <br />
-    <table class="table" style="width: 50%; min-width: 250px;">
+    <table class="table table-borderless" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <th scope="col">@Localizer["Role"]</th>
@@ -33,7 +34,7 @@
     </table>
     @if (_users.Count != 0)
     {
-        <table class="table" style="width: 50%; min-width: 250px;">
+        <table class="table table-borderless" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
                     <th scope="col">@Localizer["User"]</th>
@@ -61,12 +62,12 @@
             </tbody>
         </table>
     }
-    <table class="table" style="width: 50%; min-width: 250px;">
+    <table class="table table-borderless" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <td class="input-group">
-                    <input type="text" name="Username" class="form-control" placeholder="@Localizer["Enter Username"]" @bind="@_username" />
-                    <button type="button" class="btn btn-primary" @onclick="AddUser">@Localizer["Add"]</button>
+                    <input type="text" name="Username" class="form-control" placeholder="@Localizer["Username.Enter"]" @bind="@_username" />
+                    <button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
                 </td>
             </tr>
         </tbody>
@@ -180,7 +181,7 @@
             }
             catch
             {
-                _message = Localizer["Username Does Not Exist"];
+                _message = Localizer["Message.Username.DontExist"];
             }
         }
 
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index ce50272d..793761f5 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -14,9 +14,9 @@
                         <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
                         <br />
                     }
-                    <div class="row justify-content-center" style="margin-bottom: 20px;">
-                        <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["Synchronize Content"]</button>&nbsp;&nbsp;
-                        <button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["Insert Image"]</button>
+                    <div class="d-flex justify-content-center mb-2">
+                        <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["SynchronizeContent"]</button>&nbsp;&nbsp;
+                        <button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["InsertImage"]</button>
                         @if (_filemanagervisible)
                         {
                             @((MarkupString)"&nbsp;&nbsp;")
@@ -66,8 +66,8 @@
                 </div>
             </TabPanel>
             <TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
-                <div class="row justify-content-center" style="margin-bottom: 20px;">
-                    <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["Synchronize Content"]</button>
+                <div class="d-flex justify-content-center mb-2">
+                    <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["SynchronizeContent"]</button>
                 </div>
                 @if (ReadOnly)
                 {
@@ -143,6 +143,8 @@
 
             await interop.LoadEditorContent(_editorElement, Content);
 
+            _content = Content; // raw HTML
+
             // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
             _original = await interop.GetHtml(_editorElement);
         }
@@ -200,7 +202,7 @@
             }
             else
             {
-                _message = Localizer["You Must Select An Image To Insert"];
+                _message = Localizer["Message.Require.Image"];
             }
         }
         else
diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor
index 7f253cc2..3620d893 100644
--- a/Oqtane.Client/Modules/Controls/Section.razor
+++ b/Oqtane.Client/Modules/Controls/Section.razor
@@ -1,14 +1,14 @@
 @namespace Oqtane.Modules.Controls
 @inherits LocalizableComponent
 
-<div class="d-flex">
+<div class="d-flex mt-2">
     <div>
-        <a data-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
+        <a data-bs-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
             <h5>@_heading</h5>
         </a>
     </div>
-    <div class="ml-auto">
-        <a data-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
+    <div class="ms-auto">
+        <a data-bs-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
             <i class="oi oi-chevron-bottom"></i>&nbsp;
         </a>
     </div>
diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor
index b2806a82..2d423818 100644
--- a/Oqtane.Client/Modules/Controls/TabStrip.razor
+++ b/Oqtane.Client/Modules/Controls/TabStrip.razor
@@ -10,13 +10,13 @@
                     <li class="nav-item" @key="tabPanel.Name">
                         @if (tabPanel.Name == ActiveTab)
                         {
-                            <a class="nav-link active" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+                            <a class="nav-link active" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
                         else
                         {
-                            <a class="nav-link" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+                            <a class="nav-link" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
index 26991f37..538aa3ae 100644
--- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
+++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
@@ -52,11 +52,11 @@
         {
             case true:
                 _src = "images/checked.png";
-                _title = Localizer["Permission Granted"];
+                _title = Localizer["PermissionGranted"];
                 break;
             case false:
                 _src = "images/unchecked.png";
-                _title = Localizer["Permission Denied"];
+                _title = Localizer["PermissionDenied"];
                 break;
             case null:
                 _src = "images/null.png";
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 5e93e330..bc94cebc 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -7,12 +7,13 @@
 @inject ISettingService SettingService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_content != null)
 {
     <RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
-    <button type="button" class="btn btn-success" @onclick="SaveContent">@Localizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     @if (!string.IsNullOrEmpty(_content))
     {
         <br />
@@ -96,7 +97,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Saving Content"], MessageType.Error);
+            AddModuleMessage(Localizer["Error.Content.Save"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 21263f72..b1dc8fd6 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -2,17 +2,21 @@
 @namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject IHtmlTextService HtmlTextService
+@inject IStringLocalizer<Edit> Localizer
 
 @((MarkupString)content)
 
 @if (PageState.EditMode)
 {
-    <br /><ActionLink Action="Edit" EditMode="true" ResourceKey="Edit" /><br /><br />
+    <br />
+    <ActionLink Action="Edit" EditMode="true" ResourceKey="Edit" />
+    <br />
+    <br />
 }
 
 @code {
     public override List<Resource> Resources => new List<Resource>()
-    {
+{
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
index a90451cd..73776394 100644
--- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
+++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Oqtane.Services;
@@ -9,34 +7,28 @@ namespace Oqtane.Modules.HtmlText.Services
 {
     public class HtmlTextService : ServiceBase, IHtmlTextService, IService
     {        
-        private readonly SiteState _siteState;
+        public HtmlTextService(HttpClient http, SiteState siteState) : base(http, siteState) {}
 
-        public HtmlTextService(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string ApiUrl => CreateApiUrl("HtmlText", _siteState.Alias);
+        private string ApiUrl => CreateApiUrl("HtmlText");
 
         public async Task<Models.HtmlText> GetHtmlTextAsync(int moduleId)
         {
-            var htmltext = await GetJsonAsync<List<Models.HtmlText>>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", new Dictionary<string, int>() { { EntityNames.Module, moduleId } }));
-            return htmltext.FirstOrDefault();
+            return await GetJsonAsync<Models.HtmlText>(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
         }
 
         public async Task AddHtmlTextAsync(Models.HtmlText htmlText)
         {
-            await PostJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}", new Dictionary<string, int>() { { EntityNames.Module, htmlText.ModuleId } }), htmlText);
+            await PostJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}", EntityNames.Module, htmlText.ModuleId), htmlText);
         }
 
         public async Task UpdateHtmlTextAsync(Models.HtmlText htmlText)
         {
-            await PutJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlText.HtmlTextId}", new Dictionary<string, int>() { { EntityNames.Module, htmlText.ModuleId } }), htmlText);
+            await PutJsonAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{htmlText.HtmlTextId}", EntityNames.Module, htmlText.ModuleId), htmlText);
         }
 
         public async Task DeleteHtmlTextAsync(int moduleId)
         {
-            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", new Dictionary<string, int>() { { EntityNames.Module, moduleId } }));
+            await DeleteAsync(CreateAuthorizationPolicyUrl($"{ApiUrl}/{moduleId}", EntityNames.Module, moduleId));
         }
     }
 }
diff --git a/Oqtane.Client/Modules/HtmlText/Settings.razor b/Oqtane.Client/Modules/HtmlText/Settings.razor
index 6e7795e4..cf903c0e 100644
--- a/Oqtane.Client/Modules/HtmlText/Settings.razor
+++ b/Oqtane.Client/Modules/HtmlText/Settings.razor
@@ -3,16 +3,17 @@
 @inject ISettingService SettingService
 @implements Oqtane.Interfaces.ISettingsControl
 @inject IStringLocalizer<Settings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
         </td>
         <td>
-            <select id="files" class="form-control" @bind="@_allowfilemanagement">
-                <option value="true">@Localizer["Yes"]</option>
-                <option value="false">@Localizer["No"]</option>
+            <select id="files" class="form-select" @bind="@_allowfilemanagement">
+                <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
             </select>
         </td>
     </tr>
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 3fd548ac..e7c6658d 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -84,11 +84,21 @@ namespace Oqtane.Modules
             return NavigateUrl(path, "");
         }
 
+        public string NavigateUrl(bool refresh)
+        {
+            return NavigateUrl(PageState.Page.Path, refresh);
+        }
+
         public string NavigateUrl(string path, string parameters)
         {
             return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
         }
 
+        public string NavigateUrl(string path, bool refresh)
+        {
+            return Utilities.NavigateUrl(PageState.Alias.Path, path, refresh ? "refresh" : "");
+        }
+
         public string EditUrl(string action)
         {
             return EditUrl(ModuleState.ModuleId, action);
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index 24e2efb7..1971e531 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -33,4 +33,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Resources\" />
+    <Folder Include="Resources\Themes\Controls\Theme\" />
+  </ItemGroup>
 </Project>
diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs
index 3ae04bd8..f27f0c2e 100644
--- a/Oqtane.Client/Program.cs
+++ b/Oqtane.Client/Program.cs
@@ -8,14 +8,11 @@ using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
-using Oqtane.Interfaces;
 using Oqtane.Modules;
-using Oqtane.Providers;
 using Oqtane.Services;
 using Oqtane.Shared;
 using Oqtane.UI;
@@ -28,7 +25,8 @@ namespace Oqtane.Client
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
-            HttpClient httpClient = new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)};
+
+            var httpClient = new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)};
 
             builder.Services.AddSingleton(httpClient);
             builder.Services.AddOptions();
@@ -37,38 +35,10 @@ namespace Oqtane.Client
             builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
 
             // register auth services
-            builder.Services.AddAuthorizationCore();
-            builder.Services.AddScoped<IdentityAuthenticationStateProvider>();
-            builder.Services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
+            builder.Services.AddOqtaneAuthorization();
 
             // register scoped core services
-            builder.Services.AddScoped<SiteState>();
-            builder.Services.AddScoped<IInstallationService, InstallationService>();
-            builder.Services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
-            builder.Services.AddScoped<IThemeService, ThemeService>();
-            builder.Services.AddScoped<IAliasService, AliasService>();
-            builder.Services.AddScoped<ITenantService, TenantService>();
-            builder.Services.AddScoped<ISiteService, SiteService>();
-            builder.Services.AddScoped<IPageService, PageService>();
-            builder.Services.AddScoped<IModuleService, ModuleService>();
-            builder.Services.AddScoped<IPageModuleService, PageModuleService>();
-            builder.Services.AddScoped<IUserService, UserService>();
-            builder.Services.AddScoped<IProfileService, ProfileService>();
-            builder.Services.AddScoped<IRoleService, RoleService>();
-            builder.Services.AddScoped<IUserRoleService, UserRoleService>();
-            builder.Services.AddScoped<ISettingService, SettingService>();
-            builder.Services.AddScoped<IPackageService, PackageService>();
-            builder.Services.AddScoped<ILogService, LogService>();
-            builder.Services.AddScoped<IJobService, JobService>();
-            builder.Services.AddScoped<IJobLogService, JobLogService>();
-            builder.Services.AddScoped<INotificationService, NotificationService>();
-            builder.Services.AddScoped<IFolderService, FolderService>();
-            builder.Services.AddScoped<IFileService, FileService>();
-            builder.Services.AddScoped<ISiteTemplateService, SiteTemplateService>();
-            builder.Services.AddScoped<ISqlService, SqlService>();
-            builder.Services.AddScoped<ISystemService, SystemService>();
-            builder.Services.AddScoped<ILocalizationService, LocalizationService>();
-            builder.Services.AddScoped<ILanguageService, LanguageService>();
+            builder.Services.AddOqtaneScopedServices();
 
             await LoadClientAssemblies(httpClient);
 
@@ -76,38 +46,15 @@ namespace Oqtane.Client
             foreach (var assembly in assemblies)
             {
                 // dynamically register module services
-                var implementationTypes = assembly.GetInterfaces<IService>();
-                foreach (var implementationType in implementationTypes)
-                {
-                    if (implementationType.AssemblyQualifiedName != null)
-                    {
-                        var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
-                        builder.Services.AddScoped(serviceType ?? implementationType, implementationType);
-                    }
-                }
+                RegisterModuleServices(assembly, builder.Services);
 
                 // register client startup services
-                var startUps = assembly.GetInstances<IClientStartup>();
-                foreach (var startup in startUps)
-                {
-                    startup.ConfigureServices(builder.Services);
-                }
+                RegisterClientStartups(assembly, builder.Services);
             }
 
             var host = builder.Build();
-            var jsRuntime = host.Services.GetRequiredService<IJSRuntime>();
-            var interop = new Interop(jsRuntime);
-            var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
-            var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie).UICultures[0].Value;
-            var localizationService = host.Services.GetRequiredService<ILocalizationService>();
-            var cultures = await localizationService.GetCulturesAsync();
 
-            if (culture == null || !cultures.Any(c => c.Name.Equals(culture, StringComparison.OrdinalIgnoreCase)))
-            {
-                culture = cultures.Single(c => c.IsDefault).Name;
-            }
-
-            SetCulture(culture);
+            await SetCultureFromLocalizationCookie(host.Services);
 
             ServiceActivator.Configure(host.Services);
 
@@ -163,6 +110,45 @@ namespace Oqtane.Client
             }
         }
 
+        private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
+        {
+            var implementationTypes = assembly.GetInterfaces<IService>();
+            foreach (var implementationType in implementationTypes)
+            {
+                if (implementationType.AssemblyQualifiedName != null)
+                {
+                    var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                    services.AddScoped(serviceType ?? implementationType, implementationType);
+                }
+            }
+        }
+
+        private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
+        {
+            var startUps = assembly.GetInstances<IClientStartup>();
+            foreach (var startup in startUps)
+            {
+                startup.ConfigureServices(services);
+            }
+        }
+
+        private static async Task SetCultureFromLocalizationCookie(IServiceProvider serviceProvider)
+        {
+            var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
+            var interop = new Interop(jsRuntime);
+            var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
+            var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie)?.UICultures?[0].Value;
+            var localizationService = serviceProvider.GetRequiredService<ILocalizationService>();
+            var cultures = await localizationService.GetCulturesAsync();
+
+            if (culture == null || !cultures.Any(c => c.Name.Equals(culture, StringComparison.OrdinalIgnoreCase)))
+            {
+                culture = cultures.Single(c => c.IsDefault).Name;
+            }
+
+            SetCulture(culture);
+        }
+
         private static void SetCulture(string culture)
         {
             var cultureInfo = CultureInfo.GetCultureInfo(culture);
diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
index 8bc0dd98..146df8d4 100644
--- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
+++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
@@ -30,14 +30,11 @@ namespace Oqtane.Providers
 
             // get HttpClient lazily from IServiceProvider as you cannot use standard dependency injection due to the AuthenticationStateProvider being initialized prior to NavigationManager(https://github.com/aspnet/AspNetCore/issues/11867 )
             var http = _serviceProvider.GetRequiredService<HttpClient>();
-            // get alias as SiteState has not been initialized ( cannot use AliasService as it is not yet registered )
-            var path = new Uri(_navigationManager.Uri).LocalPath.Substring(1);
-            var alias = await http.GetFromJsonAsync<Alias>($"/api/Alias/name/?path={WebUtility.UrlEncode(path)}&sync={DateTime.UtcNow.ToString("yyyyMMddHHmmssfff")}");
-            // get user
-            User user = await http.GetFromJsonAsync<User>(Utilities.TenantUrl(alias, "/api/User/authenticate"));
+            var siteState = _serviceProvider.GetRequiredService<SiteState>();
+            User user = await http.GetFromJsonAsync<User>(Utilities.TenantUrl(siteState.Alias, "/api/User/authenticate"));
             if (user.IsAuthenticated)
             {
-                identity = UserSecurity.CreateClaimsIdentity(alias, user);
+                identity = UserSecurity.CreateClaimsIdentity(siteState.Alias, user);
             }
 
             return new AuthenticationState(new ClaimsPrincipal(identity));
diff --git a/Oqtane.Client/Resources/.gitkeep b/Oqtane.Client/Resources/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/Oqtane.Client/Resources/Installer/Controls/LocalDBConfig.resx b/Oqtane.Client/Resources/Installer/Controls/LocalDBConfig.resx
new file mode 100644
index 00000000..a3acd769
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Controls/LocalDBConfig.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Installer/Controls/MySQLConfig.resx b/Oqtane.Client/Resources/Installer/Controls/MySQLConfig.resx
new file mode 100644
index 00000000..f338521f
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Controls/MySQLConfig.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Port.Text" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="Port.HelpText" xml:space="preserve">
+    <value>Enter the port used to connect to the server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Installer/Controls/PostgreSQLConfig.resx b/Oqtane.Client/Resources/Installer/Controls/PostgreSQLConfig.resx
new file mode 100644
index 00000000..86e92b80
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Controls/PostgreSQLConfig.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Port.Text" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="Port.HelpText" xml:space="preserve">
+    <value>Enter the port used to connect to the server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="IntegratedSecurity.Text" xml:space="preserve">
+    <value>Integrated Security:</value>
+  </data>
+  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
+    <value>Select if you want integrated security or not</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
new file mode 100644
index 00000000..c526c9f9
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="IntegratedSecurity.Text" xml:space="preserve">
+    <value>Integrated Security:</value>
+  </data>
+  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
+    <value>Select if you want integrated security or not</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Installer/Controls/SqliteConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqliteConfig.resx
new file mode 100644
index 00000000..d2a51205
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Controls/SqliteConfig.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>File Name:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the file name to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Installer/Installer.resx b/Oqtane.Client/Resources/Installer/Installer.resx
new file mode 100644
index 00000000..e8da5177
--- /dev/null
+++ b/Oqtane.Client/Resources/Installer/Installer.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DatabaseConfig" xml:space="preserve">
+    <value>Database Configuration</value>
+  </data>
+  <data name="DatabaseType" xml:space="preserve">
+    <value>Database Type:</value>
+  </data>
+  <data name="ApplicationAdmin" xml:space="preserve">
+    <value>Application Administrator</value>
+  </data>
+  <data name="InstallNow" xml:space="preserve">
+    <value>Install Now</value>
+  </data>
+  <data name="Error.DbConfig.Load" xml:space="preserve">
+    <value>Error loading Database Configuration Control</value>
+  </data>
+  <data name="Message.Require.DbInfo" xml:space="preserve">
+    <value>Please Enter All Required Fields. Ensure Passwords Match And Are Greater Than 5 Characters In Length. Ensure Email Address Provided Is Valid.</value>
+  </data>
+  <data name="Register" xml:space="preserve">
+    <value>Please Register Me For Major Product Updates And Security Bulletins</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Dashboard/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Dashboard/Index.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Dashboard/Index.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Error/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Error/Index.resx
new file mode 100644
index 00000000..c9890a9f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Error/Index.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.Module.Load" xml:space="preserve">
+    <value>A Problem Was Encountered Loading Module {0}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Add.resx
new file mode 100644
index 00000000..fae32989
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Files/Add.resx
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Folder.Select" xml:space="preserve">
+    <value>Select Folder</value>
+  </data>
+  <data name="Message.Required.UrlFolder" xml:space="preserve">
+    <value>You Must Enter A Url And Select A Folder</value>
+  </data>
+  <data name="Message.Download.InvalidExtension" xml:space="preserve">
+    <value>File Could Not Be Downloaded From Url Due To Its File Extension</value>
+  </data>
+  <data name="Message.Required.UrlName" xml:space="preserve">
+    <value>You Must Enter A Url With A Valid File Name</value>
+  </data>
+  <data name="Success.Download.File" xml:space="preserve">
+    <value>File Downloaded Successfully From Url</value>
+  </data>
+  <data name="Error.Download.InvalidUrl" xml:space="preserve">
+    <value>Error Downloading File From Url. Please Verify That The Url Is Valid.</value>
+  </data>
+  <data name="Upload.HelpText" xml:space="preserve">
+    <value>Upload the file you want</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>Enter the url of the file you wish to download</value>
+  </data>
+  <data name="Folder.HelpText" xml:space="preserve">
+    <value>Select the folder to save the file in</value>
+  </data>
+  <data name="Upload.Text" xml:space="preserve">
+    <value>Upload: </value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url: </value>
+  </data>
+  <data name="Folder.Text" xml:space="preserve">
+    <value>Folder: </value>
+  </data>
+  <data name="UploadFiles.Heading" xml:space="preserve">
+    <value>Upload Files</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Details.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Details.resx
new file mode 100644
index 00000000..95bac50f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Files/Details.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Folder.Text" xml:space="preserve">
+    <value>Folder: </value>
+  </data>
+  <data name="Error.File.Load" xml:space="preserve">
+    <value>Error Loading File</value>
+  </data>
+  <data name="Message.File.InvalidName" xml:space="preserve">
+    <value>File Name Not Valid</value>
+  </data>
+  <data name="Error.File.Save" xml:space="preserve">
+    <value>Error Saving File</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>The name of the file</value>
+  </data>
+  <data name="Folder.HelpText" xml:space="preserve">
+    <value>The folder where the file is located</value>
+  </data>
+  <data name="Size.HelpText" xml:space="preserve">
+    <value>The size of the file (in bytes)</value>
+  </data>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Size.Text" xml:space="preserve">
+    <value>Size: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx
new file mode 100644
index 00000000..ec757e5e
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="NoParent" xml:space="preserve">
+    <value>No Parent</value>
+  </data>
+  <data name="Error.Folder.Load" xml:space="preserve">
+    <value>Error Loading Folder</value>
+  </data>
+  <data name="Message.Required.FolderParent" xml:space="preserve">
+    <value>Folders Must Have A Parent And A Name</value>
+  </data>
+  <data name="Message.Folder.InvalidName" xml:space="preserve">
+    <value>Folder Name Not Valid.</value>
+  </data>
+  <data name="Error.Folder.Save" xml:space="preserve">
+    <value>Error Saving Folder</value>
+  </data>
+  <data name="Message.Folder.Files.InvalidDelete" xml:space="preserve">
+    <value>Folder Has Files And Cannot Be Deleted</value>
+  </data>
+  <data name="Message.Folder.Subfolders.InvalidDelete" xml:space="preserve">
+    <value>Folder Has Subfolders And Cannot Be Deleted</value>
+  </data>
+  <data name="Error.Folder.Delete" xml:space="preserve">
+    <value>Error Deleting Folder</value>
+  </data>
+  <data name="Parent.HelpText" xml:space="preserve">
+    <value>Select the parent folder</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the folder name</value>
+  </data>
+  <data name="Permissions.HelpText" xml:space="preserve">
+    <value>Select the permissions you want for the folder</value>
+  </data>
+  <data name="Parent.Text" xml:space="preserve">
+    <value>Parent: </value>
+  </data>
+  <data name="Permissions.Text" xml:space="preserve">
+    <value>Permissions: </value>
+  </data>
+  <data name="DeleteFolder.Header" xml:space="preserve">
+    <value>Delete Folder</value>
+  </data>
+  <data name="DeleteFolder.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Folder?</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Files/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Files/Index.resx
new file mode 100644
index 00000000..68f20205
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Files/Index.resx
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.File.Load" xml:space="preserve">
+    <value>Error Loading Files</value>
+  </data>
+  <data name="UploadFiles.Heading" xml:space="preserve">
+    <value>Upload Files</value>
+  </data>
+  <data name="Confirm.File.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
+  <data name="NoFiles" xml:space="preserve">
+    <value>No Files Exist In Selected Folder</value>
+  </data>
+  <data name="Success.File.Delete" xml:space="preserve">
+    <value>File {0} Deleted</value>
+  </data>
+  <data name="Error.File.Delete" xml:space="preserve">
+    <value>Error Deleting File {0}</value>
+  </data>
+  <data name="EditFolder.Text" xml:space="preserve">
+    <value>Edit Folder</value>
+  </data>
+  <data name="AddFolder.Text" xml:space="preserve">
+    <value>Add Folder</value>
+  </data>
+  <data name="Details.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="DeleteFile.Header" xml:space="preserve">
+    <value>Delete File</value>
+  </data>
+  <data name="Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="Modified" xml:space="preserve">
+    <value>Modified</value>
+  </data>
+  <data name="Size" xml:space="preserve">
+    <value>Size</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
new file mode 100644
index 00000000..b30cffac
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Minute(s)" xml:space="preserve">
+    <value>Minute(s)</value>
+  </data>
+  <data name="Hour(s)" xml:space="preserve">
+    <value>Hour(s)</value>
+  </data>
+  <data name="Day(s)" xml:space="preserve">
+    <value>Day(s)</value>
+  </data>
+  <data name="Month(s)" xml:space="preserve">
+    <value>Month(s)</value>
+  </data>
+  <data name="Error.Job.Load" xml:space="preserve">
+    <value>Error Loading Job</value>
+  </data>
+  <data name="Error.Job.Update" xml:space="preserve">
+    <value>Error Updating Job</value>
+  </data>
+  <data name="Message.Required.JobInfo" xml:space="preserve">
+    <value>You Must Provide The Job Name, Type, Frequency, and Retention</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the job name</value>
+  </data>
+  <data name="Type.HelpText" xml:space="preserve">
+    <value>The fully qualified job type name</value>
+  </data>
+  <data name="Enabled.HelpText" xml:space="preserve">
+    <value>Select whether you want the job enabled or not</value>
+  </data>
+  <data name="RunsEvery.HelpText" xml:space="preserve">
+    <value>Select how often you want the job to run</value>
+  </data>
+  <data name="Starting.HelpText" xml:space="preserve">
+    <value>What time do you want the job to start</value>
+  </data>
+  <data name="Ending.HelpText" xml:space="preserve">
+    <value>When do you want the job to end</value>
+  </data>
+  <data name="RetentionLog.HelpText" xml:space="preserve">
+    <value>Number of log entries to retain for this job</value>
+  </data>
+  <data name="NextExecution.HelpText" xml:space="preserve">
+    <value>Next execution for this job.</value>
+  </data>
+  <data name="Type.Text" xml:space="preserve">
+    <value>Type: </value>
+  </data>
+  <data name="Enabled.Text" xml:space="preserve">
+    <value>Enabled? </value>
+  </data>
+  <data name="RunsEvery.Text" xml:space="preserve">
+    <value>Runs Every: </value>
+  </data>
+  <data name="Starting.Text" xml:space="preserve">
+    <value>Starting: </value>
+  </data>
+  <data name="Ending.Text" xml:space="preserve">
+    <value>Ending: </value>
+  </data>
+  <data name="RetentionLog.Text" xml:space="preserve">
+    <value>Retention Log (Items): </value>
+  </data>
+  <data name="NextExecution.Text" xml:space="preserve">
+    <value>Next Execution: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
new file mode 100644
index 00000000..3a89c54a
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="NextExecution" xml:space="preserve">
+    <value>Next Execution</value>
+  </data>
+  <data name="Disabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="Executing" xml:space="preserve">
+    <value>Executing</value>
+  </data>
+  <data name="Idle" xml:space="preserve">
+    <value>Idle</value>
+  </data>
+  <data name="Every" xml:space="preserve">
+    <value>Every</value>
+  </data>
+  <data name="Minute" xml:space="preserve">
+    <value>Minute</value>
+  </data>
+  <data name="Hour" xml:space="preserve">
+    <value>Hour</value>
+  </data>
+  <data name="Day" xml:space="preserve">
+    <value>Day</value>
+  </data>
+  <data name="Month" xml:space="preserve">
+    <value>Month</value>
+  </data>
+  <data name="s" xml:space="preserve">
+    <value>s</value>
+  </data>
+  <data name="Error.Job.Delete" xml:space="preserve">
+    <value>Error Deleting Job</value>
+  </data>
+  <data name="ViewJobs.Text" xml:space="preserve">
+    <value>View Logs</value>
+  </data>
+  <data name="DeleteJob.Header" xml:space="preserve">
+    <value>Delete Job</value>
+  </data>
+  <data name="DeleteJob.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Job?</value>
+  </data>
+  <data name="Frequency" xml:space="preserve">
+    <value>Frequency</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="Stop" xml:space="preserve">
+    <value>Stop</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
new file mode 100644
index 00000000..d86eb2c2
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Executing" xml:space="preserve">
+    <value>Executing</value>
+  </data>
+  <data name="Started" xml:space="preserve">
+    <value>Started</value>
+  </data>
+  <data name="Finished" xml:space="preserve">
+    <value>Finished</value>
+  </data>
+  <data name="Succeeded" xml:space="preserve">
+    <value>Succeeded</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>Failed</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
new file mode 100644
index 00000000..deff0806
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="The Only Supported Culture That Has Been Defined Is English" xml:space="preserve">
+    <value>The Only Supported Culture That Has Been Defined Is English</value>
+  </data>
+  <data name="Error.Language.Add" xml:space="preserve">
+    <value>Error Adding Language</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Name Of The Langauage</value>
+  </data>
+  <data name="IsDefault.HelpText" xml:space="preserve">
+    <value>Indicates Whether Or Not This Language Is The Default For The Site</value>
+  </data>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="IsDefault.Text" xml:space="preserve">
+    <value>Default?</value>
+  </data>
+  <data name="AllLanguages" xml:space="preserve">
+    <value>All The Installed Languages Have Been Added.</value>
+  </data>
+  <data name="Error.Language.Download" xml:space="preserve">
+    <value>Error Downloading Translation</value>
+  </data>
+  <data name="OnlyEnglish" xml:space="preserve">
+    <value>The Only Installed Language Is English</value>
+  </data>
+  <data name="Success.Language.Download" xml:space="preserve">
+    <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
+  </data>
+  <data name="Success.Language.Install" xml:space="preserve">
+    <value>Translations Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Search.NoResults" xml:space="preserve">
+    <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
new file mode 100644
index 00000000..e22197f3
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
+  <data name="Confirm.Language.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Language?</value>
+  </data>
+  <data name="Error.Language.Delete" xml:space="preserve">
+    <value>Error Deleting Language</value>
+  </data>
+  <data name="AddLanguage.Text" xml:space="preserve">
+    <value>Add Language</value>
+  </data>
+  <data name="DeleteLanguage.Header" xml:space="preserve">
+    <value>Delete Language</value>
+  </data>
+  <data name="Error.Language.Download" xml:space="preserve">
+    <value>Error Downloading Translation</value>
+  </data>
+  <data name="Success.Language.Install" xml:space="preserve">
+    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Default" xml:space="preserve">
+    <value>Default</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx
new file mode 100644
index 00000000..feaa718f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="RememberMe" xml:space="preserve">
+    <value>Remember Me?</value>
+  </data>
+  <data name="ForgotPassword" xml:space="preserve">
+    <value>Forgot Password</value>
+  </data>
+  <data name="Success.Account.Verified" xml:space="preserve">
+    <value>User Account Verified Successfully. You Can Now Login With Your Username And Password Below.</value>
+  </data>
+  <data name="Message.Account.NotVerfied" xml:space="preserve">
+    <value>User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
+  </data>
+  <data name="Error.Login.Fail" xml:space="preserve">
+    <value>Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.</value>
+  </data>
+  <data name="Message.Required.UserInfo" xml:space="preserve">
+    <value>Please Provide Your Username And Password</value>
+  </data>
+  <data name="Info.SignedIn" xml:space="preserve">
+    <value>You Are Already Signed In</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Logs/Detail.resx b/Oqtane.Client/Resources/Modules/Admin/Logs/Detail.resx
new file mode 100644
index 00000000..062d8a27
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Logs/Detail.resx
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url: </value>
+  </data>
+  <data name="Error Loading Log" xml:space="preserve">
+    <value>Error Loading Log</value>
+  </data>
+  <data name="DateTime.HelpText" xml:space="preserve">
+    <value>The date and time of this log</value>
+  </data>
+  <data name="Level.HelpText" xml:space="preserve">
+    <value>The level of this log</value>
+  </data>
+  <data name="Feature.HelpText" xml:space="preserve">
+    <value>The feature that was affected</value>
+  </data>
+  <data name="Function.HelpText" xml:space="preserve">
+    <value>The function that was performed</value>
+  </data>
+  <data name="Category.HelpText" xml:space="preserve">
+    <value>The categories that were affected</value>
+  </data>
+  <data name="Page.HelpText" xml:space="preserve">
+    <value>The page that was affected</value>
+  </data>
+  <data name="Module.HelpText" xml:space="preserve">
+    <value>The module that was affected</value>
+  </data>
+  <data name="User.HelpText" xml:space="preserve">
+    <value>The user that caused this log</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>The url the log comes from</value>
+  </data>
+  <data name="Template.HelpText" xml:space="preserve">
+    <value>What the log is about</value>
+  </data>
+  <data name="Message.HelpText" xml:space="preserve">
+    <value>The message that the system generated</value>
+  </data>
+  <data name="Exception.HelpText" xml:space="preserve">
+    <value>The exceptions generated by the system</value>
+  </data>
+  <data name="Properties.HelpText" xml:space="preserve">
+    <value>The properties that were affected</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>The server that was affected</value>
+  </data>
+  <data name="DateTime.Text" xml:space="preserve">
+    <value>Date/Time: </value>
+  </data>
+  <data name="Level.Text" xml:space="preserve">
+    <value>Level: </value>
+  </data>
+  <data name="Feature.Text" xml:space="preserve">
+    <value>Feature: </value>
+  </data>
+  <data name="Function.Text" xml:space="preserve">
+    <value>Function: </value>
+  </data>
+  <data name="Category.Text" xml:space="preserve">
+    <value>Category: </value>
+  </data>
+  <data name="Page.Text" xml:space="preserve">
+    <value>Page: </value>
+  </data>
+  <data name="Module.Text" xml:space="preserve">
+    <value>Module: </value>
+  </data>
+  <data name="User.Text" xml:space="preserve">
+    <value>User: </value>
+  </data>
+  <data name="Template.Text" xml:space="preserve">
+    <value>Template: </value>
+  </data>
+  <data name="Message.Text" xml:space="preserve">
+    <value>Message: </value>
+  </data>
+  <data name="Exception.Text" xml:space="preserve">
+    <value>Exception: </value>
+  </data>
+  <data name="Properties.Text" xml:space="preserve">
+    <value>Properties: </value>
+  </data>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server: </value>
+  </data>
+  <data name="Error.Log.Load" xml:space="preserve">
+    <value>Error Loading Log</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx
new file mode 100644
index 00000000..116d0c24
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Level.Text" xml:space="preserve">
+    <value>Level: </value>
+  </data>
+  <data name="Function.Text" xml:space="preserve">
+    <value>Function: </value>
+  </data>
+  <data name="AllLevels" xml:space="preserve">
+    <value>All Levels</value>
+  </data>
+  <data name="Trace" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+  <data name="Debug" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="Critical" xml:space="preserve">
+    <value>Critical</value>
+  </data>
+  <data name="AllFunctions" xml:space="preserve">
+    <value>All Functions</value>
+  </data>
+  <data name="Read" xml:space="preserve">
+    <value>Read</value>
+  </data>
+  <data name="Security" xml:space="preserve">
+    <value>Security</value>
+  </data>
+  <data name="Other" xml:space="preserve">
+    <value>Other</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="Level" xml:space="preserve">
+    <value>Level</value>
+  </data>
+  <data name="Feature" xml:space="preserve">
+    <value>Feature</value>
+  </data>
+  <data name="Function" xml:space="preserve">
+    <value>Function</value>
+  </data>
+  <data name="NoLogs" xml:space="preserve">
+    <value>No Logs Match The Criteria Specified</value>
+  </data>
+  <data name="Error.Log.Load" xml:space="preserve">
+    <value>Error Loading Logs</value>
+  </data>
+  <data name="Level.HelpText" xml:space="preserve">
+    <value>Select the log level for event log items</value>
+  </data>
+  <data name="Function.HelpText" xml:space="preserve">
+    <value>Select the function for event log items</value>
+  </data>
+  <data name="Rows.HelpText" xml:space="preserve">
+    <value>Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages.</value>
+  </data>
+  <data name="Rows.Text" xml:space="preserve">
+    <value>Maximum Items: </value>
+  </data>
+  <data name="Create" xml:space="preserve">
+    <value>Create</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
new file mode 100644
index 00000000..16000d3e
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Template.Text" xml:space="preserve">
+    <value>Template: </value>
+  </data>
+  <data name="Template.Select" xml:space="preserve">
+    <value>Select Template</value>
+  </data>
+  <data name="Module.Create" xml:space="preserve">
+    <value>Create Module</value>
+  </data>
+  <data name="Module.Activate" xml:space="preserve">
+    <value>Activate Module</value>
+  </data>
+  <data name="Info.Module.Creator" xml:space="preserve">
+    <value>Please Note That The Module Creator Is Only Intended To Be Used In A Development Environment</value>
+  </data>
+  <data name="Info.Module.Activate" xml:space="preserve">
+    <value>Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below</value>
+  </data>
+  <data name="Success.Module.Create" xml:space="preserve">
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Message.Require.ValidName" xml:space="preserve">
+    <value>You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
+  </data>
+  <data name="OwnerName.HelpText" xml:space="preserve">
+    <value>Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="ModuleName.HelpText" xml:space="preserve">
+    <value>Enter a name for this module. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>Enter a short description for the module</value>
+  </data>
+  <data name="Template.HelpText" xml:space="preserve">
+    <value>Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server.</value>
+  </data>
+  <data name="FrameworkReference.HelpText" xml:space="preserve">
+    <value>Select a framework reference version</value>
+  </data>
+  <data name="Location.HelpText" xml:space="preserve">
+    <value>Location where the module will be created</value>
+  </data>
+  <data name="OwnerName.Text" xml:space="preserve">
+    <value>Owner Name: </value>
+  </data>
+  <data name="ModuleName.Text" xml:space="preserve">
+    <value>Module Name: </value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description: </value>
+  </data>
+  <data name="FrameworkReference.Text" xml:space="preserve">
+    <value>Framework Reference: </value>
+  </data>
+  <data name="Location.Text" xml:space="preserve">
+    <value>Location: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
new file mode 100644
index 00000000..c7abab63
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Module.Text" xml:space="preserve">
+    <value>Module: </value>
+  </data>
+  <data name="Error.Package.Load" xml:space="preserve">
+    <value>Error Loading Packages</value>
+  </data>
+  <data name="Success.Module.Install" xml:space="preserve">
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Success.Module.Download" xml:space="preserve">
+    <value>Module Downloaded Successfully. Click Install To Complete Installation.</value>
+  </data>
+  <data name="Error.Module.Download" xml:space="preserve">
+    <value>Error Downloading Module</value>
+  </data>
+  <data name="Module.HelpText" xml:space="preserve">
+    <value>Upload one or more module packages. Once they are uploaded click Install to complete the installation.</value>
+  </data>
+  <data name="Search.NoResults" xml:space="preserve">
+    <value>No Modules Match The Criteria Provided Or Package Service Is Disabled</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
new file mode 100644
index 00000000..8ab77a00
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Template.Text" xml:space="preserve">
+    <value>Template: </value>
+  </data>
+  <data name="Template.Select" xml:space="preserve">
+    <value>Select Template</value>
+  </data>
+  <data name="CreateModule" xml:space="preserve">
+    <value>Create Module</value>
+  </data>
+  <data name="Info.Module.Development" xml:space="preserve">
+    <value>Please Note That The Module Creator Is Only Intended To Be Used In A Development Environment</value>
+  </data>
+  <data name="Message.Require.ValidName" xml:space="preserve">
+    <value>You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
+  </data>
+  <data name="OwnerName.HelpText" xml:space="preserve">
+    <value>Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="ModuleName.HelpText" xml:space="preserve">
+    <value>Enter a name for this module. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>Enter a short description for the module</value>
+  </data>
+  <data name="Template.HelpText" xml:space="preserve">
+    <value>Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server.</value>
+  </data>
+  <data name="FrameworkReference.HelpText" xml:space="preserve">
+    <value>Select a framework reference version</value>
+  </data>
+  <data name="Location.HelpText" xml:space="preserve">
+    <value>Location where the module will be created</value>
+  </data>
+  <data name="OwnerName.Text" xml:space="preserve">
+    <value>Owner Name: </value>
+  </data>
+  <data name="ModuleName.Text" xml:space="preserve">
+    <value>Module Name: </value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description: </value>
+  </data>
+  <data name="FrameworkReference.Text" xml:space="preserve">
+    <value>Framework Reference: </value>
+  </data>
+  <data name="Location.Text" xml:space="preserve">
+    <value>Location: </value>
+  </data>
+  <data name="Success.Module.Create" xml:space="preserve">
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx
new file mode 100644
index 00000000..1d5b2e3f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description: </value>
+  </data>
+  <data name="Error.Module.Load" xml:space="preserve">
+    <value>Error Loading Module</value>
+  </data>
+  <data name="Error.Module.Save" xml:space="preserve">
+    <value>Error Saving Module</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>The name of the module</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>The description of the module</value>
+  </data>
+  <data name="Categories.HelpText" xml:space="preserve">
+    <value>Comma delimited list of module categories</value>
+  </data>
+  <data name="InternalName.HelpText" xml:space="preserve">
+    <value>The internal name of the module</value>
+  </data>
+  <data name="Version.HelpText" xml:space="preserve">
+    <value>The version of the module</value>
+  </data>
+  <data name="Owner.HelpText" xml:space="preserve">
+    <value>The owner or creator of the module</value>
+  </data>
+  <data name="ReferenceUrl.HelpText" xml:space="preserve">
+    <value>The reference url of the module</value>
+  </data>
+  <data name="Contact.HelpText" xml:space="preserve">
+    <value>The contact for the module</value>
+  </data>
+  <data name="License.HelpText" xml:space="preserve">
+    <value>The module license terms</value>
+  </data>
+  <data name="Runtimes.HelpText" xml:space="preserve">
+    <value>The Blazor runtimes which this module supports</value>
+  </data>
+  <data name="Categories.Text" xml:space="preserve">
+    <value>Categories: </value>
+  </data>
+  <data name="InternalName.Text" xml:space="preserve">
+    <value>Internal Name: </value>
+  </data>
+  <data name="Version.Text" xml:space="preserve">
+    <value>Version: </value>
+  </data>
+  <data name="Owner.Text" xml:space="preserve">
+    <value>Owner: </value>
+  </data>
+  <data name="ReferenceUrl.Text" xml:space="preserve">
+    <value>Reference Url: </value>
+  </data>
+  <data name="Contact.Text" xml:space="preserve">
+    <value>Contact: </value>
+  </data>
+  <data name="License.Text" xml:space="preserve">
+    <value>License: </value>
+  </data>
+  <data name="Runtimes.Text" xml:space="preserve">
+    <value>Runtimes: </value>
+  </data>
+  <data name="Definition.Name" xml:space="preserve">
+    <value>Definition</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
new file mode 100644
index 00000000..839a8fc4
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CreateModule.Text" xml:space="preserve">
+    <value>Create Module</value>
+  </data>
+  <data name="Success.Module.Install" xml:space="preserve">
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Error.Module.Download" xml:space="preserve">
+    <value>Error Downloading Module</value>
+  </data>
+  <data name="Confirm.Module.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Module?</value>
+  </data>
+  <data name="Error.Module.Load" xml:space="preserve">
+    <value>Error Loading Modules</value>
+  </data>
+  <data name="Success.Module.Delete" xml:space="preserve">
+    <value>Module Deleted Successfully</value>
+  </data>
+  <data name="Error.Module.Delete" xml:space="preserve">
+    <value>Error Deleting Module</value>
+  </data>
+  <data name="InstallModule.Text" xml:space="preserve">
+    <value>Install Module</value>
+  </data>
+  <data name="DeleteModule.Header" xml:space="preserve">
+    <value>Delete Module</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
new file mode 100644
index 00000000..ee8f36d1
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Content.HelpText" xml:space="preserve">
+    <value>Enter the module content</value>
+  </data>
+  <data name="Content.Text" xml:space="preserve">
+    <value>Content: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
new file mode 100644
index 00000000..d008f096
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Import.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Content.HelpText" xml:space="preserve">
+    <value>Enter the module content</value>
+  </data>
+  <data name="Content.Text" xml:space="preserve">
+    <value>Content: </value>
+  </data>
+  <data name="Import" xml:space="preserve">
+    <value>Import</value>
+  </data>
+  <data name="Success.Content.Import" xml:space="preserve">
+    <value>Content Imported Successfully</value>
+  </data>
+  <data name="Message.Content.ImportProblem" xml:space="preserve">
+    <value>A Problem Was Encountered Importing Content. Please Ensure The Content Is Formatted Correctly For The Module.</value>
+  </data>
+  <data name="Error.Module.Import" xml:space="preserve">
+    <value>Error Importing Module</value>
+  </data>
+  <data name="Message.Required.ImportContent" xml:space="preserve">
+    <value>You Must Enter Some Content To Import</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx
new file mode 100644
index 00000000..0462311f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Page.Text" xml:space="preserve">
+    <value>Page: </value>
+  </data>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>Enter the title of the module</value>
+  </data>
+  <data name="Container.HelpText" xml:space="preserve">
+    <value>Select the module's container</value>
+  </data>
+  <data name="DisplayOnAllPages.HelpText" xml:space="preserve">
+    <value>Indicate if this module should be displayed on all pages</value>
+  </data>
+  <data name="Page.HelpText" xml:space="preserve">
+    <value>The page that the module is located on</value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Title: </value>
+  </data>
+  <data name="Container.Text" xml:space="preserve">
+    <value>Container: </value>
+  </data>
+  <data name="DisplayOnAllPages.Text" xml:space="preserve">
+    <value>Display On All Pages? </value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Message.Required.Title" xml:space="preserve">
+    <value>You Must Provide A Title For The Module</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
new file mode 100644
index 00000000..51d01dc9
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Parent.Text" xml:space="preserve">
+    <value>Parent: </value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Title: </value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="SiteRoot" xml:space="preserve">
+    <value>Site Root</value>
+  </data>
+  <data name="AtBeginning" xml:space="preserve">
+    <value>At Beginning</value>
+  </data>
+  <data name="Before" xml:space="preserve">
+    <value>Before</value>
+  </data>
+  <data name="After" xml:space="preserve">
+    <value>After</value>
+  </data>
+  <data name="AtEnd" xml:space="preserve">
+    <value>At End</value>
+  </data>
+  <data name="Page.Select" xml:space="preserve">
+    <value>Select Page</value>
+  </data>
+  <data name="Container.Select" xml:space="preserve">
+    <value>Select Container</value>
+  </data>
+  <data name="Error.Page.Initialize" xml:space="preserve">
+    <value>Error Initializing Page</value>
+  </data>
+  <data name="Error.ChildPage.Load" xml:space="preserve">
+    <value>Error Loading Child Pages For Parent</value>
+  </data>
+  <data name="Error.Pane.Load" xml:space="preserve">
+    <value>Error Loading Pane Layouts For Theme</value>
+  </data>
+  <data name="Message.Page.Exists" xml:space="preserve">
+    <value>A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.</value>
+  </data>
+  <data name="Message.Required.PageInfo" xml:space="preserve">
+    <value>You Must Provide Page Name, Theme, and Container</value>
+  </data>
+  <data name="Error.Page.Save" xml:space="preserve">
+    <value>Error Saving Page</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the page name</value>
+  </data>
+  <data name="Parent.HelpText" xml:space="preserve">
+    <value>Select the parent for the page in the site hierarchy</value>
+  </data>
+  <data name="Insert.HelpText" xml:space="preserve">
+    <value>Select the location where you would like the page to be inserted in relation to other pages</value>
+  </data>
+  <data name="Navigation.HelpText" xml:space="preserve">
+    <value>Select whether the page is part of the site navigation or hidden</value>
+  </data>
+  <data name="UrlPath.HelpText" xml:space="preserve">
+    <value>Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.</value>
+  </data>
+  <data name="Redirect.HelpText" xml:space="preserve">
+    <value>Optionally enter a url which this page should redirect to when a user navigates to it</value>
+  </data>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>Optionally enter the page title. If you do not provide a page title, the page name will be used.</value>
+  </data>
+  <data name="Theme.HelpText" xml:space="preserve">
+    <value>Select the theme for this page</value>
+  </data>
+  <data name="DefaultContainer.HelpText" xml:space="preserve">
+    <value>Select the default container for the page</value>
+  </data>
+  <data name="Icon.HelpText" xml:space="preserve">
+    <value>Optionally provide an icon class name for this page which will be displayed in the site navigation</value>
+  </data>
+  <data name="Personalizable.HelpText" xml:space="preserve">
+    <value>Select whether you would like users to be able to personalize this page with their own content</value>
+  </data>
+  <data name="Insert.Text" xml:space="preserve">
+    <value>Insert: </value>
+  </data>
+  <data name="Navigation.Text" xml:space="preserve">
+    <value>Navigation? </value>
+  </data>
+  <data name="UrlPath.Text" xml:space="preserve">
+    <value>Url Path: </value>
+  </data>
+  <data name="Redirect.Text" xml:space="preserve">
+    <value>Redirect: </value>
+  </data>
+  <data name="Theme.Text" xml:space="preserve">
+    <value>Theme: </value>
+  </data>
+  <data name="DefaultContainer.Text" xml:space="preserve">
+    <value>Default Container: </value>
+  </data>
+  <data name="Icon.Text" xml:space="preserve">
+    <value>Icon: </value>
+  </data>
+  <data name="Personalizable.Text" xml:space="preserve">
+    <value>Personalizable? </value>
+  </data>
+  <data name="Appearance.Name" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
new file mode 100644
index 00000000..ab2903cd
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Parent.Text" xml:space="preserve">
+    <value>Parent: </value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Title: </value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="SiteRoot" xml:space="preserve">
+    <value>Site Root</value>
+  </data>
+  <data name="Before" xml:space="preserve">
+    <value>Before</value>
+  </data>
+  <data name="After" xml:space="preserve">
+    <value>After</value>
+  </data>
+  <data name="Page.Select" xml:space="preserve">
+    <value>Select Page</value>
+  </data>
+  <data name="Container.Select" xml:space="preserve">
+    <value>Select Container</value>
+  </data>
+  <data name="Error.ChildPage.Load" xml:space="preserve">
+    <value>Error Loading Child Pages For Parent</value>
+  </data>
+  <data name="Error.Pane.Load" xml:space="preserve">
+    <value>Error Loading Pane Layouts For Theme</value>
+  </data>
+  <data name="Mesage.Page.PathExists" xml:space="preserve">
+    <value>A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.</value>
+  </data>
+  <data name="Message.Required.PageInfo" xml:space="preserve">
+    <value>You Must Provide Page Name, Theme, and Container</value>
+  </data>
+  <data name="Error.Page.Save" xml:space="preserve">
+    <value>Error Saving Page</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the page name</value>
+  </data>
+  <data name="Parent.HelpText" xml:space="preserve">
+    <value>Select the parent for the page in the site hierarchy</value>
+  </data>
+  <data name="Navigation.HelpText" xml:space="preserve">
+    <value>Select whether the page is part of the site navigation or hidden</value>
+  </data>
+  <data name="UrlPath.HelpText" xml:space="preserve">
+    <value>Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.</value>
+  </data>
+  <data name="Redirect.HelpText" xml:space="preserve">
+    <value>Optionally enter a url which this page should redirect to when a user navigates to it</value>
+  </data>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>Optionally enter the page title. If you do not provide a page title, the page name will be used.</value>
+  </data>
+  <data name="Theme.HelpText" xml:space="preserve">
+    <value>Select the theme for this page</value>
+  </data>
+  <data name="DefaultContainer.HelpText" xml:space="preserve">
+    <value>Select the default container for the page</value>
+  </data>
+  <data name="Icon.HelpText" xml:space="preserve">
+    <value>Optionally provide an icon class name for this page which will be displayed in the site navigation</value>
+  </data>
+  <data name="Personalizable.HelpText" xml:space="preserve">
+    <value>Select whether you would like users to be able to personalize this page with their own content</value>
+  </data>
+  <data name="Navigation.Text" xml:space="preserve">
+    <value>Navigation? </value>
+  </data>
+  <data name="UrlPath.Text" xml:space="preserve">
+    <value>Url Path: </value>
+  </data>
+  <data name="Redirect.Text" xml:space="preserve">
+    <value>Redirect: </value>
+  </data>
+  <data name="Theme.Text" xml:space="preserve">
+    <value>Theme: </value>
+  </data>
+  <data name="DefaultContainer.Text" xml:space="preserve">
+    <value>Default Container: </value>
+  </data>
+  <data name="Icon.Text" xml:space="preserve">
+    <value>Icon: </value>
+  </data>
+  <data name="Personalizable.Text" xml:space="preserve">
+    <value>Personalizable? </value>
+  </data>
+  <data name="Appearance.Name" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="ThisLocation.Keep" xml:space="preserve">
+    <value>Maintain Current Location</value>
+  </data>
+  <data name="ToBeginning" xml:space="preserve">
+    <value>To Beginning</value>
+  </data>
+  <data name="ToEnd" xml:space="preserve">
+    <value>To End</value>
+  </data>
+  <data name="Error.Page.Load" xml:space="preserve">
+    <value>Error Loading Page</value>
+  </data>
+  <data name="Move.HelpText" xml:space="preserve">
+    <value>Select the location where you would like the page to be moved in relation to other pages</value>
+  </data>
+  <data name="Move.Text" xml:space="preserve">
+    <value>Move: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx
new file mode 100644
index 00000000..9d1d643a
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.Page.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Page?</value>
+  </data>
+  <data name="Error.Page.Delete" xml:space="preserve">
+    <value>Error Deleting Page</value>
+  </data>
+  <data name="AddPage.Text" xml:space="preserve">
+    <value>Add Page</value>
+  </data>
+  <data name="DeletePage.Header" xml:space="preserve">
+    <value>Delete Page</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Profiles/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Profiles/Edit.resx
new file mode 100644
index 00000000..720e34f9
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Profiles/Edit.resx
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Category.Text" xml:space="preserve">
+    <value>Category: </value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description: </value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Title: </value>
+  </data>
+  <data name="Error.Profile.Load" xml:space="preserve">
+    <value>Error Loading Profile</value>
+  </data>
+  <data name="Error.Profile.Save" xml:space="preserve">
+    <value>Error Saving Profile</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>The name of this profile item</value>
+  </data>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>The title of the profile item to display to the user</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>The help text displayed to the user for this profile item</value>
+  </data>
+  <data name="Category.HelpText" xml:space="preserve">
+    <value>The category of this profile item (for grouping)</value>
+  </data>
+  <data name="Order.HelpText" xml:space="preserve">
+    <value>The index order of where this profile item should be displayed</value>
+  </data>
+  <data name="Length.HelpText" xml:space="preserve">
+    <value>The max number of characters this profile item should accept (enter zero for unlimited)</value>
+  </data>
+  <data name="DefaultValue.HelpText" xml:space="preserve">
+    <value>The default value for this profile item</value>
+  </data>
+  <data name="Options.HelpText" xml:space="preserve">
+    <value>A comma delimited list of options the user can select from</value>
+  </data>
+  <data name="Required.HelpText" xml:space="preserve">
+    <value>Should a user be required to provide a value for this profile item?</value>
+  </data>
+  <data name="Private.HelpText" xml:space="preserve">
+    <value>Should this profile item be visible to all users?</value>
+  </data>
+  <data name="Order.Text" xml:space="preserve">
+    <value>Order: </value>
+  </data>
+  <data name="Length.Text" xml:space="preserve">
+    <value>Length: </value>
+  </data>
+  <data name="DefaultValue.Text" xml:space="preserve">
+    <value>Default Value: </value>
+  </data>
+  <data name="Options.Text" xml:space="preserve">
+    <value>Options: </value>
+  </data>
+  <data name="Required.Text" xml:space="preserve">
+    <value>Required? </value>
+  </data>
+  <data name="Private.Text" xml:space="preserve">
+    <value>Private? </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx
new file mode 100644
index 00000000..0a02dad0
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.Profile.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
+  <data name="Success.Profile.Delete" xml:space="preserve">
+    <value>Profile Deleted</value>
+  </data>
+  <data name="Error.Profile.Delete" xml:space="preserve">
+    <value>Error Deleting Profile</value>
+  </data>
+  <data name="AddProfile.Text" xml:space="preserve">
+    <value>Add Profile</value>
+  </data>
+  <data name="DeleteProfile.Header" xml:space="preserve">
+    <value>Delete Profile</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
new file mode 100644
index 00000000..9dbab7f7
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DeleteModule.Header" xml:space="preserve">
+    <value>Delete Module</value>
+  </data>
+  <data name="DeletePage.Header" xml:space="preserve">
+    <value>Delete Page</value>
+  </data>
+  <data name="NoPage.Deleted" xml:space="preserve">
+    <value>No Deleted Pages</value>
+  </data>
+  <data name="DeletedBy" xml:space="preserve">
+    <value>Deleted By</value>
+  </data>
+  <data name="DeletedOn" xml:space="preserve">
+    <value>Deleted On</value>
+  </data>
+  <data name="Confirm.Page.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete The {0} Page?</value>
+  </data>
+  <data name="NoModule.Deleted" xml:space="preserve">
+    <value>No Deleted Modules</value>
+  </data>
+  <data name="Page" xml:space="preserve">
+    <value>Page</value>
+  </data>
+  <data name="Module" xml:space="preserve">
+    <value>Module</value>
+  </data>
+  <data name="Restore" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="Confirm.Module.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete The {0} Module?</value>
+  </data>
+  <data name="Error.DeletedModulePage.Load" xml:space="preserve">
+    <value>Error Loading Deleted Pages Or Modules</value>
+  </data>
+  <data name="Error.Page.Restore" xml:space="preserve">
+    <value>Error Restoring Deleted Page</value>
+  </data>
+  <data name="Error.Module.Restore" xml:space="preserve">
+    <value>Error Restoring Deleted Module</value>
+  </data>
+  <data name="Error.Module.Delete" xml:space="preserve">
+    <value>Error Permanently Deleting Module</value>
+  </data>
+  <data name="Error.Modules.Delete" xml:space="preserve">
+    <value>Error Permanently Deleting Modules</value>
+  </data>
+  <data name="DeleteAllPages.Header" xml:space="preserve">
+    <value>Delete All Pages</value>
+  </data>
+  <data name="DeleteAllPages.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete All Pages?</value>
+  </data>
+  <data name="DeleteAllModules.Header" xml:space="preserve">
+    <value>Delete All Modules</value>
+  </data>
+  <data name="DeleteAllModules.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Permanently Delete All Modules?</value>
+  </data>
+  <data name="Pages.Name" xml:space="preserve">
+    <value>Pages</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
new file mode 100644
index 00000000..9c99dcf2
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Info.Registration.Exists" xml:space="preserve">
+    <value>You Are Already Registered</value>
+  </data>
+  <data name="Info.Registration.InvalidEmail" xml:space="preserve">
+    <value>Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity</value>
+  </data>
+  <data name="Password.Confirm" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="Register" xml:space="preserve">
+    <value>Register</value>
+  </data>
+  <data name="Info.Registration.Disabled" xml:space="preserve">
+    <value>Registration is Disabled For This Site</value>
+  </data>
+  <data name="Info.User.AccountCreate" xml:space="preserve">
+    <value>User Account Created. Please Check Your Email For Verification Instructions.</value>
+  </data>
+  <data name="Error.User.AddInfo" xml:space="preserve">
+    <value>Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.</value>
+  </data>
+  <data name="Message.Password.NoMatch" xml:space="preserve">
+    <value>Passwords Entered Do Not Match</value>
+  </data>
+  <data name="Message.Required.UserInfo" xml:space="preserve">
+    <value>You Must Provide A Username, Password, and Email Address</value>
+  </data>
+  <data name="Error.User.Add" xml:space="preserve">
+    <value>Error Adding User</value>
+  </data>
+  <data name="Confirm.HelpText" xml:space="preserve">
+    <value>If you are changing your password you must enter it again to confirm it matches</value>
+  </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="DisplayName.HelpText" xml:space="preserve">
+    <value>Your full name</value>
+  </data>
+  <data name="DisplayName.Text" xml:space="preserve">
+    <value>Full Name:</value>
+  </data>
+  <data name="Email.HelpText" xml:space="preserve">
+    <value>Your email address where you wish to receive notifications</value>
+  </data>
+  <data name="Email.Text" xml:space="preserve">
+    <value>Email:</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>If you wish to change your password you can enter it here. Please choose a sufficiently secure password.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username. Note that this field can not be modified once it is saved.</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx
new file mode 100644
index 00000000..0922f6da
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Password.Confirm" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="Message.Password.NoMatch" xml:space="preserve">
+    <value>Passwords Entered Do Not Match</value>
+  </data>
+  <data name="Message.Required.UserInfo" xml:space="preserve">
+    <value>You Must Provide A Username, Password, and Email Address</value>
+  </data>
+  <data name="Password.Reset" xml:space="preserve">
+    <value>Reset Password</value>
+  </data>
+  <data name="Error.Password.ResetInfo" xml:space="preserve">
+    <value>Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.</value>
+  </data>
+  <data name="Error.Password.Reset" xml:space="preserve">
+    <value>Error Resetting User Password</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Roles/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Roles/Add.resx
new file mode 100644
index 00000000..c7236805
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Roles/Add.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="Error.AddRole" xml:space="preserve">
+    <value>Error Adding Role</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Name Of The Role</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>A Short Description Of The Role Which Describes Its Purpose</value>
+  </data>
+  <data name="AutoAssigned.HelpText" xml:space="preserve">
+    <value>Indicates Whether Or Not New Users Are Automatically Assigned To This Role</value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="AutoAssigned.Text" xml:space="preserve">
+    <value>Auto Assigned?</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Roles/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Roles/Edit.resx
new file mode 100644
index 00000000..d4cb0b0a
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Roles/Edit.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Name Of The Role</value>
+  </data>
+  <data name="Description.HelpText" xml:space="preserve">
+    <value>A Short Description Of The Role Which Describes Its Purpose</value>
+  </data>
+  <data name="AutoAssigned.HelpText" xml:space="preserve">
+    <value>Indicates Whether Or Not New Users Are Automatically Assigned To This Role</value>
+  </data>
+  <data name="Description.Text" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="AutoAssigned.Text" xml:space="preserve">
+    <value>Auto Assigned?</value>
+  </data>
+  <data name="Error.LoadRole" xml:space="preserve">
+    <value>Error Loading Role</value>
+  </data>
+  <data name="Error.SaveRole" xml:space="preserve">
+    <value>Error Saving Role</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Roles/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Roles/Index.resx
new file mode 100644
index 00000000..ea550f48
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Roles/Index.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.DeleteUser" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Role?</value>
+  </data>
+  <data name="Error.DeleteRole" xml:space="preserve">
+    <value>Error Deleting Role</value>
+  </data>
+  <data name="AddRole.Text" xml:space="preserve">
+    <value>Add Role</value>
+  </data>
+  <data name="DeleteRole.Header" xml:space="preserve">
+    <value>Delete Role</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Roles/Users.resx b/Oqtane.Client/Resources/Modules/Admin/Roles/Users.resx
new file mode 100644
index 00000000..e85706e7
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Roles/Users.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="User.Text" xml:space="preserve">
+    <value>User: </value>
+  </data>
+  <data name="User.Select" xml:space="preserve">
+    <value>Select User</value>
+  </data>
+  <data name="Users" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="Error.User.Load" xml:space="preserve">
+    <value>Error Loading Users</value>
+  </data>
+  <data name="Error.User.LoadRole" xml:space="preserve">
+    <value>Error Loading User Roles</value>
+  </data>
+  <data name="Success.User.AssignedRole" xml:space="preserve">
+    <value>User Assigned To Role</value>
+  </data>
+  <data name="Message.Required.UserSelect" xml:space="preserve">
+    <value>You Must Select A User</value>
+  </data>
+  <data name="Error.User.SaveRole" xml:space="preserve">
+    <value>Error Saving User Roles</value>
+  </data>
+  <data name="Confirm.User.RoleRemoved" xml:space="preserve">
+    <value>User Removed From Role</value>
+  </data>
+  <data name="Error.User.RemoveRole" xml:space="preserve">
+    <value>Error Removing User From Role</value>
+  </data>
+  <data name="Role.HelpText" xml:space="preserve">
+    <value>The role you are assigning users to</value>
+  </data>
+  <data name="User.HelpText" xml:space="preserve">
+    <value>Select a user</value>
+  </data>
+  <data name="EffectiveDate.HelpText" xml:space="preserve">
+    <value>The date that this role assignment is active</value>
+  </data>
+  <data name="ExpiryDate.HelpText" xml:space="preserve">
+    <value>The date that this role assignment expires</value>
+  </data>
+  <data name="Role.Text" xml:space="preserve">
+    <value>Role: </value>
+  </data>
+  <data name="EffectiveDate.Text" xml:space="preserve">
+    <value>Effective Date: </value>
+  </data>
+  <data name="ExpiryDate.Text" xml:space="preserve">
+    <value>Expiry Date: </value>
+  </data>
+  <data name="Confirm.User.DeleteRole" xml:space="preserve">
+    <value>Are You Sure You Wish To Remove {0} From This Role?</value>
+  </data>
+  <data name="Effective" xml:space="preserve">
+    <value>Effective</value>
+  </data>
+  <data name="Expiry" xml:space="preserve">
+    <value>Expiry</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
new file mode 100644
index 00000000..74882e86
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Container.Select" xml:space="preserve">
+    <value>Select Container</value>
+  </data>
+  <data name="Error.Theme.LoadPane" xml:space="preserve">
+    <value>Error Loading Pane Layouts For Theme</value>
+  </data>
+  <data name="DefaultContainer.Text" xml:space="preserve">
+    <value>Default Container: </value>
+  </data>
+  <data name="Appearance.Name" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="DefaultAdminContainer" xml:space="preserve">
+    <value>Default Admin Container</value>
+  </data>
+  <data name="Smtp.Required.EnableNotificationJob" xml:space="preserve">
+    <value>** Please Note That SMTP Requires The Notification Job To Be Enabled In Scheduled Jobs</value>
+  </data>
+  <data name="Smtp.TestConfig" xml:space="preserve">
+    <value>Test SMTP Configuration</value>
+  </data>
+  <data name="Success.Settings.SaveSite" xml:space="preserve">
+    <value>Site Settings Saved</value>
+  </data>
+  <data name="Message.Aliases.Taken" xml:space="preserve">
+    <value>An Alias Specified Has Already Been Used For Another Site</value>
+  </data>
+  <data name="Message.Required.SiteName" xml:space="preserve">
+    <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
+  </data>
+  <data name="Error.SaveSite" xml:space="preserve">
+    <value>Error Saving Site</value>
+  </data>
+  <data name="Info.Smtp.SaveSettings" xml:space="preserve">
+    <value>SMTP Settings Saved And A Message Has Been Sent To The Email Address Associated To Your User Account... Please Wait A Few Minutes For Delivery. If You Do Not Receive The Email Please Review The Notification Job In Scheduled Jobs For Any Log Details.</value>
+  </data>
+  <data name="Error.Smtp.TestConfig" xml:space="preserve">
+    <value>Error Testing SMTP Configuration</value>
+  </data>
+  <data name="Message.Required.Smtp" xml:space="preserve">
+    <value>You Must Specify The SMTP Host, Port, And Sender</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the site name</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>Enter the tenant for the site</value>
+  </data>
+  <data name="Aliases.HelpText" xml:space="preserve">
+    <value>Enter the alias for the server</value>
+  </data>
+  <data name="AllowRegistration.HelpText" xml:space="preserve">
+    <value>Do you want the users to be able to register for an account on the site</value>
+  </data>
+  <data name="IsDeleted.HelpText" xml:space="preserve">
+    <value>Is this site deleted?</value>
+  </data>
+  <data name="Logo.HelpText" xml:space="preserve">
+    <value>Specify a logo for the site</value>
+  </data>
+  <data name="FavoriteIcon.HelpText" xml:space="preserve">
+    <value>Specify a Favicon</value>
+  </data>
+  <data name="DefaultTheme.HelpText" xml:space="preserve">
+    <value>Select the sites default theme</value>
+  </data>
+  <data name="DefaultContainer.HelpText" xml:space="preserve">
+    <value>Select the default container for the site</value>
+  </data>
+  <data name="DefaultAdminContainer.HelpText" xml:space="preserve">
+    <value>Select the default admin container for the site</value>
+  </data>
+  <data name="Host.HelpText" xml:space="preserve">
+    <value>Enter the host name of the SMTP server</value>
+  </data>
+  <data name="Port.HelpText" xml:space="preserve">
+    <value>Enter the port number for the SMTP server. Please note this field is required if you provide a host name.</value>
+  </data>
+  <data name="UseSsl.HelpText" xml:space="preserve">
+    <value>Specify if SSL is required for your SMTP server</value>
+  </data>
+  <data name="SmptUsername.HelpText" xml:space="preserve">
+    <value>Enter the username for your SMTP account</value>
+  </data>
+  <data name="SmtpPassword.HelpText" xml:space="preserve">
+    <value>Enter the password for your SMTP account</value>
+  </data>
+  <data name="SmptSender.HelpText" xml:space="preserve">
+    <value>Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server.</value>
+  </data>
+  <data name="EnablePWA.HelpText" xml:space="preserve">
+    <value>Select whether you would like this site to be available as a Progressive Web Application (PWA)</value>
+  </data>
+  <data name="PwaApplicationIcon.HelpText" xml:space="preserve">
+    <value>Include an application icon for your PWA. It should be a PNG which is 192 X 192 pixels in dimension.</value>
+  </data>
+  <data name="PwaSplashIcon.HelpText" xml:space="preserve">
+    <value>Include a splash icon for your PWA. It should be a PNG which is 512 X 512 pixels in dimension.</value>
+  </data>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Tenant: </value>
+  </data>
+  <data name="Aliases.Text" xml:space="preserve">
+    <value>Aliases: </value>
+  </data>
+  <data name="AllowRegistration.Text" xml:space="preserve">
+    <value>Allow User Registration? </value>
+  </data>
+  <data name="IsDeleted.Text" xml:space="preserve">
+    <value>Is Deleted? </value>
+  </data>
+  <data name="Logo.Text" xml:space="preserve">
+    <value>Logo: </value>
+  </data>
+  <data name="FavoriteIcon.Text" xml:space="preserve">
+    <value>Favicon: </value>
+  </data>
+  <data name="DefaultTheme.Text" xml:space="preserve">
+    <value>Default Theme: </value>
+  </data>
+  <data name="DefaultAdminContainer.Text" xml:space="preserve">
+    <value>Default Admin Container: </value>
+  </data>
+  <data name="Host.Text" xml:space="preserve">
+    <value>Host: </value>
+  </data>
+  <data name="Port.Text" xml:space="preserve">
+    <value>Port: </value>
+  </data>
+  <data name="UseSsl.Text" xml:space="preserve">
+    <value>SSL Enabled: </value>
+  </data>
+  <data name="SmptUsername.Text" xml:space="preserve">
+    <value>Username: </value>
+  </data>
+  <data name="SmtpPassword.Text" xml:space="preserve">
+    <value>Password: </value>
+  </data>
+  <data name="SmptSender.Text" xml:space="preserve">
+    <value>Email Sender: </value>
+  </data>
+  <data name="EnablePWA.Text" xml:space="preserve">
+    <value>Is Enabled? </value>
+  </data>
+  <data name="PwaApplicationIcon.Text" xml:space="preserve">
+    <value>App Icon: </value>
+  </data>
+  <data name="PwaSplashIcon.Text" xml:space="preserve">
+    <value>Splash Icon: </value>
+  </data>
+  <data name="Confirm.DeleteSite" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Site?</value>
+  </data>
+  <data name="Error.DeleteSite" xml:space="preserve">
+    <value>Error Deleting Site</value>
+  </data>
+  <data name="Message.FailAuth.DeleteSite" xml:space="preserve">
+    <value>You Are Not Authorized To Delete The Site</value>
+  </data>
+  <data name="Theme.Select" xml:space="preserve">
+    <value>Select Theme</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
new file mode 100644
index 00000000..3209b1dc
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="LocalDatabase" xml:space="preserve">
+    <value>Local Database</value>
+  </data>
+  <data name="SqlServer" xml:space="preserve">
+    <value>SQL Server</value>
+  </data>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server: </value>
+  </data>
+  <data name="Container.Select" xml:space="preserve">
+    <value>Select Container</value>
+  </data>
+  <data name="DefaultContainer.Text" xml:space="preserve">
+    <value>Default Container: </value>
+  </data>
+  <data name="Theme.Select" xml:space="preserve">
+    <value>Select Theme</value>
+  </data>
+  <data name="DefaultContainer.Admin" xml:space="preserve">
+    <value>Default Admin Container</value>
+  </data>
+  <data name="Aliases.HelpText" xml:space="preserve">
+    <value>Enter the alias for the server</value>
+  </data>
+  <data name="DefaultContainer.HelpText" xml:space="preserve">
+    <value>Select the default container for the site</value>
+  </data>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Tenant: </value>
+  </data>
+  <data name="Aliases.Text" xml:space="preserve">
+    <value>Aliases: </value>
+  </data>
+  <data name="DefaultTheme.Text" xml:space="preserve">
+    <value>Default Theme: </value>
+  </data>
+  <data name="SiteTemplate.Select" xml:space="preserve">
+    <value>Select Site Template</value>
+  </data>
+  <data name="Tenant.Select" xml:space="preserve">
+    <value>Select Tenant</value>
+  </data>
+  <data name="Tenant.Add" xml:space="preserve">
+    <value>Create New Tenant</value>
+  </data>
+  <data name="Error.Theme.LoadContainers" xml:space="preserve">
+    <value>Error Loading Containers For Theme</value>
+  </data>
+  <data name="Error.Required.ServerDatabase" xml:space="preserve">
+    <value>You Must Specify A Server And Database</value>
+  </data>
+  <data name="Error.InvalidPassword" xml:space="preserve">
+    <value>Invalid Host Password</value>
+  </data>
+  <data name="Error.TenantName.Exists" xml:space="preserve">
+    <value>Tenant Name Is Missing Or Already Exists</value>
+  </data>
+  <data name="Message.SiteName.InUse" xml:space="preserve">
+    <value>{0} Already Used For Another Site</value>
+  </data>
+  <data name="Message.Required.Tenant" xml:space="preserve">
+    <value>You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the name of the site</value>
+  </data>
+  <data name="DefaultTheme.HelpText" xml:space="preserve">
+    <value>Select the default theme for the website</value>
+  </data>
+  <data name="AdminContainer.HelpText" xml:space="preserve">
+    <value>Select the admin container for the site</value>
+  </data>
+  <data name="SiteTemplate.HelpText" xml:space="preserve">
+    <value>Select the site template</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>Select the tenant for the site</value>
+  </data>
+  <data name="TenantName.HelpText" xml:space="preserve">
+    <value>Enter the name for the tenant</value>
+  </data>
+  <data name="DatabaseType.HelpText" xml:space="preserve">
+    <value>Select the database type for the tenant</value>
+  </data>
+  <data name="DatabaseServer.HelpText" xml:space="preserve">
+    <value>Enter the server for the tenant</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the database for the tenant</value>
+  </data>
+  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
+    <value>Select if you want integrated security or not</value>
+  </data>
+  <data name="DatabaseUsername.HelpText" xml:space="preserve">
+    <value>Enter the username for the integrated security</value>
+  </data>
+  <data name="DatabasePassword.HelpText" xml:space="preserve">
+    <value>Enter the password for the integrated security</value>
+  </data>
+  <data name="HostUsername.HelpText" xml:space="preserve">
+    <value>Enter the username of the host for this site</value>
+  </data>
+  <data name="HostPassword.HelpText" xml:space="preserve">
+    <value>Enter the password for the host of this site</value>
+  </data>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Site Name: </value>
+  </data>
+  <data name="AdminContainer.Text" xml:space="preserve">
+    <value>Admin Container: </value>
+  </data>
+  <data name="SiteTemplate.Text" xml:space="preserve">
+    <value>Site Template: </value>
+  </data>
+  <data name="TenantName.Text" xml:space="preserve">
+    <value>Tenant Name: </value>
+  </data>
+  <data name="DatabaseType.Text" xml:space="preserve">
+    <value>Database Type: </value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database: </value>
+  </data>
+  <data name="IntegratedSecurity.Text" xml:space="preserve">
+    <value>Integrated Security: </value>
+  </data>
+  <data name="DatabaseUsername.Text" xml:space="preserve">
+    <value>Database Username: </value>
+  </data>
+  <data name="DatabasePassword.Text" xml:space="preserve">
+    <value>Database Password: </value>
+  </data>
+  <data name="HostUsername.Text" xml:space="preserve">
+    <value>Host Username:</value>
+  </data>
+  <data name="HostPassword.Text" xml:space="preserve">
+    <value>Host Password:</value>
+  </data>
+  <data name="Error.Database.LoadConfig" xml:space="preserve">
+    <value>Error loading Database Configuration Control</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx
new file mode 100644
index 00000000..3a3b783c
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.DeleteSite" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Site?</value>
+  </data>
+  <data name="Error.FailAuth.DeleteSite" xml:space="preserve">
+    <value>You Can Not Delete The Current Site</value>
+  </data>
+  <data name="Error.DeleteSite" xml:space="preserve">
+    <value>Error Deleting Site</value>
+  </data>
+  <data name="AddSite.Text" xml:space="preserve">
+    <value>Add Site</value>
+  </data>
+  <data name="DeleteSite.Header" xml:space="preserve">
+    <value>Delete Site</value>
+  </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Sql/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Sql/Index.resx
new file mode 100644
index 00000000..9654eac7
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Sql/Index.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Tenant: </value>
+  </data>
+  <data name="Tenant.Select" xml:space="preserve">
+    <value>Select Tenant</value>
+  </data>
+  <data name="Execute" xml:space="preserve">
+    <value>Execute</value>
+  </data>
+  <data name="Message.Required.Tenant" xml:space="preserve">
+    <value>You Must Select A Tenant And Provide A Valid SQL Query</value>
+  </data>
+  <data name="Return.NoResult" xml:space="preserve">
+    <value>No Results Returned</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>Select the tenant for the SQL server</value>
+  </data>
+  <data name="SqlQuery.HelpText" xml:space="preserve">
+    <value>Enter the query for the SQL server</value>
+  </data>
+  <data name="SqlQuery.Text" xml:space="preserve">
+    <value>SQL Query: </value>
+  </data>
+  <data name="Success.QueryExecuted" xml:space="preserve">
+    <value>SQL Query Executed</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
new file mode 100644
index 00000000..84c6992b
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Access.ApiFramework" xml:space="preserve">
+    <value>Access Swagger API</value>
+  </data>
+  <data name="FrameworkVersion.HelpText" xml:space="preserve">
+    <value>Framework Version</value>
+  </data>
+  <data name="BlazorRuntime.HelpText" xml:space="preserve">
+    <value>Blazor Runtime (Server or WebAssembly)</value>
+  </data>
+  <data name="CLRVersion.HelpText" xml:space="preserve">
+    <value>Common Language Runtime Version</value>
+  </data>
+  <data name="OSVersion.HelpText" xml:space="preserve">
+    <value>Operating System Version</value>
+  </data>
+  <data name="ServerPath.HelpText" xml:space="preserve">
+    <value>Server Path</value>
+  </data>
+  <data name="ServerTime.HelpText" xml:space="preserve">
+    <value>Server Time</value>
+  </data>
+  <data name="FrameworkVersion.Text" xml:space="preserve">
+    <value>Framework Version: </value>
+  </data>
+  <data name="BlazorRuntime.Text" xml:space="preserve">
+    <value>Blazor Runtime: </value>
+  </data>
+  <data name="CLRVersion.Text" xml:space="preserve">
+    <value>CLR Version: </value>
+  </data>
+  <data name="OSVersion.Text" xml:space="preserve">
+    <value>OS Version: </value>
+  </data>
+  <data name="ServerPath.Text" xml:space="preserve">
+    <value>Server Path: </value>
+  </data>
+  <data name="ServerTime.Text" xml:space="preserve">
+    <value>Server Time: </value>
+  </data>
+  <data name="RestartApplication.Header" xml:space="preserve">
+    <value>Restart Application</value>
+  </data>
+  <data name="RestartApplication.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Restart The Application?</value>
+  </data>
+  <data name="Error.UpdateConfig" xml:space="preserve">
+    <value>An Error Occurred Updating The Configuration</value>
+  </data>
+  <data name="Server" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="ServerPrerendered" xml:space="preserve">
+    <value>ServerPrerendered</value>
+  </data>
+  <data name="Success.UpdateConfig.Restart" xml:space="preserve">
+    <value>Configuration Updated. Please Select Restart Application For These Changes To Be Activated.</value>
+  </data>
+  <data name="WebAssembly" xml:space="preserve">
+    <value>WebAssembly</value>
+  </data>
+  <data name="InstallationId.Text" xml:space="preserve">
+    <value>Installation ID: </value>
+  </data>
+  <data name="InstallationId.HelpText" xml:space="preserve">
+    <value>The Unique Identifier For Your Installation</value>
+  </data>
+  <data name="DetailedErrors.Text" xml:space="preserve">
+    <value>Detailed Errors? </value>
+  </data>
+  <data name="DetailedErrors.HelpText" xml:space="preserve">
+    <value>Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production.</value>
+  </data>
+  <data name="True" xml:space="preserve">
+    <value>True</value>
+  </data>
+  <data name="False" xml:space="preserve">
+    <value>False</value>
+  </data>
+  <data name="LoggingLevel.Text" xml:space="preserve">
+    <value>Logging Level: </value>
+  </data>
+  <data name="LoggingLevel.HelpText" xml:space="preserve">
+    <value>The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log.</value>
+  </data>
+  <data name="Trace" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+  <data name="Debug" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="Critical" xml:space="preserve">
+    <value>Critical</value>
+  </data>
+  <data name="Info" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="Register" xml:space="preserve">
+    <value>Please Register Me For Major Product Updates And Security Bulletins</value>
+  </data>
+  <data name="Success.Register" xml:space="preserve">
+    <value>You Have Been Successfully Registered For Updates</value>
+  </data>
+  <data name="PackageService.HelpText" xml:space="preserve">
+    <value>Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations</value>
+  </data>
+  <data name="PackageService.Text" xml:space="preserve">
+    <value>Package Service Enabled?</value>
+  </data>
+  <data name="Swagger.HelpText" xml:space="preserve">
+    <value>Specify If Swagger Is Enabled For Your Server API</value>
+  </data>
+  <data name="Swagger.Text" xml:space="preserve">
+    <value>Swagger Enabled?</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
new file mode 100644
index 00000000..f6b6079b
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.Package.Load" xml:space="preserve">
+    <value>Error Loading Packages</value>
+  </data>
+  <data name="Theme.Text" xml:space="preserve">
+    <value>Theme: </value>
+  </data>
+  <data name="Success.Theme.Install" xml:space="preserve">
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Success.Theme.Download" xml:space="preserve">
+    <value>Theme Downloaded Successfully. Click Install To Complete Installation.</value>
+  </data>
+  <data name="Error.Theme.Download" xml:space="preserve">
+    <value>Error Downloading Theme</value>
+  </data>
+  <data name="Theme.HelpText" xml:space="preserve">
+    <value>Upload one or more theme packages. Once they are uploaded click Install to complete the installation.</value>
+  </data>
+  <data name="Search.NoResults" xml:space="preserve">
+    <value>No Themes Match The Criteria Provided Or Package Service Is Disabled</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
new file mode 100644
index 00000000..96bfd1c4
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Template.Text" xml:space="preserve">
+    <value>Template: </value>
+  </data>
+  <data name="Template.Select" xml:space="preserve">
+    <value>Select Template</value>
+  </data>
+  <data name="FrameworkReference.HelpText" xml:space="preserve">
+    <value>Select a framework reference version</value>
+  </data>
+  <data name="OwnerName.Text" xml:space="preserve">
+    <value>Owner Name: </value>
+  </data>
+  <data name="FrameworkReference.Text" xml:space="preserve">
+    <value>Framework Reference: </value>
+  </data>
+  <data name="Location.Text" xml:space="preserve">
+    <value>Location: </value>
+  </data>
+  <data name="Theme.Create" xml:space="preserve">
+    <value>Create Theme</value>
+  </data>
+  <data name="Info.Theme.CreatorIntent" xml:space="preserve">
+    <value>Please Note That The Theme Creator Is Only Intended To Be Used In A Development Environment</value>
+  </data>
+  <data name="Success.Theme.Create" xml:space="preserve">
+    <value>The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+  </data>
+  <data name="Message.Required.ValidName" xml:space="preserve">
+    <value>You Must Provide A Valid Owner Name And Theme Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
+  </data>
+  <data name="OwnerName.HelpText" xml:space="preserve">
+    <value>Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="ThemeName.HelpText" xml:space="preserve">
+    <value>Enter a name for this theme. It should not contain spaces or punctuation.</value>
+  </data>
+  <data name="Template.HelpText" xml:space="preserve">
+    <value>Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server.</value>
+  </data>
+  <data name="Location.HelpText" xml:space="preserve">
+    <value>Location where the theme will be created</value>
+  </data>
+  <data name="ThemeName.Text" xml:space="preserve">
+    <value>Theme Name: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
new file mode 100644
index 00000000..ba7b8f8c
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Success.Theme.Install" xml:space="preserve">
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Error.Theme.Download" xml:space="preserve">
+    <value>Error Downloading Theme</value>
+  </data>
+  <data name="Confirm.Theme.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete The {0} Theme?</value>
+  </data>
+  <data name="Error.Theme.Load" xml:space="preserve">
+    <value>Error Loading Themes</value>
+  </data>
+  <data name="Success.Theme.Delete" xml:space="preserve">
+    <value>Theme Deleted Successfully</value>
+  </data>
+  <data name="Error.Theme.Delete" xml:space="preserve">
+    <value>Error Deleting Theme</value>
+  </data>
+  <data name="DeleteTheme.Header" xml:space="preserve">
+    <value>Delete Theme</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/View.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/View.resx
new file mode 100644
index 00000000..f8540759
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/View.resx
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="InternalName.HelpText" xml:space="preserve">
+    <value>The internal name of the module</value>
+  </data>
+  <data name="InternalName.Text" xml:space="preserve">
+    <value>Internal Name: </value>
+  </data>
+  <data name="Version.Text" xml:space="preserve">
+    <value>Version: </value>
+  </data>
+  <data name="Owner.Text" xml:space="preserve">
+    <value>Owner: </value>
+  </data>
+  <data name="ReferenceUrl.Text" xml:space="preserve">
+    <value>Reference Url: </value>
+  </data>
+  <data name="Contact.Text" xml:space="preserve">
+    <value>Contact: </value>
+  </data>
+  <data name="License.Text" xml:space="preserve">
+    <value>License: </value>
+  </data>
+  <data name="Error.Theme.Loading" xml:space="preserve">
+    <value>Error Loading Theme</value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>The name of the theme</value>
+  </data>
+  <data name="Version.HelpText" xml:space="preserve">
+    <value>The version of the theme</value>
+  </data>
+  <data name="Owner.HelpText" xml:space="preserve">
+    <value>The owner or creator of the theme</value>
+  </data>
+  <data name="ReferenceUrl.HelpText" xml:space="preserve">
+    <value>The reference url of the theme</value>
+  </data>
+  <data name="Contact.HelpText" xml:space="preserve">
+    <value>The contact for the theme</value>
+  </data>
+  <data name="License.HelpText" xml:space="preserve">
+    <value>The license of the theme</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
new file mode 100644
index 00000000..001ebebe
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.Upgrade.Execute" xml:space="preserve">
+    <value>Error Executing Upgrade</value>
+  </data>
+  <data name="Error.Framework.Download" xml:space="preserve">
+    <value>Error Downloading Framework Package</value>
+  </data>
+  <data name="Framework.HelpText" xml:space="preserve">
+    <value>Upload a framework package and select Install to complete the installation</value>
+  </data>
+  <data name="Framework.Text" xml:space="preserve">
+    <value>Framework: </value>
+  </data>
+  <data name="Info.Upgrade.Wait" xml:space="preserve">
+    <value>Please Be Patient While The Upgrade Is In Progress...</value>
+  </data>
+  <data name="Success.Framework.Download" xml:space="preserve">
+    <value>Framework Downloaded Successfully... Please Select Upgrade To Complete the Process</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx
new file mode 100644
index 00000000..3666102c
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Add.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Message.Text" xml:space="preserve">
+    <value>Message: </value>
+  </data>
+  <data name="Message.User.Invalid" xml:space="preserve">
+    <value>User Does Not Exist. Please Verify That The Username Provided Is Correct.</value>
+  </data>
+  <data name="Error.Notification.Add" xml:space="preserve">
+    <value>Error Adding Notification</value>
+  </data>
+  <data name="To.HelpText" xml:space="preserve">
+    <value>Enter the username you wish to send a message to</value>
+  </data>
+  <data name="Subject.HelpText" xml:space="preserve">
+    <value>Enter the subject of the message</value>
+  </data>
+  <data name="Message.HelpText" xml:space="preserve">
+    <value>Enter the message</value>
+  </data>
+  <data name="To.Text" xml:space="preserve">
+    <value>To: </value>
+  </data>
+  <data name="Subject.Text" xml:space="preserve">
+    <value>Subject: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
new file mode 100644
index 00000000..294cc895
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Message.Password.Invalid" xml:space="preserve">
+    <value>Passwords Entered Do Not Match</value>
+  </data>
+  <data name="From" xml:space="preserve">
+    <value>From</value>
+  </data>
+  <data name="Subject" xml:space="preserve">
+    <value>Subject</value>
+  </data>
+  <data name="Received" xml:space="preserve">
+    <value>Received</value>
+  </data>
+  <data name="To" xml:space="preserve">
+    <value>To</value>
+  </data>
+  <data name="Sent" xml:space="preserve">
+    <value>Sent</value>
+  </data>
+  <data name="Inbox" xml:space="preserve">
+    <value>Inbox</value>
+  </data>
+  <data name="Items.Sent" xml:space="preserve">
+    <value>Sent Items</value>
+  </data>
+  <data name="Message.User.NoLogIn" xml:space="preserve">
+    <value>Current User Is Not Logged In</value>
+  </data>
+  <data name="Error.Profile.Load" xml:space="preserve">
+    <value>Error Loading User Profile</value>
+  </data>
+  <data name="Success.Profile.Update" xml:space="preserve">
+    <value>User Profile Updated Successfully</value>
+  </data>
+  <data name="Message.Required.ProfileInfo" xml:space="preserve">
+    <value>You Must Provide A Username and Email Address As Well As All Required Profile Information</value>
+  </data>
+  <data name="Error.Profile.Save" xml:space="preserve">
+    <value>Error Saving User Profile</value>
+  </data>
+  <data name="SendNotification.Text" xml:space="preserve">
+    <value>Send Notification</value>
+  </data>
+  <data name="DeleteNotification.Header" xml:space="preserve">
+    <value>Delete Notification</value>
+  </data>
+  <data name="DeleteNotification.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Notification?</value>
+  </data>
+  <data name="Identity.Name" xml:space="preserve">
+    <value>Identity</value>
+  </data>
+  <data name="Confirm.HelpText" xml:space="preserve">
+    <value>If you are changing your password you must enter it again to confirm it matches</value>
+  </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="DisplayName.HelpText" xml:space="preserve">
+    <value>Your full name</value>
+  </data>
+  <data name="DisplayName.Text" xml:space="preserve">
+    <value>Full Name:</value>
+  </data>
+  <data name="Email.HelpText" xml:space="preserve">
+    <value>Your email address where you wish to receive notifications</value>
+  </data>
+  <data name="Email.Text" xml:space="preserve">
+    <value>Email:</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>If you wish to change your password you can enter it here. Please choose a sufficiently secure password.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Photo.HelpText" xml:space="preserve">
+    <value>A photo of yourself</value>
+  </data>
+  <data name="Photo.Text" xml:space="preserve">
+    <value>Photo:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username. Note that this field can not be modified.</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx
new file mode 100644
index 00000000..47a59876
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/UserProfile/View.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.User.Load" xml:space="preserve">
+    <value>Error Loading Users</value>
+  </data>
+  <data name="Message.User.Invalid" xml:space="preserve">
+    <value>User Does Not Exist. Please Verify That The Username Provided Is Correct.</value>
+  </data>
+  <data name="Error.Notification.Add" xml:space="preserve">
+    <value>Error Adding Notification</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Title:</value>
+  </data>
+  <data name="Subject" xml:space="preserve">
+    <value>Subject:</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date:</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Message:</value>
+  </data>
+  <data name="Reply" xml:space="preserve">
+    <value>Reply</value>
+  </data>
+  <data name="OriginalMessage" xml:space="preserve">
+    <value>Original Message</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
new file mode 100644
index 00000000..4726a6e9
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.User.AddCheckPass" xml:space="preserve">
+    <value>Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.</value>
+  </data>
+  <data name="Message.Password.NoMatch" xml:space="preserve">
+    <value>Passwords Entered Do Not Match</value>
+  </data>
+  <data name="Error.User.Add" xml:space="preserve">
+    <value>Error Adding User</value>
+  </data>
+  <data name="Error.Profile.Load" xml:space="preserve">
+    <value>Error Loading User Profile</value>
+  </data>
+  <data name="Identity.Name" xml:space="preserve">
+    <value>Identity</value>
+  </data>
+  <data name="Message.Required.ProfileInfo" xml:space="preserve">
+    <value>You Must Provide A Username, Password, Email Address And All Required Profile Information</value>
+  </data>
+  <data name="Message.Username.Exists" xml:space="preserve">
+    <value>Username Already Exists</value>
+  </data>
+  <data name="Confirm.HelpText" xml:space="preserve">
+    <value>Please enter the password again to confirm it matches with the value above</value>
+  </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="DisplayName.HelpText" xml:space="preserve">
+    <value>The full name of the user</value>
+  </data>
+  <data name="DisplayName.Text" xml:space="preserve">
+    <value>Full Name:</value>
+  </data>
+  <data name="Email.HelpText" xml:space="preserve">
+    <value>The email address where the user will receive notifications</value>
+  </data>
+  <data name="Email.Text" xml:space="preserve">
+    <value>Email:</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The user's password. Please choose a password which is sufficiently secure.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>A unique username for a user. Note that this field can not be modified once it is saved.</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
new file mode 100644
index 00000000..5e19826c
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Message.Password.NoMatch" xml:space="preserve">
+    <value>Passwords Entered Do Not Match</value>
+  </data>
+  <data name="Identity.Name" xml:space="preserve">
+    <value>Identity</value>
+  </data>
+  <data name="Confirm.Delete" xml:space="preserve">
+    <value>Is Deleted?</value>
+  </data>
+  <data name="Error.User.Load" xml:space="preserve">
+    <value>Error Loading User</value>
+  </data>
+  <data name="Message.Required.ProfileInfo" xml:space="preserve">
+    <value>You Must Provide A Username, Password, Email Address, And All Required Profile Information</value>
+  </data>
+  <data name="Error.User.Save" xml:space="preserve">
+    <value>Error Saving User</value>
+  </data>
+  <data name="Confirm.HelpText" xml:space="preserve">
+    <value>Please enter the password again to confirm it matches with the value above</value>
+  </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm Password:</value>
+  </data>
+  <data name="DisplayName.HelpText" xml:space="preserve">
+    <value>The full name of the user</value>
+  </data>
+  <data name="DisplayName.Text" xml:space="preserve">
+    <value>Full Name:</value>
+  </data>
+  <data name="Email.HelpText" xml:space="preserve">
+    <value>The email address where the user will receive notifications</value>
+  </data>
+  <data name="Email.Text" xml:space="preserve">
+    <value>Email:</value>
+  </data>
+  <data name="IsDeleted.HelpText" xml:space="preserve">
+    <value>Indicate if the user is active</value>
+  </data>
+  <data name="IsDeleted.Text" xml:space="preserve">
+    <value>Deleted?</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The user's password. Please choose a password which is sufficiently secure.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Photo.HelpText" xml:space="preserve">
+    <value>A photo of the user</value>
+  </data>
+  <data name="Photo.Text" xml:space="preserve">
+    <value>Photo:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>The unique username for a user. Note that this field can not be modified.</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
new file mode 100644
index 00000000..bb13df9e
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Confirm.User.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
+  <data name="AddUser.Text" xml:space="preserve">
+    <value>Add User</value>
+  </data>
+  <data name="DeleteUser.Header" xml:space="preserve">
+    <value>Delete User</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Roles.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Roles.resx
new file mode 100644
index 00000000..bcce499f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Roles.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="User.Text" xml:space="preserve">
+    <value>User: </value>
+  </data>
+  <data name="Error.User.LoadRole" xml:space="preserve">
+    <value>Error Loading User Roles</value>
+  </data>
+  <data name="Success.User.AssignRole" xml:space="preserve">
+    <value>User Assigned To Role</value>
+  </data>
+  <data name="Error.User.SaveRole" xml:space="preserve">
+    <value>Error Saving User Roles</value>
+  </data>
+  <data name="Success.User.Remove" xml:space="preserve">
+    <value>User Removed From Role</value>
+  </data>
+  <data name="Error.User.RemoveRole" xml:space="preserve">
+    <value>Error Removing User From Role</value>
+  </data>
+  <data name="EffectiveDate.HelpText" xml:space="preserve">
+    <value>The date that this role assignment is active</value>
+  </data>
+  <data name="ExpiryDate.HelpText" xml:space="preserve">
+    <value>The date that this role assignment expires</value>
+  </data>
+  <data name="Role.Text" xml:space="preserve">
+    <value>Role: </value>
+  </data>
+  <data name="EffectiveDate.Text" xml:space="preserve">
+    <value>Effective Date: </value>
+  </data>
+  <data name="ExpiryDate.Text" xml:space="preserve">
+    <value>Expiry Date: </value>
+  </data>
+  <data name="Role.Select" xml:space="preserve">
+    <value>Select Role</value>
+  </data>
+  <data name="Roles" xml:space="preserve">
+    <value>Roles</value>
+  </data>
+  <data name="Error.LoadRole" xml:space="preserve">
+    <value>Error Loading Roles</value>
+  </data>
+  <data name="Message.Required.Role" xml:space="preserve">
+    <value>You Must Select A Role</value>
+  </data>
+  <data name="User.HelpText" xml:space="preserve">
+    <value>The user you are assigning roles to</value>
+  </data>
+  <data name="Role.HelpText" xml:space="preserve">
+    <value>Select a role</value>
+  </data>
+  <data name="Confirm.User.RemoveRole" xml:space="preserve">
+    <value>Are You Sure You Wish To Remove This User From The {0} Role?</value>
+  </data>
+  <data name="Effective" xml:space="preserve">
+    <value>Effective</value>
+  </data>
+  <data name="Expiry" xml:space="preserve">
+    <value>Expiry</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx
new file mode 100644
index 00000000..eabb94a1
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Created" xml:space="preserve">
+    <value>Created</value>
+  </data>
+  <data name="By" xml:space="preserve">
+    <value>by</value>
+  </data>
+  <data name="On" xml:space="preserve">
+    <value>on</value>
+  </data>
+  <data name="LastModified" xml:space="preserve">
+    <value>Last modified</value>
+  </data>
+  <data name="Deleted" xml:space="preserve">
+    <value>Deleted</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/FileManager.resx b/Oqtane.Client/Resources/Modules/Controls/FileManager.resx
new file mode 100644
index 00000000..f7f93e08
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/FileManager.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Folder.Select" xml:space="preserve">
+    <value>Select Folder</value>
+  </data>
+  <data name="File.Select" xml:space="preserve">
+    <value>Select File</value>
+  </data>
+  <data name="Error.File.Load" xml:space="preserve">
+    <value>Error Loading Files</value>
+  </data>
+  <data name="Success.File.Upload" xml:space="preserve">
+    <value>File Upload Succeeded</value>
+  </data>
+  <data name="Error.File.Upload" xml:space="preserve">
+    <value>File Upload Failed</value>
+  </data>
+  <data name="Message.File.NotSelected" xml:space="preserve">
+    <value>You Have Not Selected A File To Upload</value>
+  </data>
+  <data name="Success.File.Delete" xml:space="preserve">
+    <value>File Deleted</value>
+  </data>
+  <data name="Error.File.Delete" xml:space="preserve">
+    <value>Error Deleting File</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx b/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx
new file mode 100644
index 00000000..3961c7cc
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/PermissionGrid.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Role" xml:space="preserve">
+    <value>Role</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>User</value>
+  </data>
+  <data name="Username.Enter" xml:space="preserve">
+    <value>Enter Username</value>
+  </data>
+  <data name="Message.Username.DontExist" xml:space="preserve">
+    <value>Username Does Not Exist</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/RichTextEditor.resx b/Oqtane.Client/Resources/Modules/Controls/RichTextEditor.resx
new file mode 100644
index 00000000..a59e6680
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/RichTextEditor.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="SynchronizeContent" xml:space="preserve">
+    <value>Synchronize Content</value>
+  </data>
+  <data name="InsertImage" xml:space="preserve">
+    <value>Insert Image</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="Message.Require.Image" xml:space="preserve">
+    <value>You Must Select An Image To Insert</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/TriStateCheckBox.resx b/Oqtane.Client/Resources/Modules/Controls/TriStateCheckBox.resx
new file mode 100644
index 00000000..3def68ad
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/TriStateCheckBox.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PermissionGranted" xml:space="preserve">
+    <value>Permission Granted</value>
+  </data>
+  <data name="PermissionDenied" xml:space="preserve">
+    <value>Permission Denied</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/HtmlText/Edit.resx b/Oqtane.Client/Resources/Modules/HtmlText/Edit.resx
new file mode 100644
index 00000000..0439bfae
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/HtmlText/Edit.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.Content.Save" xml:space="preserve">
+    <value>Error Saving Content</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/HtmlText/Index.resx b/Oqtane.Client/Resources/Modules/HtmlText/Index.resx
new file mode 100644
index 00000000..7c534702
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/HtmlText/Index.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Edit.Action" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/HtmlText/Settings.resx b/Oqtane.Client/Resources/Modules/HtmlText/Settings.resx
new file mode 100644
index 00000000..c760704c
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/HtmlText/Settings.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AllowFileManagement.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Upload and Select Files</value>
+  </data>
+  <data name="AllowFileManagement.Text" xml:space="preserve">
+    <value>Allow File Management: </value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Controls/LocalDBConfig.resx b/Oqtane.Client/Resources/Modules/Installer/Controls/LocalDBConfig.resx
new file mode 100644
index 00000000..a3acd769
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Controls/LocalDBConfig.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Controls/MySQLConfig.resx b/Oqtane.Client/Resources/Modules/Installer/Controls/MySQLConfig.resx
new file mode 100644
index 00000000..f338521f
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Controls/MySQLConfig.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Port.Text" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="Port.HelpText" xml:space="preserve">
+    <value>Enter the port used to connect to the server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Controls/PostgreSQLConfig.resx b/Oqtane.Client/Resources/Modules/Installer/Controls/PostgreSQLConfig.resx
new file mode 100644
index 00000000..86e92b80
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Controls/PostgreSQLConfig.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Port.Text" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="Port.HelpText" xml:space="preserve">
+    <value>Enter the port used to connect to the server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="IntegratedSecurity.Text" xml:space="preserve">
+    <value>Integrated Security:</value>
+  </data>
+  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
+    <value>Select if you want integrated security or not</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Modules/Installer/Controls/SqlServerConfig.resx
new file mode 100644
index 00000000..c526c9f9
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Controls/SqlServerConfig.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>Server:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the database server</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>Enter the name of the database</value>
+  </data>
+  <data name="IntegratedSecurity.Text" xml:space="preserve">
+    <value>Integrated Security:</value>
+  </data>
+  <data name="IntegratedSecurity.HelpText" xml:space="preserve">
+    <value>Select if you want integrated security or not</value>
+  </data>
+  <data name="Uid.Text" xml:space="preserve">
+    <value>User Id:</value>
+  </data>
+  <data name="Uid.HelpText" xml:space="preserve">
+    <value>Enter the username to use for the database</value>
+  </data>
+  <data name="Pwd.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Pwd.HelpText" xml:space="preserve">
+    <value>Enter the password to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Controls/SqliteConfig.resx b/Oqtane.Client/Resources/Modules/Installer/Controls/SqliteConfig.resx
new file mode 100644
index 00000000..d2a51205
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Controls/SqliteConfig.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Server.Text" xml:space="preserve">
+    <value>File Name:</value>
+  </data>
+  <data name="Server.HelpText" xml:space="preserve">
+    <value>Enter the file name to use for the database</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Installer/Installer.resx b/Oqtane.Client/Resources/Modules/Installer/Installer.resx
new file mode 100644
index 00000000..3d839df5
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Installer/Installer.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DatabaseConfig" xml:space="preserve">
+    <value>Database Configuration</value>
+  </data>
+  <data name="DatabaseType" xml:space="preserve">
+    <value>Database Type:</value>
+  </data>
+  <data name="ApplicationAdmin" xml:space="preserve">
+    <value>Application Administrator</value>
+  </data>
+  <data name="InstallNow" xml:space="preserve">
+    <value>Install Now</value>
+  </data>
+  <data name="Error.DbConfig.Load" xml:space="preserve">
+    <value>Error loading Database Configuration Control</value>
+  </data>
+  <data name="Message.Require.DbInfo" xml:space="preserve">
+    <value>Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/SharedResources.resx b/Oqtane.Client/Resources/SharedResources.resx
new file mode 100644
index 00000000..0c5cf356
--- /dev/null
+++ b/Oqtane.Client/Resources/SharedResources.resx
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="True" xml:space="preserve">
+    <value>True</value>
+  </data>
+  <data name="False" xml:space="preserve">
+    <value>False</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Yes</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>No</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Update" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Admin Dashboard" xml:space="preserve">
+    <value>Admin Dashboard</value>
+  </data>
+  <data name="User Login" xml:space="preserve">
+    <value>User Login</value>
+  </data>
+  <data name="User Registration" xml:space="preserve">
+    <value>User Registration</value>
+  </data>
+  <data name="Password Reset" xml:space="preserve">
+    <value>Password Reset</value>
+  </data>
+  <data name="User Profile" xml:space="preserve">
+    <value>User Profile</value>
+  </data>
+  <data name="Site Settings" xml:space="preserve">
+    <value>Site Settings</value>
+  </data>
+  <data name="Page Management" xml:space="preserve">
+    <value>Page Management</value>
+  </data>
+  <data name="User Management" xml:space="preserve">
+    <value>User Management</value>
+  </data>
+  <data name="Profile Management" xml:space="preserve">
+    <value>Profile Management</value>
+  </data>
+  <data name="Role Management" xml:space="preserve">
+    <value>Role Management</value>
+  </data>
+  <data name="File Management" xml:space="preserve">
+    <value>File Management</value>
+  </data>
+  <data name="Recycle Bin" xml:space="preserve">
+    <value>Recycle Bin</value>
+  </data>
+  <data name="Event Log" xml:space="preserve">
+    <value>Event Log</value>
+  </data>
+  <data name="Site Management" xml:space="preserve">
+    <value>Site Management</value>
+  </data>
+  <data name="Module Management" xml:space="preserve">
+    <value>Module Management</value>
+  </data>
+  <data name="Theme Management" xml:space="preserve">
+    <value>Theme Management</value>
+  </data>
+  <data name="Language Management" xml:space="preserve">
+    <value>Language Management</value>
+  </data>
+  <data name="Scheduled Jobs" xml:space="preserve">
+    <value>Scheduled Jobs</value>
+  </data>
+  <data name="Sql Management" xml:space="preserve">
+    <value>Sql Management</value>
+  </data>
+  <data name="System Info" xml:space="preserve">
+    <value>System Info</value>
+  </data>
+  <data name="System Update" xml:space="preserve">
+    <value>System Update</value>
+  </data>
+  <data name="Download" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="Upload" xml:space="preserve">
+    <value>Upload</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="Search.Hint" xml:space="preserve">
+    <value>Enter Search Term</value>
+  </data>
+  <data name="Search.By" xml:space="preserve">
+    <value>by</value>
+  </data>
+  <data name="Search.Downloads" xml:space="preserve">
+    <value>downloads</value>
+  </data>
+  <data name="Search.Released" xml:space="preserve">
+    <value>released</value>
+  </data>
+  <data name="Search.Version" xml:space="preserve">
+    <value>version</value>
+  </data>
+  <data name="Edit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Install" xml:space="preserve">
+    <value>Install</value>
+  </data>
+  <data name="Loading" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
+  <data name="Login" xml:space="preserve">
+    <value>Login</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Send" xml:space="preserve">
+    <value>Send</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
+  <data name="Upgrade" xml:space="preserve">
+    <value>Upgrade</value>
+  </data>
+  <data name="Username" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>Email</value>
+  </data>
+  <data name="FullName" xml:space="preserve">
+    <value>Full Name:</value>
+  </data>
+    <data name="LocalVersion" xml:space="preserve">
+    <value>Local Version</value>
+  </data>
+  <data name="Search.Source" xml:space="preserve">
+    <value>source</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx
new file mode 100644
index 00000000..f76bc983
--- /dev/null
+++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ControlPanel" xml:space="preserve">
+    <value>Control Panel</value>
+  </data>
+  <data name="AdminDash" xml:space="preserve">
+    <value>Admin Dashboard</value>
+  </data>
+  <data name="Page.Unpublish" xml:space="preserve">
+    <value>Unpublish Page</value>
+  </data>
+  <data name="Page.Publish" xml:space="preserve">
+    <value>Publish Page</value>
+  </data>
+  <data name="Page.Delete" xml:space="preserve">
+    <value>Delete Page</value>
+  </data>
+  <data name="Module.AddNew" xml:space="preserve">
+    <value>Add New Module</value>
+  </data>
+  <data name="Module.AddExisting" xml:space="preserve">
+    <value>Add Existing Module</value>
+  </data>
+  <data name="Modules" xml:space="preserve">
+    <value>Modules</value>
+  </data>
+  <data name="Page.Select" xml:space="preserve">
+    <value>Select Page</value>
+  </data>
+  <data name="Page.Module.Add" xml:space="preserve">
+    <value>Add Module To Page</value>
+  </data>
+  <data name="Container" xml:space="preserve">
+    <value>Container:</value>
+  </data>
+  <data name="Error.Authorize.No" xml:space="preserve">
+    <value>Not Authorized</value>
+  </data>
+  <data name="Message.Require.ModuleSelect" xml:space="preserve">
+    <value>You Must Select A Module</value>
+  </data>
+  <data name="Module.Manage" xml:space="preserve">
+    <value>Module Management:</value>
+  </data>
+  <data name="Module.Select" xml:space="preserve">
+    <value>Select Module</value>
+  </data>
+  <data name="Page.Manage" xml:space="preserve">
+    <value>Page Management:</value>
+  </data>
+  <data name="Pane" xml:space="preserve">
+    <value>Pane:</value>
+  </data>
+  <data name="Success.Page.ModuleAdd" xml:space="preserve">
+    <value>Module Added to Page</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Title:</value>
+  </data>
+  <data name="System.Update" xml:space="preserve">
+    <value>Check For System Updates</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/Controls/Login.resx b/Oqtane.Client/Resources/Themes/Controls/Login.resx
new file mode 100644
index 00000000..f4c6014c
--- /dev/null
+++ b/Oqtane.Client/Resources/Themes/Controls/Login.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Logout" xml:space="preserve">
+    <value>Logout</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/Controls/UserProfile.resx b/Oqtane.Client/Resources/Themes/Controls/UserProfile.resx
new file mode 100644
index 00000000..f8896a03
--- /dev/null
+++ b/Oqtane.Client/Resources/Themes/Controls/UserProfile.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Register" xml:space="preserve">
+    <value>Register</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx b/Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx
new file mode 100644
index 00000000..4c05a1fb
--- /dev/null
+++ b/Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>Specify If The Module Title Should Be Displayed</value>
+  </data>
+  <data name="Background.HelpText" xml:space="preserve">
+    <value>Optionally Specify A Background Color For The Container</value>
+  </data>
+  <data name="Text.HelpText" xml:space="preserve">
+    <value>Optionally Specify A Text Color For The Container</value>
+  </data>
+  <data name="Border.HelpText" xml:space="preserve">
+    <value>Optionally Specify A Border For The Container</value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Display Title?</value>
+  </data>
+  <data name="Background.Text" xml:space="preserve">
+    <value>Background Color:</value>
+  </data>
+  <data name="Text.Text" xml:space="preserve">
+    <value>Text Color:</value>
+  </data>
+  <data name="Border.Text" xml:space="preserve">
+    <value>Border Color:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx b/Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx
new file mode 100644
index 00000000..34b6b05b
--- /dev/null
+++ b/Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Title.HelpText" xml:space="preserve">
+    <value>Specify If The Page Footer Should Be Displayed</value>
+  </data>
+  <data name="Title.Text" xml:space="preserve">
+    <value>Display Footer?</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/UI/ModuleInstance.resx b/Oqtane.Client/Resources/UI/ModuleInstance.resx
new file mode 100644
index 00000000..3ce75ee0
--- /dev/null
+++ b/Oqtane.Client/Resources/UI/ModuleInstance.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Error.Module.InvalidName" xml:space="preserve">
+    <value>Module Does Not Have A Component Named {0}.razor</value>
+  </data>
+  <data name="Error.Module.InvalidType" xml:space="preserve">
+    <value>Module Type Is Invalid For {0}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs
index 5a72e4bb..891c5a08 100644
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@@ -3,8 +3,6 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
 using System.Collections.Generic;
-using System.Net;
-using System;
 using Oqtane.Documentation;
 using Oqtane.Shared;
 
@@ -40,13 +38,6 @@ namespace Oqtane.Services
             return await GetJsonAsync<Alias>($"{ApiUrl}/{aliasId}");
         }
 
-        /// <inheritdoc />
-        public async Task<Alias> GetAliasAsync(string path, DateTime lastSyncDate)
-        {
-            // tenant agnostic as SiteState does not exist
-            return await GetJsonAsync<Alias>($"{CreateApiUrl("Alias", null)}/name/?path={WebUtility.UrlEncode(path)}&sync={lastSyncDate.ToString("yyyyMMddHHmmssfff")}");
-        }
-
         /// <inheritdoc />
         public async Task<Alias> AddAliasAsync(Alias alias)
         {
diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs
index 5cc8f6ec..b2943bc0 100644
--- a/Oqtane.Client/Services/InstallationService.cs
+++ b/Oqtane.Client/Services/InstallationService.cs
@@ -3,19 +3,32 @@ using System.Threading.Tasks;
 using System.Net.Http;
 using Oqtane.Documentation;
 using Oqtane.Shared;
+using Microsoft.AspNetCore.Components;
+using System;
+using System.Net;
 
 namespace Oqtane.Services
 {
     [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
     public class InstallationService : ServiceBase, IInstallationService
     {
-        public InstallationService(HttpClient http) : base(http) {}
+        private readonly NavigationManager _navigationManager;
+        private readonly SiteState _siteState;
 
-        private string ApiUrl => CreateApiUrl("Installation", null); // tenant agnostic as SiteState does not exist
+        public InstallationService(HttpClient http, NavigationManager navigationManager, SiteState siteState) : base(http)
+        {
+            _navigationManager = navigationManager;
+            _siteState = siteState;
+        }
+
+        private string ApiUrl => CreateApiUrl("Installation", null, ControllerRoutes.ApiRoute); // tenant agnostic
 
         public async Task<Installation> IsInstalled()
         {
-            return await GetJsonAsync<Installation>($"{ApiUrl}/installed");
+            // add antiforgerytoken header so that it is included on all HttpClient calls for the lifetime of the app
+            AddRequestHeader(Constants.AntiForgeryTokenHeaderName, _siteState.AntiForgeryToken);
+            var path = new Uri(_navigationManager.Uri).LocalPath.Substring(1);            
+            return await GetJsonAsync<Installation>($"{ApiUrl}/installed/?path={WebUtility.UrlEncode(path)}");
         }
 
         public async Task<Installation> Install(InstallConfig config)
@@ -32,5 +45,10 @@ namespace Oqtane.Services
         {
             await PostAsync($"{ApiUrl}/restart");
         }
+
+        public async Task RegisterAsync(string email)
+        {
+            await PostJsonAsync($"{ApiUrl}/register?email={WebUtility.UrlEncode(email)}", true);
+        }
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IAliasService.cs b/Oqtane.Client/Services/Interfaces/IAliasService.cs
index 1ab43fa9..6b002ec7 100644
--- a/Oqtane.Client/Services/Interfaces/IAliasService.cs
+++ b/Oqtane.Client/Services/Interfaces/IAliasService.cs
@@ -23,14 +23,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<Alias> GetAliasAsync(int aliasId);
 
-        /// <summary>
-        /// Retrieve the Alias object of a URL.
-        /// </summary>
-        /// <param name="url">The URL - todoc - is this only the root, or can it be a longer path?</param>
-        /// <param name="lastSyncDate">todoc - unclear what this is for</param>
-        /// <returns></returns>
-        Task<Alias> GetAliasAsync(string url, DateTime lastSyncDate);
-
         /// <summary>
         /// Save another <see cref="Oqtane.Models.Alias"/> in the DB. It must already contain all the information incl. <see cref="Oqtane.Models.Tenant"/> it belongs to. 
         /// </summary>
diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs
index da9222e9..e9eb961b 100644
--- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs
+++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs
@@ -10,5 +10,6 @@ namespace Oqtane.Services
         Task<Installation> Install(InstallConfig config);
         Task<Installation> Upgrade();
         Task RestartAsync();
+        Task RegisterAsync(string email);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IJobLogService.cs b/Oqtane.Client/Services/Interfaces/IJobLogService.cs
index 015d83f0..e198bf9f 100644
--- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs
+++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs
@@ -1,4 +1,4 @@
-using Oqtane.Models;
+using Oqtane.Models;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -9,11 +9,5 @@ namespace Oqtane.Services
         Task<List<JobLog>> GetJobLogsAsync();
 
         Task<JobLog> GetJobLogAsync(int jobLogId);
-
-        Task<JobLog> AddJobLogAsync(JobLog jobLog);
-
-        Task<JobLog> UpdateJobLogAsync(JobLog jobLog);
-
-        Task DeleteJobLogAsync(int jobLogId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IPackageService.cs b/Oqtane.Client/Services/Interfaces/IPackageService.cs
index 4c5f24b1..59847af8 100644
--- a/Oqtane.Client/Services/Interfaces/IPackageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPackageService.cs
@@ -6,7 +6,8 @@ namespace Oqtane.Services
 {
     public interface IPackageService
     {
-        Task<List<Package>> GetPackagesAsync(string tag);
+        Task<List<Package>> GetPackagesAsync(string type);
+        Task<List<Package>> GetPackagesAsync(string type, string search);
         Task DownloadPackageAsync(string packageId, string version, string folder);
         Task InstallPackagesAsync();
     }
diff --git a/Oqtane.Client/Services/Interfaces/ISyncService.cs b/Oqtane.Client/Services/Interfaces/ISyncService.cs
new file mode 100644
index 00000000..65b5c226
--- /dev/null
+++ b/Oqtane.Client/Services/Interfaces/ISyncService.cs
@@ -0,0 +1,19 @@
+using Oqtane.Models;
+using System;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to retrieve <see cref="Sync"/> information.
+    /// </summary>
+    public interface ISyncService
+    {
+        /// <summary>
+        /// Get sync events
+        /// </summary>
+        /// <param name="lastSyncDate"></param>
+        /// <returns></returns>
+        Task<Sync> GetSyncAsync(DateTime lastSyncDate);
+    }
+}
diff --git a/Oqtane.Client/Services/Interfaces/ISystemService.cs b/Oqtane.Client/Services/Interfaces/ISystemService.cs
index c450cdc7..f710b524 100644
--- a/Oqtane.Client/Services/Interfaces/ISystemService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISystemService.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
@@ -6,5 +6,7 @@ namespace Oqtane.Services
     public interface ISystemService
     {
         Task<Dictionary<string, string>> GetSystemInfoAsync();
+
+        Task UpdateSystemInfoAsync(Dictionary<string, string> settings);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/ITenantService.cs b/Oqtane.Client/Services/Interfaces/ITenantService.cs
index 12738f58..cbb4e526 100644
--- a/Oqtane.Client/Services/Interfaces/ITenantService.cs
+++ b/Oqtane.Client/Services/Interfaces/ITenantService.cs
@@ -21,26 +21,5 @@ namespace Oqtane.Services
         /// <param name="tenantId">ID-reference of the <see cref="Tenant"/></param>
         /// <returns></returns>
         Task<Tenant> GetTenantAsync(int tenantId);
-
-        /// <summary>
-        /// Add / save another <see cref="Tenant"/> to the database
-        /// </summary>
-        /// <param name="tenant">A <see cref="Tenant"/> object containing the configuration</param>
-        /// <returns></returns>
-        Task<Tenant> AddTenantAsync(Tenant tenant);
-
-        /// <summary>
-        /// Update the <see cref="Tenant"/> information in the database.
-        /// </summary>
-        /// <param name="tenant"></param>
-        /// <returns></returns>
-        Task<Tenant> UpdateTenantAsync(Tenant tenant);
-
-        /// <summary>
-        /// Delete / remove a <see cref="Tenant"/>
-        /// </summary>
-        /// <param name="tenantId"></param>
-        /// <returns></returns>
-        Task DeleteTenantAsync(int tenantId);
     }
 }
diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs
index 6d9a3e56..6c2f0a73 100644
--- a/Oqtane.Client/Services/JobLogService.cs
+++ b/Oqtane.Client/Services/JobLogService.cs
@@ -30,19 +30,5 @@ namespace Oqtane.Services
         {
             return await GetJsonAsync<JobLog>($"{Apiurl}/{jobLogId}");
         }
-
-        public async Task<JobLog> AddJobLogAsync(JobLog joblog)
-        {
-            return await PostJsonAsync<JobLog>(Apiurl, joblog);
-        }
-
-        public async Task<JobLog> UpdateJobLogAsync(JobLog joblog)
-        {
-            return await PutJsonAsync<JobLog>($"{Apiurl}/{joblog.JobLogId}", joblog);
-        }
-        public async Task DeleteJobLogAsync(int jobLogId)
-        {
-            await DeleteAsync($"{Apiurl}/{jobLogId}");
-        }
     }
 }
diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs
index 59e049f4..8bcd843f 100644
--- a/Oqtane.Client/Services/PackageService.cs
+++ b/Oqtane.Client/Services/PackageService.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Oqtane.Documentation;
 using Oqtane.Shared;
+using System.Net;
 
 namespace Oqtane.Services
 {
@@ -19,10 +20,14 @@ namespace Oqtane.Services
         }
         private string Apiurl => CreateApiUrl("Package", _siteState.Alias);
 
-        public async Task<List<Package>> GetPackagesAsync(string tag)
+        public async Task<List<Package>> GetPackagesAsync(string type)
         {
-            List<Package> packages = await GetJsonAsync<List<Package>>($"{Apiurl}?tag={tag}");
-            return packages.OrderByDescending(item => item.Downloads).ToList();
+            return await GetPackagesAsync(type, "");
+        }
+
+        public async Task<List<Package>> GetPackagesAsync(string type, string search)
+        {
+            return await GetJsonAsync<List<Package>>($"{Apiurl}?type={type}&search={WebUtility.UrlEncode(search)}");
         }
 
         public async Task DownloadPackageAsync(string packageId, string version, string folder)
diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs
index 81d12dc8..ecd6c37b 100644
--- a/Oqtane.Client/Services/ServiceBase.cs
+++ b/Oqtane.Client/Services/ServiceBase.cs
@@ -15,10 +15,25 @@ namespace Oqtane.Services
     public class ServiceBase
     {
         private readonly HttpClient _http;
+        private readonly SiteState _siteState;
 
-        protected ServiceBase(HttpClient client)
+        protected ServiceBase(HttpClient client, SiteState siteState)
         {
             _http = client;
+            _siteState = siteState;
+        }
+
+        // should be used with new constructor
+        public string CreateApiUrl(string serviceName)
+        {
+            if (_siteState != null)
+            {
+                return CreateApiUrl(serviceName, _siteState.Alias, ControllerRoutes.ApiRoute);
+            }
+            else // legacy support (before 2.1.0)
+            {           
+                return CreateApiUrl(serviceName, null, ControllerRoutes.Default);
+            }
         }
 
         public string CreateApiUrl(string serviceName, Alias alias)
@@ -61,10 +76,10 @@ namespace Oqtane.Services
             return CreateAuthorizationPolicyUrl(url, new Dictionary<string, int>() { { entityName, entityId } });
         }
 
-        public string CreateAuthorizationPolicyUrl(string url, Dictionary<string, int> args)
+        public string CreateAuthorizationPolicyUrl(string url, Dictionary<string, int> authEntityId)
         {
             string qs = "";
-            foreach (KeyValuePair<string, int> kvp in args)
+            foreach (KeyValuePair<string, int> kvp in authEntityId)
             {
                 qs += (qs != "") ? "&" : "";
                 qs += "auth" + kvp.Key.ToLower() + "id=" + kvp.Value.ToString();
@@ -80,6 +95,21 @@ namespace Oqtane.Services
             }
         }
 
+        // note that HttpClient is registered as a Scoped(shared) service and therefore you should not use request headers whose value can vary over the lifetime of the service
+        protected void AddRequestHeader(string name, string value)
+        {
+            RemoveRequestHeader(name);
+            _http.DefaultRequestHeaders.Add(name, value);
+        }
+
+        protected void RemoveRequestHeader(string name)
+        {
+            if (_http.DefaultRequestHeaders.Contains(name))
+            {
+                _http.DefaultRequestHeaders.Remove(name);
+            }
+        }
+
         protected async Task GetAsync(string uri)
         {
             var response = await _http.GetAsync(uri);
@@ -194,10 +224,11 @@ namespace Oqtane.Services
             return mediaType != null && mediaType.Equals("application/json", StringComparison.OrdinalIgnoreCase);
         }
 
-        [Obsolete("This method is obsolete. Use CreateApiUrl(string serviceName, Alias alias) in conjunction with ControllerRoutes.ApiRoute in Controllers instead.", false)]
-        public string CreateApiUrl(string serviceName)
+        //[Obsolete("This constructor is obsolete. Use ServiceBase(HttpClient client, SiteState siteState) : base(http, siteState) {} instead.", false)]
+        // This constructor is obsolete. Use ServiceBase(HttpClient client, SiteState siteState) : base(http, siteState) {} instead.
+        protected ServiceBase(HttpClient client)
         {
-            return CreateApiUrl(serviceName, null, ControllerRoutes.Default);
+            _http = client;
         }
 
         [Obsolete("This method is obsolete. Use CreateApiUrl(string serviceName, Alias alias) in conjunction with ControllerRoutes.ApiRoute in Controllers instead.", false)]
diff --git a/Oqtane.Client/Services/SyncService.cs b/Oqtane.Client/Services/SyncService.cs
new file mode 100644
index 00000000..45d2cfca
--- /dev/null
+++ b/Oqtane.Client/Services/SyncService.cs
@@ -0,0 +1,33 @@
+using Oqtane.Models;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+
+namespace Oqtane.Services
+{
+    /// <inheritdoc cref="ISyncService" />
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class SyncService : ServiceBase, ISyncService
+    {
+
+        private readonly SiteState _siteState;
+
+        /// <summary>
+        /// Constructor - should only be used by Dependency Injection
+        /// </summary>
+        public SyncService(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+        private string ApiUrl => CreateApiUrl("Sync", _siteState.Alias);
+
+        /// <inheritdoc />
+        public async Task<Sync> GetSyncAsync(DateTime lastSyncDate)
+        {
+            return await GetJsonAsync<Sync>($"{ApiUrl}/{lastSyncDate.ToString("yyyyMMddHHmmssfff")}");
+        }
+    }
+}
diff --git a/Oqtane.Client/Services/SystemService.cs b/Oqtane.Client/Services/SystemService.cs
index 97112ca1..ba0f54d0 100644
--- a/Oqtane.Client/Services/SystemService.cs
+++ b/Oqtane.Client/Services/SystemService.cs
@@ -22,5 +22,10 @@ namespace Oqtane.Services
         {
             return await GetJsonAsync<Dictionary<string, string>>(Apiurl);
         }
+
+        public async Task UpdateSystemInfoAsync(Dictionary<string, string> settings)
+        {
+            await PostJsonAsync(Apiurl, settings);
+        }
     }
 }
diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs
index 52b3d345..6c02b9a9 100644
--- a/Oqtane.Client/Services/TenantService.cs
+++ b/Oqtane.Client/Services/TenantService.cs
@@ -30,20 +30,5 @@ namespace Oqtane.Services
         {
             return await GetJsonAsync<Tenant>($"{Apiurl}/{tenantId}");
         }
-
-        public async Task<Tenant> AddTenantAsync(Tenant tenant)
-        {
-            return await PostJsonAsync<Tenant>(Apiurl, tenant);
-        }
-
-        public async Task<Tenant> UpdateTenantAsync(Tenant tenant)
-        {
-            return await PutJsonAsync<Tenant>($"{Apiurl}/{tenant.TenantId}", tenant);
-        }
-
-        public async Task DeleteTenantAsync(int tenantId)
-        {
-            await DeleteAsync($"{Apiurl}/{tenantId}");
-        }
     }
 }
diff --git a/Oqtane.Client/SharedResources.cs b/Oqtane.Client/SharedResources.cs
new file mode 100644
index 00000000..1ea66d42
--- /dev/null
+++ b/Oqtane.Client/SharedResources.cs
@@ -0,0 +1,14 @@
+namespace Oqtane
+{
+    /// <summary>
+    /// Dummy class used to collect shared resource strings for this application
+    /// </summary>
+    /// <remarks>
+    /// This class is mostly used with IStringLocalizer and IHtmlLocalizer interfaces.
+    /// The class must reside at the project root.
+    /// </remarks>
+    public class SharedResources
+    {
+
+    }
+}
diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index bce9ff44..1999a970 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes
+@namespace Oqtane.Themes
 @inherits ContainerBase
 @inject NavigationManager NavigationManager
 
@@ -8,7 +8,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title"><ModuleTitle /></h5>
-                    <button type="button" class="close" @onclick="CloseModal" aria-label="Close">&times;</button>
+                    <button type="button" class="btn-close" aria-label="Close" @onclick="CloseModal"></button>
                 </div>
                 <div class="modal-body">
                     <ModuleInstance />
diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index 74444f48..d770cc1b 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -13,7 +13,7 @@
 
 <div class="main">
     <div class="top-row px-4">
-        <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+        <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
     <div class="container">
         <div class="row px-4">
@@ -27,11 +27,9 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css", Integrity = "sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", Integrity = "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.5.1.slim.min.js", Integrity = "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js", Integrity = "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js", Integrity = "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI", CrossOrigin = "anonymous" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
     };
 
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleActions.razor b/Oqtane.Client/Themes/Controls/Container/ModuleActions.razor
index 7311d7e8..e680e807 100644
--- a/Oqtane.Client/Themes/Controls/Container/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/Container/ModuleActions.razor
@@ -5,7 +5,7 @@
 @if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions) && PageState.Action == Constants.DefaultAction)
 {
     <div class="app-moduleactions">
-        <a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>
+        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>
         <ul class="dropdown-menu" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 37px, 0px);">
             @foreach (var action in Actions.Where(item => !item.Name.Contains("Pane")))
             {
diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
index 3551b897..edf5b8e4 100644
--- a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
@@ -115,7 +115,7 @@ namespace Oqtane.Themes.Controls
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, oldPane);
-            return url;
+            return NavigateUrl(url, true);
         }
 
         private async Task<string> DeleteModule(string url, PageModule pagemodule)
@@ -123,7 +123,7 @@ namespace Oqtane.Themes.Controls
             pagemodule.IsDeleted = true;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-            return url;
+            return NavigateUrl(url, true);
         }
 
         private async Task<string> Settings(string url, PageModule pagemodule)
@@ -148,7 +148,7 @@ namespace Oqtane.Themes.Controls
             }
             pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
-            return NavigateUrl(s, "reload");
+            return NavigateUrl(s, true);
         }
 
         private async Task<string> Unpublish(string s, PageModule pagemodule)
@@ -166,7 +166,7 @@ namespace Oqtane.Themes.Controls
             }
             pagemodule.Module.Permissions = UserSecurity.SetPermissionStrings(permissions);
             await ModuleService.UpdateModuleAsync(pagemodule.Module);
-            return NavigateUrl(s, "reload");
+            return NavigateUrl(s, true);
         }
 
         private async Task<string> MoveTop(string s, PageModule pagemodule)
@@ -174,7 +174,7 @@ namespace Oqtane.Themes.Controls
             pagemodule.Order = 0;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-            return s;
+            return NavigateUrl(s, true);
         }
 
         private async Task<string> MoveBottom(string s, PageModule pagemodule)
@@ -182,7 +182,7 @@ namespace Oqtane.Themes.Controls
             pagemodule.Order = int.MaxValue;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-            return s;
+            return NavigateUrl(s, true);
         }
 
         private async Task<string> MoveUp(string s, PageModule pagemodule)
@@ -190,7 +190,7 @@ namespace Oqtane.Themes.Controls
             pagemodule.Order -= 3;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-            return s;
+            return NavigateUrl(s, true);
         }
 
         private async Task<string> MoveDown(string s, PageModule pagemodule)
@@ -198,7 +198,7 @@ namespace Oqtane.Themes.Controls
             pagemodule.Order += 3;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-            return s;
+            return NavigateUrl(s, true);
         }
 
         public class ActionViewModel
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index 14e985e1..6cf9d0b8 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -10,25 +10,25 @@
 @inject ILogService logger
 @inject ISettingService SettingService
 @inject IStringLocalizer<ControlPanel> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
     <div class="app-controlpanel" style="@_display">
-
         <div class="@CardClass">
-            <div class="@HeaderClass">
-                <span class="font-weight-bold">@Localizer["Control Panel"]</span>
-                <button type="button" class="close" @onclick="HideControlPanel" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+            <div class="@HeaderClass d-flex">
+                <span class="font-weight-bold">@Localizer["ControlPanel"]</span>
+                <div class="ms-auto">
+                    <button type="button" class="btn-close" aria-label="Close" @onclick="HideControlPanel"></button>
+                </div>
             </div>
             <div class="@BodyClass">
 
                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
                 {
-                    <div class="row">
+                    <div class="row d-flex">
                         <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Admin"))>@Localizer["Admin Dashboard"]</button>
+                            <button type="button" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
                         </div>
                     </div>
 
@@ -36,34 +36,28 @@
 
                     <div class="row">
                         <div class="col text-center">
-                            <label class="control-label">@Localizer["Page Management:"] </label>
+                            <label class="control-label">@Localizer["Page.Manage"] </label>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Add"))>@Localizer["Add"]</button>
-                        </div>
-                        <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Edit"))>@Localizer["Edit"]</button>
-                        </div>
-                        <div class="col">
-                            <button class="btn btn-danger btn-block mx-auto" @onclick="ConfirmDelete">@Localizer["Delete"]</button>
+                    <div class="row d-flex">
+                        <div class="col d-flex justify-content-between">
+                            <button type="button" class="btn btn-secondary col-3" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
+                            <button type="button" class="btn btn-secondary col-3" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
+                            <button type="button" class="btn btn-danger col-3" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
                         </div>
                     </div>
                     <br />
-                    <div class="row">
-                        @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
-                        {
-                            <div class="col">
-                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>@Localizer["Unpublish Page"]</button>
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="col">
-                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("publish"))>@Localizer["Publish Page"]</button>
-                            </div>
-                        }
+                    <div class="row d-flex">
+                        <div class="col">
+                            @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
+                            {
+                                <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
+                            }
+                            else
+                            {
+                                <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
+                            }
+                        </div>
                     </div>
                 }
 
@@ -74,15 +68,15 @@
                             <div class="modal-dialog">
                                 <div class="modal-content">
                                     <div class="modal-header">
-                                        <h5 class="modal-title">@Localizer["Delete Page"]</h5>
-                                        <button type="button" class="close" @onclick="ConfirmDelete" aria-label="Close">&times;</button>
+                                        <h5 class="modal-title">@Localizer["Page.Delete"]</h5>
+                                        <button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
                                     </div>
                                     <div class="modal-body">
                                         <p>Are You Sure You Want To Delete This Page?</p>
                                     </div>
                                     <div class="modal-footer">
-                                        <button type="button" class="btn btn-danger" @onclick="DeletePage">@Localizer["Delete"]</button>
-                                        <button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@Localizer["Cancel"]</button>
+                                        <button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
+                                        <button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
                                     </div>
                                 </div>
                             </div>
@@ -90,19 +84,18 @@
                     </div>
                 }
                 <hr class="app-rule" />
-
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Module" class="control-label">@Localizer["Module Management:"] </label>
-                        <select class="form-control" @bind="@ModuleType">
-                            <option value="new">@Localizer["Add New Module"]</option>
-                            <option value="existing">@Localizer["Add Existing Module"]</option>
+                        <label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
+                        <select class="form-select" @bind="@ModuleType">
+                            <option value="new">@Localizer["Module.AddNew"]</option>
+                            <option value="existing">@Localizer["Module.AddExisting"]</option>
                         </select>
                         @if (ModuleType == "new")
                         {
                             @if (_moduleDefinitions != null)
                             {
-                                <select class="form-control" @onchange="(e => CategoryChanged(e))">
+                                <select class="form-select" @onchange="(e => CategoryChanged(e))">
                                     @foreach (var category in _categories)
                                     {
                                         if (category == Category)
@@ -115,14 +108,14 @@
                                         }
                                     }
                                 </select>
-                                <select class="form-control" @onchange="(e => ModuleChanged(e))">
+                                <select class="form-select" @onchange="(e => ModuleChanged(e))">
                                     @if (ModuleDefinitionName == "-")
                                     {
-                                        <option value="-" selected>&lt;@Localizer["Select Module"]&gt;</option>
+                                        <option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
                                     }
                                     else
                                     {
-                                        <option value="-">&lt;@Localizer["Select Module"]&gt;</option>
+                                        <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
                                     }
                                     @foreach (var moduledefinition in _moduleDefinitions)
                                     {
@@ -140,15 +133,15 @@
                         }
                         else
                         {
-                            <select class="form-control" @onchange="(e => PageChanged(e))">
-                                <option value="-">&lt;@Localizer["Select Page"]&gt;</option>
+                            <select class="form-select" @onchange="(e => PageChanged(e))">
+                                <option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
                                 @foreach (Page p in _pages)
                                 {
                                     <option value="@p.PageId">@p.Name</option>
                                 }
                             </select>
-                            <select class="form-control" @bind="@ModuleId">
-                                <option value="-">&lt;@Localizer["Select Module"]&gt;</option>
+                            <select class="form-select" @bind="@ModuleId">
+                                <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
                                 @foreach (Module module in _modules)
                                 {
                                     <option value="@module.ModuleId">@module.Title</option>
@@ -159,7 +152,7 @@
                 </div>
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Title" class="control-label">@Localizer["Title:"] </label>
+                        <label for="Title" class="control-label">@Localizer["Title"] </label>
                         <input type="text" name="Title" class="form-control" @bind="@Title" />
                     </div>
                 </div>
@@ -167,8 +160,8 @@
                 {
                     <div class="row">
                         <div class="col text-center">
-                            <label for="Pane" class="control-label">@Localizer["Pane:"] </label>
-                            <select class="form-control" @bind="@Pane">
+                            <label for="Pane" class="control-label">@Localizer["Pane"] </label>
+                            <select class="form-select" @bind="@Pane">
                                 @foreach (string pane in PageState.Page.Panes)
                                 {
                                     <option value="@pane">@pane Pane</option>
@@ -179,8 +172,8 @@
                 }
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Container" class="control-label">@Localizer["Container:"] </label>
-                        <select class="form-control" @bind="@ContainerType">
+                        <label for="Container" class="control-label">@Localizer["Container"] </label>
+                        <select class="form-select" @bind="@ContainerType">
                             @foreach (var container in _containers)
                             {
                                 <option value="@container.TypeName">@container.Name</option>
@@ -188,11 +181,14 @@
                         </select>
                     </div>
                 </div>
-
                 <br />
-
-                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick="@AddModule">@Localizer["Add Module To Page"]</button>
+                <button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
                 @((MarkupString) Message)
+                @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    <hr class="app-rule" />
+                    <NavLink class="btn btn-info col-12" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
+                }
             </div>
         </div>
     </div>
@@ -207,13 +203,13 @@
 {
     if (PageState.EditMode)
     {
-        <button type="button" class="btn @ButtonClass active" data-toggle="button" aria-pressed="true" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
+        <button type="button" class="btn @ButtonClass active" data-bs-toggle="button" aria-pressed="true" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
             <span class="oi oi-pencil"></span>
         </button>
     }
     else
     {
-        <button type="button" class="btn @ButtonClass" data-toggle="button" aria-pressed="false" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
+        <button type="button" class="btn @ButtonClass" data-bs-toggle="button" aria-pressed="false" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
             <span class="oi oi-pencil"></span>
         </button>
     }
@@ -409,17 +405,17 @@
                 await PageModuleService.AddPageModuleAsync(pageModule);
                 await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
 
-                Message = $"<br /><div class=\"alert alert-success\" role=\"alert\">{Localizer["Module Added To Page"]}</div>";
+                Message = $"<br /><div class=\"alert alert-success\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
                 NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {
-                Message = $"<br /><div class=\"alert alert-warning\" role=\"alert\">{Localizer["You Must Select A Module"]}</div>";
+                Message = $"<br /><div class=\"alert alert-warning\" role=\"alert\">{Localizer["Message.Require.ModuleSelect"]}</div>";
             }
         }
         else
         {
-            Message = $"<br /><div class=\"alert alert-error\" role=\"alert\">{Localizer["Not Authorized"]}</div>";
+            Message = $"<br /><div class=\"alert alert-error\" role=\"alert\">{Localizer["Error.Authorize.No"]}</div>";
         }
     }
 
@@ -537,7 +533,7 @@
             }
             page.Permissions = UserSecurity.SetPermissionStrings(permissions);
             await PageService.UpdatePageAsync(page);
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
         }
     }
 
diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
index 64b1d196..41219b0b 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
@@ -9,7 +9,7 @@
 @if (_supportedCultures?.Count() > 1)
 {
     <div class="btn-group" role="group">
-        <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="oi oi-globe"></span>
         </button>
         <div class="dropdown-menu" aria-labelledby="btnCultures">
diff --git a/Oqtane.Client/Themes/Controls/Theme/Login.razor b/Oqtane.Client/Themes/Controls/Theme/Login.razor
index f572cf30..98f880fc 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Login.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Themes.Controls
 @inherits LoginBase
-@inject IStringLocalizer<Login> Localizer 
+@inject IStringLocalizer<Login> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <span class="app-login">
     <AuthorizeView Roles="@RoleNames.Registered">
@@ -11,7 +12,7 @@
             <button type="button" class="btn btn-primary" @onclick="LogoutUser">@Localizer["Logout"]</button>
         </Authorized>
         <NotAuthorized>
-            <button type="button" class="btn btn-primary" @onclick="LoginUser">@Localizer["Login"]</button>
+            <button type="button" class="btn btn-primary" @onclick="LoginUser">@SharedLocalizer["Login"]</button>
         </NotAuthorized>
     </AuthorizeView>
 </span>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
index af80d518..cc454412 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
+++ b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
@@ -16,6 +16,7 @@ namespace Oqtane.Themes.Controls
         [Inject] public IUserService UserService { get; set; }
         [Inject] public IJSRuntime jsRuntime { get; set; }
         [Inject] public IServiceProvider ServiceProvider { get; set; }
+        [Inject] public SiteState SiteState { get; set; }
 
         protected void LoginUser()
         {
@@ -35,11 +36,10 @@ namespace Oqtane.Themes.Controls
 
             if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
             {
-                // server-side Blazor
-                var interop = new Interop(jsRuntime);
-                string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-                var fields = new { __RequestVerificationToken = antiforgerytoken, returnurl = !authorizedtoviewpage ? PageState.Alias.Path : PageState.Alias.Path + "/" + PageState.Page.Path };
+                // server-side Blazor needs to post to the Logout page
+                var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, returnurl = !authorizedtoviewpage ? PageState.Alias.Path : PageState.Alias.Path + "/" + PageState.Page.Path };
                 string url = Utilities.TenantUrl(PageState.Alias, "/pages/logout/");
+                var interop = new Interop(jsRuntime);
                 await interop.SubmitForm(url, fields);
             }
             else
@@ -47,7 +47,7 @@ namespace Oqtane.Themes.Controls
                 // client-side Blazor
                 var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                 authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(!authorizedtoviewpage ? PageState.Alias.Path : PageState.Page.Path, "reload"));
+                NavigationManager.NavigateTo(NavigateUrl(!authorizedtoviewpage ? PageState.Alias.Path : PageState.Page.Path, true));
             }
         }
     }
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs b/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
index c63f0dc8..85a9b776 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuBase.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Models;
 using Oqtane.Security;
@@ -17,7 +17,14 @@ namespace Oqtane.Themes.Controls
 
         protected string GetUrl(Page page)
         {
-            return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+            if (page.IsClickable)
+            {
+                return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+            }
+            else
+            {
+                return "javascript:void(0)";
+            }
         }
 
         private IEnumerable<Page> GetMenuPages()
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor b/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
index c4c45f16..4f90ba70 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
@@ -5,7 +5,7 @@
 @if (MenuPages.Any())
 {
     <span class="app-menu-toggler">
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
     </span>
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
index 5e75738b..2bf9a284 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
@@ -10,7 +10,7 @@
             {
                 <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                         <span class="@childPage.Icon" aria-hidden="true" />
-                        @childPage.Name <span class="sr-only">(current)</span>
+                        @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                 </a>
             }
             else
@@ -32,10 +32,10 @@ else
             {
                 if (childPage.PageId == PageState.Page.PageId)
                 {
-                    <li class="nav-item active">
-                        <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <li class="nav-item">
+                        <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                             <span class="@childPage.Icon" aria-hidden="true" />
-                            @childPage.Name <span class="sr-only">(current)</span>
+                            @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                         </a>
                     </li>
                 }
@@ -54,9 +54,9 @@ else
                 if (childPage.PageId == PageState.Page.PageId)
                 {
                     <li class="nav-item dropdown active">
-                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="@childPage.Icon" aria-hidden="true" />
-                            @childPage.Name <span class="sr-only">(current)</span>
+                            @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
                     </li>
@@ -64,7 +64,7 @@ else
                 else
                 {
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
index 2f314ca0..529ae3f3 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
@@ -10,7 +10,7 @@
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                     <span class="@childPage.Icon" aria-hidden="true" />
-                    @childPage.Name <span class="sr-only">(current)</span>
+                    @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                 </a>
             </li>
         }
@@ -39,7 +39,7 @@ else
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                         <span class="@childPage.Icon" aria-hidden="true" />
-                        @childPage.Name <span class="sr-only">(current)</span>
+                        @childPage.Name <span class="visually-hidden-focusable">(current)</span>
                     </a>
                 </li>
             }
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor b/Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor
index a552ea11..8ca1f097 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor
@@ -4,7 +4,7 @@
 @if (MenuPages.Any())
 {
     <span class="app-menu-toggler">
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
     </span>
diff --git a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
index e70e3562..fca3cfd0 100644
--- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
@@ -1,6 +1,6 @@
 @namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
-@inject IStringLocalizer<UserProfile> Localizer 
+@inject IStringLocalizer<UserProfile> Localizer
 
 @inject NavigationManager NavigationManager
 
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
index abf8059a..95d23dff 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
@@ -6,11 +6,11 @@
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="title" ResourceKey="Title" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
         </td>
         <td>
-            <select id="title" class="form-control" @bind="@_title">
+            <select id="title" class="form-select" @bind="@_title">
                 <option value="true">Yes</option>
                 <option value="false">No</option>
             </select>
@@ -21,7 +21,7 @@
             <Label For="background\" ResourceKey="Background" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
         </td>
         <td>
-            <select id="background" class="form-control" @bind="@_background">
+            <select id="background" class="form-select" @bind="@_background">
                 <option value="">None</option>
                 <option value="bg-primary">Primary</option>
                 <option value="bg-secondary">Secondary</option>
@@ -39,7 +39,7 @@
             <Label For="text" ResourceKey="Text" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
         </td>
         <td>
-            <select id="text" class="form-control" @bind="@_text">
+            <select id="text" class="form-select" @bind="@_text">
                 <option value="">None</option>
                 <option value="text-primary">Primary</option>
                 <option value="text-secondary">Secondary</option>
@@ -57,7 +57,7 @@
             <Label For="border" ResourceKey="Border" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
         </td>
         <td>
-            <select id="border" class="form-control" @bind="@_border">
+            <select id="border" class="form-select" @bind="@_border">
                 <option value="">None</option>
                 <option value="border">Default</option>
                 <option value="border border-primary">Primary</option>
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index 039ecc07..9779050c 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -5,7 +5,7 @@
 <main role="main">
     <nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top">
         <Logo /><Menu Orientation="Horizontal" />
-        <div class="controls ml-md-auto">
+        <div class="controls ms-auto">
             <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
         </div>
     </nav>
@@ -111,12 +111,10 @@
     public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer";
 
     public override List<Resource> Resources => new List<Resource>()
-{
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.5.0/cyborg/bootstrap.min.css", Integrity = "sha384-GKugkVcT8wqoh3M8z1lqHbU+g6j498/ZT/zuXbepz7Dc09/otQZxTimkEMTkRWHP", CrossOrigin = "anonymous" },
+    {
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.0.2/cyborg/bootstrap.min.css", Integrity = "sha512-X2u8dAWrVfvanPTlHwLh0fXttDDhkdV79q7cOibXR7hm9R3pRMFi53OwpGMdcbUiRk97isaXCRqFbm5LX1MiYw==", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.5.1.slim.min.js", Integrity = "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js", Integrity = "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js", Integrity = "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI", CrossOrigin = "anonymous" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
     };
 
     private bool _footer = false;
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
index 05d0351b..2b5d56b6 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
@@ -6,11 +6,11 @@
 
 <table class="table table-borderless">
     <tr>
-        <td>
+        <td width="30%">
             <Label For="footer" ResourceKey="Footer" HelpText="Specify If A Footer Should Always Be Displayed In A Fixed Location At The Bottom Of The Browser Window">Display Fixed Footer?</Label>
         </td>
         <td>
-            <select id="footer" class="form-control" @bind="@_footer">
+            <select id="footer" class="form-select" @bind="@_footer">
                 <option value="true">Yes</option>
                 <option value="false">No</option>
             </select>
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index a2ca3c86..158321f9 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -64,6 +64,16 @@ namespace Oqtane.Themes
             return NavigateUrl(path, "");
         }
 
+        public string NavigateUrl(bool refresh)
+        {
+            return NavigateUrl(PageState.Page.Path, refresh);
+        }
+
+        public string NavigateUrl(string path, bool refresh)
+        {
+            return Utilities.NavigateUrl(PageState.Alias.Path, path, refresh ? "refresh" : "");
+        }
+
         public string NavigateUrl(string path, string parameters)
         {
             return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index e98995d0..0dec5413 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -42,13 +42,13 @@
                 else
                 {
                     // module does not exist with typename specified
-                    _message = Localizer["Module Does Not Have A Component Named {0}.razor", Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0)];
+                    _message = string.Format(Localizer["Error.Module.InvalidName"], Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0));
                     _messagetype = MessageType.Error;
                 }
             }
             else
             {
-                _message = Localizer["Module Type Is Invalid For {0}", ModuleState.ModuleDefinitionName];
+                _message = string.Format(Localizer["Error.Module.InvalidType"], ModuleState.ModuleDefinitionName);
                 _messagetype = MessageType.Error;
             }
 
diff --git a/Oqtane.Client/UI/Reload.cs b/Oqtane.Client/UI/Refresh.cs
similarity index 62%
rename from Oqtane.Client/UI/Reload.cs
rename to Oqtane.Client/UI/Refresh.cs
index 6fb632c6..0c0d7871 100644
--- a/Oqtane.Client/UI/Reload.cs
+++ b/Oqtane.Client/UI/Refresh.cs
@@ -1,6 +1,6 @@
-namespace Oqtane.UI
+namespace Oqtane.UI
 {
-    public enum Reload
+    public enum Refresh
     {
         None,
         Page,
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 0f5870f2..3714eeb9 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -5,8 +5,7 @@
 @inject SiteState SiteState
 @inject NavigationManager NavigationManager
 @inject INavigationInterception NavigationInterception
-@inject IAliasService AliasService
-@inject ITenantService TenantService
+@inject ISyncService SyncService
 @inject ISiteService SiteService
 @inject IPageService PageService
 @inject IUserService UserService
@@ -54,22 +53,13 @@
     {
         if (PageState == null)
         {
-            // misconfigured api calls should not be processed through the router
-            if (!_absoluteUri.Contains("~/api/"))
-            {
-                await Refresh();
-            }
-            else
-            {
-                System.Diagnostics.Debug.WriteLine(GetType().FullName + ": Error: API call to " + _absoluteUri + " is not mapped to a Controller");
-            }
+            await Refresh();
         }
     }
 
     [SuppressMessage("ReSharper", "StringIndexOfIsCultureSpecific.1")]
     private async Task Refresh()
     {
-        Alias alias = null;
         Site site;
         List<Page> pages;
         Page page;
@@ -79,7 +69,7 @@
         var action = Constants.DefaultAction;
         var urlparameters = string.Empty;
         var editmode = false;
-        var reload = Reload.None;
+        var refresh = UI.Refresh.None;
         var lastsyncdate = DateTime.UtcNow.AddHours(-1);
         var runtime = GetRuntime();
 
@@ -91,10 +81,19 @@
         // parse querystring
         var querystring = ParseQueryString(uri.Query);
 
-        // the reload parameter is used to reload the PageState
-        if (querystring.ContainsKey("reload"))
+        // the refresh parameter is used to refresh the PageState
+        if (querystring.ContainsKey("refresh"))
         {
-            reload = Reload.Site;
+            refresh = UI.Refresh.Site;
+        }
+        else
+        {
+            // reload the client application if the user navigated to a site with a different alias or there is a forced reload
+            if ((!path.StartsWith(SiteState.Alias.Path) && SiteState.Alias.Path != "") || querystring.ContainsKey("reload"))
+            {
+                NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", ""), true);
+                return;
+            }
         }
 
         if (PageState != null)
@@ -103,28 +102,27 @@
             lastsyncdate = PageState.LastSyncDate;
         }
 
-        alias = await AliasService.GetAliasAsync(path, lastsyncdate);
-        SiteState.Alias = alias; // set state for services
-        lastsyncdate = alias.SyncDate;
-
         // process any sync events
-        if (reload != Reload.Site && alias.SyncEvents.Any())
+        var sync = await SyncService.GetSyncAsync(lastsyncdate);
+        lastsyncdate = sync.SyncDate;
+        if (refresh != UI.Refresh.Site && sync.SyncEvents.Any())
         {
             // if running on WebAssembly reload the client application if the server application was restarted
-            if (runtime == Shared.Runtime.WebAssembly && PageState != null && alias.SyncEvents.Exists(item => item.TenantId == -1))
+            if (runtime == Shared.Runtime.WebAssembly && PageState != null && sync.SyncEvents.Exists(item => item.TenantId == -1))
             {
-                NavigationManager.NavigateTo(_absoluteUri + (!_absoluteUri.Contains("?") ? "?" : "&") + "reload", true);
+                NavigationManager.NavigateTo(_absoluteUri, true);
+                return;
             }
-            if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == alias.SiteId))
+            if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId))
             {
-                reload = Reload.Site;
+                refresh = UI.Refresh.Site;
             }
         }
 
-        if (reload == Reload.Site || PageState == null || alias.SiteId != PageState.Alias.SiteId)
+        if (refresh == UI.Refresh.Site || PageState == null || PageState.Alias.SiteId != SiteState.Alias.SiteId)
         {
-            site = await SiteService.GetSiteAsync(alias.SiteId);
-            reload = Reload.Site;
+            site = await SiteService.GetSiteAsync(SiteState.Alias.SiteId);
+            refresh = UI.Refresh.Site;
         }
         else
         {
@@ -133,7 +131,7 @@
 
         if (site != null)
         {
-            if (PageState == null || reload == Reload.Site)
+            if (PageState == null || refresh == UI.Refresh.Site)
             {
                 // get user
                 var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
@@ -148,15 +146,15 @@
             }
 
             // process any sync events for user
-            if (reload != Reload.Site && user != null && alias.SyncEvents.Any())
+            if (refresh != UI.Refresh.Site && user != null && sync.SyncEvents.Any())
             {
-                if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
+                if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
                 {
-                    reload = Reload.Site;
+                    refresh = UI.Refresh.Site;
                 }
             }
 
-            if (PageState == null || reload == Reload.Site)
+            if (PageState == null || refresh == UI.Refresh.Site)
             {
                 pages = await PageService.GetPagesAsync(site.SiteId);
             }
@@ -166,16 +164,11 @@
             }
 
             // format path and remove alias
-            path = path.Replace("//", "/");
-
-            if (!path.EndsWith("/"))
+            path = path.Replace("//", "/"); // in case of doubleslash at end
+            path += (!path.EndsWith("/")) ? "/" : "";
+            if (SiteState.Alias.Path != "" && path.StartsWith(SiteState.Alias.Path))
             {
-                path += "/";
-            }
-
-            if (alias.Path != "")
-            {
-                path = path.Substring(alias.Path.Length + 1);
+                path = path.Substring(SiteState.Alias.Path.Length + 1);
             }
 
             // extract admin route elements from path
@@ -233,7 +226,7 @@
             // remove trailing slash so it can be used as a key for Pages
             if (path.EndsWith("/")) path = path.Substring(0, path.Length - 1);
 
-            if (PageState == null || reload == Reload.Site)
+            if (PageState == null || refresh == UI.Refresh.Site)
             {
                 page = pages.FirstOrDefault(item => item.Path.Equals(path, StringComparison.OrdinalIgnoreCase));
             }
@@ -268,7 +261,7 @@
                 {
                     page = await ProcessPage(page, site, user);
 
-                    if (PageState == null || reload == Reload.Site)
+                    if (PageState == null || refresh == UI.Refresh.Site)
                     {
                         modules = await ModuleService.GetModulesAsync(site.SiteId);
                     }
@@ -281,7 +274,7 @@
 
                     _pagestate = new PageState
                     {
-                        Alias = alias,
+                        Alias = SiteState.Alias,
                         Site = site,
                         Pages = pages,
                         Page = page,
@@ -305,7 +298,7 @@
                 if (user == null)
                 {
                     // redirect to login page
-                    NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "?returnurl=" + path));
+                    NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + path));
                 }
                 else
                 {
@@ -313,7 +306,7 @@
                     if (path != "")
                     {
                         // redirect to home page
-                        NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "", ""));
+                        NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "", ""));
                     }
                 }
             }
diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor
index cbf43e76..45403934 100644
--- a/Oqtane.Client/_Imports.razor
+++ b/Oqtane.Client/_Imports.razor
@@ -10,6 +10,7 @@
 @using Microsoft.Extensions.Localization
 @using Microsoft.JSInterop
 
+@using Oqtane.Client
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls
@@ -22,3 +23,4 @@
 @using Oqtane.UI
 @using Oqtane.Enums
 @using Oqtane.Installer
+@using Oqtane.Interfaces 
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index 147824fc..8d9f32ed 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
index a458a1e1..67aa29b5 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index 4cb9c81b..b2694514 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
index 4547b5e5..117f196c 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index 03c8adb5..ba7ec99a 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
index 2a7dce13..fec7a5d7 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index b63dcca7..0957517d 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
index d37e8c72..c16e2246 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Databases.sln b/Oqtane.Databases.sln
index 379afe97..67deb124 100644
--- a/Oqtane.Databases.sln
+++ b/Oqtane.Databases.sln
@@ -18,6 +18,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.Sqlite", "O
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Database.SqlServer", "Oqtane.Database.SqlServer\Oqtane.Database.SqlServer.csproj", "{033DCA37-6354-4A3D-8250-4EC20740EE19}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "Oqtane.Server\Oqtane.Server.csproj", "{6A60C4DD-67E6-42A7-B9AA-A1EE45AD45C7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,6 +42,10 @@ Global
 		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{033DCA37-6354-4A3D-8250-4EC20740EE19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A60C4DD-67E6-42A7-B9AA-A1EE45AD45C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A60C4DD-67E6-42A7-B9AA-A1EE45AD45C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A60C4DD-67E6-42A7-B9AA-A1EE45AD45C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A60C4DD-67E6-42A7-B9AA-A1EE45AD45C7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
index c3b79199..9f5f8cd4 100644
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index 109d5613..fa021193 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -11,8 +11,8 @@
     <copyright>.NET Foundation</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v2.0.2/Oqtane.Framework.2.0.2.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v2.2.0/Oqtane.Framework.2.2.0.Upgrade.zip</projectUrl>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
index 7eff67be..e4c1ad7d 100644
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
index d310b91a..fa69642a 100644
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec
index fcd54d86..3b57f6d5 100644
--- a/Oqtane.Package/Oqtane.Updater.nuspec
+++ b/Oqtane.Package/Oqtane.Updater.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1
index 6ddc3fde..71010206 100644
--- a/Oqtane.Package/install.ps1
+++ b/Oqtane.Package/install.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "Oqtane.Framework.2.1.0.Install.zip" -Force 
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "Oqtane.Framework.2.2.0.Install.zip" -Force 
\ No newline at end of file
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index bd1b9784..226b949e 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -1,5 +1,7 @@
 del "*.nupkg"
+del "*.zip"
 dotnet clean -c Release ..\Oqtane.sln 
+dotnet build -c Release ..\Oqtane.Databases.sln
 dotnet build -c Release ..\Oqtane.sln
 copy /Y/B/V "..\Oqtane.Server\bin\Release\net5.0\System.Drawing.Common.dll" "..\Oqtane.Server\bin\Release\net5.0\publish\System.Drawing.Common.dll"
 nuget.exe pack Oqtane.Client.nuspec
diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1
index 429ad4da..756d96ed 100644
--- a/Oqtane.Package/upgrade.ps1
+++ b/Oqtane.Package/upgrade.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "Oqtane.Framework.2.1.0.Upgrade.zip" -Force 
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "Oqtane.Framework.2.2.0.Upgrade.zip" -Force 
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs
index 9edea4dd..644fa278 100644
--- a/Oqtane.Server/Controllers/AliasController.cs
+++ b/Oqtane.Server/Controllers/AliasController.cs
@@ -3,14 +3,13 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using Oqtane.Models;
 using Oqtane.Shared;
-using System.Linq;
-using System;
 using System.Net;
-using System.Globalization;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Microsoft.AspNetCore.Http;
+using Oqtane.Themes.Controls;
+using System.Linq;
 
 namespace Oqtane.Controllers
 {
@@ -18,16 +17,14 @@ namespace Oqtane.Controllers
     public class AliasController : Controller
     {
         private readonly IAliasRepository _aliases;
-        private readonly IHttpContextAccessor _accessor;
-        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public AliasController(IAliasRepository aliases, IHttpContextAccessor accessor, ISyncManager syncManager, ILogManager logger)
+        public AliasController(IAliasRepository aliases, ILogManager logger, ITenantManager tenantManager)
         {
             _aliases = aliases;
-            _accessor = accessor;
-            _syncManager = syncManager;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>
@@ -35,42 +32,25 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public IEnumerable<Alias> Get()
         {
-            return _aliases.GetAliases();
+            var aliases = _aliases.GetAliases();
+            if (!User.IsInRole(RoleNames.Host))
+            {
+                aliases = aliases.Where(item => item.SiteId == _alias.SiteId && item.TenantId == _alias.TenantId);
+            }
+            return aliases;
         }
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public Alias Get(int id)
         {
             return _aliases.GetAlias(id);
         }
-
-        // GET api/<controller>/name/?path=xxx&sync=yyyyMMddHHmmssfff
-        [HttpGet("name")]
-        public Alias Get(string path, string sync)
-        {
-            Alias alias = null;
-
-            if (_accessor.HttpContext != null)
-            {
-                path = _accessor.HttpContext.Request.Host.Value + "/" + WebUtility.UrlDecode(path);
-                alias = _aliases.GetAlias(path);
-            }
-
-            // get sync events
-            if (alias != null)
-            {
-                alias.SyncDate = DateTime.UtcNow;
-                alias.SyncEvents = _syncManager.GetSyncEvents(alias.TenantId, DateTime.ParseExact(sync, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
-            }
-
-            return alias;
-        }
         
         // POST api/<controller>
         [HttpPost]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public Alias Post([FromBody] Alias alias)
         {
             if (ModelState.IsValid)
@@ -78,29 +58,50 @@ namespace Oqtane.Controllers
                 alias = _aliases.AddAlias(alias);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Alias Added {Alias}", alias);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Alias Post Attempt {Alias}", alias);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                alias = null;
+            }
             return alias;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public Alias Put(int id, [FromBody] Alias alias)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && _aliases.GetAlias(alias.AliasId, false) != null)
             {
                 alias = _aliases.UpdateAlias(alias);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Alias Updated {Alias}", alias);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Alias Put Attempt {Alias}", alias);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                alias = null;
+            }
             return alias;
         }
 
         // DELETE api/<controller>/5
         [HttpDelete("{id}")]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public void Delete(int id)
         {
-            _aliases.DeleteAlias(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
+            var alias = _aliases.GetAlias(id);
+            if (alias != null)
+            {
+                _aliases.DeleteAlias(id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Alias Delete Attempt {AliasId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/DatabaseController.cs b/Oqtane.Server/Controllers/DatabaseController.cs
index d3993505..95f34824 100644
--- a/Oqtane.Server/Controllers/DatabaseController.cs
+++ b/Oqtane.Server/Controllers/DatabaseController.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
+using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Shared;
 
@@ -10,17 +11,25 @@ namespace Oqtane.Controllers
     public class DatabaseController : Controller
     {
         private IOptions<List<Database>> _databaseOptions;
+        private IConfigManager _config;
 
-        public DatabaseController(IOptions<List<Database>> databaseOptions)
+        public DatabaseController(IOptions<List<Database>> databaseOptions, IConfigManager config)
         {
             _databaseOptions = databaseOptions;
+            _config = config;
         }
 
         // GET: api/<controller>
         [HttpGet]
-        public IEnumerable<Models.Database> Get()
+        public IEnumerable<Database> Get()
         {
-            return _databaseOptions.Value;
+            var databases = _databaseOptions.Value;
+            var master = _config.GetSetting(SettingKeys.DatabaseSection, SettingKeys.DatabaseTypeKey, "");
+            if (master != "" && databases.Exists(item => item.DBType == master))
+            {
+                databases.Find(item => item.DBType == master).IsDefault = true;
+            }
+            return databases;
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index d687c657..dc6e04a3 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -30,14 +30,16 @@ namespace Oqtane.Controllers
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public FileController(IWebHostEnvironment environment, IFileRepository files, IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger)
+        public FileController(IWebHostEnvironment environment, IFileRepository files, IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
         {
             _environment = environment;
             _files = files;
             _folders = folders;
             _userPermissions = userPermissions;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?folder=x
@@ -48,11 +50,17 @@ namespace Oqtane.Controllers
             int folderid;
             if (int.TryParse(folder, out folderid))
             {
-                Folder f = _folders.GetFolder(folderid);
-                if (f != null && _userPermissions.IsAuthorized(User, PermissionNames.Browse, f.Permissions))
+                Folder Folder = _folders.GetFolder(folderid);
+                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, Folder.Permissions))
                 {
                     files = _files.GetFiles(folderid).ToList();
                 }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {FolderId}", folder);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    files = null;
+                }
             }
             else
             {
@@ -67,6 +75,12 @@ namespace Oqtane.Controllers
                         }
                     }
                 }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {Folder}", folder);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    files = null;
+                }
             }
 
             return files;
@@ -76,27 +90,18 @@ namespace Oqtane.Controllers
         [HttpGet("{siteId}/{path}")]
         public IEnumerable<Models.File> Get(int siteId, string path)
         {
-            var folderPath = WebUtility.UrlDecode(path);
-            Folder folder = _folders.GetFolder(siteId, folderPath);
             List<Models.File> files;
-            if (folder != null)
+
+            Folder folder = _folders.GetFolder(siteId, WebUtility.UrlDecode(path));
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
             {
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
-                {
-                    files = _files.GetFiles(folder.FolderId).ToList();
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {folder}", folder);
-                    HttpContext.Response.StatusCode = 401;
-                    return null;
-                }
+                files = _files.GetFiles(folder.FolderId).ToList();
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "Folder Not Found {SiteId} {Path}", siteId, path);
-                HttpContext.Response.StatusCode = 404;
-                return null;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {SiteId} {Path}", siteId, path);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                files = null;
             }
 
             return files;
@@ -107,23 +112,14 @@ namespace Oqtane.Controllers
         public Models.File Get(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (file != null)
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
             {
-                if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
-                {
-                    return file;
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {File}", file);
-                    HttpContext.Response.StatusCode = 401;
-                    return null;
-                }
+                return file;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Not Found {FileId}", id);
-                HttpContext.Response.StatusCode = 404;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {FileId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -133,19 +129,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Models.File Put(int id, [FromBody] Models.File file)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit))
+            var File = _files.GetFile(file.FileId, false);
+            if (ModelState.IsValid && File != null && File.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit))
             {
-                file.Folder = _folders.GetFolder(file.FolderId);
-                Models.File _file = _files.GetFile(id, false);
-                if (_file.Name != file.Name || _file.FolderId != file.FolderId)
+                if (File.Name != file.Name || File.FolderId != file.FolderId)
                 {
                     string folderpath = _folders.GetFolderPath(file.Folder);
                     if (!Directory.Exists(folderpath))
                     {
                         Directory.CreateDirectory(folderpath);
                     }
-
-                    System.IO.File.Move(_files.GetFilePath(_file), Path.Combine(folderpath, file.Name));
+                    System.IO.File.Move(_files.GetFilePath(File), Path.Combine(folderpath, file.Name));
                 }
 
                 file.Extension = Path.GetExtension(file.Name).ToLower().Replace(".", "");
@@ -154,8 +148,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update File {File}", file);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Put Attempt {File}", file);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 file = null;
             }
 
@@ -168,30 +162,22 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (file != null)
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
             {
-                if (_userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
-                {
-                    _files.DeleteFile(id);
+                _files.DeleteFile(id);
 
-                    string filepath = _files.GetFilePath(file);
-                    if (System.IO.File.Exists(filepath))
-                    {
-                        System.IO.File.Delete(filepath);
-                    }
-
-                    _logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
-                }
-                else
+                string filepath = _files.GetFilePath(file);
+                if (System.IO.File.Exists(filepath))
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete File {FileId}", id);
-                    HttpContext.Response.StatusCode = 401;
+                    System.IO.File.Delete(filepath);
                 }
+
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "File Not Found {FileId}", id);
-                HttpContext.Response.StatusCode = 404;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Delete Attempt {FileId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
@@ -200,55 +186,57 @@ namespace Oqtane.Controllers
         public Models.File UploadFile(string url, string folderid)
         {
             Models.File file = null;
-            Folder folder = _folders.GetFolder(int.Parse(folderid));
 
-            if (folder == null || !_userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.Permissions))
+            Folder folder = null;
+            int FolderId;
+            if (int.TryParse(folderid, out FolderId))
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create,
-                    "User Not Authorized To Download File {Url} {FolderId}", url, folderid);
-                HttpContext.Response.StatusCode = 401;
-                return file;
+                folder = _folders.GetFolder(FolderId);
             }
 
-            string folderPath = _folders.GetFolderPath(folder);
-            CreateDirectory(folderPath);
-
-            string filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1);
-            // check for allowable file extensions
-            if (!Constants.UploadableFiles.Split(',')
-                .Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
+            if (folder != null  && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.Permissions))
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create,
-                    "File Could Not Be Downloaded From Url Due To Its File Extension {Url}", url);
-                HttpContext.Response.StatusCode = (int) HttpStatusCode.Conflict;
-                return file;
-            }
+                string folderPath = _folders.GetFolderPath(folder);
+                CreateDirectory(folderPath);
 
-            if (!filename.IsPathOrFileValid())
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create,
-                    $"File Could Not Be Downloaded From Url Due To Its File Name Not Allowed {url}");
-                HttpContext.Response.StatusCode = (int) HttpStatusCode.Conflict;
-                return file;
-            }
-
-            try
-            {
-                var client = new WebClient();
-                string targetPath = Path.Combine(folderPath, filename);
-                // remove file if it already exists
-                if (System.IO.File.Exists(targetPath))
+                string filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1);
+                // check for allowable file extensions
+                if (!Constants.UploadableFiles.Split(',').Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
                 {
-                    System.IO.File.Delete(targetPath);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url Due To Its File Extension {Url}", url);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Conflict;
+                    return file;
                 }
 
-                client.DownloadFile(url, targetPath);
-                file = _files.AddFile(CreateFile(filename, folder.FolderId, targetPath));
+                if (!filename.IsPathOrFileValid())
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, $"File Could Not Be Downloaded From Url Due To Its File Name Not Allowed {url}");
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Conflict;
+                    return file;
+                }
+
+                try
+                {
+                    var client = new WebClient();
+                    string targetPath = Path.Combine(folderPath, filename);
+                    // remove file if it already exists
+                    if (System.IO.File.Exists(targetPath))
+                    {
+                        System.IO.File.Delete(targetPath);
+                    }
+
+                    client.DownloadFile(url, targetPath);
+                    file = _files.AddFile(CreateFile(filename, folder.FolderId, targetPath));
+                }
+                catch
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url {Url}", url);
+                }
             }
-            catch
+            else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create,
-                    "File Could Not Be Downloaded From Url {Url}", url);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Upload Attempt {FolderId} {Url}", folderid, url);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
 
             return file;
@@ -271,25 +259,25 @@ namespace Oqtane.Controllers
 
             string folderPath = "";
 
-            if (int.TryParse(folder, out int folderId))
+            int FolderId;
+            if (int.TryParse(folder, out FolderId))
             {
-                Folder virtualFolder = _folders.GetFolder(folderId);
-                if (virtualFolder != null &&
-                    _userPermissions.IsAuthorized(User, PermissionNames.Edit, virtualFolder.Permissions))
+                Folder Folder = _folders.GetFolder(FolderId);
+                if (Folder != null && Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, Folder.Permissions))
                 {
-                    folderPath = _folders.GetFolderPath(virtualFolder);
+                    folderPath = _folders.GetFolderPath(Folder);
                 }
             }
             else
             {
+                FolderId = -1;
                 if (User.IsInRole(RoleNames.Host))
                 {
                     folderPath = GetFolderPath(folder);
-                    folderId = -1;
                 }
             }
 
-            if (!String.IsNullOrEmpty(folderPath))
+            if (!string.IsNullOrEmpty(folderPath))
             {
                 CreateDirectory(folderPath);
                 using (var stream = new FileStream(Path.Combine(folderPath, file.FileName), FileMode.Create))
@@ -298,16 +286,15 @@ namespace Oqtane.Controllers
                 }
 
                 string upload = await MergeFile(folderPath, file.FileName);
-                if (upload != "" && folderId != -1)
+                if (upload != "" && FolderId != -1)
                 {
-                    _files.AddFile(CreateFile(upload, folderId, Path.Combine(folderPath, upload)));
+                    _files.AddFile(CreateFile(upload, FolderId, Path.Combine(folderPath, upload)));
                 }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create,
-                    "User Not Authorized To Upload File {Folder} {File}", folder, file);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Upload Attempt {Folder} {File}", folder, file);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
@@ -466,32 +453,26 @@ namespace Oqtane.Controllers
         private IActionResult Download(int id, bool asAttachment)
         {
             var file = _files.GetFile(id);
-            if (file != null)
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
             {
-                if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+                var filepath = _files.GetFilePath(file);
+                if (System.IO.File.Exists(filepath))
                 {
-                    var filepath = _files.GetFilePath(file);
-                    if (System.IO.File.Exists(filepath))
-                    {
-                        var result = asAttachment
-                            ? PhysicalFile(filepath, file.GetMimeType(), file.Name)
-                            : PhysicalFile(filepath, file.GetMimeType());
-                        return result;
-                    }
-
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {FileId} {FilePath}", id, filepath);
-                    HttpContext.Response.StatusCode = 404;
+                    var result = asAttachment
+                        ? PhysicalFile(filepath, file.GetMimeType(), file.Name)
+                        : PhysicalFile(filepath, file.GetMimeType());
+                    return result;
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
-                    HttpContext.Response.StatusCode = 401;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {FileId} {FilePath}", id, filepath);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
                 }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Not Found {FileId}", id);
-                HttpContext.Response.StatusCode = 404;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Access Attempt {FileId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
 
             string errorPath = Path.Combine(GetFolderPath("images"), "error.png");
diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs
index 9093631f..8ae32116 100644
--- a/Oqtane.Server/Controllers/FolderController.cs
+++ b/Oqtane.Server/Controllers/FolderController.cs
@@ -21,16 +21,16 @@ namespace Oqtane.Controllers
         private readonly IWebHostEnvironment _environment;
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
-        private readonly ITenantManager _tenantManager;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public FolderController(IWebHostEnvironment environment, IFolderRepository folders, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger)
+        public FolderController(IWebHostEnvironment environment, IFolderRepository folders, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
         {
             _environment = environment;
             _folders = folders;
             _userPermissions = userPermissions;
-            _tenantManager = tenantManager;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?siteid=x
@@ -38,13 +38,23 @@ namespace Oqtane.Controllers
         public IEnumerable<Folder> Get(string siteid)
         {
             List<Folder> folders = new List<Folder>();
-            foreach (Folder folder in _folders.GetFolders(int.Parse(siteid)))
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+                foreach (Folder folder in _folders.GetFolders(SiteId))
                 {
-                    folders.Add(folder);
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+                    {
+                        folders.Add(folder);
+                    }
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                folders = null;
+            }
             return folders;
         }
 
@@ -53,14 +63,14 @@ namespace Oqtane.Controllers
         public Folder Get(int id)
         {
             Folder folder = _folders.GetFolder(id);
-            if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
             {
                 return folder;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {Folder}", folder);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {FolderId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -74,23 +84,14 @@ namespace Oqtane.Controllers
                 folderPath = Utilities.PathCombine(folderPath, System.IO.Path.DirectorySeparatorChar.ToString());
             }
             Folder folder = _folders.GetFolder(siteId, folderPath);
-            if (folder != null)
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
-                {
-                    return folder;
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {Folder}",
-                        folder);
-                    HttpContext.Response.StatusCode = 401;
-                    return null;
-                }
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.Permissions))
+            {
+                return folder;
+            }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "Folder not found {path}",
-                    path);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {Path} For Site {SiteId}", path, siteId);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -100,7 +101,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Folder Post([FromBody] Folder folder)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && folder.SiteId == _alias.SiteId)
             {
                 string permissions;
                 if (folder.ParentId != null)
@@ -129,17 +130,23 @@ namespace Oqtane.Controllers
                     else
                     {
                         _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Name Not Valid {Folder}", folder);
-                        HttpContext.Response.StatusCode = 401;
+                        HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                         folder = null;
                     }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Folder {Folder}", folder);
-                    HttpContext.Response.StatusCode = 401;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Post Attempt {Folder}", folder);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                     folder = null;
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Post Attempt {Folder}", folder);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                folder = null;
+            }
             return folder;
         }
 
@@ -148,7 +155,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Folder Put(int id, [FromBody] Folder folder)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
+            if (ModelState.IsValid && folder.SiteId == _alias.SiteId && _folders.GetFolder(folder.FolderId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
             {
                 if (folder.IsPathValid())
                 {
@@ -171,14 +178,14 @@ namespace Oqtane.Controllers
                 else
                 {
                     _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Name Not Valid {Folder}", folder);
-                    HttpContext.Response.StatusCode = 401;
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                     folder = null;
                 }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder {Folder}", folder);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Put Attempt  {Folder}", folder);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 folder = null;
             }
             return folder;
@@ -189,7 +196,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int siteid, int folderid, int? parentid)
         {
-            if (_userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit))
+            if (siteid == _alias.SiteId && _folders.GetFolder(folderid, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<Folder> folders = _folders.GetFolders(siteid).ToList();
@@ -206,8 +213,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder Order {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "Unauthorized Folder Put Attempt {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
@@ -216,26 +223,26 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Delete(int id)
         {
-            if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))
+            var folder = _folders.GetFolder(id, false);
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))
             {
-                Models.Folder _folder = _folders.GetFolder(id, false);
-                if (Directory.Exists(GetFolderPath(_folder)))
+                if (Directory.Exists(GetFolderPath(folder)))
                 {
-                    Directory.Delete(GetFolderPath(_folder));
+                    Directory.Delete(GetFolderPath(folder));
                 }
                 _folders.DeleteFolder(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Folder {FolderId}", id);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Delete Attempt {FolderId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
         private string GetFolderPath(Folder folder)
         {
-            return Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", _tenantManager.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path);
+            return Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", _alias.TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path);
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index dc23374f..ccf181b8 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -5,43 +5,60 @@ using System.Linq;
 using System.IO.Compression;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Shared;
 using Oqtane.Themes;
 using Microsoft.Extensions.Caching.Memory;
+using System.Net;
+using Oqtane.Repository;
+using Microsoft.AspNetCore.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Oqtane.Controllers
 {
     [Route(ControllerRoutes.ApiRoute)]
     public class InstallationController : Controller
     {
-        private readonly IConfigurationRoot _config;
+        private readonly IConfigManager _configManager;
         private readonly IInstallationManager _installationManager;
         private readonly IDatabaseManager _databaseManager;
         private readonly ILocalizationManager _localizationManager;
         private readonly IMemoryCache _cache;
+        private readonly IHttpContextAccessor _accessor;
+        private readonly IAliasRepository _aliases;
+        private readonly ILogger<InstallationController> _filelogger;
 
-        public InstallationController(IConfigurationRoot config, IInstallationManager installationManager, IDatabaseManager databaseManager, ILocalizationManager localizationManager, IMemoryCache cache)
+        public InstallationController(IConfigManager configManager, IInstallationManager installationManager, IDatabaseManager databaseManager, ILocalizationManager localizationManager, IMemoryCache cache, IHttpContextAccessor accessor, IAliasRepository aliases, ILogger<InstallationController> filelogger)
         {
-            _config = config;
+            _configManager = configManager;
             _installationManager = installationManager;
             _databaseManager = databaseManager;
             _localizationManager = localizationManager;
             _cache = cache;
+            _accessor = accessor;
+            _aliases = aliases;
+            _filelogger = filelogger;
         }
 
         // POST api/<controller>
         [HttpPost]
-        public Installation Post([FromBody] InstallConfig config)
+        public async Task<Installation> Post([FromBody] InstallConfig config)
         {
             var installation = new Installation {Success = false, Message = ""};
 
-            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
+            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || string.IsNullOrEmpty(_configManager.GetSetting("ConnectionStrings:" + SettingKeys.ConnectionStringKey, ""))))
             {
                 installation = _databaseManager.Install(config);
+
+                if (installation.Success && config.Register)
+                {
+                    await RegisterContact(config.HostEmail);
+                }
             }
             else
             {
@@ -51,11 +68,17 @@ namespace Oqtane.Controllers
             return installation;
         }
 
-        // GET api/<controller>/installed
+        // GET api/<controller>/installed/?path=xxx
         [HttpGet("installed")]
-        public Installation IsInstalled()
+        public Installation IsInstalled(string path)
         {
-            return _databaseManager.IsInstalled();
+            var installation = _databaseManager.IsInstalled();
+            if (installation.Success)
+            {
+                path = _accessor.HttpContext.Request.Host.Value + "/" + WebUtility.UrlDecode(path);
+                installation.Alias = _aliases.GetAlias(path);
+            }
+            return installation;
         }
 
         [HttpGet("upgrade")]
@@ -79,13 +102,13 @@ namespace Oqtane.Controllers
         [HttpGet("load")]
         public IActionResult Load()
         {
-            if (_config.GetSection("Runtime").Value == "WebAssembly")
+            if (_configManager.GetSection("Runtime").Value == "WebAssembly")
             {
-                return File(GetAssemblies(), System.Net.Mime.MediaTypeNames.Application.Octet, "oqtane.zip");
+                return File(GetAssemblies(), System.Net.Mime.MediaTypeNames.Application.Octet, "oqtane.dll");
             }
             else
             {
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -117,7 +140,7 @@ namespace Oqtane.Controllers
                     }
                     else
                     {
-                        Console.WriteLine($"The satellite assemblies folder named '{culture}' is not found.");
+                        _filelogger.LogError(Utilities.LogMessage(this, $"The Satellite Assembly Folder For {culture} Does Not Exist"));
                     }
                 }
 
@@ -135,7 +158,7 @@ namespace Oqtane.Controllers
                             }
                             else
                             {
-                                Console.WriteLine("Module " + instance.ModuleDefinition.ModuleDefinitionName + " dependency " + name + ".dll does not exist");
+                                _filelogger.LogError(Utilities.LogMessage(this, $"Module {instance.ModuleDefinition.ModuleDefinitionName} Dependency {name}.dll Does Not Exist"));
                             }
                         }
                     }
@@ -150,7 +173,7 @@ namespace Oqtane.Controllers
                             }
                             else
                             {
-                                Console.WriteLine("Theme " + instance.Theme.ThemeName + " dependency " + name + ".dll does not exist" );
+                                _filelogger.LogError(Utilities.LogMessage(this, $"Theme {instance.Theme.ThemeName} Dependency {name}.dll Does Not Exist"));
                             }
                         }
                     }
@@ -185,5 +208,31 @@ namespace Oqtane.Controllers
                 }
             });
         }
+
+        private async Task RegisterContact(string email)
+        {
+            try
+            {
+                using (var client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
+                    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
+                    Uri uri = new Uri(Constants.PackageRegistryUrl + $"/api/registry/contact/?id={_configManager.GetInstallationId()}&email={WebUtility.UrlEncode(email)}");
+                    var response = await client.GetAsync(uri).ConfigureAwait(false);
+                }
+            }
+            catch
+            {
+                // error calling registry service
+            }
+        }
+
+        // GET api/<controller>/register?email=x
+        [HttpPost("register")]
+        [Authorize(Roles = RoleNames.Host)]
+        public async Task Register(string email)
+        {
+            await RegisterContact(email);
+        }
     }
 }
diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs
index db4f4bfb..356fd75f 100644
--- a/Oqtane.Server/Controllers/JobController.cs
+++ b/Oqtane.Server/Controllers/JobController.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -52,6 +53,12 @@ namespace Oqtane.Controllers
                 job = _jobs.AddJob(job);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Added {Job}", job);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Post Attempt {Alias}", job);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                job = null;
+            }
             return job;
         }
 
@@ -60,11 +67,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Host)]
         public Job Put(int id, [FromBody] Job job)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && _jobs.GetJob(job.JobId, false) != null)
             {
                 job = _jobs.UpdateJob(job);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Updated {Job}", job);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Put Attempt {Alias}", job);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                job = null;
+            }
             return job;
         }
 
@@ -73,8 +86,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Host)]
         public void Delete(int id)
         {
-            _jobs.DeleteJob(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Deleted {JobId}", id);
+            var job = _jobs.GetJob(id);
+            if (job != null)
+            {
+                _jobs.DeleteJob(id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Deleted {JobId}", id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Delete Attempt {JobId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         // GET api/<controller>/start
@@ -83,12 +105,17 @@ namespace Oqtane.Controllers
         public void Start(int id)
         {
             Job job = _jobs.GetJob(id);
-            Type jobtype = Type.GetType(job.JobType);
-            if (jobtype != null)
+            if (job != null)
             {
+                Type jobtype = Type.GetType(job.JobType);
                 var jobobject = ActivatorUtilities.CreateInstance(_serviceProvider, jobtype);
                 ((IHostedService)jobobject).StartAsync(new System.Threading.CancellationToken());
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Start Attempt {JobId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         // GET api/<controller>/stop
@@ -97,12 +124,17 @@ namespace Oqtane.Controllers
         public void Stop(int id)
         {
             Job job = _jobs.GetJob(id);
-            Type jobtype = Type.GetType(job.JobType);
-            if (jobtype != null)
+            if (job != null)
             {
+                Type jobtype = Type.GetType(job.JobType);
                 var jobobject = ActivatorUtilities.CreateInstance(_serviceProvider, jobtype);
                 ((IHostedService)jobobject).StopAsync(new System.Threading.CancellationToken());
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Stop Attempt {JobId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs
index 39fd8ac9..5f711e4f 100644
--- a/Oqtane.Server/Controllers/JobLogController.cs
+++ b/Oqtane.Server/Controllers/JobLogController.cs
@@ -1,10 +1,8 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers
@@ -13,12 +11,10 @@ namespace Oqtane.Controllers
     public class JobLogController : Controller
     {
         private readonly IJobLogRepository _jobLogs;
-        private readonly ILogManager _logger;
 
-        public JobLogController(IJobLogRepository jobLogs, ILogManager logger)
+        public JobLogController(IJobLogRepository jobLogs)
         {
             _jobLogs = jobLogs;
-            _logger = logger;
         }
 
         // GET: api/<controller>
@@ -36,40 +32,5 @@ namespace Oqtane.Controllers
         {
             return _jobLogs.GetJobLog(id);
         }
-
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Roles = RoleNames.Host)]
-        public JobLog Post([FromBody] JobLog jobLog)
-        {
-            if (ModelState.IsValid)
-            {
-                jobLog = _jobLogs.AddJobLog(jobLog);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Log Added {JobLog}", jobLog);
-            }
-            return jobLog;
-        }
-
-        // PUT api/<controller>/5
-        [HttpPut("{id}")]
-        [Authorize(Roles = RoleNames.Host)]
-        public JobLog Put(int id, [FromBody] JobLog jobLog)
-        {
-            if (ModelState.IsValid)
-            {
-                jobLog = _jobLogs.UpdateJobLog(jobLog);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Log Updated {JobLog}", jobLog);
-            }
-            return jobLog;
-        }
-
-        // DELETE api/<controller>/5
-        [HttpDelete("{id}")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void Delete(int id)
-        {
-            _jobLogs.DeleteJobLog(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Job Log Deleted {JobLogId}", id);
-        }
     }
 }
diff --git a/Oqtane.Server/Controllers/LanguageController.cs b/Oqtane.Server/Controllers/LanguageController.cs
index b55f4bff..cbe67896 100644
--- a/Oqtane.Server/Controllers/LanguageController.cs
+++ b/Oqtane.Server/Controllers/LanguageController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Net;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Enums;
@@ -14,28 +15,62 @@ namespace Oqtane.Controllers
     {
         private readonly ILanguageRepository _languages;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public LanguageController(ILanguageRepository language, ILogManager logger)
+        public LanguageController(ILanguageRepository language, ILogManager logger, ITenantManager tenantManager)
         {
             _languages = language;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         [HttpGet]
-        public IEnumerable<Language> Get(string siteid) => _languages.GetLanguages(int.Parse(siteid));
+        public IEnumerable<Language> Get(string siteid)
+        {
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            {
+                return _languages.GetLanguages(SiteId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
 
         [HttpGet("{id}")]
-        public Language Get(int id) => _languages.GetLanguage(id);
+        public Language Get(int id)
+        {
+            var language = _languages.GetLanguage(id);
+            if (language != null && language.SiteId == _alias.SiteId)
+            {
+                return language;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Get Attempt {LanguageId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
 
         [HttpPost]
         [Authorize(Roles = RoleNames.Admin)]
         public Language Post([FromBody] Language language)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && language.SiteId == _alias.SiteId)
             {
                 language = _languages.AddLanguage(language);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Language Added {Language}", language);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Post Attempt {Language}", language);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                language = null;
+            }
             return language;
         }
 
@@ -43,8 +78,18 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public void Delete(int id)
         {
-            _languages.DeleteLanguage(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Language Deleted {LanguageId}", id);
+            var language = _languages.GetLanguage(id);
+            if (language != null && language.SiteId == _alias.SiteId)
+            {
+                _languages.DeleteLanguage(id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Language Deleted {LanguageId}", id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Delete Attempt {LanguageId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
+
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs
index 244a2a60..34fc5b7c 100644
--- a/Oqtane.Server/Controllers/LogController.cs
+++ b/Oqtane.Server/Controllers/LogController.cs
@@ -5,6 +5,8 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Shared;
+using Oqtane.Enums;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -14,11 +16,13 @@ namespace Oqtane.Controllers
     {
         private readonly ILogManager _logger;
         private readonly ILogRepository _logs;
+        private readonly Alias _alias;
 
-        public LogController(ILogManager logger, ILogRepository logs)
+        public LogController(ILogManager logger, ILogRepository logs, ITenantManager tenantManager)
         {
             _logger = logger;
             _logs = logs;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?siteid=x&level=y&function=z&rows=50
@@ -26,7 +30,18 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public IEnumerable<Log> Get(string siteid, string level, string function, string rows)
         {
-            return _logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows));
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            {
+                return _logs.GetLogs(SiteId, level, function, int.Parse(rows));
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Log Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+
         }
 
         // GET api/<controller>/5
@@ -34,17 +49,32 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Log Get(int id)
         {
-            return _logs.GetLog(id);
+            var log = _logs.GetLog(id);
+            if (log != null && log.SiteId == _alias.SiteId)
+            {
+                return log;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Log Get Attempt {LogId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // POST api/<controller>
         [HttpPost]
         public void Post([FromBody] Log log)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && log.SiteId == _alias.SiteId)
             {
                 _logger.Log(log);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Log Post Attempt {Log}", log);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index 0faba825..4de5bb0a 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -8,6 +8,7 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -41,40 +42,52 @@ namespace Oqtane.Controllers
         [HttpGet]
         public IEnumerable<Module> Get(string siteid)
         {
-            List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList();
-            List<Setting> settings = _settings.GetSettings(EntityNames.Module).ToList();
-
             List<Module> modules = new List<Module>();
-            foreach (PageModule pagemodule in _pageModules.GetPageModules(int.Parse(siteid)))
+
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                if (_userPermissions.IsAuthorized(User,PermissionNames.View, pagemodule.Module.Permissions))
+                List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(SiteId).ToList();
+                List<Setting> settings = _settings.GetSettings(EntityNames.Module).ToList();
+
+                foreach (PageModule pagemodule in _pageModules.GetPageModules(SiteId))
                 {
-                    Module module = new Module();
-                    module.SiteId = pagemodule.Module.SiteId;
-                    module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
-                    module.AllPages = pagemodule.Module.AllPages;
-                    module.Permissions = pagemodule.Module.Permissions;
-                    module.CreatedBy = pagemodule.Module.CreatedBy;
-                    module.CreatedOn = pagemodule.Module.CreatedOn;
-                    module.ModifiedBy = pagemodule.Module.ModifiedBy;
-                    module.ModifiedOn = pagemodule.Module.ModifiedOn;
-                    module.IsDeleted = pagemodule.IsDeleted;
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
+                    {
+                        Module module = new Module();
+                        module.SiteId = pagemodule.Module.SiteId;
+                        module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
+                        module.AllPages = pagemodule.Module.AllPages;
+                        module.Permissions = pagemodule.Module.Permissions;
+                        module.CreatedBy = pagemodule.Module.CreatedBy;
+                        module.CreatedOn = pagemodule.Module.CreatedOn;
+                        module.ModifiedBy = pagemodule.Module.ModifiedBy;
+                        module.ModifiedOn = pagemodule.Module.ModifiedOn;
+                        module.IsDeleted = pagemodule.IsDeleted;
 
-                    module.PageModuleId = pagemodule.PageModuleId;
-                    module.ModuleId = pagemodule.ModuleId;
-                    module.PageId = pagemodule.PageId;
-                    module.Title = pagemodule.Title;
-                    module.Pane = pagemodule.Pane;
-                    module.Order = pagemodule.Order;
-                    module.ContainerType = pagemodule.ContainerType;
+                        module.PageModuleId = pagemodule.PageModuleId;
+                        module.ModuleId = pagemodule.ModuleId;
+                        module.PageId = pagemodule.PageId;
+                        module.Title = pagemodule.Title;
+                        module.Pane = pagemodule.Pane;
+                        module.Order = pagemodule.Order;
+                        module.ContainerType = pagemodule.ContainerType;
 
-                    module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
-                    module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
-                        .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                        module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
+                        module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
+                            .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
 
-                    modules.Add(module);
+                        modules.Add(module);
+                    }
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                modules = null;
+            }
+
             return modules;
         }
 
@@ -83,19 +96,18 @@ namespace Oqtane.Controllers
         public Module Get(int id)
         {
             Module module = _modules.GetModule(id);
-            if (_userPermissions.IsAuthorized(User,PermissionNames.View, module.Permissions))
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, module.Permissions))
             {
                 List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
                 module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                 module.Settings = _settings.GetSettings(EntityNames.Module, id)
                         .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
-
                 return module;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Module {Module}", module);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Get Attempt {ModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -105,7 +117,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Module Post([FromBody] Module module)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
             {
                 module = _modules.AddModule(module);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
@@ -113,8 +125,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Module {Module}", module);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Post Attempt {Module}", module);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 module = null;
             }
             return module;
@@ -125,7 +137,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Module Put(int id, [FromBody] Module module)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
+            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _modules.GetModule(module.ModuleId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 module = _modules.UpdateModule(module);
                 if (module.AllPages)
@@ -146,8 +158,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Module {Module}", module);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Put Attempt {Module}", module);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 module = null;
             }
             return module;
@@ -158,7 +170,8 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Delete(int id)
         {
-            if (_userPermissions.IsAuthorized(User, EntityNames.Module, id, PermissionNames.Edit))
+            var module = _modules.GetModule(id);
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, module.ModuleId, PermissionNames.Edit))
             {
                 _modules.DeleteModule(id);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
@@ -166,8 +179,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Module {ModuleId}", id);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Delete Attempt {ModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
@@ -177,14 +190,23 @@ namespace Oqtane.Controllers
         public string Export(int moduleid)
         {
             string content = "";
-            if (_userPermissions.IsAuthorized(User, EntityNames.Module, moduleid, PermissionNames.Edit))
+            var module = _modules.GetModule(moduleid);
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 content = _modules.ExportModule(moduleid);
+                if (!string.IsNullOrEmpty(content))
+                {
+                    _logger.Log(LogLevel.Information, this, LogFunction.Read, "Module Content Exported {ModuleId}", moduleid);
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Warning, this, LogFunction.Read, "No Module Content Exported {ModuleId}", moduleid);
+                }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Export Module {ModuleId}", moduleid);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Export Attempt {ModuleId}", moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
             return content;
         }
@@ -195,14 +217,23 @@ namespace Oqtane.Controllers
         public bool Import(int moduleid, [FromBody] string content)
         {
             bool success = false;
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, moduleid, PermissionNames.Edit))
+            var module = _modules.GetModule(moduleid);
+            if (ModelState.IsValid && module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 success = _modules.ImportModule(moduleid, content);
+                if (success)
+                {
+                    _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Content Imported {ModuleId}", moduleid);
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Warning, this, LogFunction.Update, "Module Content Import Failed {ModuleId}", moduleid);
+                }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Other, "User Not Authorized To Import Module {ModuleId}", moduleid);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Import Attempt {ModuleId}", moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
             return success;
         }
diff --git a/Oqtane.Server/Controllers/ModuleControllerBase.cs b/Oqtane.Server/Controllers/ModuleControllerBase.cs
index 8400809e..6f89bac2 100644
--- a/Oqtane.Server/Controllers/ModuleControllerBase.cs
+++ b/Oqtane.Server/Controllers/ModuleControllerBase.cs
@@ -3,14 +3,14 @@ using Microsoft.AspNetCore.Http;
 using Oqtane.Infrastructure;
 using System.Collections.Generic;
 using System;
-using Oqtane.Shared;
 
 namespace Oqtane.Controllers
 {
     public class ModuleControllerBase : Controller
     {
         protected readonly ILogManager _logger;
-        // querystring parameters for policy authorization and validation
+
+        // parameters for policy authorization and validation
         protected Dictionary<string, int> _authEntityId = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
         protected int _entityId = -1; // legacy support
 
@@ -18,7 +18,7 @@ namespace Oqtane.Controllers
         {
             _logger = logger;
 
-            // populate policy authorization dictionary
+            // populate policy authorization dictionary from querystring
             int value;
             foreach (var param in accessor.HttpContext.Request.Query)
             {
@@ -27,10 +27,24 @@ namespace Oqtane.Controllers
                     _authEntityId.Add(param.Key.Substring(4, param.Key.Length - 6), value);
                 }
             }
+
             // legacy support
-            if (_authEntityId.ContainsKey(EntityNames.Module))
+            if (_authEntityId.Count == 0 && accessor.HttpContext.Request.Query.ContainsKey("entityid"))
             {
-                _entityId = _authEntityId[EntityNames.Module];
+                _entityId = int.Parse(accessor.HttpContext.Request.Query["entityid"]);
+            }
+
+        }
+
+        protected int AuthEntityId(string entityname)
+        {
+            if (_authEntityId.ContainsKey(entityname))
+            {
+                return _authEntityId[entityname];
+            }
+            else
+            {
+                return -1;
             }
         }
 
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index cd6d1cd7..b3fb0299 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -14,6 +14,7 @@ using Oqtane.Security;
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using System.Text.Json;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -29,6 +30,7 @@ namespace Oqtane.Controllers
         private readonly IServiceProvider _serviceProvider;
         private readonly ITenantManager _tenantManager;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
         public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, ITenantRepository tenants, ISqlRepository sql, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ITenantManager tenantManager, ILogManager logger)
         {
@@ -41,58 +43,115 @@ namespace Oqtane.Controllers
             _serviceProvider = serviceProvider;
             _tenantManager = tenantManager;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?siteid=x
         [HttpGet]
         public IEnumerable<ModuleDefinition> Get(string siteid)
         {
-            List<ModuleDefinition> moduledefinitions = new List<ModuleDefinition>();
-            foreach(ModuleDefinition moduledefinition in _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)))
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                if (_userPermissions.IsAuthorized(User,PermissionNames.Utilize, moduledefinition.Permissions))
+                List<ModuleDefinition> moduledefinitions = new List<ModuleDefinition>();
+                foreach (ModuleDefinition moduledefinition in _moduleDefinitions.GetModuleDefinitions(SiteId))
                 {
-                    moduledefinitions.Add(moduledefinition);
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.Permissions))
+                    {
+                        if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
+                        moduledefinitions.Add(moduledefinition);
+                    }
                 }
+                return moduledefinitions;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return moduledefinitions;
         }
 
         // GET api/<controller>/5?siteid=x
         [HttpGet("{id}")]
         public ModuleDefinition Get(int id, string siteid)
         {
-            ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, int.Parse(siteid));
-            if (_userPermissions.IsAuthorized(User,PermissionNames.Utilize, moduledefinition.Permissions))
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                return moduledefinition;
+                ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, SiteId);
+                if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.Permissions))
+                {
+                    if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
+                    return moduledefinition;
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {ModuleDefinitionId} {SiteId}", id, siteid);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return null;
+                }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access ModuleDefinition {ModuleDefinition}", moduledefinition);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {ModuleDefinitionId} {SiteId}", id, siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
 
+        // POST api/<controller>
+        [HttpPost]
+        [Authorize(Roles = RoleNames.Host)]
+        public ModuleDefinition Post([FromBody] ModuleDefinition moduleDefinition)
+        {
+            if (ModelState.IsValid)
+            {
+                string rootPath;
+                DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
+                string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", moduleDefinition.Template, Path.DirectorySeparatorChar.ToString());
+
+                if (moduleDefinition.Template.ToLower().Contains("internal"))
+                {
+                    rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + ", Oqtane.Client";
+                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
+                }
+                else
+                {
+                    rootPath = Utilities.PathCombine(rootFolder.Parent.FullName, moduleDefinition.Owner + "." + moduleDefinition.Name, Path.DirectorySeparatorChar.ToString());
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + ", " + moduleDefinition.Owner + "." + moduleDefinition.Name + ".Client.Oqtane";
+                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + ".Server.Oqtane";
+                }
+
+                ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, moduleDefinition);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Definition Created {ModuleDefinition}", moduleDefinition);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Post Attempt {ModuleDefinition}", moduleDefinition);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                moduleDefinition = null;
+            }
+
+            return moduleDefinition;
+        }
+
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = RoleNames.Admin)]
         public void Put(int id, [FromBody] ModuleDefinition moduleDefinition)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && moduleDefinition.SiteId == _alias.SiteId && _moduleDefinitions.GetModuleDefinition(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId) != null)
             {
                 _moduleDefinitions.UpdateModuleDefinition(moduleDefinition);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", moduleDefinition);
             }
-        }
-
-        [HttpGet("install")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void InstallModules()
-        {
-            _logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
-            _installationManager.InstallPackages();
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Put Attempt {ModuleDefinition}", moduleDefinition);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         // DELETE api/<controller>/5?siteid=x
@@ -101,31 +160,44 @@ namespace Oqtane.Controllers
         public void Delete(int id, int siteid)
         {
             ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, siteid);
-            if (moduledefinition != null && Utilities.GetAssemblyName(moduledefinition.ServerManagerType) != "Oqtane.Server")
+            if (moduledefinition != null && moduledefinition.SiteId == _alias.SiteId && Utilities.GetAssemblyName(moduledefinition.ServerManagerType) != "Oqtane.Server")
             {
                 // execute uninstall logic or scripts
                 if (!string.IsNullOrEmpty(moduledefinition.ServerManagerType))
                 {
                     Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
-                    foreach (Tenant tenant in _tenants.GetTenants())
+                    if (moduletype != null)
                     {
-                        try
+                        var alias = _tenantManager.GetAlias(); // save current
+                        string result = string.Empty;
+                        foreach (Tenant tenant in _tenants.GetTenants())
                         {
-                            if (moduletype.GetInterface("IInstallable") != null)
+                            try
                             {
-                                _tenantManager.SetTenant(tenant.TenantId);
-                                var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
-                                ((IInstallable)moduleobject).Uninstall(tenant);
+                                if (moduletype.GetInterface("IInstallable") != null)
+                                {
+                                    _tenantManager.SetTenant(tenant.TenantId);
+                                    var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
+                                    ((IInstallable)moduleobject).Uninstall(tenant);
+                                }
+                                else
+                                {
+                                    _sql.ExecuteScript(tenant, moduletype.Assembly, Utilities.GetTypeName(moduledefinition.ModuleDefinitionName) + ".Uninstall.sql");
+                                }
                             }
-                            else
+                            catch (Exception ex)
                             {
-                                _sql.ExecuteScript(tenant, moduletype.Assembly, Utilities.GetTypeName(moduledefinition.ModuleDefinitionName) + ".Uninstall.sql");
+                                result = "For " + tenant.Name + " " + ex.Message;
                             }
-                            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "{ModuleDefinitionName} Uninstalled For Tenant {Tenant}", moduledefinition.ModuleDefinitionName, tenant.Name);
                         }
-                        catch (Exception ex)
+                        _tenantManager.SetAlias(alias); // restore current
+                        if (string.IsNullOrEmpty(result))
                         {
-                            _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Uninstalling {ModuleDefinitionName} For Tenant {Tenant} {Error}", moduledefinition.ModuleDefinitionName, tenant.Name, ex.Message);
+                            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "{ModuleDefinitionName} Uninstalled For All Tenants", moduledefinition.ModuleDefinitionName);
+                        }
+                        else
+                        {
+                            _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Uninstalling {ModuleDefinitionName} {Error}", moduledefinition.ModuleDefinitionName, result);
                         }
                     }
                 }
@@ -157,6 +229,19 @@ namespace Oqtane.Controllers
                 _moduleDefinitions.DeleteModuleDefinition(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Definition {ModuleDefinitionName} Deleted", moduledefinition.Name);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Delete Attempt {ModuleDefinitionId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
+        }
+
+        [HttpGet("install")]
+        [Authorize(Roles = RoleNames.Host)]
+        public void InstallModules()
+        {
+            _logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
+            _installationManager.InstallPackages();
         }
 
         // GET: api/<controller>/templates
@@ -189,37 +274,6 @@ namespace Oqtane.Controllers
             return templates;
         }
 
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Roles = RoleNames.Host)]
-        public ModuleDefinition Post([FromBody] ModuleDefinition moduleDefinition)
-        {
-            if (ModelState.IsValid)
-            {
-                string rootPath;
-                DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
-                string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", moduleDefinition.Template,Path.DirectorySeparatorChar.ToString());
-
-                if (moduleDefinition.Template.ToLower().Contains("internal"))
-                {
-                    rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + ", Oqtane.Client";
-                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
-                }
-                else
-                {
-                    rootPath = Utilities.PathCombine(rootFolder.Parent.FullName, moduleDefinition.Owner + "." + moduleDefinition.Name, Path.DirectorySeparatorChar.ToString());
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + ", " + moduleDefinition.Owner + "." + moduleDefinition.Name + ".Client.Oqtane";
-                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + ".Server.Oqtane";
-                }
-
-                ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, moduleDefinition);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Definition Created {ModuleDefinition}", moduleDefinition);
-            }
-
-            return moduleDefinition;
-        }
-
         private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition)
         {
             // process folder
diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs
index fe721479..c4c22f87 100644
--- a/Oqtane.Server/Controllers/NotificationController.cs
+++ b/Oqtane.Server/Controllers/NotificationController.cs
@@ -7,6 +7,7 @@ using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -16,12 +17,14 @@ namespace Oqtane.Controllers
         private readonly INotificationRepository _notifications;
         private readonly IUserPermissions _userPermissions;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public NotificationController(INotificationRepository notifications, IUserPermissions userPermissions, ILogManager logger)
+        public NotificationController(INotificationRepository notifications, IUserPermissions userPermissions, ILogManager logger, ITenantManager tenantManager)
         {
             _notifications = notifications;
             _userPermissions = userPermissions;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?siteid=x&type=y&userid=z
@@ -30,17 +33,27 @@ namespace Oqtane.Controllers
         public IEnumerable<Notification> Get(string siteid, string direction, string userid)
         {
             IEnumerable<Notification> notifications = null;
-            if (IsAuthorized(int.Parse(userid)))
+
+            int SiteId;
+            int UserId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && int.TryParse(userid, out UserId) && IsAuthorized(UserId))
             {
                 if (direction == "to")
                 {
-                    notifications = _notifications.GetNotifications(int.Parse(siteid), -1, int.Parse(userid));
+                    notifications = _notifications.GetNotifications(SiteId, -1, UserId);
                 }
                 else
                 {
-                    notifications = _notifications.GetNotifications(int.Parse(siteid), int.Parse(userid), -1);
+                    notifications = _notifications.GetNotifications(SiteId, UserId, -1);
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {SiteId} {Direction} {UserId}", siteid, direction, userid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                notifications = null;
+            }
+
             return notifications;
         }
 
@@ -50,11 +63,16 @@ namespace Oqtane.Controllers
         public Notification Get(int id)
         {
             Notification notification = _notifications.GetNotification(id);
-            if (!(IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
+            if (notification != null && notification.SiteId == _alias.SiteId && (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
-                notification = null;
+                return notification;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {NotificationId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return notification;
         }
 
         // POST api/<controller>
@@ -62,11 +80,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Notification Post([FromBody] Notification notification)
         {
-            if (IsAuthorized(notification.FromUserId))
+            if (ModelState.IsValid && notification.SiteId == _alias.SiteId && IsAuthorized(notification.FromUserId))
             {
                 notification = _notifications.AddNotification(notification);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {NotificationId}", notification.NotificationId);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Post Attempt {Notification}", notification);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                notification = null;
+            }
             return notification;
         }
 
@@ -75,11 +99,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Notification Put(int id, [FromBody] Notification notification)
         {
-            if (IsAuthorized(notification.FromUserId))
+            if (ModelState.IsValid && notification.SiteId == _alias.SiteId && _notifications.GetNotification(notification.NotificationId, false) != null && IsAuthorized(notification.FromUserId))
             {
                 notification = _notifications.UpdateNotification(notification);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {NotificationId}", notification.NotificationId);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Put Attempt {Notification}", notification);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                notification = null;
+            }
             return notification;
         }
 
@@ -89,11 +119,16 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Notification notification = _notifications.GetNotification(id);
-            if (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId))
+            if (notification != null && notification.SiteId == _alias.SiteId && (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
                 _notifications.DeleteNotification(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Notification Deleted {NotificationId}", id);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Delete Attempt {NotificationId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         private bool IsAuthorized(int? userid)
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index 78c12da1..bed4e81c 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -6,12 +6,12 @@ using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.IO;
-using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Authorization;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Enums;
+using System.Net.Http.Headers;
 // ReSharper disable PartialTypeWithSinglePart
 
 namespace Oqtane.Controllers
@@ -21,41 +21,32 @@ namespace Oqtane.Controllers
     {
         private readonly IInstallationManager _installationManager;
         private readonly IWebHostEnvironment _environment;
+        private readonly IConfigManager _configManager;
         private readonly ILogManager _logger;
 
-        public PackageController(IInstallationManager installationManager, IWebHostEnvironment environment, ILogManager logger)
+        public PackageController(IInstallationManager installationManager, IWebHostEnvironment environment, IConfigManager configManager, ILogManager logger)
         {
             _installationManager = installationManager;
             _environment = environment;
+            _configManager = configManager;
             _logger = logger;
         }
 
-        // GET: api/<controller>?tag=x
+        // GET: api/<controller>?type=x&search=y
         [HttpGet]
-        [Authorize(Roles = RoleNames.Host)]
-        public async Task<IEnumerable<Package>> Get(string tag)
+        public async Task<IEnumerable<Package>> Get(string type, string search)
         {
+            // get packages
             List<Package> packages = new List<Package>();
-
-            using (var httpClient = new HttpClient())
+            if (bool.Parse(_configManager.GetSetting("PackageService", "true")) == true)
             {
-                var searchResult = await GetJson<SearchResult>(httpClient, "https://azuresearch-usnc.nuget.org/query?q=tags:oqtane");
-                foreach(Data data in searchResult.Data)
+                using (var client = new HttpClient())
                 {
-                    if (data.Tags.Contains(tag))
-                    {
-                        Package package = new Package();
-                        package.PackageId = data.Id;
-                        package.Name = data.Title;
-                        package.Description = data.Description;
-                        package.Owner = data.Authors[0];
-                        package.Version = data.Version;
-                        package.Downloads = data.TotalDownloads;
-                        packages.Add(package);
-                    }
+                    client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
+                    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
+                    packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}");
                 }
             }
-
             return packages;
         }
 
@@ -63,15 +54,40 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Host)]
         public async Task Post(string packageid, string version, string folder)
         {
-            using (var httpClient = new HttpClient())
+            // get package info
+            Package package = null;
+            if (bool.Parse(_configManager.GetSetting("PackageService", "true")) == true)
             {
-                folder = Path.Combine(_environment.ContentRootPath, folder);
-                var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false);
-                response.EnsureSuccessStatusCode();
-                string filename = packageid + "." + version + ".nupkg";
-                using (var fileStream = new FileStream(Path.Combine(folder, filename), FileMode.Create, FileAccess.Write, FileShare.None))
+                using (var client = new HttpClient())
                 {
-                    await response.Content.CopyToAsync(fileStream).ConfigureAwait(false);
+                    client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
+                    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
+                    package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}");
+                }
+
+                if (package != null)
+                {
+                    using (var httpClient = new HttpClient())
+                    {
+                        folder = Path.Combine(_environment.ContentRootPath, folder);
+                        var response = await httpClient.GetAsync(package.PackageUrl).ConfigureAwait(false);
+                        if (response.IsSuccessStatusCode)
+                        {
+                            string filename = packageid + "." + version + ".nupkg";
+                            using (var fileStream = new FileStream(Path.Combine(folder, filename), FileMode.Create, FileAccess.Write, FileShare.None))
+                            {
+                                await response.Content.CopyToAsync(fileStream).ConfigureAwait(false);
+                            }
+                        }
+                        else
+                        {
+                            _logger.Log(LogLevel.Error, this, LogFunction.Create, "Could Not Download {PackageUrl}", package.PackageUrl);
+                        }
+                    }
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "Package {PackageId}.{Version} Is Not Registered", packageid, version);
                 }
             }
         }
@@ -80,16 +96,19 @@ namespace Oqtane.Controllers
         {
             Uri uri = new Uri(url);
             var response = await httpClient.GetAsync(uri).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            var stream = await response.Content.ReadAsStreamAsync();
-            using (var streamReader = new StreamReader(stream))
+            if (response.IsSuccessStatusCode)
             {
-                using (var jsonTextReader = new JsonTextReader(streamReader))
+                var stream = await response.Content.ReadAsStreamAsync();
+                using (var streamReader = new StreamReader(stream))
                 {
-                    var serializer = new JsonSerializer();
-                    return serializer.Deserialize<T>(jsonTextReader);
+                    using (var jsonTextReader = new JsonTextReader(streamReader))
+                    {
+                        var serializer = new JsonSerializer();
+                        return serializer.Deserialize<T>(jsonTextReader);
+                    }
                 }
             }
+            return default(T);
         }
 
         [HttpGet("install")]
@@ -100,88 +119,4 @@ namespace Oqtane.Controllers
             _installationManager.InstallPackages();
         }
     }
-
-    public partial class SearchResult
-    {
-        [JsonProperty("@context")]
-        public Context Context { get; set; }
-
-        [JsonProperty("totalHits")]
-        public long TotalHits { get; set; }
-
-        [JsonProperty("data")]
-        public Data[] Data { get; set; }
-    }
-
-    public partial class Context
-    {
-        [JsonProperty("@vocab")]
-        public Uri Vocab { get; set; }
-
-        [JsonProperty("@base")]
-        public Uri Base { get; set; }
-    }
-
-    public partial class Data
-    {
-        [JsonProperty("@id")]
-        public Uri Url { get; set; }
-
-        [JsonProperty("@type")]
-        public string Type { get; set; }
-
-        [JsonProperty("registration")]
-        public Uri Registration { get; set; }
-
-        [JsonProperty("id")]
-        public string Id { get; set; }
-
-        [JsonProperty("version")]
-        public string Version { get; set; }
-
-        [JsonProperty("description")]
-        public string Description { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-
-        [JsonProperty("title")]
-        public string Title { get; set; }
-
-        [JsonProperty("iconUrl")]
-        public Uri IconUrl { get; set; }
-
-        [JsonProperty("licenseUrl")]
-        public Uri LicenseUrl { get; set; }
-
-        [JsonProperty("projectUrl")]
-        public Uri ProjectUrl { get; set; }
-
-        [JsonProperty("tags")]
-        public string[] Tags { get; set; }
-
-        [JsonProperty("authors")]
-        public string[] Authors { get; set; }
-
-        [JsonProperty("totalDownloads")]
-        public long TotalDownloads { get; set; }
-
-        [JsonProperty("verified")]
-        public bool Verified { get; set; }
-
-        [JsonProperty("versions")]
-        public Version[] Versions { get; set; }
-    }
-
-    public partial class Version
-    {
-        [JsonProperty("version")]
-        public string Number { get; set; }
-
-        [JsonProperty("downloads")]
-        public long Downloads { get; set; }
-
-        [JsonProperty("@id")]
-        public Uri Url { get; set; }
-    }
 }
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index 2ddccb06..80936d3f 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -43,18 +43,30 @@ namespace Oqtane.Controllers
         [HttpGet]
         public IEnumerable<Page> Get(string siteid)
         {
-            List<Setting> settings = _settings.GetSettings(EntityNames.Page).ToList();
-
             List<Page> pages = new List<Page>();
-            foreach (Page page in _pages.GetPages(int.Parse(siteid)))
+
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                if (_userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
+                List<Setting> settings = _settings.GetSettings(EntityNames.Page).ToList();
+
+                foreach (Page page in _pages.GetPages(SiteId))
                 {
-                    page.Settings = settings.Where(item => item.EntityId == page.PageId)
-                        .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
-                    pages.Add(page);
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
+                    {
+                        page.Settings = settings.Where(item => item.EntityId == page.PageId)
+                            .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                        pages.Add(page);
+                    }
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                pages = null;
+            }
+
             return pages;
         }
 
@@ -62,7 +74,7 @@ namespace Oqtane.Controllers
         [HttpGet("{id}")]
         public Page Get(int id, string userid)
         {
-            Page page;
+            Page page = null;
             if (string.IsNullOrEmpty(userid))
             {
                 page = _pages.GetPage(id);
@@ -79,8 +91,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Page}", page);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -90,7 +102,7 @@ namespace Oqtane.Controllers
         public Page Get(string path, int siteid)
         {
             Page page = _pages.GetPage(WebUtility.UrlDecode(path), siteid);
-            if (page != null)
+            if (page != null && page.SiteId == _alias.SiteId)
             {
                 if (_userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
                 {
@@ -100,14 +112,15 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
-                    HttpContext.Response.StatusCode = 401;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Page}", page);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                     return null;
                 }
             }
             else
             {
-                HttpContext.Response.StatusCode = 404;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Path} for Site {SiteId}", path, siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -117,7 +130,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Page Post([FromBody] Page page)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && page.SiteId == _alias.SiteId)
             {
                 string permissions;
                 if (page.ParentId != null)
@@ -149,11 +162,17 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", page);
-                    HttpContext.Response.StatusCode = 401;
+                    _logger.Log(LogLevel.Warning, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", page);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                     page = null;
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Post Attempt {Page}", page);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                page = null;
+            }
             return page;
         }
 
@@ -164,7 +183,7 @@ namespace Oqtane.Controllers
         {
             Page page = null;
             Page parent = _pages.GetPage(id);
-            if (parent != null && parent.IsPersonalizable && _userPermissions.GetUser(User).UserId == int.Parse(userid))
+            if (parent != null && parent.SiteId == _alias.SiteId && parent.IsPersonalizable && _userPermissions.GetUser(User).UserId == int.Parse(userid))
             {
                 page = new Page();
                 page.SiteId = parent.SiteId;
@@ -219,6 +238,12 @@ namespace Oqtane.Controllers
                     _pageModules.AddPageModule(pagemodule);
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Post Attempt {PageId} By User {UserId}", id, userid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                page = null;
+            }
             return page;
         }
 
@@ -227,7 +252,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Page Put(int id, [FromBody] Page page)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && page.SiteId == _alias.SiteId && _pages.GetPage(page.PageId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
                 // preserve page permissions
                 var oldPermissions = _permissionRepository.GetPermissions(EntityNames.Page, page.PageId).ToList();
@@ -281,9 +306,9 @@ namespace Oqtane.Controllers
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", page);
             }
             else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page {Page}", page);
-                HttpContext.Response.StatusCode = 401;
+            { 
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Put Attempt {Page}", page);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 page = null;
             }
             return page;
@@ -307,7 +332,7 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int siteid, int pageid, int? parentid)
         {
-            if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            if (siteid == _alias.SiteId && siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<Page> pages = _pages.GetPages(siteid).ToList();
@@ -325,8 +350,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Order {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Put Attempt {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
@@ -336,7 +361,7 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Page page = _pages.GetPage(id);
-            if (_userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
                 _pages.DeletePage(page.PageId);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId);
@@ -344,8 +369,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Page {PageId}", page.PageId);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Delete Attempt {PageId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
     }
diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs
index ffb35623..d7015e09 100644
--- a/Oqtane.Server/Controllers/PageModuleController.cs
+++ b/Oqtane.Server/Controllers/PageModuleController.cs
@@ -8,6 +8,7 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -15,14 +16,16 @@ namespace Oqtane.Controllers
     public class PageModuleController : Controller
     {
         private readonly IPageModuleRepository _pageModules;
+        private readonly IPageRepository _pages;
         private readonly IUserPermissions _userPermissions;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public PageModuleController(IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
+        public PageModuleController(IPageModuleRepository pageModules, IPageRepository pages, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
         {
             _pageModules = pageModules;
+            _pages = pages;
             _userPermissions = userPermissions;
             _syncManager = syncManager;
             _logger = logger;
@@ -34,14 +37,14 @@ namespace Oqtane.Controllers
         public PageModule Get(int id)
         {
             PageModule pagemodule = _pageModules.GetPageModule(id);
-            if (_userPermissions.IsAuthorized(User,PermissionNames.View, pagemodule.Module.Permissions))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, pagemodule.Module.Permissions))
             {
                 return pagemodule;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -51,14 +54,14 @@ namespace Oqtane.Controllers
         public PageModule Get(int pageid, int moduleid)
         {
             PageModule pagemodule = _pageModules.GetPageModule(pageid, moduleid);
-            if (_userPermissions.IsAuthorized(User,PermissionNames.View, pagemodule.Module.Permissions))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, pagemodule.Module.Permissions))
             {
                 return pagemodule;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access PageModule {PageModule}", pagemodule);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageId} {ModuleId}", pageid, moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -68,7 +71,8 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public PageModule Post([FromBody] PageModule pageModule)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
+            var page = _pages.GetPage(pageModule.PageId);
+            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
             {
                 pageModule = _pageModules.AddPageModule(pageModule);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
@@ -76,8 +80,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add PageModule {PageModule}", pageModule);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Post Attempt {PageModule}", pageModule);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 pageModule = null;
             }
             return pageModule;
@@ -88,7 +92,8 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public PageModule Put(int id, [FromBody] PageModule pageModule)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit))
+            var page = _pages.GetPage(pageModule.PageId);
+            if (ModelState.IsValid && page != null && page.SiteId == _alias.SiteId && _pageModules.GetPageModule(pageModule.PageModuleId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit))
             {
                 pageModule = _pageModules.UpdatePageModule(pageModule);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
@@ -96,8 +101,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update PageModule {PageModule}", pageModule);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Put Attempt {PageModule}", pageModule);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 pageModule = null;
             }
             return pageModule;
@@ -108,7 +113,8 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public void Put(int pageid, string pane)
         {
-            if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
+            var page = _pages.GetPage(pageid);
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
             {
                 int order = 1;
                 List<PageModule> pagemodules = _pageModules.GetPageModules(pageid, pane).OrderBy(item => item.Order).ToList();
@@ -126,9 +132,9 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page Module Order {PageId} {Pane}", pageid, pane);
-                HttpContext.Response.StatusCode = 401;
-            }
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Put Attempt {PageId} {Pane}", pageid, pane);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+           }
         }
 
         // DELETE api/<controller>/5
@@ -137,7 +143,7 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             PageModule pagemodule = _pageModules.GetPageModule(id);
-            if (_userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
+            if (pagemodule != null && pagemodule.Module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
             {
                 _pageModules.DeletePageModule(id);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
@@ -145,8 +151,8 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete PageModule {PageModuleId}", id);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Delete Attempt {PageModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
     }
diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs
index 60b1de2d..9793b1c6 100644
--- a/Oqtane.Server/Controllers/ProfileController.cs
+++ b/Oqtane.Server/Controllers/ProfileController.cs
@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -14,25 +15,47 @@ namespace Oqtane.Controllers
     {
         private readonly IProfileRepository _profiles;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public ProfileController(IProfileRepository profiles, ILogManager logger)
+        public ProfileController(IProfileRepository profiles, ILogManager logger, ITenantManager tenantManager)
         {
             _profiles = profiles;
             _logger = logger;
-        }
+            _alias = tenantManager.GetAlias();
+    }
 
-        // GET: api/<controller>?siteid=x
-        [HttpGet]
+    // GET: api/<controller>?siteid=x
+    [HttpGet]
         public IEnumerable<Profile> Get(string siteid)
         {
-            return _profiles.GetProfiles(int.Parse(siteid));
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            {
+                return _profiles.GetProfiles(SiteId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
         public Profile Get(int id)
         {
-            return _profiles.GetProfile(id);
+            var profile = _profiles.GetProfile(id);
+            if (profile != null && profile.SiteId == _alias.SiteId)
+            {
+                return profile;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Get Attempt {ProfileId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // POST api/<controller>
@@ -40,11 +63,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Profile Post([FromBody] Profile profile)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && profile.SiteId == _alias.SiteId)
             {
                 profile = _profiles.AddProfile(profile);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", profile);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Post Attempt {Profile}", profile);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                profile = null;
+            }
             return profile;
         }
 
@@ -53,11 +82,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Profile Put(int id, [FromBody] Profile profile)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && profile.SiteId == _alias.SiteId && _profiles.GetProfile(profile.ProfileId, false) != null)
             {
                 profile = _profiles.UpdateProfile(profile);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", profile);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Put Attempt {Profile}", profile);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                profile = null;
+            }
             return profile;
         }
 
@@ -66,8 +101,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public void Delete(int id)
         {
-            _profiles.DeleteProfile(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Profile Deleted {ProfileId}", id);
+            var profile = _profiles.GetProfile(id);
+            if (profile != null && profile.SiteId == _alias.SiteId)
+            {
+                _profiles.DeleteProfile(id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Profile Deleted {ProfileId}", id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Delete Attempt {ProfileId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs
index 1b6d9112..169c9014 100644
--- a/Oqtane.Server/Controllers/RoleController.cs
+++ b/Oqtane.Server/Controllers/RoleController.cs
@@ -6,6 +6,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -14,31 +15,53 @@ namespace Oqtane.Controllers
     {
         private readonly IRoleRepository _roles;
         private readonly ILogManager _logger;
+        private readonly Alias _alias;
 
-        public RoleController(IRoleRepository roles, ILogManager logger)
+        public RoleController(IRoleRepository roles, ILogManager logger, ITenantManager tenantManager)
         {
             _roles = roles;
             _logger = logger;
+            _alias = tenantManager.GetAlias();
         }
 
         // GET: api/<controller>?siteid=x&global=true/false
         [HttpGet]
-        [Authorize(Roles = RoleNames.Registered)]
+        [Authorize(Roles = RoleNames.Admin)]
         public IEnumerable<Role> Get(string siteid, string global)
         {
-            if (string.IsNullOrEmpty(global))
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                global = "False";
+                if (string.IsNullOrEmpty(global))
+                {
+                    global = "False";
+                }
+                return _roles.GetRoles(SiteId, bool.Parse(global));
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return _roles.GetRoles(int.Parse(siteid), bool.Parse(global));
         }
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        [Authorize(Roles = RoleNames.Registered)]
+        [Authorize(Roles = RoleNames.Admin)]
         public Role Get(int id)
         {
-            return _roles.GetRole(id);
+            var role = _roles.GetRole(id);
+            if (role != null && (role.SiteId == _alias.SiteId || User.IsInRole(RoleNames.Host)))
+            {
+                return role;
+            }
+            else
+            { 
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Get Attempt {RoleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // POST api/<controller>
@@ -46,11 +69,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Role Post([FromBody] Role role)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && role.SiteId == _alias.SiteId)
             {
                 role = _roles.AddRole(role);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", role);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Post Attempt {Role}", role);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                role = null;
+            }
             return role;
         }
 
@@ -59,11 +88,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Role Put(int id, [FromBody] Role role)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && role.SiteId == _alias.SiteId && _roles.GetRole(role.RoleId, false) != null)
             {
                 role = _roles.UpdateRole(role);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", role);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Put Attempt {Role}", role);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                role = null;
+            }
             return role;
         }
 
@@ -73,11 +108,16 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             var role = _roles.GetRole(id);
-            if (!role.IsSystem)
+            if (role != null && !role.IsSystem && role.SiteId == _alias.SiteId)
             {
                 _roles.DeleteRole(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Delete Attempt {RoleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index b10a1534..32d0573b 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -42,7 +43,7 @@ namespace Oqtane.Controllers
             else
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityname, entityid);
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
             return settings;
         }
@@ -59,7 +60,7 @@ namespace Oqtane.Controllers
             else
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -80,7 +81,7 @@ namespace Oqtane.Controllers
             else
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 setting = null;
             }
             return setting;
@@ -102,7 +103,7 @@ namespace Oqtane.Controllers
             else
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 setting = null;
             }
             return setting;
@@ -125,7 +126,7 @@ namespace Oqtane.Controllers
             else
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete Setting {Setting}", setting);
-                HttpContext.Response.StatusCode = 401;
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
 
diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
index e40e9065..8b6cba5c 100644
--- a/Oqtane.Server/Controllers/SiteController.cs
+++ b/Oqtane.Server/Controllers/SiteController.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -38,7 +39,17 @@ namespace Oqtane.Controllers
         [HttpGet("{id}")]
         public Site Get(int id)
         {
-            return _sites.GetSite(id);
+            var site = _sites.GetSite(id);
+            if (site.SiteId == _alias.SiteId)
+            {
+                return site;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Get Attempt {SiteId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // POST api/<controller>
@@ -72,12 +83,18 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public Site Put(int id, [FromBody] Site site)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && site.SiteId == _alias.SiteId && site.TenantId == _alias.TenantId && _sites.GetSite(site.SiteId, false) != null)
             {
                 site = _sites.UpdateSite(site);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, site.SiteId);
                 _logger.Log(site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", site);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Put Attempt {Site}", site);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                site = null;
+            }
             return site;
         }
 
@@ -86,8 +103,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Host)]
         public void Delete(int id)
         {
-            _sites.DeleteSite(id);
-            _logger.Log(id, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
+            var site = _sites.GetSite(id);
+            if (site != null && site.SiteId == _alias.SiteId)
+            {
+                _sites.DeleteSite(id);
+                _logger.Log(id, LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Delete Attempt {SiteId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs
index 16df8935..10922007 100644
--- a/Oqtane.Server/Controllers/SqlController.cs
+++ b/Oqtane.Server/Controllers/SqlController.cs
@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
             }
             catch (Exception ex)
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId} Results In An Error {Error}", sqlquery.Query, sqlquery.TenantId, ex.Message);
+                _logger.Log(LogLevel.Error, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId} Resulted In An Error {Error}", sqlquery.Query, sqlquery.TenantId, ex.Message);
             }
             sqlquery.Results = results;
             return sqlquery;
diff --git a/Oqtane.Server/Controllers/SyncController.cs b/Oqtane.Server/Controllers/SyncController.cs
new file mode 100644
index 00000000..6c4a136d
--- /dev/null
+++ b/Oqtane.Server/Controllers/SyncController.cs
@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Mvc;
+using Oqtane.Models;
+using Oqtane.Shared;
+using System;
+using System.Globalization;
+using Oqtane.Infrastructure;
+
+namespace Oqtane.Controllers
+{
+    [Route(ControllerRoutes.ApiRoute)]
+    public class SyncController : Controller
+    {
+        private readonly ISyncManager _syncManager;
+        private readonly Alias _alias;
+
+        public SyncController(ISyncManager syncManager, ITenantManager tenantManager)
+        {
+            _syncManager = syncManager;
+            _alias = tenantManager.GetAlias();
+        }
+
+        // GET api/<controller>/yyyyMMddHHmmssfff
+        [HttpGet("{lastSyncDate}")]
+        public Sync Get(string lastSyncDate)
+        {
+            Sync sync = new Sync
+            {
+                SyncDate = DateTime.UtcNow,
+                SyncEvents = _syncManager.GetSyncEvents(_alias.TenantId, DateTime.ParseExact(lastSyncDate, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture))
+            };
+            return sync;
+        }        
+    }
+}
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 0adeaacd..7a95cc5c 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -27,15 +27,51 @@ namespace Oqtane.Controllers
         {
             Dictionary<string, string> systeminfo = new Dictionary<string, string>();
 
-            systeminfo.Add("rendermode", _configManager.GetSetting("RenderMode", "Server"));
             systeminfo.Add("clrversion", Environment.Version.ToString());
             systeminfo.Add("osversion", Environment.OSVersion.ToString());
             systeminfo.Add("machinename", Environment.MachineName);
             systeminfo.Add("serverpath", _environment.ContentRootPath);
             systeminfo.Add("servertime", DateTime.Now.ToString());
+            systeminfo.Add("installationid", _configManager.GetInstallationId());
+
+            systeminfo.Add("runtime", _configManager.GetSetting("Runtime", "Server"));
+            systeminfo.Add("rendermode", _configManager.GetSetting("RenderMode", "ServerPrerendered"));
+            systeminfo.Add("detailederrors", _configManager.GetSetting("DetailedErrors", "false"));
+            systeminfo.Add("logginglevel", _configManager.GetSetting("Logging:LogLevel:Default", "Information"));
+            systeminfo.Add("swagger", _configManager.GetSetting("UseSwagger", "true"));
+            systeminfo.Add("packageservice", _configManager.GetSetting("PackageService", "true"));
 
             return systeminfo;
         }
 
+        [HttpPost]
+        [Authorize(Roles = RoleNames.Host)]
+        public void Post([FromBody] Dictionary<string, string> settings)
+        {
+            foreach(KeyValuePair<string, string> kvp in settings)
+            {
+                switch (kvp.Key)
+                {
+                    case "runtime":
+                        _configManager.AddOrUpdateSetting("Runtime", kvp.Value, false);
+                        break;
+                    case "rendermode":
+                        _configManager.AddOrUpdateSetting("RenderMode", kvp.Value, false);
+                        break;
+                    case "detailederrors":
+                        _configManager.AddOrUpdateSetting("DetailedErrors", kvp.Value, false);
+                        break;
+                    case "logginglevel":
+                        _configManager.AddOrUpdateSetting("Logging:LogLevel:Default", kvp.Value, false);
+                        break;
+                    case "swagger":
+                        _configManager.AddOrUpdateSetting("UseSwagger", kvp.Value, false);
+                        break;
+                    case "packageservice":
+                        _configManager.AddOrUpdateSetting("PackageService", kvp.Value, false);
+                        break;
+                }
+            }
+        }
     }
 }
diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs
index b6ef064d..1b01d0f1 100644
--- a/Oqtane.Server/Controllers/TenantController.cs
+++ b/Oqtane.Server/Controllers/TenantController.cs
@@ -23,7 +23,7 @@ namespace Oqtane.Controllers
 
         // GET: api/<controller>
         [HttpGet]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public IEnumerable<Tenant> Get()
         {
             return _tenants.GetTenants();
@@ -31,45 +31,10 @@ namespace Oqtane.Controllers
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        [Authorize(Roles = RoleNames.Admin)]
+        [Authorize(Roles = RoleNames.Host)]
         public Tenant Get(int id)
         {
             return _tenants.GetTenant(id);
         }
-
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Roles = RoleNames.Host)]
-        public Tenant Post([FromBody] Tenant tenant)
-        {
-            if (ModelState.IsValid)
-            {
-                tenant = _tenants.AddTenant(tenant);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Tenant Added {TenantId}", tenant.TenantId);
-            }
-            return tenant;
-        }
-
-        // PUT api/<controller>/5
-        [HttpPut("{id}")]
-        [Authorize(Roles = RoleNames.Host)]
-        public Tenant Put(int id, [FromBody] Tenant tenant)
-        {
-            if (ModelState.IsValid)
-            {
-                tenant = _tenants.UpdateTenant(tenant);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Tenant Updated {TenantId}", tenant.TenantId);
-            }
-            return tenant;
-        }
-
-        // DELETE api/<controller>/5
-        [HttpDelete("{id}")]
-        [Authorize(Roles = RoleNames.Host)]
-        public void Delete(int id)
-        {
-            _tenants.DeleteTenant(id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Tenant Deleted {TenantId}", id);
-        }
     }
 }
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 7c05b0ba..dd8bae6f 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -11,6 +11,7 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using System.Text.Json;
+using System.Net;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 
@@ -84,6 +85,11 @@ namespace Oqtane.Controllers
                 _themes.DeleteTheme(theme.ThemeName);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Removed For {ThemeName}", theme.ThemeName);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Theme Delete Attempt {Themename}", themename);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         // GET: api/<controller>/templates
@@ -141,6 +147,12 @@ namespace Oqtane.Controllers
                 ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, theme);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Theme Created {Theme}", theme);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Theme Post Attempt {Theme}", theme);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                theme = null;
+            }
 
             return theme;
         }
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 1d1434bf..8f42d644 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -53,26 +53,46 @@ namespace Oqtane.Controllers
         [Authorize]
         public User Get(int id, string siteid)
         {
-            User user = _users.GetUser(id);
-            if (user != null)
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                user.SiteId = int.Parse(siteid);
-                user.Roles = GetUserRoles(user.UserId, user.SiteId);
+                User user = _users.GetUser(id);
+                if (user != null)
+                {
+                    user.SiteId = int.Parse(siteid);
+                    user.Roles = GetUserRoles(user.UserId, user.SiteId);
+                }
+                return Filter(user);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Get Attempt {UserId} {SiteId}", id, siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return Filter(user);
         }
 
         // GET api/<controller>/name/x?siteid=x
         [HttpGet("name/{name}")]
         public User Get(string name, string siteid)
         {
-            User user = _users.GetUser(name);
-            if (user != null)
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                user.SiteId = int.Parse(siteid);
-                user.Roles = GetUserRoles(user.UserId, user.SiteId);
+                User user = _users.GetUser(name);
+                if (user != null)
+                {
+                    user.SiteId = int.Parse(siteid);
+                    user.Roles = GetUserRoles(user.UserId, user.SiteId);
+                }
+                return Filter(user);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Get Attempt {Username} {SiteId}", name, siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return Filter(user);
         }
 
         private User Filter(User user)
@@ -102,13 +122,18 @@ namespace Oqtane.Controllers
         [HttpPost]
         public async Task<User> Post([FromBody] User user)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && user.SiteId == _alias.SiteId)
             {
-                var newUser = await CreateUser(user);
-                return newUser;
+                var User = await CreateUser(user);
+                return User;
+            }
+            else
+            {
+                user.Password = ""; // remove sensitive information
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Post Attempt {User}", user);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-
-            return null;
         }
 
         private async Task<User> CreateUser(User user)
@@ -230,30 +255,28 @@ namespace Oqtane.Controllers
         [Authorize]
         public async Task<User> Put(int id, [FromBody] User user)
         {
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && user.SiteId == _alias.SiteId && _users.GetUser(user.UserId, false) != null && (User.IsInRole(RoleNames.Admin) || User.Identity.Name == user.Username))
             {
-                if (User.IsInRole(RoleNames.Admin) || User.Identity.Name == user.Username)
+                if (user.Password != "")
                 {
-                    if (user.Password != "")
+                    IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
+                    if (identityuser != null)
                     {
-                        IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
-                        if (identityuser != null)
-                        {
-                            identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, user.Password);
-                            await _identityUserManager.UpdateAsync(identityuser);
-                        }
+                        identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, user.Password);
+                        await _identityUserManager.UpdateAsync(identityuser);
                     }
-                    user = _users.UpdateUser(user);
-                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, user.UserId);
-                    user.Password = ""; // remove sensitive information
-                    _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", user);
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update User {User}", user);
-                    HttpContext.Response.StatusCode = 401;
-                    user = null;
                 }
+                user = _users.UpdateUser(user);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, user.UserId);
+                user.Password = ""; // remove sensitive information
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", user);
+            }
+            else
+            {
+                user.Password = ""; // remove sensitive information
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Post Attempt {User}", user);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                user = null;
             }
             return user;
         }
@@ -263,18 +286,19 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public async Task Delete(int id, string siteid)
         {
+            int SiteId;
             User user = _users.GetUser(id);
-            if (user != null)
+            if (user != null && int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
                 // remove user roles for site
-                foreach (UserRole userrole in _userRoles.GetUserRoles(user.UserId, Int32.Parse(siteid)).ToList())
+                foreach (UserRole userrole in _userRoles.GetUserRoles(user.UserId, SiteId).ToList())
                 {
                     _userRoles.DeleteUserRole(userrole.UserRoleId);
                     _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userrole);
                 }
 
                 // remove user folder for site
-                var folder = _folders.GetFolder(Int32.Parse(siteid), Utilities.PathCombine("Users", user.UserId.ToString(), Path.DirectorySeparatorChar.ToString()));
+                var folder = _folders.GetFolder(SiteId, Utilities.PathCombine("Users", user.UserId.ToString(), Path.DirectorySeparatorChar.ToString()));
                 if (folder != null)
                 {
                     if (Directory.Exists(_folders.GetFolderPath(folder)))
@@ -307,6 +331,11 @@ namespace Oqtane.Controllers
                     }
                 }
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Delete Attempt {UserId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
 
         // POST api/<controller>/login
diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs
index 99b1253f..4d1ac5bc 100644
--- a/Oqtane.Server/Controllers/UserRoleController.cs
+++ b/Oqtane.Server/Controllers/UserRoleController.cs
@@ -7,6 +7,7 @@ using Oqtane.Shared;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using System.Linq;
+using System.Net;
 
 namespace Oqtane.Controllers
 {
@@ -33,7 +34,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public IEnumerable<UserRole> Get(string siteid)
         {
-            return _userRoles.GetUserRoles(int.Parse(siteid));
+            int SiteId;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            {
+                return _userRoles.GetUserRoles(SiteId);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UserRole Get Attempt {SiteId}", siteid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
         
         // GET api/<controller>/5
@@ -41,7 +52,17 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Admin)]
         public UserRole Get(int id)
         {
-            return _userRoles.GetUserRole(id);
+            var userrole = _userRoles.GetUserRole(id);
+            if (userrole != null && userrole.Role.SiteId == _alias.SiteId)
+            {
+                return userrole;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Get Attempt {UserRoleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
         }
 
         // POST api/<controller>
@@ -50,7 +71,7 @@ namespace Oqtane.Controllers
         public UserRole Post([FromBody] UserRole userRole)
         {
             var role = _roles.GetRole(userRole.RoleId);
-            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host))
+            if (ModelState.IsValid && role != null && role.SiteId == _alias.SiteId && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host))
             {
                 if (role.Name == RoleNames.Host)
                 {
@@ -64,6 +85,12 @@ namespace Oqtane.Controllers
 
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, userRole.UserId);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UserRole Post Attempt {UserRole}", userRole);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                userRole = null;
+            }
             return userRole;
         }
 
@@ -73,12 +100,18 @@ namespace Oqtane.Controllers
         public UserRole Put(int id, [FromBody] UserRole userRole)
         {
             var role = _roles.GetRole(userRole.RoleId);
-            if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host))
+            if (ModelState.IsValid && role != null && role.SiteId == _alias.SiteId && _userRoles.GetUserRole(userRole.UserRoleId, false) != null && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host))
             {
                 userRole = _userRoles.UpdateUserRole(userRole);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, userRole.UserId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", userRole);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Put Attempt {UserRole}", userRole);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                userRole = null;
+            }
             return userRole;
         }
 
@@ -88,7 +121,7 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             UserRole userRole = _userRoles.GetUserRole(id);
-            if (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host)
+            if (userRole != null && userRole.Role.SiteId == _alias.SiteId && (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host))
             {
                 _userRoles.DeleteUserRole(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole);
@@ -106,6 +139,11 @@ namespace Oqtane.Controllers
 
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.User, userRole.UserId);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Delete Attempt {UserRoleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
index b3f489bf..13668322 100644
--- a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Oqtane.Infrastructure;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
@@ -22,7 +23,7 @@ namespace Microsoft.Extensions.DependencyInjection
             foreach (var assembly in assemblies)
             {
                 // check if assembly contains MVC Controllers
-                if (assembly.GetTypes().Any(t => t.IsSubclassOf(typeof(Controller))))
+                if (assembly.GetTypes().Any(t => t.IsSubclassOf(typeof(Controller)) || t.IsSubclassOf(typeof(Page))))
                 {
                     var partFactory = ApplicationPartFactory.GetApplicationPartFactory(assembly);
                     foreach (var part in partFactory.GetApplicationParts(assembly))
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index 55f5eb8a..b395ed0e 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -1,16 +1,25 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Loader;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
-using Oqtane.Interfaces;
 using Oqtane.Modules;
+using Oqtane.Repository;
+using Oqtane.Security;
 using Oqtane.Services;
 using Oqtane.Shared;
 
-// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OqtaneServiceCollectionExtensions
@@ -24,6 +33,161 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
+        public static IServiceCollection AddOqtaneDbContext(this IServiceCollection services)
+        {
+            services.AddDbContext<MasterDBContext>(options => { });
+            services.AddDbContext<TenantDBContext>(options => { });
+
+            return services;
+        }
+
+        public static IServiceCollection AddOqtaneAuthorizationPolicies(this IServiceCollection services)
+        {
+            services.AddAuthorizationCore(options =>
+            {
+                options.AddPolicy(PolicyNames.ViewPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.View)));
+                options.AddPolicy(PolicyNames.EditPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.Edit)));
+                options.AddPolicy(PolicyNames.ViewModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.View)));
+                options.AddPolicy(PolicyNames.EditModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.Edit)));
+                options.AddPolicy(PolicyNames.ViewFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.View)));
+                options.AddPolicy(PolicyNames.EditFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Edit)));
+                options.AddPolicy(PolicyNames.ListFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Browse)));
+            });
+
+            return services;
+        }
+
+        internal static IServiceCollection AddOqtaneSingletonServices(this IServiceCollection services)
+        {
+            services.AddSingleton<IInstallationManager, InstallationManager>();
+            services.AddSingleton<ISyncManager, SyncManager>();
+            services.AddSingleton<IDatabaseManager, DatabaseManager>();
+            services.AddSingleton<IConfigManager, ConfigManager>();
+            services.AddSingleton<ILoggerProvider, FileLoggerProvider>();
+            return services;
+        }
+
+        internal static IServiceCollection AddOqtaneTransientServices(this IServiceCollection services)
+        {
+            services.AddTransient<ITenantManager, TenantManager>();
+            services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
+            services.AddTransient<IThemeRepository, ThemeRepository>();
+            services.AddTransient<IUserPermissions, UserPermissions>();
+            services.AddTransient<ITenantResolver, TenantResolver>();
+            services.AddTransient<IAliasRepository, AliasRepository>();
+            services.AddTransient<ITenantRepository, TenantRepository>();
+            services.AddTransient<ISiteRepository, SiteRepository>();
+            services.AddTransient<IPageRepository, PageRepository>();
+            services.AddTransient<IModuleRepository, ModuleRepository>();
+            services.AddTransient<IPageModuleRepository, PageModuleRepository>();
+            services.AddTransient<IUserRepository, UserRepository>();
+            services.AddTransient<IProfileRepository, ProfileRepository>();
+            services.AddTransient<IRoleRepository, RoleRepository>();
+            services.AddTransient<IUserRoleRepository, UserRoleRepository>();
+            services.AddTransient<IPermissionRepository, PermissionRepository>();
+            services.AddTransient<ISettingRepository, SettingRepository>();
+            services.AddTransient<ILogRepository, LogRepository>();
+            services.AddTransient<ILogManager, LogManager>();
+            services.AddTransient<ILocalizationManager, LocalizationManager>();
+            services.AddTransient<IJobRepository, JobRepository>();
+            services.AddTransient<IJobLogRepository, JobLogRepository>();
+            services.AddTransient<INotificationRepository, NotificationRepository>();
+            services.AddTransient<IFolderRepository, FolderRepository>();
+            services.AddTransient<IFileRepository, FileRepository>();
+            services.AddTransient<ISiteTemplateRepository, SiteTemplateRepository>();
+            services.AddTransient<ISqlRepository, SqlRepository>();
+            services.AddTransient<IUpgradeManager, UpgradeManager>();
+            services.AddTransient<ILanguageRepository, LanguageRepository>();
+            // obsolete - replaced by ITenantManager
+            services.AddTransient<ITenantResolver, TenantResolver>();
+
+            return services;
+        }
+
+        public static IServiceCollection ConfigureOqtaneCookieOptions(this IServiceCollection services)
+        {
+            services.ConfigureApplicationCookie(options =>
+            {
+                options.Cookie.HttpOnly = false;
+                options.Cookie.SameSite = SameSiteMode.Strict;
+                options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
+                options.Events.OnRedirectToLogin = context =>
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return Task.CompletedTask;
+                };
+                options.Events.OnRedirectToAccessDenied = context =>
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    return Task.CompletedTask;
+                };
+                options.Events.OnValidatePrincipal = PrincipalValidator.ValidateAsync;
+            });
+
+            return services;
+        }
+
+        public static IServiceCollection ConfigureOqtaneIdentityOptions(this IServiceCollection services)
+        {
+            services.Configure<IdentityOptions>(options =>
+            {
+                // Password settings
+                options.Password.RequireDigit = false;
+                options.Password.RequiredLength = 6;
+                options.Password.RequireNonAlphanumeric = false;
+                options.Password.RequireUppercase = false;
+                options.Password.RequireLowercase = false;
+
+                // Lockout settings
+                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(30);
+                options.Lockout.MaxFailedAccessAttempts = 10;
+                options.Lockout.AllowedForNewUsers = true;
+
+                // User settings
+                options.User.RequireUniqueEmail = false;
+            });
+
+            return services;
+        }
+
+        internal static IServiceCollection TryAddHttpClientWithAuthenticationCookie(this IServiceCollection services)
+        {
+            if (!services.Any(x => x.ServiceType == typeof(HttpClient)))
+            {
+                services.AddScoped(s =>
+                {
+                    // creating the URI helper needs to wait until the JS Runtime is initialized, so defer it.
+                    var navigationManager = s.GetRequiredService<NavigationManager>();
+                    var client = new HttpClient(new HttpClientHandler { UseCookies = false });
+                    client.BaseAddress = new Uri(navigationManager.Uri);
+
+                    // set the cookies to allow HttpClient API calls to be authenticated
+                    var httpContextAccessor = s.GetRequiredService<IHttpContextAccessor>();
+                    foreach (var cookie in httpContextAccessor.HttpContext.Request.Cookies)
+                    {
+                        client.DefaultRequestHeaders.Add("Cookie", cookie.Key + "=" + cookie.Value);
+                    }
+
+                    return client;
+                });
+            }
+
+            return services;
+        }
+
+        internal static IServiceCollection TryAddSwagger(this IServiceCollection services, bool useSwagger)
+        {
+            if (useSwagger)
+            {
+                services.AddSwaggerGen(c =>
+                {
+                    c.SwaggerDoc(Constants.Version, new OpenApiInfo { Title = Constants.PackageId, Version = Constants.Version });
+                });
+            }
+
+            return services;
+        }
+
         private static IServiceCollection AddOqtaneServices(this IServiceCollection services, Runtime runtime)
         {
             if (services is null)
@@ -95,7 +259,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 }
                 catch
                 {
-                    Console.WriteLine($"Not Assembly : {dll.Name}");
+                    Debug.WriteLine($"Oqtane Error: Cannot Get Assembly Name For {dll.Name}");
                     continue;
                 }
 
@@ -136,24 +300,24 @@ namespace Microsoft.Extensions.DependencyInjection
                         }
                         catch
                         {
-                            Console.WriteLine($"Not Satellite Assembly : {assemblyFile.Name}");
+                            Debug.WriteLine($"Oqtane Error: Cannot Get Satellite Assembly Name For {assemblyFile.Name}");
                             continue;
                         }
 
                         try
                         {
                             Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(assemblyFile.FullName)));
-                            Console.WriteLine($"Loaded : {assemblyName}");
+                            Debug.WriteLine($"Oqtane Info: Loaded Assembly {assemblyName}");
                         }
-                        catch (Exception e)
+                        catch (Exception ex)
                         {
-                            Console.WriteLine($"Failed : {assemblyName}\n{e}");
+                            Debug.WriteLine($"Oqtane Error: Unable To Load Assembly {assemblyName} - {ex}");
                         }
                     }
                 }
                 else
                 {
-                    Console.WriteLine($"The satellite assemblies folder named '{culture}' is not found.");
+                    Debug.WriteLine($"Oqtane Error: The Satellite Assembly Folder For {culture} Does Not Exist");
                 }
             }
         }
diff --git a/Oqtane.Server/Infrastructure/ConfigManager.cs b/Oqtane.Server/Infrastructure/ConfigManager.cs
index 3b35b027..6b1d2349 100644
--- a/Oqtane.Server/Infrastructure/ConfigManager.cs
+++ b/Oqtane.Server/Infrastructure/ConfigManager.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Oqtane.Shared;
 
 namespace Oqtane.Infrastructure
 {
@@ -57,7 +59,7 @@ namespace Oqtane.Infrastructure
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Error modifying app settings {0}", ex);
+                Debug.WriteLine($"Oqtane Error: Error Updating App Setting {key} - {ex}");
             }
         }
 
@@ -78,7 +80,7 @@ namespace Oqtane.Infrastructure
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Error modifying app settings {0}", ex);
+                Debug.WriteLine($"Oqtane Error: Error Removing App Setting {key} - {ex}");
             }
         }
 
@@ -101,7 +103,10 @@ namespace Oqtane.Infrastructure
                         jsonObj[currentSection] = value;
                         break;
                     case "remove":
-                        jsonObj.Property(currentSection).Remove();
+                        if (jsonObj.Property(currentSection) != null)
+                        {
+                            jsonObj.Property(currentSection).Remove();
+                        }
                         break;
                 }
             }
@@ -111,5 +116,31 @@ namespace Oqtane.Infrastructure
         {
             _config.Reload();
         }
+
+        public string GetConnectionString()
+        {
+            return _config.GetConnectionString(SettingKeys.ConnectionStringKey);
+        }
+
+        public string GetConnectionString(string name)
+        {
+            return _config.GetConnectionString(name);
+        }
+
+        public bool IsInstalled()
+        {
+            return !string.IsNullOrEmpty(GetConnectionString());
+        }
+
+        public string GetInstallationId()
+        {
+            var installationid = GetSetting("InstallationId", "");
+            if (installationid == "")
+            {
+                installationid = Guid.NewGuid().ToString();
+                AddOrUpdateSetting("InstallationId", installationid, true);
+            }
+            return installationid;
+        }
     }
 }
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index c2d577ee..333579c5 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -17,6 +17,7 @@ using Oqtane.Repository;
 using Oqtane.Shared;
 using Oqtane.Enums;
 using Newtonsoft.Json;
+using Microsoft.Extensions.Logging;
 
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable ConvertToUsingDeclaration
@@ -32,14 +33,16 @@ namespace Oqtane.Infrastructure
         private readonly IWebHostEnvironment _environment;
         private readonly IMemoryCache _cache;
         private readonly IConfigManager _configManager;
+        private readonly ILogger<DatabaseManager> _filelogger;
 
-        public DatabaseManager(IConfigurationRoot config, IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IMemoryCache cache, IConfigManager configManager)
+        public DatabaseManager(IConfigurationRoot config, IServiceScopeFactory serviceScopeFactory, IWebHostEnvironment environment, IMemoryCache cache, IConfigManager configManager, ILogger<DatabaseManager> filelogger)
         {
             _config = config;
             _serviceScopeFactory = serviceScopeFactory;
             _environment = environment;
             _cache = cache;
             _configManager = configManager;
+            _filelogger = filelogger;
         }
 
         public Installation IsInstalled()
@@ -55,16 +58,25 @@ namespace Oqtane.Infrastructure
                     {
                         try
                         {
+                            // verify master database contains a Tenant table ( ie. validate schema is properly provisioned )
                             var provisioned = db.Tenant.Any();
                         }
-                        catch
+                        catch (Exception ex)
                         {
-                            result.Message = "Master Database Not Installed Correctly";
+                            result.Message = "Master Database Not Installed Correctly. " + ex.Message;
                         }
                     }
-                    else
+                    else // cannot connect
                     {
-                        result.Message = "Cannot Connect To Master Database";
+                        try
+                        {
+                            // get the actual connection error details
+                            db.Database.OpenConnection();
+                        }
+                        catch (Exception ex)
+                        {
+                            result.Message = "Cannot Connect To Master Database. " + ex.Message;
+                        }
                     }
                 }
             }
@@ -128,6 +140,7 @@ namespace Oqtane.Infrastructure
                     if (!string.IsNullOrEmpty(installation.Message))
                     {
                         // problem with prior installation
+                        _filelogger.LogError(Utilities.LogMessage(this, installation.Message));
                         install.ConnectionString = "";
                     }
                 }
@@ -483,11 +496,17 @@ namespace Oqtane.Infrastructure
                                                 {
                                                     tenantManager.SetTenant(tenant.TenantId);
                                                     var moduleObject = ActivatorUtilities.CreateInstance(scope.ServiceProvider, moduleType) as IInstallable;
-                                                    moduleObject?.Install(tenant, versions[i]);
+                                                    if (moduleObject == null || !moduleObject.Install(tenant, versions[i]))
+                                                    {
+                                                        result.Message = "An Error Occurred Executing IInstallable Interface For " + moduleDefinition.ServerManagerType;
+                                                    }
                                                 }
                                                 else
                                                 {
-                                                    sql.ExecuteScript(tenant, moduleType.Assembly, Utilities.GetTypeName(moduleDefinition.ModuleDefinitionName) + "." + versions[i] + ".sql");
+                                                    if (!sql.ExecuteScript(tenant, moduleType.Assembly, Utilities.GetTypeName(moduleDefinition.ModuleDefinitionName) + "." + versions[i] + ".sql"))
+                                                    {
+                                                        result.Message = "An Error Occurred Executing Database Script " + Utilities.GetTypeName(moduleDefinition.ModuleDefinitionName) + "." + versions[i] + ".sql";
+                                                    }
                                                 }
                                             }
                                             catch (Exception ex)
@@ -499,6 +518,12 @@ namespace Oqtane.Infrastructure
                                 }
                                 if (string.IsNullOrEmpty(result.Message) && moduleDefinition.Version != versions[versions.Length - 1])
                                 {
+                                    // get module definition from database to retain user customizable property values
+                                    var moduledef = db.ModuleDefinition.AsNoTracking().FirstOrDefault(item => item.ModuleDefinitionId == moduleDefinition.ModuleDefinitionId);
+                                    moduleDefinition.Name = moduledef.Name;
+                                    moduleDefinition.Description = moduledef.Description;
+                                    moduleDefinition.Categories = moduledef.Categories;
+                                    // update version
                                     moduleDefinition.Version = versions[versions.Length - 1];
                                     db.Entry(moduleDefinition).State = EntityState.Modified;
                                     db.SaveChanges();
@@ -618,7 +643,7 @@ namespace Oqtane.Infrastructure
                         tenant.Version = Constants.Version;
                         tenants.UpdateTenant(tenant);
 
-                        if (site != null) log.Log(site.SiteId, LogLevel.Trace, this, LogFunction.Create, "Site Created {Site}", site);
+                        if (site != null) log.Log(site.SiteId, Shared.LogLevel.Information, this, LogFunction.Create, "Site Created {Site}", site);
                     }
                 }
             }
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IConfigManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IConfigManager.cs
index 400c5e6a..5bff86b9 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/IConfigManager.cs
+++ b/Oqtane.Server/Infrastructure/Interfaces/IConfigManager.cs
@@ -12,5 +12,10 @@ namespace Oqtane.Infrastructure
         void RemoveSetting(string key, bool reload);
         void RemoveSetting(string file, string key, bool reload);
         void Reload();
+
+        public string GetConnectionString();
+        public string GetConnectionString(string name);
+        public bool IsInstalled();
+        public string GetInstallationId();
     }
 }
diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs
index 7ee8cf4a..afbb1de8 100644
--- a/Oqtane.Server/Infrastructure/LogManager.cs
+++ b/Oqtane.Server/Infrastructure/LogManager.cs
@@ -46,18 +46,14 @@ namespace Oqtane.Infrastructure
         public void Log(int siteId, LogLevel level, object @class, LogFunction function, Exception exception, string message, params object[] args)
         {
             Log log = new Log();
-            if (siteId == -1)
+
+            log.SiteId = siteId;
+            if (log.SiteId == -1 && _alias != null)
             {
-                log.SiteId = null;
-                if (_alias != null)
-                {
-                    log.SiteId = _alias.SiteId;
-                }
-            }
-            else
-            {
-                log.SiteId = siteId;
+                log.SiteId = _alias.SiteId;
             }
+            if (log.SiteId == -1) return; // logs must be site specific
+
             log.PageId = null;
             log.ModuleId = null;
             log.UserId = null;
@@ -125,9 +121,10 @@ namespace Oqtane.Infrastructure
                 {
                     _logs.AddLog(log);
                 }
-                catch
+                catch (Exception ex)
                 {
                     // an error occurred writing to the database
+                    var x = ex.Message;
                 }
             }
         }
diff --git a/Oqtane.Server/Infrastructure/Logging/FileLogger.cs b/Oqtane.Server/Infrastructure/Logging/FileLogger.cs
new file mode 100644
index 00000000..58bc3c0f
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Logging/FileLogger.cs
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Oqtane.Infrastructure
+{
+    public class FileLogger : ILogger
+    {
+        protected readonly FileLoggerProvider _FileLoggerProvider;
+        private readonly IWebHostEnvironment _environment;
+        private readonly IConfigManager _configManager;
+
+        public FileLogger(FileLoggerProvider FileLoggerProvider, IWebHostEnvironment environment,IConfigManager configManager)
+        {
+            _FileLoggerProvider = FileLoggerProvider;
+            _environment = environment;
+            _configManager = configManager;
+        }
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return null;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return logLevel != LogLevel.None;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
+            if (_configManager.GetSetting("Logging:FileLogger:LogLevel:Default", "") == "")
+            {
+                _configManager.AddOrUpdateSetting("Logging:FileLogger:LogLevel:Default", "Error", true);
+                if (logLevel < LogLevel.Error)
+                {
+                    return;
+                }
+            }
+
+            if (!IsEnabled(logLevel))
+            {
+                return;
+            }
+
+            string folder = Path.Combine(_environment.ContentRootPath, "Content", "Log");
+
+            // ensure directory exists
+            if (!Directory.Exists(folder))
+            {
+                Directory.CreateDirectory(folder);
+            }
+
+            var filepath = Path.Combine(folder, "error.log");
+
+            var logentry = string.Format("{0} [{1}] {2} {3}", "[" + DateTimeOffset.UtcNow.ToString("yyyy-MM-dd HH:mm:ss+00:00") + "]", logLevel.ToString(), formatter(state, exception), exception != null ? exception.StackTrace : "");
+
+            try
+            {
+                using (var streamWriter = new StreamWriter(filepath, true))
+                {
+                    streamWriter.WriteLine(logentry);
+                }
+            }
+            catch
+            {
+                // error occurred
+            }
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs b/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs
new file mode 100644
index 00000000..11c4ff48
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Oqtane.Infrastructure
+{
+    /// <summary>
+    /// FileLogger should only be used in scenarios where a database is not available or tenant/site cannot be determined ( ie. during startup )
+    /// </summary>
+    [ProviderAlias("FileLogger")]
+    public class FileLoggerProvider : ILoggerProvider
+    {
+        private readonly IWebHostEnvironment _environment;
+        private readonly IConfigManager _configManager;
+
+        public FileLoggerProvider(IWebHostEnvironment environment, IConfigManager configManager)
+        {
+            _environment = environment;
+            _configManager = configManager;
+        }
+
+        public ILogger CreateLogger(string categoryName)
+        {
+            return new FileLogger(this, _environment, _configManager);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/TenantManager.cs b/Oqtane.Server/Infrastructure/TenantManager.cs
index 7f0470f8..72798454 100644
--- a/Oqtane.Server/Infrastructure/TenantManager.cs
+++ b/Oqtane.Server/Infrastructure/TenantManager.cs
@@ -81,7 +81,7 @@ namespace Oqtane.Infrastructure
         public void SetTenant(int tenantId)
         {
             // background processes can set the alias using the SiteState service
-            _siteState.Alias = new Alias { TenantId = tenantId };
+            _siteState.Alias = new Alias { TenantId = tenantId, AliasId = -1, SiteId = -1 };
         }
     }
 }
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
index 2fec05bb..51da8971 100644
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -5,7 +5,9 @@ using Newtonsoft.Json;
 using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Shared;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
@@ -44,25 +46,32 @@ namespace Oqtane.Infrastructure
                     case "2.1.0":
                         Upgrade_2_1_0(tenant, scope);
                         break;
+                    case "2.2.0":
+                        Upgrade_2_2_0(tenant, scope);
+                        break;
                 }
             }
         }
 
+        /// <summary>
+        /// **Note: this code is commented out on purpose - it provides an example of how to programmatically add a page to all existing sites on upgrade
+        /// </summary>
+        /// <param name="tenant"></param>
+        /// <param name="scope"></param>
         private void Upgrade_1_0_0(Tenant tenant, IServiceScope scope)
         {
-            var pageTemplates = new List<PageTemplate>();
-
-            // **Note: this code is commented out on purpose - it provides an example of how to programmatically add a page to all existing sites on upgrade
-
+            //var pageTemplates = new List<PageTemplate>();
+            //
             //pageTemplates.Add(new PageTemplate
             //{
             //    Name = "Test",
             //    Parent = "",
+            //    Order = 1,
             //    Path = "test",
             //    Icon = Icons.Badge,
             //    IsNavigation = true,
             //    IsPersonalizable = false,
-            //    EditMode = false,
+            //    IsClickable = true,
             //    PagePermissions = new List<Permission>
             //    {
             //        new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -84,8 +93,15 @@ namespace Oqtane.Infrastructure
             //        }
             //    }
             //});
-
-            CreateSitePages(scope, pageTemplates);
+            //
+            //if (pageTemplates.Count != 0)
+            //{
+            //    var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+            //    foreach (Site site in sites.GetSites().ToList())
+            //    {
+            //        sites.CreatePages(site, pageTemplates);
+            //    }
+            //}
         }
 
         private void Upgrade_2_0_2(Tenant tenant, IServiceScope scope)
@@ -100,19 +116,28 @@ namespace Oqtane.Infrastructure
                     {
                         Directory.Delete(internalTemplatePath, true);
                     }
-                    catch
+                    catch (Exception ex)
                     {
                         // error deleting directory
+                        Debug.WriteLine($"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}");
                     }
                 }
             }
 
             // initialize SiteGuid
-            var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
-            foreach (Site site in sites.GetSites().ToList())
+            try
             {
-                site.SiteGuid = System.Guid.NewGuid().ToString();
-                sites.UpdateSite(site);
+                var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+                foreach (Site site in sites.GetSites().ToList())
+                {
+                    site.SiteGuid = System.Guid.NewGuid().ToString();
+                    sites.UpdateSite(site);
+                }
+            }
+            catch (Exception ex)
+            {
+                // error populating guid
+                Debug.WriteLine($"Oqtane Error: Error In 2.0.2 Upgrade Logic - {ex}");
             }
         }
 
@@ -128,14 +153,13 @@ namespace Oqtane.Infrastructure
             }
         }
 
-        private void CreateSitePages(IServiceScope scope, List<PageTemplate> pageTemplates)
+        private void Upgrade_2_2_0(Tenant tenant, IServiceScope scope)
         {
-            if (pageTemplates.Count != 0)
+            if (tenant.Name == TenantNames.Master)
             {
-                var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
-                foreach (Site site in sites.GetSites().ToList())
+                if (_configManager.GetSetting("Logging:LogLevel:Default", "") == "")
                 {
-                    sites.CreatePages(site, pageTemplates);
+                    _configManager.AddOrUpdateSetting("Logging:LogLevel:Default", "Information", true);
                 }
             }
         }
diff --git a/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs
index fb2fd69a..e60aaade 100644
--- a/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs
+++ b/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.NetworkInformation;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
@@ -44,9 +45,9 @@ namespace Oqtane.Migrations.EntityBuilders
             return  ActiveDatabase.AddAutoIncrementColumn(table, RewriteName(name));
         }
 
-        public void AddBooleanColumn(string name)
+        public void AddBooleanColumn(string name, bool nullable = false)
         {
-            _migrationBuilder.AddColumn<bool>(RewriteName(name), RewriteName(EntityTableName));
+            _migrationBuilder.AddColumn<bool>(RewriteName(name), RewriteName(EntityTableName), nullable: nullable);
         }
 
         protected OperationBuilder<AddColumnOperation> AddBooleanColumn(ColumnsBuilder table, string name, bool nullable = false)
@@ -84,7 +85,7 @@ namespace Oqtane.Migrations.EntityBuilders
             return table.Column<int>(name: RewriteName(name), nullable: nullable);
         }
 
-        public void AddMaxStringColumn(string name, int length, bool nullable = false, bool unicode = true)
+        public void AddMaxStringColumn(string name, bool nullable = false, bool unicode = true)
         {
             _migrationBuilder.AddColumn<string>(RewriteName(name), RewriteName(EntityTableName), nullable: nullable, unicode: unicode);
         }
@@ -109,6 +110,16 @@ namespace Oqtane.Migrations.EntityBuilders
             _migrationBuilder.AlterColumn<string>(RewriteName(name), RewriteName(EntityTableName), maxLength: length, nullable: nullable, unicode: unicode);
         }
 
+        public void AddDecimalColumn(string name, int precision, int scale, bool nullable = false)
+        {
+            _migrationBuilder.AddColumn<decimal>(RewriteName(name), RewriteName(EntityTableName), nullable: nullable, precision: precision, scale: scale);
+        }
+
+        protected OperationBuilder<AddColumnOperation> AddDecimalColumn(ColumnsBuilder table, string name, int precision, int scale, bool nullable = false)
+        {
+            return table.Column<decimal>(name: RewriteName(name), nullable: nullable, precision: precision, scale: scale);
+        }
+
         public void DropColumn(string name)
         {
             _migrationBuilder.DropColumn(RewriteName(name), RewriteName(EntityTableName));
@@ -132,6 +143,17 @@ namespace Oqtane.Migrations.EntityBuilders
                 unique: isUnique);
         }
 
+        public virtual void AddForeignKey(string foreignKeyName, string columnName, string principalTable, string principalColumn, ReferentialAction onDelete)
+        {
+            _migrationBuilder.AddForeignKey(
+                name: RewriteName(foreignKeyName),
+                table: RewriteName(EntityTableName),
+                column: RewriteName(columnName),
+                principalTable: RewriteName(principalTable),
+                principalColumn: RewriteName(principalColumn),
+                onDelete: onDelete );
+        }
+
         /// <summary>
         /// Creates a Migration to add an Index to the Entity (table)
         /// </summary>
diff --git a/Oqtane.Server/Migrations/Framework/MultiDatabaseMigrationsAssembly.cs b/Oqtane.Server/Migrations/Framework/MultiDatabaseMigrationsAssembly.cs
index 879ec4a5..e6151881 100644
--- a/Oqtane.Server/Migrations/Framework/MultiDatabaseMigrationsAssembly.cs
+++ b/Oqtane.Server/Migrations/Framework/MultiDatabaseMigrationsAssembly.cs
@@ -12,7 +12,9 @@ using Oqtane.Repository.Databases.Interfaces;
 
 namespace Oqtane.Migrations.Framework
 {
+#pragma warning disable EF1001 // Internal EF Core API usage.
     public class MultiDatabaseMigrationsAssembly: MigrationsAssembly
+#pragma warning restore EF1001 // Internal EF Core API usage.
     {
         private readonly IDatabase _database;
 
@@ -21,7 +23,9 @@ namespace Oqtane.Migrations.Framework
             IDbContextOptions options,
             IMigrationsIdGenerator idGenerator,
             IDiagnosticsLogger<DbLoggerCategory.Migrations> logger)
+#pragma warning disable EF1001 // Internal EF Core API usage.
             : base(currentContext, options, idGenerator, logger)
+#pragma warning restore EF1001 // Internal EF Core API usage.
         {
             var multiDatabaseContext = currentContext.Context as IMultiDatabase;
             if (multiDatabaseContext != null) _database = multiDatabaseContext.ActiveDatabase;
@@ -40,7 +44,9 @@ namespace Oqtane.Migrations.Framework
                 }
             }
 
+#pragma warning disable EF1001 // Internal EF Core API usage.
             return base.CreateMigration(migrationClass, activeProvider);
+#pragma warning restore EF1001 // Internal EF Core API usage.
         }
     }
 }
diff --git a/Oqtane.Server/Migrations/Tenant/02020001_AddPageIsClickable.cs b/Oqtane.Server/Migrations/Tenant/02020001_AddPageIsClickable.cs
new file mode 100644
index 00000000..89f458c1
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/02020001_AddPageIsClickable.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.02.02.00.01")]
+    public class AddPageIsClickable : MultiDatabaseMigration
+    {
+        public AddPageIsClickable(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
+
+            pageEntityBuilder.AddBooleanColumn("IsClickable", true);
+            pageEntityBuilder.UpdateColumn("IsClickable", "1");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
+
+            pageEntityBuilder.DropColumn("IsClickable");
+        }
+    }
+}
diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
index 3de69445..4f0f75e2 100644
--- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
+++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
@@ -3,11 +3,10 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Modules.HtmlText.Repository;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Shared;
-using System;
-using System.Collections.Generic;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Controllers;
+using System.Net;
 
 namespace Oqtane.Modules.HtmlText.Controllers
 {
@@ -24,85 +23,75 @@ namespace Oqtane.Modules.HtmlText.Controllers
         // GET api/<controller>/5
         [HttpGet("{id}")]
         [Authorize(Policy = PolicyNames.ViewModule)]
-        public List<Models.HtmlText> Get(int id)
+        public Models.HtmlText Get(int id)
         {
-            var list = new List<Models.HtmlText>();
-            try
+            if (AuthEntityId(EntityNames.Module) == id)
             {
-                Models.HtmlText htmlText = null;
-                if (_authEntityId[EntityNames.Module] == id)
-                {
-                    htmlText = _htmlText.GetHtmlText(id);
-                    list.Add(htmlText);
-                }
+                return _htmlText.GetHtmlText(id);
             }
-            catch (Exception ex)
+            else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, ex, "Get Error {Error}", ex.Message);
-                throw;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HtmlText Get Attempt {ModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
-            return list;
         }
 
         // POST api/<controller>
+        [ValidateAntiForgeryToken]
         [HttpPost]
         [Authorize(Policy = PolicyNames.EditModule)]
         public Models.HtmlText Post([FromBody] Models.HtmlText htmlText)
         {
-            try
+            if (ModelState.IsValid && AuthEntityId(EntityNames.Module) == htmlText.ModuleId)
             {
-                if (ModelState.IsValid && htmlText.ModuleId == _authEntityId[EntityNames.Module])
-                {
-                    htmlText = _htmlText.AddHtmlText(htmlText);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", htmlText);
-                }
+                htmlText = _htmlText.AddHtmlText(htmlText);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", htmlText);
                 return htmlText;
             }
-            catch (Exception ex)
+            else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, ex, "Post Error {Error}", ex.Message);
-                throw;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HtmlText Post Attempt {HtmlText}", htmlText);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
         }
 
         // PUT api/<controller>/5
+        [ValidateAntiForgeryToken]
         [HttpPut("{id}")]
         [Authorize(Policy = PolicyNames.EditModule)]
         public Models.HtmlText Put(int id, [FromBody] Models.HtmlText htmlText)
         {
-            try
+            if (ModelState.IsValid && AuthEntityId(EntityNames.Module) == htmlText.ModuleId)
             {
-                if (ModelState.IsValid && htmlText.ModuleId == _authEntityId[EntityNames.Module])
-                {
-                    htmlText = _htmlText.UpdateHtmlText(htmlText);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Update, "Html/Text Updated {HtmlText}", htmlText);
-                }
+                htmlText = _htmlText.UpdateHtmlText(htmlText);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Html/Text Updated {HtmlText}", htmlText);
                 return htmlText;
             }
-            catch (Exception ex)
+            else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, ex, "Put Error {Error}", ex.Message);
-                throw;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HtmlText Put Attempt {HtmlText}", htmlText);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
             }
         }
 
         // DELETE api/<controller>/5
+        [ValidateAntiForgeryToken]
         [HttpDelete("{id}")]
         [Authorize(Policy = PolicyNames.EditModule)]
         public void Delete(int id)
         {
-            try
+            if (AuthEntityId(EntityNames.Module) == id)
             {
-                if (id == _authEntityId[EntityNames.Module])
-                {
-                    _htmlText.DeleteHtmlText(id);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id);
-                }
+                _htmlText.DeleteHtmlText(id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id);
             }
-            catch (Exception ex)
+            else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, ex, "Delete Error {Error}", ex.Message);
-                throw;
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HtmlText Delete Attempt {ModuleId}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
         }
     }
diff --git a/Oqtane.Server/Modules/HtmlText/Migrations/01000000_InitializeModule.cs b/Oqtane.Server/Modules/HtmlText/Migrations/01000000_InitializeModule.cs
index 9527b239..094c32e3 100644
--- a/Oqtane.Server/Modules/HtmlText/Migrations/01000000_InitializeModule.cs
+++ b/Oqtane.Server/Modules/HtmlText/Migrations/01000000_InitializeModule.cs
@@ -1,8 +1,6 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations;
 using Oqtane.Modules.HtmlText.Migrations.EntityBuilders;
 using Oqtane.Modules.HtmlText.Repository;
@@ -19,14 +17,12 @@ namespace Oqtane.Modules.HtmlText.Migrations
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            //Create HtmlText table
             var entityBuilder = new HtmlTextEntityBuilder(migrationBuilder, ActiveDatabase);
             entityBuilder.Create();
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            //Drop HtmlText table
             var entityBuilder = new HtmlTextEntityBuilder(migrationBuilder, ActiveDatabase);
             entityBuilder.Drop();
         }
diff --git a/Oqtane.Server/Modules/MigratableModuleBase.cs b/Oqtane.Server/Modules/MigratableModuleBase.cs
index 11dbc081..324d4dba 100644
--- a/Oqtane.Server/Modules/MigratableModuleBase.cs
+++ b/Oqtane.Server/Modules/MigratableModuleBase.cs
@@ -1,10 +1,8 @@
-using System;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Repository;
-using Oqtane.Shared;
 
 namespace Oqtane.Modules
 {
@@ -16,27 +14,18 @@ namespace Oqtane.Modules
 
             using (dbContext)
             {
-                try
+                var migrator = dbContext.GetService<IMigrator>();
+                if (migrationType == MigrationType.Down)
                 {
-                    var migrator = dbContext.GetService<IMigrator>();
-                    if (migrationType == MigrationType.Down)
-                    {
-                        migrator.Migrate(Migration.InitialDatabase);
-                    }
-                    else
-                    {
-                        migrator.Migrate();
-                    }
+                    migrator.Migrate(Migration.InitialDatabase);
                 }
-                catch (Exception e)
+                else
                 {
-                    Console.WriteLine(e);
-                    result = false;
+                    migrator.Migrate();
                 }
-
             }
-            return result;
 
+            return result;
         }
     }
 }
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index c1f39b2d..d5356996 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index ccb24679..cfd3b78c 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -34,13 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @if (Model.Message != "")
-    {
-        <div class="app-alert">
-            @Model.Message
-        </div>
-    }
-
     <script src="js/interop.js"></script>
 
     @if (Model.Runtime == "WebAssembly")
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 235d70cc..c0333760 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -38,7 +38,6 @@ namespace Oqtane.Pages
         public RenderMode RenderMode = RenderMode.Server;
         public string HeadResources = "";
         public string BodyResources = "";
-        public string Message = "";
 
         public void OnGet()
         {
@@ -60,12 +59,13 @@ namespace Oqtane.Pages
                 ProcessThemeControls(assembly);
             }
 
-            // if culture not specified and framework is installed 
+            // if framework is installed 
             if (!string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
             {
                 var alias = _tenantManager.GetAlias();
                 if (alias != null)
                 {
+                    // if culture not specified
                     if (HttpContext.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName] == null)
                     {
                         // set default language for site if the culture is not supported
diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs
index 1ac0797e..14a64abc 100644
--- a/Oqtane.Server/Program.cs
+++ b/Oqtane.Server/Program.cs
@@ -1,9 +1,12 @@
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Infrastructure;
+using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+using Oqtane.Shared;
 
 namespace Oqtane.Server
 {
@@ -12,10 +15,15 @@ namespace Oqtane.Server
         public static void Main(string[] args)
         {
             var host = BuildWebHost(args);
-            using (var serviceScope = host.Services.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            var databaseManager = host.Services.GetService<IDatabaseManager>();
+            var install = databaseManager.Install();
+            if (!string.IsNullOrEmpty(install.Message))
             {
-                var databaseManager = serviceScope.ServiceProvider.GetService<IDatabaseManager>();
-                databaseManager.Install();
+                var filelogger = host.Services.GetRequiredService<ILogger<Program>>();
+                if (filelogger != null)
+                {
+                    filelogger.LogError($"[Oqtane.Server.Program.Main] {install.Message}");
+                }
             }
             host.Run();
         }
diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs
index 619724dc..9e4e82d9 100644
--- a/Oqtane.Server/Repository/AliasRepository.cs
+++ b/Oqtane.Server/Repository/AliasRepository.cs
@@ -45,15 +45,28 @@ namespace Oqtane.Repository
 
         public Alias GetAlias(int aliasId)
         {
-            return _db.Alias.Find(aliasId);
+            return GetAlias(aliasId, true);
         }
 
-        public Alias GetAlias(string name)
+        public Alias GetAlias(int aliasId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Alias.Find(aliasId);
+            }
+            else
+            {
+                return _db.Alias.AsNoTracking().FirstOrDefault(item => item.AliasId == aliasId);
+            }
+        }
+
+        // lookup alias based on url - note that alias values are hierarchical
+        public Alias GetAlias(string url)
         {
             Alias alias = null;
 
             List<Alias> aliases = GetAliases().ToList();
-            var segments = name.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            var segments = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
 
             // iterate segments to find keywords
             int start = segments.Length;
diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs
index 4a5180e6..926bdcf2 100644
--- a/Oqtane.Server/Repository/Context/DBContextBase.cs
+++ b/Oqtane.Server/Repository/Context/DBContextBase.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
@@ -84,6 +86,13 @@ namespace Oqtane.Repository
             return base.SaveChanges();
         }
 
+        public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+        {
+            DbContextUtils.SaveChanges(this, _accessor);
+
+            return base.SaveChangesAsync(cancellationToken);
+        }
+
         [Obsolete("This constructor is obsolete. Use DBContextBase(ITenantManager tenantManager, IHttpContextAccessor httpContextAccessor) instead.", false)]
         public DBContextBase(ITenantResolver tenantResolver, IHttpContextAccessor httpContextAccessor)
         {
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index fe70ee0f..a7874100 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -12,6 +12,8 @@ using Oqtane.Interfaces;
 using Oqtane.Migrations.Framework;
 using Oqtane.Repository.Databases.Interfaces;
 using Oqtane.Shared;
+using System.Threading.Tasks;
+using System.Threading;
 
 // ReSharper disable BuiltInTypeReferenceStyleForMemberAccess
 // ReSharper disable UnusedAutoPropertyAccessor.Global
@@ -75,5 +77,12 @@ namespace Oqtane.Repository
 
             return base.SaveChanges();
         }
+
+        public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+        {
+            DbContextUtils.SaveChanges(this, _accessor);
+
+            return base.SaveChangesAsync(cancellationToken);
+        }
     }
 }
diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs
index 9c170523..1c6179f6 100644
--- a/Oqtane.Server/Repository/FileRepository.cs
+++ b/Oqtane.Server/Repository/FileRepository.cs
@@ -63,12 +63,11 @@ namespace Oqtane.Repository
             File file;
             if (tracking)
             {
-                file = _db.File.Where(item => item.FileId == fileId).Include(item => item.Folder).FirstOrDefault();
-
+                file = _db.File.Include(item => item.Folder).FirstOrDefault(item => item.FileId == fileId);
             }
             else
             {
-                file = _db.File.AsNoTracking().Where(item => item.FileId == fileId).Include(item => item.Folder).FirstOrDefault();
+                file = _db.File.AsNoTracking().Include(item => item.Folder).FirstOrDefault(item => item.FileId == fileId);
             }
             if (file != null)
             {
diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs
index 13797658..7059f389 100644
--- a/Oqtane.Server/Repository/FolderRepository.cs
+++ b/Oqtane.Server/Repository/FolderRepository.cs
@@ -61,7 +61,7 @@ namespace Oqtane.Repository
             Folder folder;
             if (tracking)
             {
-                folder = _db.Folder.Where(item => item.FolderId == folderId).FirstOrDefault();
+                folder = _db.Folder.Find(folderId);
             }
             else
             {
diff --git a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
index 5422ab07..81a42d68 100644
--- a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
@@ -9,7 +9,8 @@ namespace Oqtane.Repository
         Alias AddAlias(Alias alias);
         Alias UpdateAlias(Alias alias);
         Alias GetAlias(int aliasId);
-        Alias GetAlias(string name);
+        Alias GetAlias(int aliasId, bool tracking);
+        Alias GetAlias(string url);
         void DeleteAlias(int aliasId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
index 12be85c1..e45b0231 100644
--- a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Job AddJob(Job job);
         Job UpdateJob(Job job);
         Job GetJob(int jobId);
+        Job GetJob(int jobId, bool tracking);
         void DeleteJob(int jobId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
index 48de4c8a..81b31b50 100644
--- a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
@@ -6,8 +6,9 @@ namespace Oqtane.Repository
     public interface IModuleDefinitionRepository
     {
         IEnumerable<ModuleDefinition> GetModuleDefinitions();
-        IEnumerable<ModuleDefinition> GetModuleDefinitions(int sideId);
-        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int sideId);
+        IEnumerable<ModuleDefinition> GetModuleDefinitions(int siteId);
+        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int siteId);
+        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, bool tracking);
         void UpdateModuleDefinition(ModuleDefinition moduleDefinition);
         void DeleteModuleDefinition(int moduleDefinitionId);
     }
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
index 2ef4185d..08923ecd 100644
--- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Module AddModule(Module module);
         Module UpdateModule(Module module);
         Module GetModule(int moduleId);
+        Module GetModule(int moduleId, bool tracking);
         void DeleteModule(int moduleId);
         string ExportModule(int moduleId);
         bool ImportModule(int moduleId, string content);
diff --git a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
index ef53bc3a..5dfb81b6 100644
--- a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Notification AddNotification(Notification notification);
         Notification UpdateNotification(Notification notification);
         Notification GetNotification(int notificationId);
+        Notification GetNotification(int notificationId, bool tracking);
         void DeleteNotification(int notificationId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
index 181fb629..6085fcc2 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -10,6 +10,7 @@ namespace Oqtane.Repository
         PageModule AddPageModule(PageModule pageModule);
         PageModule UpdatePageModule(PageModule pageModule);
         PageModule GetPageModule(int pageModuleId);
+        PageModule GetPageModule(int pageModuleId, bool tracking);
         PageModule GetPageModule(int pageId, int moduleId);
         void DeletePageModule(int pageModuleId);
     }
diff --git a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
index 6db92dba..98ce2ef3 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Page AddPage(Page page);
         Page UpdatePage(Page page);
         Page GetPage(int pageId);
+        Page GetPage(int pageId, bool tracking);
         Page GetPage(int pageId, int userId);
         Page GetPage(string path, int siteId);
         void DeletePage(int pageId);
diff --git a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
index c9b4f34b..95405c96 100644
--- a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Profile AddProfile(Profile profile);
         Profile UpdateProfile(Profile profile);
         Profile GetProfile(int profileId);
+        Profile GetProfile(int profileId, bool tracking);
         void DeleteProfile(int profileId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
index 35f9315f..1b2ea0e4 100644
--- a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -10,6 +10,7 @@ namespace Oqtane.Repository
         Role AddRole(Role role);
         Role UpdateRole(Role role);
         Role GetRole(int roleId);
+        Role GetRole(int roleId, bool tracking);
         void DeleteRole(int roleId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
index c8cfec23..8172efff 100644
--- a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         Site AddSite(Site site);
         Site UpdateSite(Site site);
         Site GetSite(int siteId);
+        Site GetSite(int siteId, bool tracking);
         void DeleteSite(int siteId);
         void CreatePages(Site site, List<PageTemplate> pageTemplates);
     }
diff --git a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
index be646e56..89a25bca 100644
--- a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -9,6 +9,7 @@ namespace Oqtane.Repository
         User AddUser(User user);
         User UpdateUser(User user);
         User GetUser(int userId);
+        User GetUser(int userId, bool tracking);
         User GetUser(string username);
         void DeleteUser(int userId);
     }
diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
index b26eb5dc..0c4a2290 100644
--- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
@@ -10,6 +10,7 @@ namespace Oqtane.Repository
         UserRole AddUserRole(UserRole userRole);
         UserRole UpdateUserRole(UserRole userRole);
         UserRole GetUserRole(int userRoleId);
+        UserRole GetUserRole(int userRoleId, bool tracking);
         void DeleteUserRole(int userRoleId);
         void DeleteUserRoles(int userId);
     }
diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs
index cbe51c19..37b38521 100644
--- a/Oqtane.Server/Repository/JobRepository.cs
+++ b/Oqtane.Server/Repository/JobRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
@@ -48,6 +48,19 @@ namespace Oqtane.Repository
             return _db.Job.Find(jobId);
         }
 
+        public Job GetJob(int jobId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Job.Find(jobId);
+            }
+            else
+            {
+                return _db.Job.AsNoTracking().FirstOrDefault(item => item.JobId == jobId);
+            }
+
+        }
+
         public void DeleteJob(int jobId)
         {
             Job job = _db.Job.Find(jobId);
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 1b72d3f8..62566b19 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -41,6 +42,24 @@ namespace Oqtane.Repository
             return moduledefinitions.Find(item => item.ModuleDefinitionId == moduleDefinitionId);
         }
 
+        public ModuleDefinition GetModuleDefinition(int moduleDefinitionId, bool tracking)
+        {
+            ModuleDefinition moduledefinition;
+            if (tracking)
+            {
+                moduledefinition = _db.ModuleDefinition.Find(moduleDefinitionId);
+            }
+            else
+            {
+                moduledefinition = _db.ModuleDefinition.AsNoTracking().FirstOrDefault(item => item.ModuleDefinitionId == moduleDefinitionId);
+            }
+            if (moduledefinition != null)
+            {
+                moduledefinition.Permissions = _permissions.GetPermissionString(EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId);
+            }
+            return moduledefinition;
+        }
+
         public void UpdateModuleDefinition(ModuleDefinition moduleDefinition)
         {
             _db.Entry(moduleDefinition).State = EntityState.Modified;
@@ -132,30 +151,15 @@ namespace Oqtane.Repository
                     moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName };
                     _db.ModuleDefinition.Add(moduledef);
                     _db.SaveChanges();
+                    moduledefinition.Version = "";
                 }
                 else
                 {
-                    // existing module definition
-                    if (!string.IsNullOrEmpty(moduledef.Name))
-                    {
-                        moduledefinition.Name = moduledef.Name;
-                    }
-
-                    if (!string.IsNullOrEmpty(moduledef.Description))
-                    {
-                        moduledefinition.Description = moduledef.Description;
-                    }
-
-                    if (!string.IsNullOrEmpty(moduledef.Categories))
-                    {
-                        moduledefinition.Categories = moduledef.Categories;
-                    }
-
-                    if (!string.IsNullOrEmpty(moduledef.Version))
-                    {
-                        moduledefinition.Version = moduledef.Version;
-                    }
-
+                    // override user customizable property values
+                    moduledefinition.Name = (!string.IsNullOrEmpty(moduledef.Name)) ? moduledef.Name : moduledefinition.Name;
+                    moduledefinition.Description = (!string.IsNullOrEmpty(moduledef.Description)) ? moduledef.Description : moduledefinition.Description;
+                    moduledefinition.Categories = (!string.IsNullOrEmpty(moduledef.Categories)) ? moduledef.Categories : moduledefinition.Categories;
+                    moduledefinition.Version = moduledef.Version;
                     // remove module definition from list as it is already synced
                     moduledefs.Remove(moduledef);
                 }
@@ -235,7 +239,6 @@ namespace Oqtane.Repository
 
                     // set internal properties
                     moduledefinition.ModuleDefinitionName = qualifiedModuleType;
-                    moduledefinition.Version = ""; // will be populated from database
                     moduledefinition.ControlTypeTemplate = modulecontroltype.Namespace + "." + Constants.ActionToken + ", " + modulecontroltype.Assembly.GetName().Name;
                     moduledefinition.AssemblyName = assembly.GetName().Name;
                     if (string.IsNullOrEmpty(moduledefinition.PackageName))
@@ -264,7 +267,7 @@ namespace Oqtane.Repository
                         }.EncodePermissions();
                     }
 
-                    Console.WriteLine($"Registering module: {moduledefinition.ModuleDefinitionName}");
+                    Debug.WriteLine($"Oqtane Info: Registering Module {moduledefinition.ModuleDefinitionName}");
                     moduledefinitions.Add(moduledefinition);
                     index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == qualifiedModuleType);
                 }
diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
index 9d83351a..922dfb5d 100644
--- a/Oqtane.Server/Repository/ModuleRepository.cs
+++ b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
@@ -48,12 +48,24 @@ namespace Oqtane.Repository
 
         public Module GetModule(int moduleId)
         {
-            Module module = _db.Module.Find(moduleId);
+            return GetModule(moduleId, true);
+        }
+
+        public Module GetModule(int moduleId, bool tracking)
+        {
+            Module module;
+            if (tracking)
+            {
+                module = _db.Module.Find(moduleId);
+            }
+            else
+            {
+                module = _db.Module.AsNoTracking().FirstOrDefault(item => item.ModuleId == moduleId);
+            }
             if (module != null)
             {
                 module.Permissions = _permissions.GetPermissionString("Module", module.ModuleId);
             }
-
             return module;
         }
 
@@ -147,10 +159,9 @@ namespace Oqtane.Repository
                     }
                 }
             }
-            catch (Exception ex)
+            catch
             {
                 // error occurred during import
-                string error = ex.Message;
             }
 
             return success;
diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs
index 38ec8559..aa05bf17 100644
--- a/Oqtane.Server/Repository/NotificationRepository.cs
+++ b/Oqtane.Server/Repository/NotificationRepository.cs
@@ -45,10 +45,21 @@ namespace Oqtane.Repository
             _db.SaveChanges();
             return notification;
         }
-
         public Notification GetNotification(int notificationId)
         {
-            return _db.Notification.Find(notificationId);
+            return GetNotification(notificationId, true);
+        }
+
+        public Notification GetNotification(int notificationId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Notification.Find(notificationId);
+            }
+            else
+            {
+                return _db.Notification.AsNoTracking().FirstOrDefault(item => item.NotificationId == notificationId);
+            }
         }
 
         public void DeleteNotification(int notificationId)
diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs
index e78abb07..07d39801 100644
--- a/Oqtane.Server/Repository/PageModuleRepository.cs
+++ b/Oqtane.Server/Repository/PageModuleRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Extensions;
@@ -69,8 +69,22 @@ namespace Oqtane.Repository
 
         public PageModule GetPageModule(int pageModuleId)
         {
-            PageModule pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules
-                .SingleOrDefault(item => item.PageModuleId == pageModuleId);
+            return GetPageModule(pageModuleId, true);
+        }
+
+        public PageModule GetPageModule(int pageModuleId, bool tracking)
+        {
+            PageModule pagemodule;
+            if (tracking)
+            {
+                pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules
+                    .FirstOrDefault(item => item.PageModuleId == pageModuleId);
+            }
+            else
+            {
+                pagemodule = _db.PageModule.AsNoTracking().Include(item => item.Module) // eager load modules
+                    .FirstOrDefault(item => item.PageModuleId == pageModuleId);
+            }
             if (pagemodule != null)
             {
                 pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs
index 9db59dc2..ac89a444 100644
--- a/Oqtane.Server/Repository/PageRepository.cs
+++ b/Oqtane.Server/Repository/PageRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Extensions;
@@ -49,7 +49,21 @@ namespace Oqtane.Repository
 
         public Page GetPage(int pageId)
         {
-            Page page = _db.Page.Find(pageId);
+            return GetPage(pageId, true);
+        }
+
+        public Page GetPage(int pageId, bool tracking)
+        {
+            Page page;
+            if (tracking)
+            {
+                page = _db.Page.Find(pageId);
+
+            }
+            else
+            {
+                page = _db.Page.AsNoTracking().FirstOrDefault(item => item.PageId == pageId);
+            }
             if (page != null)
             {
                 page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs
index 8577ea78..3109fa3c 100644
--- a/Oqtane.Server/Repository/ProfileRepository.cs
+++ b/Oqtane.Server/Repository/ProfileRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
@@ -35,7 +35,19 @@ namespace Oqtane.Repository
 
         public Profile GetProfile(int profileId)
         {
-            return _db.Profile.Find(profileId);
+            return GetProfile(profileId, true);
+        }
+
+        public Profile GetProfile(int profileId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Profile.Find(profileId);
+            }
+            else
+            {
+                return _db.Profile.AsNoTracking().FirstOrDefault(item => item.ProfileId == profileId);
+            }
         }
 
         public void DeleteProfile(int profileId)
diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index b8afb4a4..c50ead27 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -49,7 +49,19 @@ namespace Oqtane.Repository
 
         public Role GetRole(int roleId)
         {
-            return _db.Role.Find(roleId);
+            return GetRole(roleId, true);
+        }
+
+        public Role GetRole(int roleId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Role.Find(roleId);
+            }
+            else
+            {
+                return _db.Role.AsNoTracking().FirstOrDefault(item => item.RoleId == roleId);
+            }
         }
 
         public void DeleteRole(int roleId)
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 7d45e691..c47f3977 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
 using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
@@ -44,559 +43,6 @@ namespace Oqtane.Repository
             _config = config;
         }
 
-        private List<PageTemplate> CreateAdminPages(List<PageTemplate> pageTemplates = null)
-        {
-            if (pageTemplates == null) pageTemplates = new List<PageTemplate>();
-
-            // user pages
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Login",
-                Parent = "",
-                Path = "login",
-                Icon = Icons.LockLocked,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = SharedResources.UserLogin, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Register",
-                Parent = "",
-                Path = "register",
-                Icon = Icons.Person,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = SharedResources.UserRegistration, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Reset",
-                Parent = "",
-                Path = "reset",
-                Icon = Icons.Person,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = SharedResources.PasswordReset, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Profile",
-                Parent = "",
-                Path = "profile",
-                Icon = Icons.Person,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.View, RoleNames.Registered, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = SharedResources.UserProfile, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.View, RoleNames.Registered, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            
-            // admin pages
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = SharedResources.AdminDashboard, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Site Settings",
-                Parent = "Admin",
-                Path = "admin/site",
-                Icon = Icons.Home,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = SharedResources.SiteSettings, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Page Management",
-                Parent = "Admin",
-                Path = "admin/pages",
-                Icon = Icons.Layers,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = SharedResources.PageManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "User Management",
-                Parent = "Admin",
-                Path = "admin/users",
-                Icon = Icons.People,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = SharedResources.UserManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Profile Management",
-                Parent = "Admin",
-                Path = "admin/profiles",
-                Icon = Icons.Person,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = SharedResources.ProfileManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Role Management",
-                Parent = "Admin",
-                Path = "admin/roles",
-                Icon = Icons.LockLocked,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = SharedResources.RoleManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "File Management",
-                Parent = "Admin",
-                Path = "admin/files",
-                Icon = Icons.File,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = SharedResources.FileManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Recycle Bin",
-                Parent = "Admin",
-                Path = "admin/recyclebin",
-                Icon = Icons.Trash,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = SharedResources.RecycleBin, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-
-            // host pages
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Event Log",
-                Parent = "Admin",
-                Path = "admin/log",
-                Icon = Icons.MagnifyingGlass,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = SharedResources.EventLog, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = Icons.Globe, IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = SharedResources.SiteManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = Icons.Browser, IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = SharedResources.ModuleManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = Icons.Brush, IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = SharedResources.ThemeManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Language Management",
-                Parent = "Admin",
-                Path = "admin/languages",
-                Icon = Icons.Text,
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true),
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = SharedResources.LanguageManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true),
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = SharedResources.ScheduledJobs, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "Sql Management", Parent = "Admin", Path = "admin/sql", Icon = Icons.Spreadsheet, IsNavigation = false, IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = SharedResources.SqlManagement, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "System Info", Parent = "Admin", Path = "admin/system", Icon = Icons.MedicalCross, IsNavigation = false, IsPersonalizable = false,
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = SharedResources.SystemInfo, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-            pageTemplates.Add(new PageTemplate
-            {
-                Name = "System Update", Parent = "Admin", Path = "admin/update", Icon = Icons.Aperture, IsNavigation = false, IsPersonalizable = false, 
-                PagePermissions = new List<Permission>
-                {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                }.EncodePermissions(),
-                PageTemplateModules = new List<PageTemplateModule>
-                {
-                    new PageTemplateModule
-                    {
-                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = SharedResources.SystemUpdate, Pane = PaneNames.Admin,
-                        ModulePermissions = new List<Permission>
-                        {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }.EncodePermissions(),
-                        Content = ""
-                    }
-                }
-            });
-
-            return pageTemplates;
-        }
-
         public IEnumerable<Site> GetSites()
         {
             return _db.Site;
@@ -620,7 +66,19 @@ namespace Oqtane.Repository
 
         public Site GetSite(int siteId)
         {
-            return _db.Site.Find(siteId);
+            return GetSite(siteId, true);
+        }
+
+        public Site GetSite(int siteId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.Site.Find(siteId);
+            }
+            else
+            {
+                return _db.Site.AsNoTracking().FirstOrDefault(item => item.SiteId == siteId);
+            }
         }
 
         public void DeleteSite(int siteId)
@@ -748,7 +206,7 @@ namespace Oqtane.Repository
                     Name = pagetemplate.Name,
                     Title = "",
                     Path = pagetemplate.Path,
-                    Order = 1,
+                    Order = (pagetemplate.Order == 0) ? 1 : pagetemplate.Order,
                     Url = "",
                     IsNavigation = pagetemplate.IsNavigation,
                     ThemeType = "",
@@ -756,7 +214,8 @@ namespace Oqtane.Repository
                     Icon = pagetemplate.Icon,
                     Permissions = pagetemplate.PagePermissions,
                     IsPersonalizable = pagetemplate.IsPersonalizable,
-                    UserId = null
+                    UserId = null,
+                    IsClickable = true
                 };
                 page = _pageRepository.AddPage(page);
 
@@ -808,5 +267,614 @@ namespace Oqtane.Repository
                 }
             }
         }
+
+        private List<PageTemplate> CreateAdminPages(List<PageTemplate> pageTemplates = null)
+        {
+            if (pageTemplates == null) pageTemplates = new List<PageTemplate>();
+
+            // user pages
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Login",
+                Parent = "",
+                Path = "login",
+                Icon = Icons.LockLocked,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Register",
+                Parent = "",
+                Path = "register",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Reset",
+                Parent = "",
+                Path = "reset",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Profile",
+                Parent = "",
+                Path = "profile",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.View, RoleNames.Registered, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.View, RoleNames.Registered, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            // admin pages
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Admin",
+                Parent = "",
+                Path = "admin",
+                Icon = "",
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Site Settings",
+                Parent = "Admin",
+                Order = 1,
+                Path = "admin/site",
+                Icon = Icons.Home,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Page Management",
+                Parent = "Admin",
+                Order = 3,
+                Path = "admin/pages",
+                Icon = Icons.Layers,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "User Management",
+                Parent = "Admin",
+                Order = 5,
+                Path = "admin/users",
+                Icon = Icons.People,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Profile Management",
+                Parent = "Admin",
+                Order = 7,
+                Path = "admin/profiles",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Role Management",
+                Parent = "Admin",
+                Order = 9,
+                Path = "admin/roles",
+                Icon = Icons.LockLocked,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "File Management",
+                Parent = "Admin",
+                Order = 11,
+                Path = "admin/files",
+                Icon = Icons.File,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Recycle Bin",
+                Parent = "Admin",
+                Order = 13,
+                Path = "admin/recyclebin",
+                Icon = Icons.Trash,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            // host pages
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Event Log",
+                Parent = "Admin",
+                Order = 15,
+                Path = "admin/log",
+                Icon = Icons.MagnifyingGlass,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Site Management",
+                Parent = "Admin",
+                Order = 17,
+                Path = "admin/sites",
+                Icon = Icons.Globe,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Module Management",
+                Parent = "Admin",
+                Order = 19,
+                Path = "admin/modules",
+                Icon = Icons.Browser,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Theme Management",
+                Parent = "Admin",
+                Order = 21,
+                Path = "admin/themes",
+                Icon = Icons.Brush,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Language Management",
+                Parent = "Admin",
+                Order = 23,
+                Path = "admin/languages",
+                Icon = Icons.Text,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true),
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true),
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Scheduled Jobs",
+                Parent = "Admin",
+                Order = 25,
+                Path = "admin/jobs",
+                Icon = Icons.Timer,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Sql Management",
+                Parent = "Admin",
+                Order = 27,
+                Path = "admin/sql",
+                Icon = Icons.Spreadsheet,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "System Info",
+                Parent = "Admin",
+                Order = 29,
+                Path = "admin/system",
+                Icon = Icons.MedicalCross,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "System Update",
+                Parent = "Admin",
+                Order = 31,
+                Path = "admin/update",
+                Icon = Icons.Aperture,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            return pageTemplates;
+        }
     }
 }
diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs
index e338c080..e5943cbe 100644
--- a/Oqtane.Server/Repository/ThemeRepository.cs
+++ b/Oqtane.Server/Repository/ThemeRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -104,6 +105,8 @@ namespace Oqtane.Repository
                     {
                         theme.PackageName = Utilities.GetTypeName(theme.ThemeName);
                     }
+
+                    Debug.WriteLine($"Oqtane Info: Registering Theme {theme.ThemeName}");
                     themes.Add(theme);
                     index = themes.FindIndex(item => item.ThemeName == qualifiedThemeType);
                 }
diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs
index a9e51afe..2a71e980 100644
--- a/Oqtane.Server/Repository/UserRepository.cs
+++ b/Oqtane.Server/Repository/UserRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
@@ -35,7 +35,19 @@ namespace Oqtane.Repository
 
         public User GetUser(int userId)
         {
-            return _db.User.Find(userId);
+            return GetUser(userId, true);
+        }
+
+        public User GetUser(int userId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.User.Find(userId);
+            }
+            else
+            {
+                return _db.User.AsNoTracking().FirstOrDefault(item => item.UserId == userId);
+            }
         }
 
         public User GetUser(string username)
diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs
index d62156f5..8eef5221 100644
--- a/Oqtane.Server/Repository/UserRoleRepository.cs
+++ b/Oqtane.Server/Repository/UserRoleRepository.cs
@@ -46,10 +46,25 @@ namespace Oqtane.Repository
 
         public UserRole GetUserRole(int userRoleId)
         {
-            return _db.UserRole
-                .Include(item => item.Role) // eager load roles
-                .Include(item => item.User) // eager load users
-                .SingleOrDefault(item => item.UserRoleId == userRoleId);
+            return GetUserRole(userRoleId, true);
+        }
+
+        public UserRole GetUserRole(int userRoleId, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.UserRole
+                    .Include(item => item.Role) // eager load roles
+                    .Include(item => item.User) // eager load users
+                    .FirstOrDefault(item => item.UserRoleId == userRoleId);
+            }
+            else
+            {
+                return _db.UserRole.AsNoTracking()
+                    .Include(item => item.Role) // eager load roles
+                    .Include(item => item.User) // eager load users
+                    .FirstOrDefault(item => item.UserRoleId == userRoleId);
+            }
         }
 
         public void DeleteUserRole(int userRoleId)
diff --git a/Oqtane.Server/Scripts/MigrateMaster.sql b/Oqtane.Server/Scripts/MigrateMaster.sql
index 197450c7..773d9521 100644
--- a/Oqtane.Server/Scripts/MigrateMaster.sql
+++ b/Oqtane.Server/Scripts/MigrateMaster.sql
@@ -11,7 +11,7 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'dbo.SchemaVersion
                 )
             END
         INSERT INTO __EFMigrationsHistory(MigrationId, ProductVersion, AppliedDate, AppliedVersion)
-            VALUES ('Master.01.00.00.00', '5.0.0', SYSDATETIME(), '{{Version}}')
+            VALUES ('Master.01.00.00.00', '5.0.4', SYSDATETIME(), '{{Version}}')
         INSERT INTO __EFMigrationsHistory(MigrationId, ProductVersion, AppliedDate, AppliedVersion)
             SELECT REPLACE(REPLACE(ScriptName, 'Oqtane.Scripts.', ''), '.sql', '') As MigrationId, 
                    ProductVersion = '5.0.4',
diff --git a/Oqtane.Server/Scripts/MigrateTenant.sql b/Oqtane.Server/Scripts/MigrateTenant.sql
index b80ed4ee..f2e8bb40 100644
--- a/Oqtane.Server/Scripts/MigrateTenant.sql
+++ b/Oqtane.Server/Scripts/MigrateTenant.sql
@@ -11,7 +11,7 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'dbo.SchemaVersion
                 )
             END
         INSERT INTO __EFMigrationsHistory(MigrationId, ProductVersion, AppliedDate, AppliedVersion)
-            VALUES ('Tenant.01.00.00.00', '5.0.0', SYSDATETIME(), '{{Version}}')
+            VALUES ('Tenant.01.00.00.00', '5.0.4', SYSDATETIME(), '{{Version}}')
         INSERT INTO __EFMigrationsHistory(MigrationId, ProductVersion, AppliedDate, AppliedVersion)
             SELECT REPLACE(REPLACE(ScriptName, 'Oqtane.Scripts.', ''), '.sql', '') As MigrationId,
                    ProductVersion = '5.0.4',
diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs
index 1a36cdce..0b507e74 100644
--- a/Oqtane.Server/Security/PermissionHandler.cs
+++ b/Oqtane.Server/Security/PermissionHandler.cs
@@ -22,20 +22,34 @@ namespace Oqtane.Security
 
         protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
         {
-            // permission is scoped based on auth{entityname}id (ie ?authmoduleid ) which must be passed as a querystring parameter
+            // permission is scoped based on entitynames and ids passed as querystring parameters or headers
             var ctx = _httpContextAccessor.HttpContext;
             if (ctx != null)
             {
+                // get entityid based on a parameter format of auth{entityname}id (ie. authmoduleid ) 
                 int entityId = -1;
                 if (ctx.Request.Query.ContainsKey("auth" + requirement.EntityName.ToLower() + "id"))
                 {
-                    entityId = int.Parse(ctx.Request.Query["auth" + requirement.EntityName.ToLower() + "id"]);
+                    if (!int.TryParse(ctx.Request.Query["auth" + requirement.EntityName.ToLower() + "id"], out entityId))
+                    {
+                        entityId = -1;
+                    }
                 }
-                if (ctx.Request.Query.ContainsKey("entityid"))
+
+                // legacy support
+                if (entityId == -1)
                 {
-                    entityId = int.Parse(ctx.Request.Query["entityid"]);
+                    if (ctx.Request.Query.ContainsKey("entityid"))
+                    {
+                        if (!int.TryParse(ctx.Request.Query["entityid"], out entityId))
+                        {
+                            entityId = -1;
+                        }
+                    }
                 }
-                if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName))
+
+                // validate permissions
+                if (entityId != -1 && _userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName))
                 {
                     context.Succeed(requirement);
                 }
diff --git a/Oqtane.Server/Security/PrincipalValidator.cs b/Oqtane.Server/Security/PrincipalValidator.cs
index 0523bd92..170e20ff 100644
--- a/Oqtane.Server/Security/PrincipalValidator.cs
+++ b/Oqtane.Server/Security/PrincipalValidator.cs
@@ -29,7 +29,7 @@ namespace Oqtane.Security
                         {
                             // tenant agnostic requests must be ignored 
                             string path = context.Request.Path.ToString().ToLower();
-                            if (path.StartsWith("/_blazor") || path.StartsWith("/api/installation/") || path.StartsWith("/api/alias/name/"))
+                            if (path.StartsWith("/_blazor") || path.StartsWith("/api/installation/"))
                             {
                                 return Task.CompletedTask;
                             }
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index 061b78bc..4f5160ec 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -1,35 +1,29 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
 using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Security;
-using Oqtane.Services;
 using Oqtane.Shared;
 
 namespace Oqtane
 {
     public class Startup
     {
-        private Runtime _runtime;
-        private bool _useSwagger;
-        private IWebHostEnvironment _env;
-        private string[] _supportedCultures;
+        private readonly Runtime _runtime;
+        private readonly bool _useSwagger;
+        private readonly IWebHostEnvironment _env;
+        private readonly string[] _supportedCultures;
 
         public IConfigurationRoot Configuration { get; }
 
@@ -60,76 +54,24 @@ namespace Oqtane
 
             services.AddOptions<List<Database>>().Bind(Configuration.GetSection(SettingKeys.AvailableDatabasesSection));
 
-            services.AddServerSideBlazor().AddCircuitOptions(options =>
-            {
-                if (_env.IsDevelopment())
+            services.AddServerSideBlazor()
+                .AddCircuitOptions(options =>
                 {
-                    options.DetailedErrors = true;
-                }
-            });
+                    if (_env.IsDevelopment())
+                    {
+                        options.DetailedErrors = true;
+                    }
+                });
 
             // setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
-            if (!services.Any(x => x.ServiceType == typeof(HttpClient)))
-            {
-                services.AddScoped(s =>
-                {
-                    // creating the URI helper needs to wait until the JS Runtime is initialized, so defer it.
-                    var navigationManager = s.GetRequiredService<NavigationManager>();
-                    var client = new HttpClient(new HttpClientHandler { UseCookies = false });
-                    client.BaseAddress = new Uri(navigationManager.Uri);
-                    // set the auth cookie to allow HttpClient API calls to be authenticated
-                    var httpContextAccessor = s.GetRequiredService<IHttpContextAccessor>();
-                    var authToken = httpContextAccessor.HttpContext.Request.Cookies[".AspNetCore." + Constants.AuthenticationScheme];
-                    if (authToken != null)
-                    {
-                        client.DefaultRequestHeaders.Add("Cookie", ".AspNetCore." + Constants.AuthenticationScheme + "=" + authToken);
-                    }
-                    return client;
-                });
-            }
+            services.TryAddHttpClientWithAuthenticationCookie();
 
             // register custom authorization policies
-            services.AddAuthorizationCore(options =>
-            {
-                options.AddPolicy(PolicyNames.ViewPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.View)));
-                options.AddPolicy(PolicyNames.EditPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.Edit)));
-                options.AddPolicy(PolicyNames.ViewModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.View)));
-                options.AddPolicy(PolicyNames.EditModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.Edit)));
-                options.AddPolicy(PolicyNames.ViewFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.View)));
-                options.AddPolicy(PolicyNames.EditFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Edit)));
-                options.AddPolicy(PolicyNames.ListFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Browse)));
-            });
+            services.AddOqtaneAuthorizationPolicies();
 
             // register scoped core services
-            services.AddScoped<SiteState>();
-            services.AddScoped<IAuthorizationHandler, PermissionHandler>();
-            services.AddScoped<IInstallationService, InstallationService>();
-            services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
-            services.AddScoped<IThemeService, ThemeService>();
-            services.AddScoped<IAliasService, AliasService>();
-            services.AddScoped<ITenantService, TenantService>();
-            services.AddScoped<ISiteService, SiteService>();
-            services.AddScoped<IPageService, PageService>();
-            services.AddScoped<IModuleService, ModuleService>();
-            services.AddScoped<IPageModuleService, PageModuleService>();
-            services.AddScoped<IUserService, UserService>();
-            services.AddScoped<IProfileService, ProfileService>();
-            services.AddScoped<IRoleService, RoleService>();
-            services.AddScoped<IUserRoleService, UserRoleService>();
-            services.AddScoped<ISettingService, SettingService>();
-            services.AddScoped<IPackageService, PackageService>();
-            services.AddScoped<ILogService, LogService>();
-            services.AddScoped<IJobService, JobService>();
-            services.AddScoped<IJobLogService, JobLogService>();
-            services.AddScoped<INotificationService, NotificationService>();
-            services.AddScoped<IFolderService, FolderService>();
-            services.AddScoped<IFileService, FileService>();
-            services.AddScoped<ISiteTemplateService, SiteTemplateService>();
-            services.AddScoped<ISqlService, SqlService>();
-            services.AddScoped<ISystemService, SystemService>();
-            services.AddScoped<ILocalizationService, LocalizationService>();
-            services.AddScoped<ILanguageService, LanguageService>();
-            services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IAuthorizationHandler, PermissionHandler>()
+                .AddOqtaneScopedServices();
 
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
@@ -139,84 +81,35 @@ namespace Oqtane
                 .AddDefaultTokenProviders()
                 .AddClaimsPrincipalFactory<ClaimsPrincipalFactory<IdentityUser>>(); // role claims
 
-            services.Configure<IdentityOptions>(options =>
-            {
-                // Password settings
-                options.Password.RequireDigit = false;
-                options.Password.RequiredLength = 6;
-                options.Password.RequireNonAlphanumeric = false;
-                options.Password.RequireUppercase = false;
-                options.Password.RequireLowercase = false;
-
-                // Lockout settings
-                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(30);
-                options.Lockout.MaxFailedAccessAttempts = 10;
-                options.Lockout.AllowedForNewUsers = true;
-
-                // User settings
-                options.User.RequireUniqueEmail = false;
-            });
+            services.ConfigureOqtaneIdentityOptions();
 
             services.AddAuthentication(Constants.AuthenticationScheme)
                 .AddCookie(Constants.AuthenticationScheme);
 
-            services.ConfigureApplicationCookie(options =>
+            services.ConfigureOqtaneCookieOptions();
+
+            services.AddAntiforgery(options =>
             {
+                options.HeaderName = Constants.AntiForgeryTokenHeaderName;
                 options.Cookie.HttpOnly = false;
-                options.Events.OnRedirectToLogin = context =>
-                {
-                    context.Response.StatusCode = 401;
-                    return Task.CompletedTask;
-                };
-                options.Events.OnValidatePrincipal = PrincipalValidator.ValidateAsync;
+                options.Cookie.Name = Constants.AntiForgeryTokenCookieName;
+                options.Cookie.SameSite = SameSiteMode.Strict;
+                options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
             });
 
             // register singleton scoped core services
-            services.AddSingleton(Configuration);
-            services.AddSingleton<IInstallationManager, InstallationManager>();
-            services.AddSingleton<ISyncManager, SyncManager>();
-            services.AddSingleton<IDatabaseManager, DatabaseManager>();
-            services.AddSingleton<IConfigManager, ConfigManager>();
+            services.AddSingleton(Configuration)
+                .AddOqtaneSingletonServices();
 
             // install any modules or themes ( this needs to occur BEFORE the assemblies are loaded into the app domain )
             InstallationManager.InstallPackages(_env.WebRootPath, _env.ContentRootPath);
 
             // register transient scoped core services
-            services.AddTransient<ITenantManager, TenantManager>();
-            services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
-            services.AddTransient<IThemeRepository, ThemeRepository>();
-            services.AddTransient<IUserPermissions, UserPermissions>();
-            services.AddTransient<IAliasRepository, AliasRepository>();
-            services.AddTransient<ITenantRepository, TenantRepository>();
-            services.AddTransient<ISiteRepository, SiteRepository>();
-            services.AddTransient<IPageRepository, PageRepository>();
-            services.AddTransient<IModuleRepository, ModuleRepository>();
-            services.AddTransient<IPageModuleRepository, PageModuleRepository>();
-            services.AddTransient<IUserRepository, UserRepository>();
-            services.AddTransient<IProfileRepository, ProfileRepository>();
-            services.AddTransient<IRoleRepository, RoleRepository>();
-            services.AddTransient<IUserRoleRepository, UserRoleRepository>();
-            services.AddTransient<IPermissionRepository, PermissionRepository>();
-            services.AddTransient<ISettingRepository, SettingRepository>();
-            services.AddTransient<ILogRepository, LogRepository>();
-            services.AddTransient<ILogManager, LogManager>();
-            services.AddTransient<ILocalizationManager, LocalizationManager>();
-            services.AddTransient<IJobRepository, JobRepository>();
-            services.AddTransient<IJobLogRepository, JobLogRepository>();
-            services.AddTransient<INotificationRepository, NotificationRepository>();
-            services.AddTransient<IFolderRepository, FolderRepository>();
-            services.AddTransient<IFileRepository, FileRepository>();
-            services.AddTransient<ISiteTemplateRepository, SiteTemplateRepository>();
-            services.AddTransient<ISqlRepository, SqlRepository>();
-            services.AddTransient<IUpgradeManager, UpgradeManager>();
-            services.AddTransient<ILanguageRepository, LanguageRepository>();
-            // obsolete - replaced by ITenantManager
-            services.AddTransient<ITenantResolver, TenantResolver>();
+            services.AddOqtaneTransientServices();
 
             // load the external assemblies into the app domain, install services
             services.AddOqtane(_runtime, _supportedCultures);
-            services.AddDbContext<MasterDBContext>(options => { });
-            services.AddDbContext<TenantDBContext>(options => { });
+            services.AddOqtaneDbContext();
 
 
             services.AddMvc()
@@ -224,10 +117,7 @@ namespace Oqtane
                 .AddOqtaneApplicationParts() // register any Controllers from custom modules
                 .ConfigureOqtaneMvc(); // any additional configuration from IStart classes.
 
-            if (_useSwagger)
-            {
-                services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo {Title = "Oqtane", Version = "v1"}); });
-            }
+            services.TryAddSwagger(_useSwagger);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -263,7 +153,7 @@ namespace Oqtane
             if (_useSwagger)
             {
                 app.UseSwagger();
-                app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "Oqtane " + Constants.Version); });
+                app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/" + Constants.Version + "/swagger.json", Constants.PackageId + " " + Constants.Version); });
             }
 
             app.UseEndpoints(endpoints =>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
index b866069a..471f5eae 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Edit.razor
@@ -6,25 +6,27 @@
 @inherits ModuleBase
 @inject I[Module]Service [Module]Service
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
 
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="name" HelpText="Enter a name">Name: </Label>
+            <Label For="name" HelpText="Enter a name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
-            <input id="name" class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" required />
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="Save">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br />
-<br />
+<button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<br /><br />
 @if (PageState.Action == "Edit")
 {
     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
 }
+</form>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
@@ -38,12 +40,15 @@
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-    int _id;
-    string _name;
-    string _createdby;
-    DateTime _createdon;
-    string _modifiedby;
-    DateTime _modifiedon;
+    private ElementReference form;
+    private bool validated = false;
+
+    private int _id;
+    private string _name;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
 
     protected override async Task OnInitializedAsync()
     {
@@ -66,7 +71,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
         }
     }
 
@@ -74,7 +79,9 @@
     {
         try
         {
-            if (!string.IsNullOrEmpty(_name))
+            validated = true;
+            var interop = new Oqtane.UI.Interop(JSRuntime);
+            if (await interop.FormValid(form))
             {
                 if (PageState.Action == "Add")
                 {
@@ -95,13 +102,13 @@
             }
             else
             {
-                AddModuleMessage("The Name Is Required", MessageType.Warning);
+                AddModuleMessage(Localizer["Message.SaveValidation"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Saving [Module]", MessageType.Error);
+            AddModuleMessage(Localizer["Message.SaveError"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Index.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Index.razor
index 4f5e0f37..d93cdb20 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Index.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Index.razor
@@ -5,6 +5,7 @@
 @inherits ModuleBase
 @inject I[Module]Service [Module]Service
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Index> Localizer
 
 @if (_[Module]s == null)
 {
@@ -12,7 +13,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" />
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" ResourceKey="Add" />
     <br />
     <br />
     @if (@_[Module]s.Count != 0)
@@ -21,18 +22,18 @@ else
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th style="width: 1px;">&nbsp;</th>
-                <th>Name</th>
+                <th>@Localizer["Name"]</th>
             </Header>
             <Row>
-                <td><ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" /></td>
-                <td><ActionDialog Header="Delete [Module]" Message="@("Are You Sure You Wish To Delete The " + context.Name + " [Module]?")" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" /></td>
+                <td><ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" ResourceKey="Edit"  /></td>
+                <td><ActionDialog Header="Delete [Module]" Message="@("Are You Sure You Wish To Delete The " + context.Name + " [Module]?")" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete"  /></td>
                 <td>@context.Name</td>
             </Row>
         </Pager>
     }
     else
     {
-        <p>No [Module]s To Display</p>
+        <p>@Localizer["Message.DisplayNone"]</p>
     }
 }
 
@@ -54,7 +55,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
         }
     }
 
@@ -70,7 +71,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
-            AddModuleMessage("Error Deleting [Module]", MessageType.Error);
+            AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
         }
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Settings.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Settings.razor
index 7989d7c9..20e042fd 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Settings.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].[Module]/Settings.razor
@@ -1,11 +1,12 @@
 @namespace [Owner].[Module]
 @inherits ModuleBase
 @inject ISettingService SettingService
+@inject IStringLocalizer<Settings> Localizer
 
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="value" HelpText="Enter a value">Name: </Label>
+            <Label For="value" HelpText="Enter a value" ResourceKey="SettingName">Name: </Label>
         </td>
         <td>
             <input id="value" type="text" class="form-control" @bind="@_value" />
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Edit.resx b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Edit.resx
new file mode 100644
index 00000000..eebd66cd
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Edit.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="Name.HelpText" xml:space="preserve">
+    <value>Enter the name</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Message.LoadError" xml:space="preserve">
+    <value>Error Loading [Module]</value>
+  </data>
+  <data name="Message.SaveValidation" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.SaveError" xml:space="preserve">
+    <value>Error Saving [Module]</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Index.resx b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Index.resx
new file mode 100644
index 00000000..2c863947
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Index.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Edit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Message.DisplayNone" xml:space="preserve">
+    <value>No [Module]s To Display</value>
+  </data>
+  <data name="Message.LoadError" xml:space="preserve">
+    <value>Error Loading [Module]</value>
+  </data>
+  <data name="Message.DeleteError" xml:space="preserve">
+    <value>Error Deleting [Module]</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Settings.resx b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Settings.resx
new file mode 100644
index 00000000..ba0390d8
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Resources/[Owner].[Module]/Settings.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+
+            Version 2.0
+
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+
+            Example:
+
+            ... ado.net/XML headers & schema ...
+            <resheader name="resmimetype">text/microsoft-resx</resheader>
+            <resheader name="version">2.0</resheader>
+            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                <value>[base64 mime encoded serialized .NET Framework object]</value>
+            </data>
+            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+                <comment>This is a comment</comment>
+            </data>
+
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+            that the ResXResourceWriter will generate, however the reader can 
+            read any of the formats listed below.
+
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+            -->
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="SettingName.Text" xml:space="preserve">
+    <value>Name: </value>
+  </data>
+  <data name="SettingName.HelpText" xml:space="preserve">
+    <value>Enter a value</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
index 5e807628..cd154052 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
@@ -11,14 +11,9 @@ namespace [Owner].[Module].Services
 {
     public class [Module]Service : ServiceBase, I[Module]Service, IService
     {
-        private readonly SiteState _siteState;
+        public [Module]Service(HttpClient http, SiteState siteState) : base(http, siteState) { }
 
-        public [Module]Service(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-        private string Apiurl => CreateApiUrl("[Module]", _siteState.Alias);
+        private string Apiurl => CreateApiUrl("[Module]");
 
         public async Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId)
         {
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
index d206b36e..5932080a 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
@@ -4,8 +4,10 @@
 @using System.Net.Http
 @using System.Net.Http.Json
 
+@using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.Extensions.Localization
 @using Microsoft.JSInterop
 
 @using Oqtane.Models
@@ -18,4 +20,5 @@
 @using Oqtane.Themes
 @using Oqtane.Themes.Controls
 @using Oqtane.UI
-@using Oqtane.Enums
\ No newline at end of file
+@using Oqtane.Enums
+@using Oqtane.Interfaces 
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
index bc769b59..15d2c514 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
@@ -7,6 +7,7 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using [Owner].[Module].Repository;
 using Oqtane.Controllers;
+using System.Net;
 
 namespace [Owner].[Module].Controllers
 {
@@ -25,12 +26,15 @@ namespace [Owner].[Module].Controllers
         [Authorize(Policy = PolicyNames.ViewModule)]
         public IEnumerable<Models.[Module]> Get(string moduleid)
         {
-            if (int.Parse(moduleid) == _entityId)
+            int ModuleId;
+            if (int.TryParse(moduleid, out ModuleId) && ModuleId == AuthEntityId(EntityNames.Module))
             {
-                return _[Module]Repository.Get[Module]s(int.Parse(moduleid));
+                return _[Module]Repository.Get[Module]s(ModuleId);
             }
             else
             {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {ModuleId}", moduleid);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
         }
@@ -41,50 +45,75 @@ namespace [Owner].[Module].Controllers
         public Models.[Module] Get(int id)
         {
             Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
-            if ([Module] != null && [Module].ModuleId != _entityId)
+            if ([Module] != null && [Module].ModuleId == AuthEntityId(EntityNames.Module))
             {
+                return [Module];
+            }
+            else
+            { 
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Get Attempt {[Module]Id}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
+
+        // POST api/<controller>
+        [ValidateAntiForgeryToken]
+        [HttpPost]
+        [Authorize(Policy = PolicyNames.EditModule)]
+        public Models.[Module] Post([FromBody] Models.[Module] [Module])
+        {
+            if (ModelState.IsValid && [Module].ModuleId == AuthEntityId(EntityNames.Module))
+            {
+                [Module] = _[Module]Repository.Add[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Post Attempt {[Module]}", [Module]);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 [Module] = null;
             }
             return [Module];
         }
 
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Policy = PolicyNames.EditModule)]
-        public Models.[Module] Post([FromBody] Models.[Module] [Module])
-        {
-            if (ModelState.IsValid && [Module].ModuleId == _entityId)
-            {
-                [Module] = _[Module]Repository.Add[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
-            }
-            return [Module];
-        }
-
         // PUT api/<controller>/5
+        [ValidateAntiForgeryToken]
         [HttpPut("{id}")]
         [Authorize(Policy = PolicyNames.EditModule)]
         public Models.[Module] Put(int id, [FromBody] Models.[Module] [Module])
         {
-            if (ModelState.IsValid && [Module].ModuleId == _entityId)
+            if (ModelState.IsValid && [Module].ModuleId == AuthEntityId(EntityNames.Module) && _[Module]Repository.Get[Module]([Module].[Module]Id, false) != null)
             {
                 [Module] = _[Module]Repository.Update[Module]([Module]);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Put Attempt {[Module]}", [Module]);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                [Module] = null;
+            }
             return [Module];
         }
 
         // DELETE api/<controller>/5
+        [ValidateAntiForgeryToken]
         [HttpDelete("{id}")]
         [Authorize(Policy = PolicyNames.EditModule)]
         public void Delete(int id)
         {
             Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
-            if ([Module] != null && [Module].ModuleId == _entityId)
+            if ([Module] != null && [Module].ModuleId == AuthEntityId(EntityNames.Module))
             {
                 _[Module]Repository.Delete[Module](id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);
             }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized [Module] Delete Attempt {[Module]Id}", id);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/I[Module]Repository.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/I[Module]Repository.cs
index 52b7913a..da2db55f 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/I[Module]Repository.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/I[Module]Repository.cs
@@ -7,6 +7,7 @@ namespace [Owner].[Module].Repository
     {
         IEnumerable<Models.[Module]> Get[Module]s(int ModuleId);
         Models.[Module] Get[Module](int [Module]Id);
+        Models.[Module] Get[Module](int [Module]Id, bool tracking);
         Models.[Module] Add[Module](Models.[Module] [Module]);
         Models.[Module] Update[Module](Models.[Module] [Module]);
         void Delete[Module](int [Module]Id);
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Repository.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Repository.cs
index 9c8c3628..238546dc 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Repository.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Repository.cs
@@ -22,7 +22,19 @@ namespace [Owner].[Module].Repository
 
         public Models.[Module] Get[Module](int [Module]Id)
         {
-            return _db.[Module].Find([Module]Id);
+            return Get[Module]([Module]Id, true);
+        }
+
+        public Models.[Module] Get[Module](int [Module]Id, bool tracking)
+        {
+            if (tracking)
+            {
+                return _db.[Module].Find([Module]Id);
+            }
+            else
+            {
+                return _db.[Module].AsNoTracking().FirstOrDefault(item => item.[Module]Id == [Module]Id);
+            }
         }
 
         public Models.[Module] Add[Module](Models.[Module] [Module])
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
index 9dbe84ca..b381a536 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "2.1.0"
+  "Version": "2.2.0"
 }
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak
index 7f7011b9..51f088eb 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak
index 4784341e..a3836fee 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak
index bd0a2df0..4a007bdd 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak
index 2dc1e87e..83a9f701 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index fba5b909..a9b0be4d 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -1,4 +1,32 @@
-.breadcrumbs {
+.table > :not(caption) > * > * {
+    box-shadow: none;
+}
+
+.table .form-control {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .form-select {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .btn-primary {
+    background-color: var(--bs-primary);
+}
+
+.table .btn-secondary {
+    background-color: var(--bs-secondary);
+}
+
+.alert-dismissible .btn-close {
+    z-index: 1;
+}
+
+.breadcrumbs {
     background-color: #e6e6e6;
     border-bottom: 1px solid #d6d5d5;
 }
@@ -69,6 +97,7 @@
     display: flex;
     align-items: center;
     line-height: 3rem;
+    padding-left: 1rem;
 }
 
 .app-menu .nav-item a.active {
@@ -87,7 +116,7 @@
 
 .navbar-toggler {
     background-color: rgba(255, 255, 255, 0.1);
-    margin-left: auto;
+    margin: .5rem;
 }
 
 @media (max-width: 767.98px) {
@@ -110,7 +139,7 @@
     .breadcrumbs {
         position: fixed;
         left: 275px;
-        top: 0;
+        top: 15px;
         z-index: 3
     }
 
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/BootswatchCyborg.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/BootswatchCyborg.css
deleted file mode 100644
index 48621c74..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/BootswatchCyborg.css
+++ /dev/null
@@ -1,11153 +0,0 @@
-/*!
- * Bootswatch v4.4.0
- * Homepage: https://bootswatch.com
- * Copyright 2012-2019 Thomas Park
- * Licensed under MIT
- * Based on Bootstrap
-*/ /*!
- * Bootstrap v4.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,700");
-
-:root {
-    --blue: #2A9FD6;
-    --indigo: #6610f2;
-    --purple: #6f42c1;
-    --pink: #e83e8c;
-    --red: #CC0000;
-    --orange: #fd7e14;
-    --yellow: #FF8800;
-    --green: #77B300;
-    --teal: #20c997;
-    --cyan: #9933CC;
-    --white: #fff;
-    --gray: #555;
-    --gray-dark: #222;
-    --primary: #2A9FD6;
-    --secondary: #555;
-    --success: #77B300;
-    --info: #9933CC;
-    --warning: #FF8800;
-    --danger: #CC0000;
-    --light: #222;
-    --dark: #ADAFAE;
-    --breakpoint-xs: 0;
-    --breakpoint-sm: 576px;
-    --breakpoint-md: 768px;
-    --breakpoint-lg: 992px;
-    --breakpoint-xl: 1200px;
-    --font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-    --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace
-}
-
-*, *::before, *::after {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box
-}
-
-html {
-    font-family: sans-serif;
-    line-height: 1.15;
-    -webkit-text-size-adjust: 100%;
-    -webkit-tap-highlight-color: rgba(0,0,0,0)
-}
-
-article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
-    display: block
-}
-
-body {
-    margin: 0;
-    font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-    font-size: 0.875rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #ADAFAE;
-    text-align: left;
-    background-color: #060606
-}
-
-[tabindex="-1"]:focus:not(:focus-visible) {
-    outline: 0 !important
-}
-
-hr {
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-    overflow: visible
-}
-
-h1, h2, h3, h4, h5, h6 {
-    margin-top: 0;
-    margin-bottom: 0.5rem
-}
-
-p {
-    margin-top: 0;
-    margin-bottom: 1rem
-}
-
-abbr[title], abbr[data-original-title] {
-    text-decoration: underline;
-    -webkit-text-decoration: underline dotted;
-    text-decoration: underline dotted;
-    cursor: help;
-    border-bottom: 0;
-    text-decoration-skip-ink: none
-}
-
-address {
-    margin-bottom: 1rem;
-    font-style: normal;
-    line-height: inherit
-}
-
-ol, ul, dl {
-    margin-top: 0;
-    margin-bottom: 1rem
-}
-
-    ol ol, ul ul, ol ul, ul ol {
-        margin-bottom: 0
-    }
-
-dt {
-    font-weight: 700
-}
-
-dd {
-    margin-bottom: .5rem;
-    margin-left: 0
-}
-
-blockquote {
-    margin: 0 0 1rem
-}
-
-b, strong {
-    font-weight: bolder
-}
-
-small {
-    font-size: 80%
-}
-
-sub, sup {
-    position: relative;
-    font-size: 75%;
-    line-height: 0;
-    vertical-align: baseline
-}
-
-sub {
-    bottom: -.25em
-}
-
-sup {
-    top: -.5em
-}
-
-a {
-    color: #2A9FD6;
-    text-decoration: none;
-    background-color: transparent
-}
-
-    a:hover {
-        color: #1d7097;
-        text-decoration: underline
-    }
-
-    a:not([href]) {
-        color: inherit;
-        text-decoration: none
-    }
-
-        a:not([href]):hover {
-            color: inherit;
-            text-decoration: none
-        }
-
-pre, code, kbd, samp {
-    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-    font-size: 1em
-}
-
-pre {
-    margin-top: 0;
-    margin-bottom: 1rem;
-    overflow: auto
-}
-
-figure {
-    margin: 0 0 1rem
-}
-
-img {
-    vertical-align: middle;
-    border-style: none
-}
-
-svg {
-    overflow: hidden;
-    vertical-align: middle
-}
-
-table {
-    border-collapse: collapse
-}
-
-caption {
-    padding-top: 0.75rem;
-    padding-bottom: 0.75rem;
-    color: #555;
-    text-align: left;
-    caption-side: bottom
-}
-
-th {
-    text-align: inherit
-}
-
-label {
-    display: inline-block;
-    margin-bottom: 0.5rem
-}
-
-button {
-    border-radius: 0
-}
-
-    button:focus {
-        outline: 1px dotted;
-        outline: 5px auto -webkit-focus-ring-color
-    }
-
-input, button, select, optgroup, textarea {
-    margin: 0;
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit
-}
-
-button, input {
-    overflow: visible
-}
-
-button, select {
-    text-transform: none
-}
-
-select {
-    word-wrap: normal
-}
-
-button, [type="button"], [type="reset"], [type="submit"] {
-    -webkit-appearance: button
-}
-
-    button:not(:disabled), [type="button"]:not(:disabled), [type="reset"]:not(:disabled), [type="submit"]:not(:disabled) {
-        cursor: pointer
-    }
-
-    button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-        padding: 0;
-        border-style: none
-    }
-
-input[type="radio"], input[type="checkbox"] {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 0
-}
-
-input[type="date"], input[type="time"], input[type="datetime-local"], input[type="month"] {
-    -webkit-appearance: listbox
-}
-
-textarea {
-    overflow: auto;
-    resize: vertical
-}
-
-fieldset {
-    min-width: 0;
-    padding: 0;
-    margin: 0;
-    border: 0
-}
-
-legend {
-    display: block;
-    width: 100%;
-    max-width: 100%;
-    padding: 0;
-    margin-bottom: .5rem;
-    font-size: 1.5rem;
-    line-height: inherit;
-    color: inherit;
-    white-space: normal
-}
-
-progress {
-    vertical-align: baseline
-}
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-    height: auto
-}
-
-[type="search"] {
-    outline-offset: -2px;
-    -webkit-appearance: none
-}
-
-    [type="search"]::-webkit-search-decoration {
-        -webkit-appearance: none
-    }
-
-::-webkit-file-upload-button {
-    font: inherit;
-    -webkit-appearance: button
-}
-
-output {
-    display: inline-block
-}
-
-summary {
-    display: list-item;
-    cursor: pointer
-}
-
-template {
-    display: none
-}
-
-[hidden] {
-    display: none !important
-}
-
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-    margin-bottom: 0.5rem;
-    font-weight: 500;
-    line-height: 1.2;
-    color: #fff
-}
-
-h1, .h1 {
-    font-size: 4rem
-}
-
-h2, .h2 {
-    font-size: 3rem
-}
-
-h3, .h3 {
-    font-size: 2.5rem
-}
-
-h4, .h4 {
-    font-size: 2rem
-}
-
-h5, .h5 {
-    font-size: 1.5rem
-}
-
-h6, .h6 {
-    font-size: 0.875rem
-}
-
-.lead {
-    font-size: 1.09375rem;
-    font-weight: 300
-}
-
-.display-1 {
-    font-size: 6rem;
-    font-weight: 300;
-    line-height: 1.2
-}
-
-.display-2 {
-    font-size: 5.5rem;
-    font-weight: 300;
-    line-height: 1.2
-}
-
-.display-3 {
-    font-size: 4.5rem;
-    font-weight: 300;
-    line-height: 1.2
-}
-
-.display-4 {
-    font-size: 3.5rem;
-    font-weight: 300;
-    line-height: 1.2
-}
-
-hr {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-    border: 0;
-    border-top: 1px solid rgba(0,0,0,0.1)
-}
-
-small, .small {
-    font-size: 80%;
-    font-weight: 400
-}
-
-mark, .mark {
-    padding: 0.2em;
-    background-color: #fcf8e3
-}
-
-.list-unstyled {
-    padding-left: 0;
-    list-style: none
-}
-
-.list-inline {
-    padding-left: 0;
-    list-style: none
-}
-
-.list-inline-item {
-    display: inline-block
-}
-
-    .list-inline-item:not(:last-child) {
-        margin-right: 0.5rem
-    }
-
-.initialism {
-    font-size: 90%;
-    text-transform: uppercase
-}
-
-.blockquote {
-    margin-bottom: 1rem;
-    font-size: 1.09375rem
-}
-
-.blockquote-footer {
-    display: block;
-    font-size: 80%;
-    color: #555
-}
-
-    .blockquote-footer::before {
-        content: "\2014\00A0"
-    }
-
-.img-fluid {
-    max-width: 100%;
-    height: auto
-}
-
-.img-thumbnail {
-    padding: 0.25rem;
-    background-color: #060606;
-    border: 1px solid #dee2e6;
-    border-radius: 0.25rem;
-    max-width: 100%;
-    height: auto
-}
-
-.figure {
-    display: inline-block
-}
-
-.figure-img {
-    margin-bottom: 0.5rem;
-    line-height: 1
-}
-
-.figure-caption {
-    font-size: 90%;
-    color: #555
-}
-
-code {
-    font-size: 87.5%;
-    color: #e83e8c;
-    word-wrap: break-word
-}
-
-a > code {
-    color: inherit
-}
-
-kbd {
-    padding: 0.2rem 0.4rem;
-    font-size: 87.5%;
-    color: #fff;
-    background-color: #212529;
-    border-radius: 0.2rem
-}
-
-    kbd kbd {
-        padding: 0;
-        font-size: 100%;
-        font-weight: 700
-    }
-
-pre {
-    display: block;
-    font-size: 87.5%;
-    color: inherit
-}
-
-    pre code {
-        font-size: inherit;
-        color: inherit;
-        word-break: normal
-    }
-
-.pre-scrollable {
-    max-height: 340px;
-    overflow-y: scroll
-}
-
-.container {
-    width: 100%;
-    padding-right: 15px;
-    padding-left: 15px;
-    margin-right: auto;
-    margin-left: auto
-}
-
-@media (min-width: 576px) {
-    .container {
-        max-width: 540px
-    }
-}
-
-@media (min-width: 768px) {
-    .container {
-        max-width: 720px
-    }
-}
-
-@media (min-width: 992px) {
-    .container {
-        max-width: 960px
-    }
-}
-
-@media (min-width: 1200px) {
-    .container {
-        max-width: 1140px
-    }
-}
-
-.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
-    width: 100%;
-    padding-right: 15px;
-    padding-left: 15px;
-    margin-right: auto;
-    margin-left: auto
-}
-
-@media (min-width: 576px) {
-    .container, .container-sm {
-        max-width: 540px
-    }
-}
-
-@media (min-width: 768px) {
-    .container, .container-sm, .container-md {
-        max-width: 720px
-    }
-}
-
-@media (min-width: 992px) {
-    .container, .container-sm, .container-md, .container-lg {
-        max-width: 960px
-    }
-}
-
-@media (min-width: 1200px) {
-    .container, .container-sm, .container-md, .container-lg, .container-xl {
-        max-width: 1140px
-    }
-}
-
-.row {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    margin-right: -15px;
-    margin-left: -15px
-}
-
-.no-gutters {
-    margin-right: 0;
-    margin-left: 0
-}
-
-    .no-gutters > .col, .no-gutters > [class*="col-"] {
-        padding-right: 0;
-        padding-left: 0
-    }
-
-.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl, .col-xl-auto {
-    position: relative;
-    width: 100%;
-    padding-right: 15px;
-    padding-left: 15px
-}
-
-.col {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -webkit-box-flex: 1;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    max-width: 100%
-}
-
-.row-cols-1 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%
-}
-
-.row-cols-2 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%
-}
-
-.row-cols-3 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 33.3333333333%;
-    flex: 0 0 33.3333333333%;
-    max-width: 33.3333333333%
-}
-
-.row-cols-4 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%
-}
-
-.row-cols-5 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 20%;
-    flex: 0 0 20%;
-    max-width: 20%
-}
-
-.row-cols-6 > * {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 16.6666666667%;
-    flex: 0 0 16.6666666667%;
-    max-width: 16.6666666667%
-}
-
-.col-auto {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: 100%
-}
-
-.col-1 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 8.3333333333%;
-    flex: 0 0 8.3333333333%;
-    max-width: 8.3333333333%
-}
-
-.col-2 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 16.6666666667%;
-    flex: 0 0 16.6666666667%;
-    max-width: 16.6666666667%
-}
-
-.col-3 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%
-}
-
-.col-4 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 33.3333333333%;
-    flex: 0 0 33.3333333333%;
-    max-width: 33.3333333333%
-}
-
-.col-5 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 41.6666666667%;
-    flex: 0 0 41.6666666667%;
-    max-width: 41.6666666667%
-}
-
-.col-6 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%
-}
-
-.col-7 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 58.3333333333%;
-    flex: 0 0 58.3333333333%;
-    max-width: 58.3333333333%
-}
-
-.col-8 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 66.6666666667%;
-    flex: 0 0 66.6666666667%;
-    max-width: 66.6666666667%
-}
-
-.col-9 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 75%;
-    flex: 0 0 75%;
-    max-width: 75%
-}
-
-.col-10 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 83.3333333333%;
-    flex: 0 0 83.3333333333%;
-    max-width: 83.3333333333%
-}
-
-.col-11 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 91.6666666667%;
-    flex: 0 0 91.6666666667%;
-    max-width: 91.6666666667%
-}
-
-.col-12 {
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%
-}
-
-.order-first {
-    -webkit-box-ordinal-group: 0;
-    -ms-flex-order: -1;
-    order: -1
-}
-
-.order-last {
-    -webkit-box-ordinal-group: 14;
-    -ms-flex-order: 13;
-    order: 13
-}
-
-.order-0 {
-    -webkit-box-ordinal-group: 1;
-    -ms-flex-order: 0;
-    order: 0
-}
-
-.order-1 {
-    -webkit-box-ordinal-group: 2;
-    -ms-flex-order: 1;
-    order: 1
-}
-
-.order-2 {
-    -webkit-box-ordinal-group: 3;
-    -ms-flex-order: 2;
-    order: 2
-}
-
-.order-3 {
-    -webkit-box-ordinal-group: 4;
-    -ms-flex-order: 3;
-    order: 3
-}
-
-.order-4 {
-    -webkit-box-ordinal-group: 5;
-    -ms-flex-order: 4;
-    order: 4
-}
-
-.order-5 {
-    -webkit-box-ordinal-group: 6;
-    -ms-flex-order: 5;
-    order: 5
-}
-
-.order-6 {
-    -webkit-box-ordinal-group: 7;
-    -ms-flex-order: 6;
-    order: 6
-}
-
-.order-7 {
-    -webkit-box-ordinal-group: 8;
-    -ms-flex-order: 7;
-    order: 7
-}
-
-.order-8 {
-    -webkit-box-ordinal-group: 9;
-    -ms-flex-order: 8;
-    order: 8
-}
-
-.order-9 {
-    -webkit-box-ordinal-group: 10;
-    -ms-flex-order: 9;
-    order: 9
-}
-
-.order-10 {
-    -webkit-box-ordinal-group: 11;
-    -ms-flex-order: 10;
-    order: 10
-}
-
-.order-11 {
-    -webkit-box-ordinal-group: 12;
-    -ms-flex-order: 11;
-    order: 11
-}
-
-.order-12 {
-    -webkit-box-ordinal-group: 13;
-    -ms-flex-order: 12;
-    order: 12
-}
-
-.offset-1 {
-    margin-left: 8.3333333333%
-}
-
-.offset-2 {
-    margin-left: 16.6666666667%
-}
-
-.offset-3 {
-    margin-left: 25%
-}
-
-.offset-4 {
-    margin-left: 33.3333333333%
-}
-
-.offset-5 {
-    margin-left: 41.6666666667%
-}
-
-.offset-6 {
-    margin-left: 50%
-}
-
-.offset-7 {
-    margin-left: 58.3333333333%
-}
-
-.offset-8 {
-    margin-left: 66.6666666667%
-}
-
-.offset-9 {
-    margin-left: 75%
-}
-
-.offset-10 {
-    margin-left: 83.3333333333%
-}
-
-.offset-11 {
-    margin-left: 91.6666666667%
-}
-
-@media (min-width: 576px) {
-    .col-sm {
-        -ms-flex-preferred-size: 0;
-        flex-basis: 0;
-        -webkit-box-flex: 1;
-        -ms-flex-positive: 1;
-        flex-grow: 1;
-        max-width: 100%
-    }
-
-    .row-cols-sm-1 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .row-cols-sm-2 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .row-cols-sm-3 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .row-cols-sm-4 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .row-cols-sm-5 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 20%;
-        flex: 0 0 20%;
-        max-width: 20%
-    }
-
-    .row-cols-sm-6 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-sm-auto {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 auto;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%
-    }
-
-    .col-sm-1 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 8.3333333333%;
-        flex: 0 0 8.3333333333%;
-        max-width: 8.3333333333%
-    }
-
-    .col-sm-2 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-sm-3 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .col-sm-4 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .col-sm-5 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 41.6666666667%;
-        flex: 0 0 41.6666666667%;
-        max-width: 41.6666666667%
-    }
-
-    .col-sm-6 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .col-sm-7 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 58.3333333333%;
-        flex: 0 0 58.3333333333%;
-        max-width: 58.3333333333%
-    }
-
-    .col-sm-8 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 66.6666666667%;
-        flex: 0 0 66.6666666667%;
-        max-width: 66.6666666667%
-    }
-
-    .col-sm-9 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 75%;
-        flex: 0 0 75%;
-        max-width: 75%
-    }
-
-    .col-sm-10 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 83.3333333333%;
-        flex: 0 0 83.3333333333%;
-        max-width: 83.3333333333%
-    }
-
-    .col-sm-11 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 91.6666666667%;
-        flex: 0 0 91.6666666667%;
-        max-width: 91.6666666667%
-    }
-
-    .col-sm-12 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .order-sm-first {
-        -webkit-box-ordinal-group: 0;
-        -ms-flex-order: -1;
-        order: -1
-    }
-
-    .order-sm-last {
-        -webkit-box-ordinal-group: 14;
-        -ms-flex-order: 13;
-        order: 13
-    }
-
-    .order-sm-0 {
-        -webkit-box-ordinal-group: 1;
-        -ms-flex-order: 0;
-        order: 0
-    }
-
-    .order-sm-1 {
-        -webkit-box-ordinal-group: 2;
-        -ms-flex-order: 1;
-        order: 1
-    }
-
-    .order-sm-2 {
-        -webkit-box-ordinal-group: 3;
-        -ms-flex-order: 2;
-        order: 2
-    }
-
-    .order-sm-3 {
-        -webkit-box-ordinal-group: 4;
-        -ms-flex-order: 3;
-        order: 3
-    }
-
-    .order-sm-4 {
-        -webkit-box-ordinal-group: 5;
-        -ms-flex-order: 4;
-        order: 4
-    }
-
-    .order-sm-5 {
-        -webkit-box-ordinal-group: 6;
-        -ms-flex-order: 5;
-        order: 5
-    }
-
-    .order-sm-6 {
-        -webkit-box-ordinal-group: 7;
-        -ms-flex-order: 6;
-        order: 6
-    }
-
-    .order-sm-7 {
-        -webkit-box-ordinal-group: 8;
-        -ms-flex-order: 7;
-        order: 7
-    }
-
-    .order-sm-8 {
-        -webkit-box-ordinal-group: 9;
-        -ms-flex-order: 8;
-        order: 8
-    }
-
-    .order-sm-9 {
-        -webkit-box-ordinal-group: 10;
-        -ms-flex-order: 9;
-        order: 9
-    }
-
-    .order-sm-10 {
-        -webkit-box-ordinal-group: 11;
-        -ms-flex-order: 10;
-        order: 10
-    }
-
-    .order-sm-11 {
-        -webkit-box-ordinal-group: 12;
-        -ms-flex-order: 11;
-        order: 11
-    }
-
-    .order-sm-12 {
-        -webkit-box-ordinal-group: 13;
-        -ms-flex-order: 12;
-        order: 12
-    }
-
-    .offset-sm-0 {
-        margin-left: 0
-    }
-
-    .offset-sm-1 {
-        margin-left: 8.3333333333%
-    }
-
-    .offset-sm-2 {
-        margin-left: 16.6666666667%
-    }
-
-    .offset-sm-3 {
-        margin-left: 25%
-    }
-
-    .offset-sm-4 {
-        margin-left: 33.3333333333%
-    }
-
-    .offset-sm-5 {
-        margin-left: 41.6666666667%
-    }
-
-    .offset-sm-6 {
-        margin-left: 50%
-    }
-
-    .offset-sm-7 {
-        margin-left: 58.3333333333%
-    }
-
-    .offset-sm-8 {
-        margin-left: 66.6666666667%
-    }
-
-    .offset-sm-9 {
-        margin-left: 75%
-    }
-
-    .offset-sm-10 {
-        margin-left: 83.3333333333%
-    }
-
-    .offset-sm-11 {
-        margin-left: 91.6666666667%
-    }
-}
-
-@media (min-width: 768px) {
-    .col-md {
-        -ms-flex-preferred-size: 0;
-        flex-basis: 0;
-        -webkit-box-flex: 1;
-        -ms-flex-positive: 1;
-        flex-grow: 1;
-        max-width: 100%
-    }
-
-    .row-cols-md-1 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .row-cols-md-2 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .row-cols-md-3 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .row-cols-md-4 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .row-cols-md-5 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 20%;
-        flex: 0 0 20%;
-        max-width: 20%
-    }
-
-    .row-cols-md-6 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-md-auto {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 auto;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%
-    }
-
-    .col-md-1 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 8.3333333333%;
-        flex: 0 0 8.3333333333%;
-        max-width: 8.3333333333%
-    }
-
-    .col-md-2 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-md-3 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .col-md-4 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .col-md-5 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 41.6666666667%;
-        flex: 0 0 41.6666666667%;
-        max-width: 41.6666666667%
-    }
-
-    .col-md-6 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .col-md-7 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 58.3333333333%;
-        flex: 0 0 58.3333333333%;
-        max-width: 58.3333333333%
-    }
-
-    .col-md-8 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 66.6666666667%;
-        flex: 0 0 66.6666666667%;
-        max-width: 66.6666666667%
-    }
-
-    .col-md-9 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 75%;
-        flex: 0 0 75%;
-        max-width: 75%
-    }
-
-    .col-md-10 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 83.3333333333%;
-        flex: 0 0 83.3333333333%;
-        max-width: 83.3333333333%
-    }
-
-    .col-md-11 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 91.6666666667%;
-        flex: 0 0 91.6666666667%;
-        max-width: 91.6666666667%
-    }
-
-    .col-md-12 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .order-md-first {
-        -webkit-box-ordinal-group: 0;
-        -ms-flex-order: -1;
-        order: -1
-    }
-
-    .order-md-last {
-        -webkit-box-ordinal-group: 14;
-        -ms-flex-order: 13;
-        order: 13
-    }
-
-    .order-md-0 {
-        -webkit-box-ordinal-group: 1;
-        -ms-flex-order: 0;
-        order: 0
-    }
-
-    .order-md-1 {
-        -webkit-box-ordinal-group: 2;
-        -ms-flex-order: 1;
-        order: 1
-    }
-
-    .order-md-2 {
-        -webkit-box-ordinal-group: 3;
-        -ms-flex-order: 2;
-        order: 2
-    }
-
-    .order-md-3 {
-        -webkit-box-ordinal-group: 4;
-        -ms-flex-order: 3;
-        order: 3
-    }
-
-    .order-md-4 {
-        -webkit-box-ordinal-group: 5;
-        -ms-flex-order: 4;
-        order: 4
-    }
-
-    .order-md-5 {
-        -webkit-box-ordinal-group: 6;
-        -ms-flex-order: 5;
-        order: 5
-    }
-
-    .order-md-6 {
-        -webkit-box-ordinal-group: 7;
-        -ms-flex-order: 6;
-        order: 6
-    }
-
-    .order-md-7 {
-        -webkit-box-ordinal-group: 8;
-        -ms-flex-order: 7;
-        order: 7
-    }
-
-    .order-md-8 {
-        -webkit-box-ordinal-group: 9;
-        -ms-flex-order: 8;
-        order: 8
-    }
-
-    .order-md-9 {
-        -webkit-box-ordinal-group: 10;
-        -ms-flex-order: 9;
-        order: 9
-    }
-
-    .order-md-10 {
-        -webkit-box-ordinal-group: 11;
-        -ms-flex-order: 10;
-        order: 10
-    }
-
-    .order-md-11 {
-        -webkit-box-ordinal-group: 12;
-        -ms-flex-order: 11;
-        order: 11
-    }
-
-    .order-md-12 {
-        -webkit-box-ordinal-group: 13;
-        -ms-flex-order: 12;
-        order: 12
-    }
-
-    .offset-md-0 {
-        margin-left: 0
-    }
-
-    .offset-md-1 {
-        margin-left: 8.3333333333%
-    }
-
-    .offset-md-2 {
-        margin-left: 16.6666666667%
-    }
-
-    .offset-md-3 {
-        margin-left: 25%
-    }
-
-    .offset-md-4 {
-        margin-left: 33.3333333333%
-    }
-
-    .offset-md-5 {
-        margin-left: 41.6666666667%
-    }
-
-    .offset-md-6 {
-        margin-left: 50%
-    }
-
-    .offset-md-7 {
-        margin-left: 58.3333333333%
-    }
-
-    .offset-md-8 {
-        margin-left: 66.6666666667%
-    }
-
-    .offset-md-9 {
-        margin-left: 75%
-    }
-
-    .offset-md-10 {
-        margin-left: 83.3333333333%
-    }
-
-    .offset-md-11 {
-        margin-left: 91.6666666667%
-    }
-}
-
-@media (min-width: 992px) {
-    .col-lg {
-        -ms-flex-preferred-size: 0;
-        flex-basis: 0;
-        -webkit-box-flex: 1;
-        -ms-flex-positive: 1;
-        flex-grow: 1;
-        max-width: 100%
-    }
-
-    .row-cols-lg-1 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .row-cols-lg-2 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .row-cols-lg-3 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .row-cols-lg-4 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .row-cols-lg-5 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 20%;
-        flex: 0 0 20%;
-        max-width: 20%
-    }
-
-    .row-cols-lg-6 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-lg-auto {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 auto;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%
-    }
-
-    .col-lg-1 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 8.3333333333%;
-        flex: 0 0 8.3333333333%;
-        max-width: 8.3333333333%
-    }
-
-    .col-lg-2 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-lg-3 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .col-lg-4 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .col-lg-5 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 41.6666666667%;
-        flex: 0 0 41.6666666667%;
-        max-width: 41.6666666667%
-    }
-
-    .col-lg-6 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .col-lg-7 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 58.3333333333%;
-        flex: 0 0 58.3333333333%;
-        max-width: 58.3333333333%
-    }
-
-    .col-lg-8 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 66.6666666667%;
-        flex: 0 0 66.6666666667%;
-        max-width: 66.6666666667%
-    }
-
-    .col-lg-9 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 75%;
-        flex: 0 0 75%;
-        max-width: 75%
-    }
-
-    .col-lg-10 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 83.3333333333%;
-        flex: 0 0 83.3333333333%;
-        max-width: 83.3333333333%
-    }
-
-    .col-lg-11 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 91.6666666667%;
-        flex: 0 0 91.6666666667%;
-        max-width: 91.6666666667%
-    }
-
-    .col-lg-12 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .order-lg-first {
-        -webkit-box-ordinal-group: 0;
-        -ms-flex-order: -1;
-        order: -1
-    }
-
-    .order-lg-last {
-        -webkit-box-ordinal-group: 14;
-        -ms-flex-order: 13;
-        order: 13
-    }
-
-    .order-lg-0 {
-        -webkit-box-ordinal-group: 1;
-        -ms-flex-order: 0;
-        order: 0
-    }
-
-    .order-lg-1 {
-        -webkit-box-ordinal-group: 2;
-        -ms-flex-order: 1;
-        order: 1
-    }
-
-    .order-lg-2 {
-        -webkit-box-ordinal-group: 3;
-        -ms-flex-order: 2;
-        order: 2
-    }
-
-    .order-lg-3 {
-        -webkit-box-ordinal-group: 4;
-        -ms-flex-order: 3;
-        order: 3
-    }
-
-    .order-lg-4 {
-        -webkit-box-ordinal-group: 5;
-        -ms-flex-order: 4;
-        order: 4
-    }
-
-    .order-lg-5 {
-        -webkit-box-ordinal-group: 6;
-        -ms-flex-order: 5;
-        order: 5
-    }
-
-    .order-lg-6 {
-        -webkit-box-ordinal-group: 7;
-        -ms-flex-order: 6;
-        order: 6
-    }
-
-    .order-lg-7 {
-        -webkit-box-ordinal-group: 8;
-        -ms-flex-order: 7;
-        order: 7
-    }
-
-    .order-lg-8 {
-        -webkit-box-ordinal-group: 9;
-        -ms-flex-order: 8;
-        order: 8
-    }
-
-    .order-lg-9 {
-        -webkit-box-ordinal-group: 10;
-        -ms-flex-order: 9;
-        order: 9
-    }
-
-    .order-lg-10 {
-        -webkit-box-ordinal-group: 11;
-        -ms-flex-order: 10;
-        order: 10
-    }
-
-    .order-lg-11 {
-        -webkit-box-ordinal-group: 12;
-        -ms-flex-order: 11;
-        order: 11
-    }
-
-    .order-lg-12 {
-        -webkit-box-ordinal-group: 13;
-        -ms-flex-order: 12;
-        order: 12
-    }
-
-    .offset-lg-0 {
-        margin-left: 0
-    }
-
-    .offset-lg-1 {
-        margin-left: 8.3333333333%
-    }
-
-    .offset-lg-2 {
-        margin-left: 16.6666666667%
-    }
-
-    .offset-lg-3 {
-        margin-left: 25%
-    }
-
-    .offset-lg-4 {
-        margin-left: 33.3333333333%
-    }
-
-    .offset-lg-5 {
-        margin-left: 41.6666666667%
-    }
-
-    .offset-lg-6 {
-        margin-left: 50%
-    }
-
-    .offset-lg-7 {
-        margin-left: 58.3333333333%
-    }
-
-    .offset-lg-8 {
-        margin-left: 66.6666666667%
-    }
-
-    .offset-lg-9 {
-        margin-left: 75%
-    }
-
-    .offset-lg-10 {
-        margin-left: 83.3333333333%
-    }
-
-    .offset-lg-11 {
-        margin-left: 91.6666666667%
-    }
-}
-
-@media (min-width: 1200px) {
-    .col-xl {
-        -ms-flex-preferred-size: 0;
-        flex-basis: 0;
-        -webkit-box-flex: 1;
-        -ms-flex-positive: 1;
-        flex-grow: 1;
-        max-width: 100%
-    }
-
-    .row-cols-xl-1 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .row-cols-xl-2 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .row-cols-xl-3 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .row-cols-xl-4 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .row-cols-xl-5 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 20%;
-        flex: 0 0 20%;
-        max-width: 20%
-    }
-
-    .row-cols-xl-6 > * {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-xl-auto {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 auto;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%
-    }
-
-    .col-xl-1 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 8.3333333333%;
-        flex: 0 0 8.3333333333%;
-        max-width: 8.3333333333%
-    }
-
-    .col-xl-2 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 16.6666666667%;
-        flex: 0 0 16.6666666667%;
-        max-width: 16.6666666667%
-    }
-
-    .col-xl-3 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 25%;
-        flex: 0 0 25%;
-        max-width: 25%
-    }
-
-    .col-xl-4 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 33.3333333333%;
-        flex: 0 0 33.3333333333%;
-        max-width: 33.3333333333%
-    }
-
-    .col-xl-5 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 41.6666666667%;
-        flex: 0 0 41.6666666667%;
-        max-width: 41.6666666667%
-    }
-
-    .col-xl-6 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 50%;
-        flex: 0 0 50%;
-        max-width: 50%
-    }
-
-    .col-xl-7 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 58.3333333333%;
-        flex: 0 0 58.3333333333%;
-        max-width: 58.3333333333%
-    }
-
-    .col-xl-8 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 66.6666666667%;
-        flex: 0 0 66.6666666667%;
-        max-width: 66.6666666667%
-    }
-
-    .col-xl-9 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 75%;
-        flex: 0 0 75%;
-        max-width: 75%
-    }
-
-    .col-xl-10 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 83.3333333333%;
-        flex: 0 0 83.3333333333%;
-        max-width: 83.3333333333%
-    }
-
-    .col-xl-11 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 91.6666666667%;
-        flex: 0 0 91.6666666667%;
-        max-width: 91.6666666667%
-    }
-
-    .col-xl-12 {
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 100%;
-        flex: 0 0 100%;
-        max-width: 100%
-    }
-
-    .order-xl-first {
-        -webkit-box-ordinal-group: 0;
-        -ms-flex-order: -1;
-        order: -1
-    }
-
-    .order-xl-last {
-        -webkit-box-ordinal-group: 14;
-        -ms-flex-order: 13;
-        order: 13
-    }
-
-    .order-xl-0 {
-        -webkit-box-ordinal-group: 1;
-        -ms-flex-order: 0;
-        order: 0
-    }
-
-    .order-xl-1 {
-        -webkit-box-ordinal-group: 2;
-        -ms-flex-order: 1;
-        order: 1
-    }
-
-    .order-xl-2 {
-        -webkit-box-ordinal-group: 3;
-        -ms-flex-order: 2;
-        order: 2
-    }
-
-    .order-xl-3 {
-        -webkit-box-ordinal-group: 4;
-        -ms-flex-order: 3;
-        order: 3
-    }
-
-    .order-xl-4 {
-        -webkit-box-ordinal-group: 5;
-        -ms-flex-order: 4;
-        order: 4
-    }
-
-    .order-xl-5 {
-        -webkit-box-ordinal-group: 6;
-        -ms-flex-order: 5;
-        order: 5
-    }
-
-    .order-xl-6 {
-        -webkit-box-ordinal-group: 7;
-        -ms-flex-order: 6;
-        order: 6
-    }
-
-    .order-xl-7 {
-        -webkit-box-ordinal-group: 8;
-        -ms-flex-order: 7;
-        order: 7
-    }
-
-    .order-xl-8 {
-        -webkit-box-ordinal-group: 9;
-        -ms-flex-order: 8;
-        order: 8
-    }
-
-    .order-xl-9 {
-        -webkit-box-ordinal-group: 10;
-        -ms-flex-order: 9;
-        order: 9
-    }
-
-    .order-xl-10 {
-        -webkit-box-ordinal-group: 11;
-        -ms-flex-order: 10;
-        order: 10
-    }
-
-    .order-xl-11 {
-        -webkit-box-ordinal-group: 12;
-        -ms-flex-order: 11;
-        order: 11
-    }
-
-    .order-xl-12 {
-        -webkit-box-ordinal-group: 13;
-        -ms-flex-order: 12;
-        order: 12
-    }
-
-    .offset-xl-0 {
-        margin-left: 0
-    }
-
-    .offset-xl-1 {
-        margin-left: 8.3333333333%
-    }
-
-    .offset-xl-2 {
-        margin-left: 16.6666666667%
-    }
-
-    .offset-xl-3 {
-        margin-left: 25%
-    }
-
-    .offset-xl-4 {
-        margin-left: 33.3333333333%
-    }
-
-    .offset-xl-5 {
-        margin-left: 41.6666666667%
-    }
-
-    .offset-xl-6 {
-        margin-left: 50%
-    }
-
-    .offset-xl-7 {
-        margin-left: 58.3333333333%
-    }
-
-    .offset-xl-8 {
-        margin-left: 66.6666666667%
-    }
-
-    .offset-xl-9 {
-        margin-left: 75%
-    }
-
-    .offset-xl-10 {
-        margin-left: 83.3333333333%
-    }
-
-    .offset-xl-11 {
-        margin-left: 91.6666666667%
-    }
-}
-
-.table {
-    width: 100%;
-    margin-bottom: 1rem;
-    color: #fff
-}
-
-    .table th, .table td {
-        padding: 0.75rem;
-        vertical-align: top;
-        border-top: 1px solid #282828
-    }
-
-    .table thead th {
-        vertical-align: bottom;
-        border-bottom: 2px solid #282828
-    }
-
-    .table tbody + tbody {
-        border-top: 2px solid #282828
-    }
-
-.table-sm th, .table-sm td {
-    padding: 0.3rem
-}
-
-.table-bordered {
-    border: 1px solid #282828
-}
-
-    .table-bordered th, .table-bordered td {
-        border: 1px solid #282828
-    }
-
-    .table-bordered thead th, .table-bordered thead td {
-        border-bottom-width: 2px
-    }
-
-.table-borderless th, .table-borderless td, .table-borderless thead th, .table-borderless tbody + tbody {
-    border: 0
-}
-
-.table-striped tbody tr:nth-of-type(odd) {
-    background-color: rgba(255,255,255,0.05)
-}
-
-.table-hover tbody tr:hover {
-    color: #fff;
-    background-color: rgba(255,255,255,0.075)
-}
-
-.table-primary, .table-primary > th, .table-primary > td {
-    background-color: #c3e4f4
-}
-
-    .table-primary th, .table-primary td, .table-primary thead th, .table-primary tbody + tbody {
-        border-color: #90cdea
-    }
-
-.table-hover .table-primary:hover {
-    background-color: #addaf0
-}
-
-    .table-hover .table-primary:hover > td, .table-hover .table-primary:hover > th {
-        background-color: #addaf0
-    }
-
-.table-secondary, .table-secondary > th, .table-secondary > td {
-    background-color: #cfcfcf
-}
-
-    .table-secondary th, .table-secondary td, .table-secondary thead th, .table-secondary tbody + tbody {
-        border-color: #a7a7a7
-    }
-
-.table-hover .table-secondary:hover {
-    background-color: #c2c2c2
-}
-
-    .table-hover .table-secondary:hover > td, .table-hover .table-secondary:hover > th {
-        background-color: #c2c2c2
-    }
-
-.table-success, .table-success > th, .table-success > td {
-    background-color: #d9eab8
-}
-
-    .table-success th, .table-success td, .table-success thead th, .table-success tbody + tbody {
-        border-color: #b8d77a
-    }
-
-.table-hover .table-success:hover {
-    background-color: #cee4a4
-}
-
-    .table-hover .table-success:hover > td, .table-hover .table-success:hover > th {
-        background-color: #cee4a4
-    }
-
-.table-info, .table-info > th, .table-info > td {
-    background-color: #e2c6f1
-}
-
-    .table-info th, .table-info td, .table-info thead th, .table-info tbody + tbody {
-        border-color: #ca95e4
-    }
-
-.table-hover .table-info:hover {
-    background-color: #d8b2ec
-}
-
-    .table-hover .table-info:hover > td, .table-hover .table-info:hover > th {
-        background-color: #d8b2ec
-    }
-
-.table-warning, .table-warning > th, .table-warning > td {
-    background-color: #ffdeb8
-}
-
-    .table-warning th, .table-warning td, .table-warning thead th, .table-warning tbody + tbody {
-        border-color: #ffc17a
-    }
-
-.table-hover .table-warning:hover {
-    background-color: #ffd29f
-}
-
-    .table-hover .table-warning:hover > td, .table-hover .table-warning:hover > th {
-        background-color: #ffd29f
-    }
-
-.table-danger, .table-danger > th, .table-danger > td {
-    background-color: #f1b8b8
-}
-
-    .table-danger th, .table-danger td, .table-danger thead th, .table-danger tbody + tbody {
-        border-color: #e47a7a
-    }
-
-.table-hover .table-danger:hover {
-    background-color: #eda3a3
-}
-
-    .table-hover .table-danger:hover > td, .table-hover .table-danger:hover > th {
-        background-color: #eda3a3
-    }
-
-.table-light, .table-light > th, .table-light > td {
-    background-color: #c1c1c1
-}
-
-    .table-light th, .table-light td, .table-light thead th, .table-light tbody + tbody {
-        border-color: #8c8c8c
-    }
-
-.table-hover .table-light:hover {
-    background-color: #b4b4b4
-}
-
-    .table-hover .table-light:hover > td, .table-hover .table-light:hover > th {
-        background-color: #b4b4b4
-    }
-
-.table-dark, .table-dark > th, .table-dark > td {
-    background-color: #e8e9e8
-}
-
-    .table-dark th, .table-dark td, .table-dark thead th, .table-dark tbody + tbody {
-        border-color: #d4d5d5
-    }
-
-.table-hover .table-dark:hover {
-    background-color: #dbdddb
-}
-
-    .table-hover .table-dark:hover > td, .table-hover .table-dark:hover > th {
-        background-color: #dbdddb
-    }
-
-.table-active, .table-active > th, .table-active > td {
-    background-color: rgba(255,255,255,0.075)
-}
-
-.table-hover .table-active:hover {
-    background-color: rgba(242,242,242,0.075)
-}
-
-    .table-hover .table-active:hover > td, .table-hover .table-active:hover > th {
-        background-color: rgba(242,242,242,0.075)
-    }
-
-.table .thead-dark th {
-    color: #fff;
-    background-color: #888;
-    border-color: #757575
-}
-
-.table .thead-light th {
-    color: #282828;
-    background-color: #e9ecef;
-    border-color: #282828
-}
-
-.table-dark {
-    color: #fff;
-    background-color: #888
-}
-
-    .table-dark th, .table-dark td, .table-dark thead th {
-        border-color: #757575
-    }
-
-    .table-dark.table-bordered {
-        border: 0
-    }
-
-    .table-dark.table-striped tbody tr:nth-of-type(odd) {
-        background-color: rgba(255,255,255,0.05)
-    }
-
-    .table-dark.table-hover tbody tr:hover {
-        color: #fff;
-        background-color: rgba(255,255,255,0.075)
-    }
-
-@media (max-width: 575.98px) {
-    .table-responsive-sm {
-        display: block;
-        width: 100%;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch
-    }
-
-        .table-responsive-sm > .table-bordered {
-            border: 0
-        }
-}
-
-@media (max-width: 767.98px) {
-    .table-responsive-md {
-        display: block;
-        width: 100%;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch
-    }
-
-        .table-responsive-md > .table-bordered {
-            border: 0
-        }
-}
-
-@media (max-width: 991.98px) {
-    .table-responsive-lg {
-        display: block;
-        width: 100%;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch
-    }
-
-        .table-responsive-lg > .table-bordered {
-            border: 0
-        }
-}
-
-@media (max-width: 1199.98px) {
-    .table-responsive-xl {
-        display: block;
-        width: 100%;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch
-    }
-
-        .table-responsive-xl > .table-bordered {
-            border: 0
-        }
-}
-
-.table-responsive {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch
-}
-
-    .table-responsive > .table-bordered {
-        border: 0
-    }
-
-.form-control {
-    display: block;
-    width: 100%;
-    height: calc(1.5em + 0.75rem + 2px);
-    padding: 0.375rem 1rem;
-    font-size: 0.875rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #282828;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid transparent;
-    border-radius: 0.25rem;
-    -webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .form-control {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.form-control::-ms-expand {
-    background-color: transparent;
-    border: 0
-}
-
-.form-control:-moz-focusring {
-    color: transparent;
-    text-shadow: 0 0 0 #282828
-}
-
-.form-control:focus {
-    color: #282828;
-    background-color: #fff;
-    border-color: #95cfeb;
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-}
-
-.form-control::-webkit-input-placeholder {
-    color: #555;
-    opacity: 1
-}
-
-.form-control::-ms-input-placeholder {
-    color: #555;
-    opacity: 1
-}
-
-.form-control::placeholder {
-    color: #555;
-    opacity: 1
-}
-
-.form-control:disabled, .form-control[readonly] {
-    background-color: #ADAFAE;
-    opacity: 1
-}
-
-select.form-control:focus::-ms-value {
-    color: #282828;
-    background-color: #fff
-}
-
-.form-control-file, .form-control-range {
-    display: block;
-    width: 100%
-}
-
-.col-form-label {
-    padding-top: calc(0.375rem + 1px);
-    padding-bottom: calc(0.375rem + 1px);
-    margin-bottom: 0;
-    font-size: inherit;
-    line-height: 1.5
-}
-
-.col-form-label-lg {
-    padding-top: calc(0.5rem + 1px);
-    padding-bottom: calc(0.5rem + 1px);
-    font-size: 1.09375rem;
-    line-height: 1.5
-}
-
-.col-form-label-sm {
-    padding-top: calc(0.25rem + 1px);
-    padding-bottom: calc(0.25rem + 1px);
-    font-size: 0.765625rem;
-    line-height: 1.5
-}
-
-.form-control-plaintext {
-    display: block;
-    width: 100%;
-    padding: 0.375rem 0;
-    margin-bottom: 0;
-    font-size: 0.875rem;
-    line-height: 1.5;
-    color: #ADAFAE;
-    background-color: transparent;
-    border: solid transparent;
-    border-width: 1px 0
-}
-
-    .form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {
-        padding-right: 0;
-        padding-left: 0
-    }
-
-.form-control-sm {
-    height: calc(1.5em + 0.5rem + 2px);
-    padding: 0.25rem 0.5rem;
-    font-size: 0.765625rem;
-    line-height: 1.5;
-    border-radius: 0.2rem
-}
-
-.form-control-lg {
-    height: calc(1.5em + 1rem + 2px);
-    padding: 0.5rem 1rem;
-    font-size: 1.09375rem;
-    line-height: 1.5;
-    border-radius: 0.3rem
-}
-
-select.form-control[size], select.form-control[multiple] {
-    height: auto
-}
-
-textarea.form-control {
-    height: auto
-}
-
-.form-group {
-    margin-bottom: 1rem
-}
-
-.form-text {
-    display: block;
-    margin-top: 0.25rem
-}
-
-.form-row {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    margin-right: -5px;
-    margin-left: -5px
-}
-
-    .form-row > .col, .form-row > [class*="col-"] {
-        padding-right: 5px;
-        padding-left: 5px
-    }
-
-.form-check {
-    position: relative;
-    display: block;
-    padding-left: 1.25rem
-}
-
-.form-check-input {
-    position: absolute;
-    margin-top: 0.3rem;
-    margin-left: -1.25rem
-}
-
-    .form-check-input[disabled] ~ .form-check-label, .form-check-input:disabled ~ .form-check-label {
-        color: #555
-    }
-
-.form-check-label {
-    margin-bottom: 0
-}
-
-.form-check-inline {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-left: 0;
-    margin-right: 0.75rem
-}
-
-    .form-check-inline .form-check-input {
-        position: static;
-        margin-top: 0;
-        margin-right: 0.3125rem;
-        margin-left: 0
-    }
-
-.valid-feedback {
-    display: none;
-    width: 100%;
-    margin-top: 0.25rem;
-    font-size: 80%;
-    color: #77B300
-}
-
-.valid-tooltip {
-    position: absolute;
-    top: 100%;
-    z-index: 5;
-    display: none;
-    max-width: 100%;
-    padding: 0.25rem 0.5rem;
-    margin-top: .1rem;
-    font-size: 0.765625rem;
-    line-height: 1.5;
-    color: #fff;
-    background-color: #77b300;
-    border-radius: 0.25rem
-}
-
-.was-validated :valid ~ .valid-feedback, .was-validated :valid ~ .valid-tooltip, .is-valid ~ .valid-feedback, .is-valid ~ .valid-tooltip {
-    display: block
-}
-
-.was-validated .form-control:valid, .form-control.is-valid {
-    border-color: #77B300;
-    padding-right: calc(1.5em + 0.75rem);
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2377B300' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
-    background-repeat: no-repeat;
-    background-position: right calc(0.375em + 0.1875rem) center;
-    background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)
-}
-
-    .was-validated .form-control:valid:focus, .form-control.is-valid:focus {
-        border-color: #77B300;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25)
-    }
-
-.was-validated textarea.form-control:valid, textarea.form-control.is-valid {
-    padding-right: calc(1.5em + 0.75rem);
-    background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem)
-}
-
-.was-validated .custom-select:valid, .custom-select.is-valid {
-    border-color: #77B300;
-    padding-right: calc(0.75em + 2.5625rem);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23222' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 1rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2377B300' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 2rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)
-}
-
-    .was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
-        border-color: #77B300;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25)
-    }
-
-.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
-    color: #77B300
-}
-
-.was-validated .form-check-input:valid ~ .valid-feedback, .was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback, .form-check-input.is-valid ~ .valid-tooltip {
-    display: block
-}
-
-.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {
-    color: #77B300
-}
-
-    .was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {
-        border-color: #77B300
-    }
-
-.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
-    border-color: #99e600;
-    background-color: #99e600
-}
-
-.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25)
-}
-
-.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {
-    border-color: #77B300
-}
-
-.was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {
-    border-color: #77B300
-}
-
-.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {
-    border-color: #77B300;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.25)
-}
-
-.invalid-feedback {
-    display: none;
-    width: 100%;
-    margin-top: 0.25rem;
-    font-size: 80%;
-    color: #CC0000
-}
-
-.invalid-tooltip {
-    position: absolute;
-    top: 100%;
-    z-index: 5;
-    display: none;
-    max-width: 100%;
-    padding: 0.25rem 0.5rem;
-    margin-top: .1rem;
-    font-size: 0.765625rem;
-    line-height: 1.5;
-    color: #fff;
-    background-color: #cc0000;
-    border-radius: 0.25rem
-}
-
-.was-validated :invalid ~ .invalid-feedback, .was-validated :invalid ~ .invalid-tooltip, .is-invalid ~ .invalid-feedback, .is-invalid ~ .invalid-tooltip {
-    display: block
-}
-
-.was-validated .form-control:invalid, .form-control.is-invalid {
-    border-color: #CC0000;
-    padding-right: calc(1.5em + 0.75rem);
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23CC0000' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23CC0000' stroke='none'/%3e%3c/svg%3e");
-    background-repeat: no-repeat;
-    background-position: right calc(0.375em + 0.1875rem) center;
-    background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)
-}
-
-    .was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {
-        border-color: #CC0000;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25)
-    }
-
-.was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {
-    padding-right: calc(1.5em + 0.75rem);
-    background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem)
-}
-
-.was-validated .custom-select:invalid, .custom-select.is-invalid {
-    border-color: #CC0000;
-    padding-right: calc(0.75em + 2.5625rem);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23222' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 1rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23CC0000' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23CC0000' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 2rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)
-}
-
-    .was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
-        border-color: #CC0000;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25)
-    }
-
-.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {
-    color: #CC0000
-}
-
-.was-validated .form-check-input:invalid ~ .invalid-feedback, .was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback, .form-check-input.is-invalid ~ .invalid-tooltip {
-    display: block
-}
-
-.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {
-    color: #CC0000
-}
-
-    .was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {
-        border-color: #CC0000
-    }
-
-.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {
-    border-color: red;
-    background-color: red
-}
-
-.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25)
-}
-
-.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {
-    border-color: #CC0000
-}
-
-.was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label {
-    border-color: #CC0000
-}
-
-.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {
-    border-color: #CC0000;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.25)
-}
-
-.form-inline {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -ms-flex-flow: row wrap;
-    flex-flow: row wrap;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center
-}
-
-    .form-inline .form-check {
-        width: 100%
-    }
-
-@media (min-width: 576px) {
-    .form-inline label {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        margin-bottom: 0
-    }
-
-    .form-inline .form-group {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-flex: 0;
-        -ms-flex: 0 0 auto;
-        flex: 0 0 auto;
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row wrap;
-        flex-flow: row wrap;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-        margin-bottom: 0
-    }
-
-    .form-inline .form-control {
-        display: inline-block;
-        width: auto;
-        vertical-align: middle
-    }
-
-    .form-inline .form-control-plaintext {
-        display: inline-block
-    }
-
-    .form-inline .input-group, .form-inline .custom-select {
-        width: auto
-    }
-
-    .form-inline .form-check {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        width: auto;
-        padding-left: 0
-    }
-
-    .form-inline .form-check-input {
-        position: relative;
-        -ms-flex-negative: 0;
-        flex-shrink: 0;
-        margin-top: 0;
-        margin-right: 0.25rem;
-        margin-left: 0
-    }
-
-    .form-inline .custom-control {
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center
-    }
-
-    .form-inline .custom-control-label {
-        margin-bottom: 0
-    }
-}
-
-.btn {
-    display: inline-block;
-    font-weight: 400;
-    color: #ADAFAE;
-    text-align: center;
-    vertical-align: middle;
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    background-color: transparent;
-    border: 1px solid transparent;
-    padding: 0.375rem 1rem;
-    font-size: 0.875rem;
-    line-height: 1.5;
-    border-radius: 0.25rem;
-    -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .btn {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.btn:hover {
-    color: #ADAFAE;
-    text-decoration: none
-}
-
-.btn:focus, .btn.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-    box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-}
-
-.btn.disabled, .btn:disabled {
-    opacity: 0.65
-}
-
-a.btn.disabled, fieldset:disabled a.btn {
-    pointer-events: none
-}
-
-.btn-primary {
-    color: #fff;
-    background-color: #2A9FD6;
-    border-color: #2A9FD6
-}
-
-    .btn-primary:hover {
-        color: #fff;
-        background-color: #2387b7;
-        border-color: #2180ac
-    }
-
-    .btn-primary:focus, .btn-primary.focus {
-        color: #fff;
-        background-color: #2387b7;
-        border-color: #2180ac;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(74,173,220,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(74,173,220,0.5)
-    }
-
-    .btn-primary.disabled, .btn-primary:disabled {
-        color: #fff;
-        background-color: #2A9FD6;
-        border-color: #2A9FD6
-    }
-
-    .btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active, .show > .btn-primary.dropdown-toggle {
-        color: #fff;
-        background-color: #2180ac;
-        border-color: #1f78a1
-    }
-
-        .btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-primary.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(74,173,220,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(74,173,220,0.5)
-        }
-
-.btn-secondary {
-    color: #fff;
-    background-color: #555;
-    border-color: #555
-}
-
-    .btn-secondary:hover {
-        color: #fff;
-        background-color: #424242;
-        border-color: #3c3b3b
-    }
-
-    .btn-secondary:focus, .btn-secondary.focus {
-        color: #fff;
-        background-color: #424242;
-        border-color: #3c3b3b;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(111,111,111,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(111,111,111,0.5)
-    }
-
-    .btn-secondary.disabled, .btn-secondary:disabled {
-        color: #fff;
-        background-color: #555;
-        border-color: #555
-    }
-
-    .btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .show > .btn-secondary.dropdown-toggle {
-        color: #fff;
-        background-color: #3c3b3b;
-        border-color: #353535
-    }
-
-        .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .show > .btn-secondary.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(111,111,111,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(111,111,111,0.5)
-        }
-
-.btn-success {
-    color: #fff;
-    background-color: #77B300;
-    border-color: #77B300
-}
-
-    .btn-success:hover {
-        color: #fff;
-        background-color: #5e8d00;
-        border-color: #558000
-    }
-
-    .btn-success:focus, .btn-success.focus {
-        color: #fff;
-        background-color: #5e8d00;
-        border-color: #558000;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(139,190,38,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(139,190,38,0.5)
-    }
-
-    .btn-success.disabled, .btn-success:disabled {
-        color: #fff;
-        background-color: #77B300;
-        border-color: #77B300
-    }
-
-    .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active, .show > .btn-success.dropdown-toggle {
-        color: #fff;
-        background-color: #558000;
-        border-color: #4d7300
-    }
-
-        .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus, .show > .btn-success.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(139,190,38,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(139,190,38,0.5)
-        }
-
-.btn-info {
-    color: #fff;
-    background-color: #9933CC;
-    border-color: #9933CC
-}
-
-    .btn-info:hover {
-        color: #fff;
-        background-color: #822bad;
-        border-color: #7a29a3
-    }
-
-    .btn-info:focus, .btn-info.focus {
-        color: #fff;
-        background-color: #822bad;
-        border-color: #7a29a3;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(168,82,212,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(168,82,212,0.5)
-    }
-
-    .btn-info.disabled, .btn-info:disabled {
-        color: #fff;
-        background-color: #9933CC;
-        border-color: #9933CC
-    }
-
-    .btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active, .show > .btn-info.dropdown-toggle {
-        color: #fff;
-        background-color: #7a29a3;
-        border-color: #732699
-    }
-
-        .btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus, .show > .btn-info.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(168,82,212,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(168,82,212,0.5)
-        }
-
-.btn-warning {
-    color: #fff;
-    background-color: #FF8800;
-    border-color: #FF8800
-}
-
-    .btn-warning:hover {
-        color: #fff;
-        background-color: #d97400;
-        border-color: #cc6d00
-    }
-
-    .btn-warning:focus, .btn-warning.focus {
-        color: #fff;
-        background-color: #d97400;
-        border-color: #cc6d00;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(255,154,38,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(255,154,38,0.5)
-    }
-
-    .btn-warning.disabled, .btn-warning:disabled {
-        color: #fff;
-        background-color: #FF8800;
-        border-color: #FF8800
-    }
-
-    .btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active, .show > .btn-warning.dropdown-toggle {
-        color: #fff;
-        background-color: #cc6d00;
-        border-color: #bf6600
-    }
-
-        .btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus, .show > .btn-warning.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(255,154,38,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(255,154,38,0.5)
-        }
-
-.btn-danger {
-    color: #fff;
-    background-color: #CC0000;
-    border-color: #CC0000
-}
-
-    .btn-danger:hover {
-        color: #fff;
-        background-color: #a60000;
-        border-color: #990000
-    }
-
-    .btn-danger:focus, .btn-danger.focus {
-        color: #fff;
-        background-color: #a60000;
-        border-color: #990000;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(212,38,38,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(212,38,38,0.5)
-    }
-
-    .btn-danger.disabled, .btn-danger:disabled {
-        color: #fff;
-        background-color: #CC0000;
-        border-color: #CC0000
-    }
-
-    .btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active, .show > .btn-danger.dropdown-toggle {
-        color: #fff;
-        background-color: #990000;
-        border-color: #8c0000
-    }
-
-        .btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus, .show > .btn-danger.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(212,38,38,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(212,38,38,0.5)
-        }
-
-.btn-light {
-    color: #fff;
-    background-color: #222;
-    border-color: #222
-}
-
-    .btn-light:hover {
-        color: #fff;
-        background-color: #0f0f0f;
-        border-color: #090808
-    }
-
-    .btn-light:focus, .btn-light.focus {
-        color: #fff;
-        background-color: #0f0f0f;
-        border-color: #090808;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(67,67,67,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(67,67,67,0.5)
-    }
-
-    .btn-light.disabled, .btn-light:disabled {
-        color: #fff;
-        background-color: #222;
-        border-color: #222
-    }
-
-    .btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active, .show > .btn-light.dropdown-toggle {
-        color: #fff;
-        background-color: #090808;
-        border-color: #020202
-    }
-
-        .btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus, .show > .btn-light.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(67,67,67,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(67,67,67,0.5)
-        }
-
-.btn-dark {
-    color: #fff;
-    background-color: #ADAFAE;
-    border-color: #ADAFAE
-}
-
-    .btn-dark:hover {
-        color: #fff;
-        background-color: #9a9c9b;
-        border-color: #939695
-    }
-
-    .btn-dark:focus, .btn-dark.focus {
-        color: #fff;
-        background-color: #9a9c9b;
-        border-color: #939695;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(185,187,186,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(185,187,186,0.5)
-    }
-
-    .btn-dark.disabled, .btn-dark:disabled {
-        color: #fff;
-        background-color: #ADAFAE;
-        border-color: #ADAFAE
-    }
-
-    .btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show > .btn-dark.dropdown-toggle {
-        color: #fff;
-        background-color: #939695;
-        border-color: #8d908e
-    }
-
-        .btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus, .show > .btn-dark.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(185,187,186,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(185,187,186,0.5)
-        }
-
-.btn-outline-primary {
-    color: #2A9FD6;
-    border-color: #2A9FD6
-}
-
-    .btn-outline-primary:hover {
-        color: #fff;
-        background-color: #2A9FD6;
-        border-color: #2A9FD6
-    }
-
-    .btn-outline-primary:focus, .btn-outline-primary.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5)
-    }
-
-    .btn-outline-primary.disabled, .btn-outline-primary:disabled {
-        color: #2A9FD6;
-        background-color: transparent
-    }
-
-    .btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active, .show > .btn-outline-primary.dropdown-toggle {
-        color: #fff;
-        background-color: #2A9FD6;
-        border-color: #2A9FD6
-    }
-
-        .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5)
-        }
-
-.btn-outline-secondary {
-    color: #555;
-    border-color: #555
-}
-
-    .btn-outline-secondary:hover {
-        color: #fff;
-        background-color: #555;
-        border-color: #555
-    }
-
-    .btn-outline-secondary:focus, .btn-outline-secondary.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5)
-    }
-
-    .btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
-        color: #555;
-        background-color: transparent
-    }
-
-    .btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active, .show > .btn-outline-secondary.dropdown-toggle {
-        color: #fff;
-        background-color: #555;
-        border-color: #555
-    }
-
-        .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-secondary.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5)
-        }
-
-.btn-outline-success {
-    color: #77B300;
-    border-color: #77B300
-}
-
-    .btn-outline-success:hover {
-        color: #fff;
-        background-color: #77B300;
-        border-color: #77B300
-    }
-
-    .btn-outline-success:focus, .btn-outline-success.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5)
-    }
-
-    .btn-outline-success.disabled, .btn-outline-success:disabled {
-        color: #77B300;
-        background-color: transparent
-    }
-
-    .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active, .show > .btn-outline-success.dropdown-toggle {
-        color: #fff;
-        background-color: #77B300;
-        border-color: #77B300
-    }
-
-        .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-success.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5)
-        }
-
-.btn-outline-info {
-    color: #9933CC;
-    border-color: #9933CC
-}
-
-    .btn-outline-info:hover {
-        color: #fff;
-        background-color: #9933CC;
-        border-color: #9933CC
-    }
-
-    .btn-outline-info:focus, .btn-outline-info.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5)
-    }
-
-    .btn-outline-info.disabled, .btn-outline-info:disabled {
-        color: #9933CC;
-        background-color: transparent
-    }
-
-    .btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active, .show > .btn-outline-info.dropdown-toggle {
-        color: #fff;
-        background-color: #9933CC;
-        border-color: #9933CC
-    }
-
-        .btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-info.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5)
-        }
-
-.btn-outline-warning {
-    color: #FF8800;
-    border-color: #FF8800
-}
-
-    .btn-outline-warning:hover {
-        color: #fff;
-        background-color: #FF8800;
-        border-color: #FF8800
-    }
-
-    .btn-outline-warning:focus, .btn-outline-warning.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5)
-    }
-
-    .btn-outline-warning.disabled, .btn-outline-warning:disabled {
-        color: #FF8800;
-        background-color: transparent
-    }
-
-    .btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active, .show > .btn-outline-warning.dropdown-toggle {
-        color: #fff;
-        background-color: #FF8800;
-        border-color: #FF8800
-    }
-
-        .btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-warning.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5)
-        }
-
-.btn-outline-danger {
-    color: #CC0000;
-    border-color: #CC0000
-}
-
-    .btn-outline-danger:hover {
-        color: #fff;
-        background-color: #CC0000;
-        border-color: #CC0000
-    }
-
-    .btn-outline-danger:focus, .btn-outline-danger.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5)
-    }
-
-    .btn-outline-danger.disabled, .btn-outline-danger:disabled {
-        color: #CC0000;
-        background-color: transparent
-    }
-
-    .btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active, .show > .btn-outline-danger.dropdown-toggle {
-        color: #fff;
-        background-color: #CC0000;
-        border-color: #CC0000
-    }
-
-        .btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-danger.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5)
-        }
-
-.btn-outline-light {
-    color: #222;
-    border-color: #222
-}
-
-    .btn-outline-light:hover {
-        color: #fff;
-        background-color: #222;
-        border-color: #222
-    }
-
-    .btn-outline-light:focus, .btn-outline-light.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5)
-    }
-
-    .btn-outline-light.disabled, .btn-outline-light:disabled {
-        color: #222;
-        background-color: transparent
-    }
-
-    .btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active, .show > .btn-outline-light.dropdown-toggle {
-        color: #fff;
-        background-color: #222;
-        border-color: #222
-    }
-
-        .btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5)
-        }
-
-.btn-outline-dark {
-    color: #ADAFAE;
-    border-color: #ADAFAE
-}
-
-    .btn-outline-dark:hover {
-        color: #fff;
-        background-color: #ADAFAE;
-        border-color: #ADAFAE
-    }
-
-    .btn-outline-dark:focus, .btn-outline-dark.focus {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5);
-        box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5)
-    }
-
-    .btn-outline-dark.disabled, .btn-outline-dark:disabled {
-        color: #ADAFAE;
-        background-color: transparent
-    }
-
-    .btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active, .show > .btn-outline-dark.dropdown-toggle {
-        color: #fff;
-        background-color: #ADAFAE;
-        border-color: #ADAFAE
-    }
-
-        .btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-dark.dropdown-toggle:focus {
-            -webkit-box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5);
-            box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5)
-        }
-
-.btn-link {
-    font-weight: 400;
-    color: #2A9FD6;
-    text-decoration: none
-}
-
-    .btn-link:hover {
-        color: #1d7097;
-        text-decoration: underline
-    }
-
-    .btn-link:focus, .btn-link.focus {
-        text-decoration: underline;
-        -webkit-box-shadow: none;
-        box-shadow: none
-    }
-
-    .btn-link:disabled, .btn-link.disabled {
-        color: #555;
-        pointer-events: none
-    }
-
-.btn-lg, .btn-group-lg > .btn {
-    padding: 0.5rem 1rem;
-    font-size: 1.09375rem;
-    line-height: 1.5;
-    border-radius: 0.3rem
-}
-
-.btn-sm, .btn-group-sm > .btn {
-    padding: 0.25rem 0.5rem;
-    font-size: 0.765625rem;
-    line-height: 1.5;
-    border-radius: 0.2rem
-}
-
-.btn-block {
-    display: block;
-    width: 100%
-}
-
-    .btn-block + .btn-block {
-        margin-top: 0.5rem
-    }
-
-input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block {
-    width: 100%
-}
-
-.fade {
-    -webkit-transition: opacity 0.15s linear;
-    transition: opacity 0.15s linear
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .fade {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.fade:not(.show) {
-    opacity: 0
-}
-
-.collapse:not(.show) {
-    display: none
-}
-
-.collapsing {
-    position: relative;
-    height: 0;
-    overflow: hidden;
-    -webkit-transition: height 0.35s ease;
-    transition: height 0.35s ease
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .collapsing {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.dropup, .dropright, .dropdown, .dropleft {
-    position: relative
-}
-
-.dropdown-toggle {
-    white-space: nowrap
-}
-
-    .dropdown-toggle::after {
-        display: inline-block;
-        margin-left: 0.255em;
-        vertical-align: 0.255em;
-        content: "";
-        border-top: 0.3em solid;
-        border-right: 0.3em solid transparent;
-        border-bottom: 0;
-        border-left: 0.3em solid transparent
-    }
-
-    .dropdown-toggle:empty::after {
-        margin-left: 0
-    }
-
-.dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 10rem;
-    padding: 0.5rem 0;
-    margin: 0.125rem 0 0;
-    font-size: 0.875rem;
-    color: #ADAFAE;
-    text-align: left;
-    list-style: none;
-    background-color: #282828;
-    background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,0.15);
-    border-radius: 0.25rem
-}
-
-.dropdown-menu-left {
-    right: auto;
-    left: 0
-}
-
-.dropdown-menu-right {
-    right: 0;
-    left: auto
-}
-
-@media (min-width: 576px) {
-    .dropdown-menu-sm-left {
-        right: auto;
-        left: 0
-    }
-
-    .dropdown-menu-sm-right {
-        right: 0;
-        left: auto
-    }
-}
-
-@media (min-width: 768px) {
-    .dropdown-menu-md-left {
-        right: auto;
-        left: 0
-    }
-
-    .dropdown-menu-md-right {
-        right: 0;
-        left: auto
-    }
-}
-
-@media (min-width: 992px) {
-    .dropdown-menu-lg-left {
-        right: auto;
-        left: 0
-    }
-
-    .dropdown-menu-lg-right {
-        right: 0;
-        left: auto
-    }
-}
-
-@media (min-width: 1200px) {
-    .dropdown-menu-xl-left {
-        right: auto;
-        left: 0
-    }
-
-    .dropdown-menu-xl-right {
-        right: 0;
-        left: auto
-    }
-}
-
-.dropup .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-top: 0;
-    margin-bottom: 0.125rem
-}
-
-.dropup .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0;
-    border-right: 0.3em solid transparent;
-    border-bottom: 0.3em solid;
-    border-left: 0.3em solid transparent
-}
-
-.dropup .dropdown-toggle:empty::after {
-    margin-left: 0
-}
-
-.dropright .dropdown-menu {
-    top: 0;
-    right: auto;
-    left: 100%;
-    margin-top: 0;
-    margin-left: 0.125rem
-}
-
-.dropright .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0;
-    border-bottom: 0.3em solid transparent;
-    border-left: 0.3em solid
-}
-
-.dropright .dropdown-toggle:empty::after {
-    margin-left: 0
-}
-
-.dropright .dropdown-toggle::after {
-    vertical-align: 0
-}
-
-.dropleft .dropdown-menu {
-    top: 0;
-    right: 100%;
-    left: auto;
-    margin-top: 0;
-    margin-right: 0.125rem
-}
-
-.dropleft .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: ""
-}
-
-.dropleft .dropdown-toggle::after {
-    display: none
-}
-
-.dropleft .dropdown-toggle::before {
-    display: inline-block;
-    margin-right: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0.3em solid;
-    border-bottom: 0.3em solid transparent
-}
-
-.dropleft .dropdown-toggle:empty::after {
-    margin-left: 0
-}
-
-.dropleft .dropdown-toggle::before {
-    vertical-align: 0
-}
-
-.dropdown-menu[x-placement^="top"], .dropdown-menu[x-placement^="right"], .dropdown-menu[x-placement^="bottom"], .dropdown-menu[x-placement^="left"] {
-    right: auto;
-    bottom: auto
-}
-
-.dropdown-divider {
-    height: 0;
-    margin: 0.5rem 0;
-    overflow: hidden;
-    border-top: 1px solid #222
-}
-
-.dropdown-item {
-    display: block;
-    width: 100%;
-    padding: 0.25rem 1.5rem;
-    clear: both;
-    font-weight: 400;
-    color: #fff;
-    text-align: inherit;
-    white-space: nowrap;
-    background-color: transparent;
-    border: 0
-}
-
-    .dropdown-item:hover, .dropdown-item:focus {
-        color: #fff;
-        text-decoration: none;
-        background-color: #2A9FD6
-    }
-
-    .dropdown-item.active, .dropdown-item:active {
-        color: #fff;
-        text-decoration: none;
-        background-color: #2A9FD6
-    }
-
-    .dropdown-item.disabled, .dropdown-item:disabled {
-        color: #555;
-        pointer-events: none;
-        background-color: transparent
-    }
-
-.dropdown-menu.show {
-    display: block
-}
-
-.dropdown-header {
-    display: block;
-    padding: 0.5rem 1.5rem;
-    margin-bottom: 0;
-    font-size: 0.765625rem;
-    color: #555;
-    white-space: nowrap
-}
-
-.dropdown-item-text {
-    display: block;
-    padding: 0.25rem 1.5rem;
-    color: #fff
-}
-
-.btn-group, .btn-group-vertical {
-    position: relative;
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    vertical-align: middle
-}
-
-    .btn-group > .btn, .btn-group-vertical > .btn {
-        position: relative;
-        -webkit-box-flex: 1;
-        -ms-flex: 1 1 auto;
-        flex: 1 1 auto
-    }
-
-        .btn-group > .btn:hover, .btn-group-vertical > .btn:hover {
-            z-index: 1
-        }
-
-        .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn:focus, .btn-group-vertical > .btn:active, .btn-group-vertical > .btn.active {
-            z-index: 1
-        }
-
-.btn-toolbar {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-pack: start;
-    -ms-flex-pack: start;
-    justify-content: flex-start
-}
-
-    .btn-toolbar .input-group {
-        width: auto
-    }
-
-.btn-group > .btn:not(:first-child), .btn-group > .btn-group:not(:first-child) {
-    margin-left: -1px
-}
-
-.btn-group > .btn:not(:last-child):not(.dropdown-toggle), .btn-group > .btn-group:not(:last-child) > .btn {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0
-}
-
-.btn-group > .btn:not(:first-child), .btn-group > .btn-group:not(:first-child) > .btn {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0
-}
-
-.dropdown-toggle-split {
-    padding-right: 0.75rem;
-    padding-left: 0.75rem
-}
-
-    .dropdown-toggle-split::after, .dropup .dropdown-toggle-split::after, .dropright .dropdown-toggle-split::after {
-        margin-left: 0
-    }
-
-.dropleft .dropdown-toggle-split::before {
-    margin-right: 0
-}
-
-.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
-    padding-right: 0.375rem;
-    padding-left: 0.375rem
-}
-
-.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
-    padding-right: 0.75rem;
-    padding-left: 0.75rem
-}
-
-.btn-group-vertical {
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    -webkit-box-align: start;
-    -ms-flex-align: start;
-    align-items: flex-start;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    justify-content: center
-}
-
-    .btn-group-vertical > .btn, .btn-group-vertical > .btn-group {
-        width: 100%
-    }
-
-        .btn-group-vertical > .btn:not(:first-child), .btn-group-vertical > .btn-group:not(:first-child) {
-            margin-top: -1px
-        }
-
-        .btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle), .btn-group-vertical > .btn-group:not(:last-child) > .btn {
-            border-bottom-right-radius: 0;
-            border-bottom-left-radius: 0
-        }
-
-        .btn-group-vertical > .btn:not(:first-child), .btn-group-vertical > .btn-group:not(:first-child) > .btn {
-            border-top-left-radius: 0;
-            border-top-right-radius: 0
-        }
-
-.btn-group-toggle > .btn, .btn-group-toggle > .btn-group > .btn {
-    margin-bottom: 0
-}
-
-    .btn-group-toggle > .btn input[type="radio"], .btn-group-toggle > .btn input[type="checkbox"], .btn-group-toggle > .btn-group > .btn input[type="radio"], .btn-group-toggle > .btn-group > .btn input[type="checkbox"] {
-        position: absolute;
-        clip: rect(0, 0, 0, 0);
-        pointer-events: none
-    }
-
-.input-group {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-align: stretch;
-    -ms-flex-align: stretch;
-    align-items: stretch;
-    width: 100%
-}
-
-    .input-group > .form-control, .input-group > .form-control-plaintext, .input-group > .custom-select, .input-group > .custom-file {
-        position: relative;
-        -webkit-box-flex: 1;
-        -ms-flex: 1 1 0%;
-        flex: 1 1 0%;
-        min-width: 0;
-        margin-bottom: 0
-    }
-
-        .input-group > .form-control + .form-control, .input-group > .form-control + .custom-select, .input-group > .form-control + .custom-file, .input-group > .form-control-plaintext + .form-control, .input-group > .form-control-plaintext + .custom-select, .input-group > .form-control-plaintext + .custom-file, .input-group > .custom-select + .form-control, .input-group > .custom-select + .custom-select, .input-group > .custom-select + .custom-file, .input-group > .custom-file + .form-control, .input-group > .custom-file + .custom-select, .input-group > .custom-file + .custom-file {
-            margin-left: -1px
-        }
-
-        .input-group > .form-control:focus, .input-group > .custom-select:focus, .input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {
-            z-index: 3
-        }
-
-        .input-group > .custom-file .custom-file-input:focus {
-            z-index: 4
-        }
-
-        .input-group > .form-control:not(:last-child), .input-group > .custom-select:not(:last-child) {
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0
-        }
-
-        .input-group > .form-control:not(:first-child), .input-group > .custom-select:not(:first-child) {
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0
-        }
-
-    .input-group > .custom-file {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center
-    }
-
-        .input-group > .custom-file:not(:last-child) .custom-file-label, .input-group > .custom-file:not(:last-child) .custom-file-label::after {
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0
-        }
-
-        .input-group > .custom-file:not(:first-child) .custom-file-label {
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0
-        }
-
-.input-group-prepend, .input-group-append {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex
-}
-
-    .input-group-prepend .btn, .input-group-append .btn {
-        position: relative;
-        z-index: 2
-    }
-
-        .input-group-prepend .btn:focus, .input-group-append .btn:focus {
-            z-index: 3
-        }
-
-        .input-group-prepend .btn + .btn, .input-group-prepend .btn + .input-group-text, .input-group-prepend .input-group-text + .input-group-text, .input-group-prepend .input-group-text + .btn, .input-group-append .btn + .btn, .input-group-append .btn + .input-group-text, .input-group-append .input-group-text + .input-group-text, .input-group-append .input-group-text + .btn {
-            margin-left: -1px
-        }
-
-.input-group-prepend {
-    margin-right: -1px
-}
-
-.input-group-append {
-    margin-left: -1px
-}
-
-.input-group-text {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    padding: 0.375rem 1rem;
-    margin-bottom: 0;
-    font-size: 0.875rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #fff;
-    text-align: center;
-    white-space: nowrap;
-    background-color: #282828;
-    border: 1px solid transparent;
-    border-radius: 0.25rem
-}
-
-    .input-group-text input[type="radio"], .input-group-text input[type="checkbox"] {
-        margin-top: 0
-    }
-
-.input-group-lg > .form-control:not(textarea), .input-group-lg > .custom-select {
-    height: calc(1.5em + 1rem + 2px)
-}
-
-.input-group-lg > .form-control, .input-group-lg > .custom-select, .input-group-lg > .input-group-prepend > .input-group-text, .input-group-lg > .input-group-append > .input-group-text, .input-group-lg > .input-group-prepend > .btn, .input-group-lg > .input-group-append > .btn {
-    padding: 0.5rem 1rem;
-    font-size: 1.09375rem;
-    line-height: 1.5;
-    border-radius: 0.3rem
-}
-
-.input-group-sm > .form-control:not(textarea), .input-group-sm > .custom-select {
-    height: calc(1.5em + 0.5rem + 2px)
-}
-
-.input-group-sm > .form-control, .input-group-sm > .custom-select, .input-group-sm > .input-group-prepend > .input-group-text, .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn {
-    padding: 0.25rem 0.5rem;
-    font-size: 0.765625rem;
-    line-height: 1.5;
-    border-radius: 0.2rem
-}
-
-.input-group-lg > .custom-select, .input-group-sm > .custom-select {
-    padding-right: 2rem
-}
-
-.input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-append:not(:last-child) > .btn, .input-group > .input-group-append:not(:last-child) > .input-group-text, .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0
-}
-
-.input-group > .input-group-append > .btn, .input-group > .input-group-append > .input-group-text, .input-group > .input-group-prepend:not(:first-child) > .btn, .input-group > .input-group-prepend:not(:first-child) > .input-group-text, .input-group > .input-group-prepend:first-child > .btn:not(:first-child), .input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0
-}
-
-.custom-control {
-    position: relative;
-    display: block;
-    min-height: 1.3125rem;
-    padding-left: 1.5rem
-}
-
-.custom-control-inline {
-    display: -webkit-inline-box;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    margin-right: 1rem
-}
-
-.custom-control-input {
-    position: absolute;
-    left: 0;
-    z-index: -1;
-    width: 1rem;
-    height: 1.15625rem;
-    opacity: 0
-}
-
-    .custom-control-input:checked ~ .custom-control-label::before {
-        color: #fff;
-        border-color: #2A9FD6;
-        background-color: #2A9FD6
-    }
-
-    .custom-control-input:focus ~ .custom-control-label::before {
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-    }
-
-    .custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
-        border-color: #95cfeb
-    }
-
-    .custom-control-input:not(:disabled):active ~ .custom-control-label::before {
-        color: #fff;
-        background-color: #c0e2f3;
-        border-color: #c0e2f3
-    }
-
-    .custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label {
-        color: #555
-    }
-
-        .custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before {
-            background-color: #ADAFAE
-        }
-
-.custom-control-label {
-    position: relative;
-    margin-bottom: 0;
-    vertical-align: top
-}
-
-    .custom-control-label::before {
-        position: absolute;
-        top: 0.15625rem;
-        left: -1.5rem;
-        display: block;
-        width: 1rem;
-        height: 1rem;
-        pointer-events: none;
-        content: "";
-        background-color: #fff;
-        border: #888 solid 1px
-    }
-
-    .custom-control-label::after {
-        position: absolute;
-        top: 0.15625rem;
-        left: -1.5rem;
-        display: block;
-        width: 1rem;
-        height: 1rem;
-        content: "";
-        background: no-repeat 50% / 50% 50%
-    }
-
-.custom-checkbox .custom-control-label::before {
-    border-radius: 0.25rem
-}
-
-.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e")
-}
-
-.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
-    border-color: #2A9FD6;
-    background-color: #2A9FD6
-}
-
-.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e")
-}
-
-.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {
-    background-color: rgba(42,159,214,0.5)
-}
-
-.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before {
-    background-color: rgba(42,159,214,0.5)
-}
-
-.custom-radio .custom-control-label::before {
-    border-radius: 50%
-}
-
-.custom-radio .custom-control-input:checked ~ .custom-control-label::after {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")
-}
-
-.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {
-    background-color: rgba(42,159,214,0.5)
-}
-
-.custom-switch {
-    padding-left: 2.25rem
-}
-
-    .custom-switch .custom-control-label::before {
-        left: -2.25rem;
-        width: 1.75rem;
-        pointer-events: all;
-        border-radius: 0.5rem
-    }
-
-    .custom-switch .custom-control-label::after {
-        top: calc(0.15625rem + 2px);
-        left: calc(-2.25rem + 2px);
-        width: calc(1rem - 4px);
-        height: calc(1rem - 4px);
-        background-color: #888;
-        border-radius: 0.5rem;
-        -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-        transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-        transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-        transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out
-    }
-
-@media (prefers-reduced-motion: reduce) {
-    .custom-switch .custom-control-label::after {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.custom-switch .custom-control-input:checked ~ .custom-control-label::after {
-    background-color: #fff;
-    -webkit-transform: translateX(0.75rem);
-    transform: translateX(0.75rem)
-}
-
-.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {
-    background-color: rgba(42,159,214,0.5)
-}
-
-.custom-select {
-    display: inline-block;
-    width: 100%;
-    height: calc(1.5em + 0.75rem + 2px);
-    padding: 0.375rem 2rem 0.375rem 1rem;
-    font-size: 0.875rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #282828;
-    vertical-align: middle;
-    background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23222' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 1rem center/8px 10px;
-    border: 1px solid transparent;
-    border-radius: 0.25rem;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none
-}
-
-    .custom-select:focus {
-        border-color: #95cfeb;
-        outline: 0;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-    }
-
-        .custom-select:focus::-ms-value {
-            color: #282828;
-            background-color: #fff
-        }
-
-    .custom-select[multiple], .custom-select[size]:not([size="1"]) {
-        height: auto;
-        padding-right: 1rem;
-        background-image: none
-    }
-
-    .custom-select:disabled {
-        color: #555;
-        background-color: #e9ecef
-    }
-
-    .custom-select::-ms-expand {
-        display: none
-    }
-
-    .custom-select:-moz-focusring {
-        color: transparent;
-        text-shadow: 0 0 0 #282828
-    }
-
-.custom-select-sm {
-    height: calc(1.5em + 0.5rem + 2px);
-    padding-top: 0.25rem;
-    padding-bottom: 0.25rem;
-    padding-left: 0.5rem;
-    font-size: 0.765625rem
-}
-
-.custom-select-lg {
-    height: calc(1.5em + 1rem + 2px);
-    padding-top: 0.5rem;
-    padding-bottom: 0.5rem;
-    padding-left: 1rem;
-    font-size: 1.09375rem
-}
-
-.custom-file {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-    height: calc(1.5em + 0.75rem + 2px);
-    margin-bottom: 0
-}
-
-.custom-file-input {
-    position: relative;
-    z-index: 2;
-    width: 100%;
-    height: calc(1.5em + 0.75rem + 2px);
-    margin: 0;
-    opacity: 0
-}
-
-    .custom-file-input:focus ~ .custom-file-label {
-        border-color: #95cfeb;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-    }
-
-    .custom-file-input[disabled] ~ .custom-file-label, .custom-file-input:disabled ~ .custom-file-label {
-        background-color: #ADAFAE
-    }
-
-    .custom-file-input:lang(en) ~ .custom-file-label::after {
-        content: "Browse"
-    }
-
-    .custom-file-input ~ .custom-file-label[data-browse]::after {
-        content: attr(data-browse)
-    }
-
-.custom-file-label {
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    z-index: 1;
-    height: calc(1.5em + 0.75rem + 2px);
-    padding: 0.375rem 1rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #fff;
-    background-color: #fff;
-    border: 1px solid #282828;
-    border-radius: 0.25rem
-}
-
-    .custom-file-label::after {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        z-index: 3;
-        display: block;
-        height: calc(1.5em + 0.75rem);
-        padding: 0.375rem 1rem;
-        line-height: 1.5;
-        color: #fff;
-        content: "Browse";
-        background-color: #282828;
-        border-left: inherit;
-        border-radius: 0 0.25rem 0.25rem 0
-    }
-
-.custom-range {
-    width: 100%;
-    height: 1.4rem;
-    padding: 0;
-    background-color: transparent;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none
-}
-
-    .custom-range:focus {
-        outline: none
-    }
-
-        .custom-range:focus::-webkit-slider-thumb {
-            -webkit-box-shadow: 0 0 0 1px #060606,0 0 0 0.2rem rgba(42,159,214,0.25);
-            box-shadow: 0 0 0 1px #060606,0 0 0 0.2rem rgba(42,159,214,0.25)
-        }
-
-        .custom-range:focus::-moz-range-thumb {
-            box-shadow: 0 0 0 1px #060606,0 0 0 0.2rem rgba(42,159,214,0.25)
-        }
-
-        .custom-range:focus::-ms-thumb {
-            box-shadow: 0 0 0 1px #060606,0 0 0 0.2rem rgba(42,159,214,0.25)
-        }
-
-    .custom-range::-moz-focus-outer {
-        border: 0
-    }
-
-    .custom-range::-webkit-slider-thumb {
-        width: 1rem;
-        height: 1rem;
-        margin-top: -0.25rem;
-        background-color: #2A9FD6;
-        border: 0;
-        border-radius: 1rem;
-        -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-        transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-        transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-        transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-        -webkit-appearance: none;
-        appearance: none
-    }
-
-@media (prefers-reduced-motion: reduce) {
-    .custom-range::-webkit-slider-thumb {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.custom-range::-webkit-slider-thumb:active {
-    background-color: #c0e2f3
-}
-
-.custom-range::-webkit-slider-runnable-track {
-    width: 100%;
-    height: 0.5rem;
-    color: transparent;
-    cursor: pointer;
-    background-color: #dee2e6;
-    border-color: transparent;
-    border-radius: 1rem
-}
-
-.custom-range::-moz-range-thumb {
-    width: 1rem;
-    height: 1rem;
-    background-color: #2A9FD6;
-    border: 0;
-    border-radius: 1rem;
-    -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    -moz-appearance: none;
-    appearance: none
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .custom-range::-moz-range-thumb {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.custom-range::-moz-range-thumb:active {
-    background-color: #c0e2f3
-}
-
-.custom-range::-moz-range-track {
-    width: 100%;
-    height: 0.5rem;
-    color: transparent;
-    cursor: pointer;
-    background-color: #dee2e6;
-    border-color: transparent;
-    border-radius: 1rem
-}
-
-.custom-range::-ms-thumb {
-    width: 1rem;
-    height: 1rem;
-    margin-top: 0;
-    margin-right: 0.2rem;
-    margin-left: 0.2rem;
-    background-color: #2A9FD6;
-    border: 0;
-    border-radius: 1rem;
-    -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    appearance: none
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .custom-range::-ms-thumb {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.custom-range::-ms-thumb:active {
-    background-color: #c0e2f3
-}
-
-.custom-range::-ms-track {
-    width: 100%;
-    height: 0.5rem;
-    color: transparent;
-    cursor: pointer;
-    background-color: transparent;
-    border-color: transparent;
-    border-width: 0.5rem
-}
-
-.custom-range::-ms-fill-lower {
-    background-color: #dee2e6;
-    border-radius: 1rem
-}
-
-.custom-range::-ms-fill-upper {
-    margin-right: 15px;
-    background-color: #dee2e6;
-    border-radius: 1rem
-}
-
-.custom-range:disabled::-webkit-slider-thumb {
-    background-color: #888
-}
-
-.custom-range:disabled::-webkit-slider-runnable-track {
-    cursor: default
-}
-
-.custom-range:disabled::-moz-range-thumb {
-    background-color: #888
-}
-
-.custom-range:disabled::-moz-range-track {
-    cursor: default
-}
-
-.custom-range:disabled::-ms-thumb {
-    background-color: #888
-}
-
-.custom-control-label::before, .custom-file-label, .custom-select {
-    -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .custom-control-label::before, .custom-file-label, .custom-select {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.nav {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    padding-left: 0;
-    margin-bottom: 0;
-    list-style: none
-}
-
-.nav-link {
-    display: block;
-    padding: 0.5rem 1rem
-}
-
-    .nav-link:hover, .nav-link:focus {
-        text-decoration: none
-    }
-
-    .nav-link.disabled {
-        color: #555;
-        pointer-events: none;
-        cursor: default
-    }
-
-.nav-tabs {
-    border-bottom: 1px solid #282828
-}
-
-    .nav-tabs .nav-item {
-        margin-bottom: -1px
-    }
-
-    .nav-tabs .nav-link {
-        border: 1px solid transparent;
-        border-top-left-radius: 0.25rem;
-        border-top-right-radius: 0.25rem
-    }
-
-        .nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {
-            border-color: #282828
-        }
-
-        .nav-tabs .nav-link.disabled {
-            color: #555;
-            background-color: transparent;
-            border-color: transparent
-        }
-
-        .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
-            color: #fff;
-            background-color: #282828;
-            border-color: #282828
-        }
-
-    .nav-tabs .dropdown-menu {
-        margin-top: -1px;
-        border-top-left-radius: 0;
-        border-top-right-radius: 0
-    }
-
-.nav-pills .nav-link {
-    border-radius: 0.25rem
-}
-
-    .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-        color: #fff;
-        background-color: #2A9FD6
-    }
-
-.nav-fill .nav-item {
-    -webkit-box-flex: 1;
-    -ms-flex: 1 1 auto;
-    flex: 1 1 auto;
-    text-align: center
-}
-
-.nav-justified .nav-item {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -webkit-box-flex: 1;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    text-align: center
-}
-
-.tab-content > .tab-pane {
-    display: none
-}
-
-.tab-content > .active {
-    display: block
-}
-
-.navbar {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    -webkit-box-pack: justify;
-    -ms-flex-pack: justify;
-    justify-content: space-between;
-    padding: 0.5rem 1rem
-}
-
-    .navbar .container, .navbar .container-fluid, .navbar .container-sm, .navbar .container-md, .navbar .container-lg, .navbar .container-xl {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -ms-flex-wrap: wrap;
-        flex-wrap: wrap;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
-        -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-        justify-content: space-between
-    }
-
-.navbar-brand {
-    display: inline-block;
-    padding-top: 0.3359375rem;
-    padding-bottom: 0.3359375rem;
-    margin-right: 1rem;
-    font-size: 1.09375rem;
-    line-height: inherit;
-    white-space: nowrap
-}
-
-    .navbar-brand:hover, .navbar-brand:focus {
-        text-decoration: none
-    }
-
-.navbar-nav {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    padding-left: 0;
-    margin-bottom: 0;
-    list-style: none
-}
-
-    .navbar-nav .nav-link {
-        padding-right: 0;
-        padding-left: 0
-    }
-
-    .navbar-nav .dropdown-menu {
-        position: static;
-        float: none
-    }
-
-.navbar-text {
-    display: inline-block;
-    padding-top: 0.5rem;
-    padding-bottom: 0.5rem
-}
-
-.navbar-collapse {
-    -ms-flex-preferred-size: 100%;
-    flex-basis: 100%;
-    -webkit-box-flex: 1;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center
-}
-
-.navbar-toggler {
-    padding: 0.25rem 0.75rem;
-    font-size: 1.09375rem;
-    line-height: 1;
-    background-color: transparent;
-    border: 1px solid transparent;
-    border-radius: 0.25rem
-}
-
-    .navbar-toggler:hover, .navbar-toggler:focus {
-        text-decoration: none
-    }
-
-.navbar-toggler-icon {
-    display: inline-block;
-    width: 1.5em;
-    height: 1.5em;
-    vertical-align: middle;
-    content: "";
-    background: no-repeat center center;
-    background-size: 100% 100%
-}
-
-@media (max-width: 575.98px) {
-    .navbar-expand-sm > .container, .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
-        padding-right: 0;
-        padding-left: 0
-    }
-}
-
-@media (min-width: 576px) {
-    .navbar-expand-sm {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row nowrap;
-        flex-flow: row nowrap;
-        -webkit-box-pack: start;
-        -ms-flex-pack: start;
-        justify-content: flex-start
-    }
-
-        .navbar-expand-sm .navbar-nav {
-            -webkit-box-orient: horizontal;
-            -webkit-box-direction: normal;
-            -ms-flex-direction: row;
-            flex-direction: row
-        }
-
-            .navbar-expand-sm .navbar-nav .dropdown-menu {
-                position: absolute
-            }
-
-            .navbar-expand-sm .navbar-nav .nav-link {
-                padding-right: 0.5rem;
-                padding-left: 0.5rem
-            }
-
-        .navbar-expand-sm > .container, .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
-            -ms-flex-wrap: nowrap;
-            flex-wrap: nowrap
-        }
-
-        .navbar-expand-sm .navbar-collapse {
-            display: -webkit-box !important;
-            display: -ms-flexbox !important;
-            display: flex !important;
-            -ms-flex-preferred-size: auto;
-            flex-basis: auto
-        }
-
-        .navbar-expand-sm .navbar-toggler {
-            display: none
-        }
-}
-
-@media (max-width: 767.98px) {
-    .navbar-expand-md > .container, .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
-        padding-right: 0;
-        padding-left: 0
-    }
-}
-
-@media (min-width: 768px) {
-    .navbar-expand-md {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row nowrap;
-        flex-flow: row nowrap;
-        -webkit-box-pack: start;
-        -ms-flex-pack: start;
-        justify-content: flex-start
-    }
-
-        .navbar-expand-md .navbar-nav {
-            -webkit-box-orient: horizontal;
-            -webkit-box-direction: normal;
-            -ms-flex-direction: row;
-            flex-direction: row
-        }
-
-            .navbar-expand-md .navbar-nav .dropdown-menu {
-                position: absolute
-            }
-
-            .navbar-expand-md .navbar-nav .nav-link {
-                padding-right: 0.5rem;
-                padding-left: 0.5rem
-            }
-
-        .navbar-expand-md > .container, .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
-            -ms-flex-wrap: nowrap;
-            flex-wrap: nowrap
-        }
-
-        .navbar-expand-md .navbar-collapse {
-            display: -webkit-box !important;
-            display: -ms-flexbox !important;
-            display: flex !important;
-            -ms-flex-preferred-size: auto;
-            flex-basis: auto
-        }
-
-        .navbar-expand-md .navbar-toggler {
-            display: none
-        }
-}
-
-@media (max-width: 991.98px) {
-    .navbar-expand-lg > .container, .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
-        padding-right: 0;
-        padding-left: 0
-    }
-}
-
-@media (min-width: 992px) {
-    .navbar-expand-lg {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row nowrap;
-        flex-flow: row nowrap;
-        -webkit-box-pack: start;
-        -ms-flex-pack: start;
-        justify-content: flex-start
-    }
-
-        .navbar-expand-lg .navbar-nav {
-            -webkit-box-orient: horizontal;
-            -webkit-box-direction: normal;
-            -ms-flex-direction: row;
-            flex-direction: row
-        }
-
-            .navbar-expand-lg .navbar-nav .dropdown-menu {
-                position: absolute
-            }
-
-            .navbar-expand-lg .navbar-nav .nav-link {
-                padding-right: 0.5rem;
-                padding-left: 0.5rem
-            }
-
-        .navbar-expand-lg > .container, .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
-            -ms-flex-wrap: nowrap;
-            flex-wrap: nowrap
-        }
-
-        .navbar-expand-lg .navbar-collapse {
-            display: -webkit-box !important;
-            display: -ms-flexbox !important;
-            display: flex !important;
-            -ms-flex-preferred-size: auto;
-            flex-basis: auto
-        }
-
-        .navbar-expand-lg .navbar-toggler {
-            display: none
-        }
-}
-
-@media (max-width: 1199.98px) {
-    .navbar-expand-xl > .container, .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
-        padding-right: 0;
-        padding-left: 0
-    }
-}
-
-@media (min-width: 1200px) {
-    .navbar-expand-xl {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row nowrap;
-        flex-flow: row nowrap;
-        -webkit-box-pack: start;
-        -ms-flex-pack: start;
-        justify-content: flex-start
-    }
-
-        .navbar-expand-xl .navbar-nav {
-            -webkit-box-orient: horizontal;
-            -webkit-box-direction: normal;
-            -ms-flex-direction: row;
-            flex-direction: row
-        }
-
-            .navbar-expand-xl .navbar-nav .dropdown-menu {
-                position: absolute
-            }
-
-            .navbar-expand-xl .navbar-nav .nav-link {
-                padding-right: 0.5rem;
-                padding-left: 0.5rem
-            }
-
-        .navbar-expand-xl > .container, .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
-            -ms-flex-wrap: nowrap;
-            flex-wrap: nowrap
-        }
-
-        .navbar-expand-xl .navbar-collapse {
-            display: -webkit-box !important;
-            display: -ms-flexbox !important;
-            display: flex !important;
-            -ms-flex-preferred-size: auto;
-            flex-basis: auto
-        }
-
-        .navbar-expand-xl .navbar-toggler {
-            display: none
-        }
-}
-
-.navbar-expand {
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -ms-flex-flow: row nowrap;
-    flex-flow: row nowrap;
-    -webkit-box-pack: start;
-    -ms-flex-pack: start;
-    justify-content: flex-start
-}
-
-    .navbar-expand > .container, .navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
-        padding-right: 0;
-        padding-left: 0
-    }
-
-    .navbar-expand .navbar-nav {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-        flex-direction: row
-    }
-
-        .navbar-expand .navbar-nav .dropdown-menu {
-            position: absolute
-        }
-
-        .navbar-expand .navbar-nav .nav-link {
-            padding-right: 0.5rem;
-            padding-left: 0.5rem
-        }
-
-    .navbar-expand > .container, .navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
-        -ms-flex-wrap: nowrap;
-        flex-wrap: nowrap
-    }
-
-    .navbar-expand .navbar-collapse {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important;
-        -ms-flex-preferred-size: auto;
-        flex-basis: auto
-    }
-
-    .navbar-expand .navbar-toggler {
-        display: none
-    }
-
-.navbar-light .navbar-brand {
-    color: rgba(0,0,0,0.9)
-}
-
-    .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus {
-        color: rgba(0,0,0,0.9)
-    }
-
-.navbar-light .navbar-nav .nav-link {
-    color: rgba(0,0,0,0.5)
-}
-
-    .navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {
-        color: rgba(0,0,0,0.7)
-    }
-
-    .navbar-light .navbar-nav .nav-link.disabled {
-        color: rgba(0,0,0,0.3)
-    }
-
-    .navbar-light .navbar-nav .show > .nav-link, .navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .nav-link.active {
-        color: rgba(0,0,0,0.9)
-    }
-
-.navbar-light .navbar-toggler {
-    color: rgba(0,0,0,0.5);
-    border-color: rgba(0,0,0,0.1)
-}
-
-.navbar-light .navbar-toggler-icon {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")
-}
-
-.navbar-light .navbar-text {
-    color: rgba(0,0,0,0.5)
-}
-
-    .navbar-light .navbar-text a {
-        color: rgba(0,0,0,0.9)
-    }
-
-        .navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus {
-            color: rgba(0,0,0,0.9)
-        }
-
-.navbar-dark .navbar-brand {
-    color: #fff
-}
-
-    .navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus {
-        color: #fff
-    }
-
-.navbar-dark .navbar-nav .nav-link {
-    color: rgba(255,255,255,0.5)
-}
-
-    .navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
-        color: #fff
-    }
-
-    .navbar-dark .navbar-nav .nav-link.disabled {
-        color: rgba(255,255,255,0.25)
-    }
-
-    .navbar-dark .navbar-nav .show > .nav-link, .navbar-dark .navbar-nav .active > .nav-link, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .nav-link.active {
-        color: #fff
-    }
-
-.navbar-dark .navbar-toggler {
-    color: rgba(255,255,255,0.5);
-    border-color: rgba(255,255,255,0.1)
-}
-
-.navbar-dark .navbar-toggler-icon {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")
-}
-
-.navbar-dark .navbar-text {
-    color: rgba(255,255,255,0.5)
-}
-
-    .navbar-dark .navbar-text a {
-        color: #fff
-    }
-
-        .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus {
-            color: #fff
-        }
-
-.card {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    min-width: 0;
-    word-wrap: break-word;
-    background-color: #282828;
-    background-clip: border-box;
-    border: 1px solid rgba(0,0,0,0.125);
-    border-radius: 0.25rem
-}
-
-    .card > hr {
-        margin-right: 0;
-        margin-left: 0
-    }
-
-    .card > .list-group:first-child .list-group-item:first-child {
-        border-top-left-radius: 0.25rem;
-        border-top-right-radius: 0.25rem
-    }
-
-    .card > .list-group:last-child .list-group-item:last-child {
-        border-bottom-right-radius: 0.25rem;
-        border-bottom-left-radius: 0.25rem
-    }
-
-.card-body {
-    -webkit-box-flex: 1;
-    -ms-flex: 1 1 auto;
-    flex: 1 1 auto;
-    min-height: 1px;
-    padding: 1.25rem
-}
-
-.card-title {
-    margin-bottom: 0.75rem
-}
-
-.card-subtitle {
-    margin-top: -0.375rem;
-    margin-bottom: 0
-}
-
-.card-text:last-child {
-    margin-bottom: 0
-}
-
-.card-link:hover {
-    text-decoration: none
-}
-
-.card-link + .card-link {
-    margin-left: 1.25rem
-}
-
-.card-header {
-    padding: 0.75rem 1.25rem;
-    margin-bottom: 0;
-    background-color: rgba(0,0,0,0.03);
-    border-bottom: 1px solid rgba(0,0,0,0.125)
-}
-
-    .card-header:first-child {
-        border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0
-    }
-
-    .card-header + .list-group .list-group-item:first-child {
-        border-top: 0
-    }
-
-.card-footer {
-    padding: 0.75rem 1.25rem;
-    background-color: rgba(0,0,0,0.03);
-    border-top: 1px solid rgba(0,0,0,0.125)
-}
-
-    .card-footer:last-child {
-        border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px)
-    }
-
-.card-header-tabs {
-    margin-right: -0.625rem;
-    margin-bottom: -0.75rem;
-    margin-left: -0.625rem;
-    border-bottom: 0
-}
-
-.card-header-pills {
-    margin-right: -0.625rem;
-    margin-left: -0.625rem
-}
-
-.card-img-overlay {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    padding: 1.25rem
-}
-
-.card-img, .card-img-top, .card-img-bottom {
-    -ms-flex-negative: 0;
-    flex-shrink: 0;
-    width: 100%
-}
-
-.card-img, .card-img-top {
-    border-top-left-radius: calc(0.25rem - 1px);
-    border-top-right-radius: calc(0.25rem - 1px)
-}
-
-.card-img, .card-img-bottom {
-    border-bottom-right-radius: calc(0.25rem - 1px);
-    border-bottom-left-radius: calc(0.25rem - 1px)
-}
-
-.card-deck .card {
-    margin-bottom: 15px
-}
-
-@media (min-width: 576px) {
-    .card-deck {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row wrap;
-        flex-flow: row wrap;
-        margin-right: -15px;
-        margin-left: -15px
-    }
-
-        .card-deck .card {
-            -webkit-box-flex: 1;
-            -ms-flex: 1 0 0%;
-            flex: 1 0 0%;
-            margin-right: 15px;
-            margin-bottom: 0;
-            margin-left: 15px
-        }
-}
-
-.card-group > .card {
-    margin-bottom: 15px
-}
-
-@media (min-width: 576px) {
-    .card-group {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-flow: row wrap;
-        flex-flow: row wrap
-    }
-
-        .card-group > .card {
-            -webkit-box-flex: 1;
-            -ms-flex: 1 0 0%;
-            flex: 1 0 0%;
-            margin-bottom: 0
-        }
-
-            .card-group > .card + .card {
-                margin-left: 0;
-                border-left: 0
-            }
-
-            .card-group > .card:not(:last-child) {
-                border-top-right-radius: 0;
-                border-bottom-right-radius: 0
-            }
-
-                .card-group > .card:not(:last-child) .card-img-top, .card-group > .card:not(:last-child) .card-header {
-                    border-top-right-radius: 0
-                }
-
-                .card-group > .card:not(:last-child) .card-img-bottom, .card-group > .card:not(:last-child) .card-footer {
-                    border-bottom-right-radius: 0
-                }
-
-            .card-group > .card:not(:first-child) {
-                border-top-left-radius: 0;
-                border-bottom-left-radius: 0
-            }
-
-                .card-group > .card:not(:first-child) .card-img-top, .card-group > .card:not(:first-child) .card-header {
-                    border-top-left-radius: 0
-                }
-
-                .card-group > .card:not(:first-child) .card-img-bottom, .card-group > .card:not(:first-child) .card-footer {
-                    border-bottom-left-radius: 0
-                }
-}
-
-.card-columns .card {
-    margin-bottom: 0.75rem
-}
-
-@media (min-width: 576px) {
-    .card-columns {
-        -webkit-column-count: 3;
-        column-count: 3;
-        -webkit-column-gap: 1.25rem;
-        column-gap: 1.25rem;
-        orphans: 1;
-        widows: 1
-    }
-
-        .card-columns .card {
-            display: inline-block;
-            width: 100%
-        }
-}
-
-.accordion > .card {
-    overflow: hidden
-}
-
-    .accordion > .card:not(:last-of-type) {
-        border-bottom: 0;
-        border-bottom-right-radius: 0;
-        border-bottom-left-radius: 0
-    }
-
-    .accordion > .card:not(:first-of-type) {
-        border-top-left-radius: 0;
-        border-top-right-radius: 0
-    }
-
-    .accordion > .card > .card-header {
-        border-radius: 0;
-        margin-bottom: -1px
-    }
-
-.breadcrumb {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    padding: 0.75rem 1rem;
-    margin-bottom: 1rem;
-    list-style: none;
-    background-color: #282828;
-    border-radius: 0.25rem
-}
-
-.breadcrumb-item + .breadcrumb-item {
-    padding-left: 0.5rem
-}
-
-    .breadcrumb-item + .breadcrumb-item::before {
-        display: inline-block;
-        padding-right: 0.5rem;
-        color: #555;
-        content: "/"
-    }
-
-    .breadcrumb-item + .breadcrumb-item:hover::before {
-        text-decoration: underline
-    }
-
-    .breadcrumb-item + .breadcrumb-item:hover::before {
-        text-decoration: none
-    }
-
-.breadcrumb-item.active {
-    color: #555
-}
-
-.pagination {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    padding-left: 0;
-    list-style: none;
-    border-radius: 0.25rem
-}
-
-.page-link {
-    position: relative;
-    display: block;
-    padding: 0.5rem 0.75rem;
-    margin-left: -1px;
-    line-height: 1.25;
-    color: #fff;
-    background-color: #282828;
-    border: 1px solid transparent
-}
-
-    .page-link:hover {
-        z-index: 2;
-        color: #fff;
-        text-decoration: none;
-        background-color: #2A9FD6;
-        border-color: transparent
-    }
-
-    .page-link:focus {
-        z-index: 3;
-        outline: 0;
-        -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25);
-        box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.25)
-    }
-
-.page-item:first-child .page-link {
-    margin-left: 0;
-    border-top-left-radius: 0.25rem;
-    border-bottom-left-radius: 0.25rem
-}
-
-.page-item:last-child .page-link {
-    border-top-right-radius: 0.25rem;
-    border-bottom-right-radius: 0.25rem
-}
-
-.page-item.active .page-link {
-    z-index: 3;
-    color: #fff;
-    background-color: #2A9FD6;
-    border-color: #2A9FD6
-}
-
-.page-item.disabled .page-link {
-    color: #555;
-    pointer-events: none;
-    cursor: auto;
-    background-color: #282828;
-    border-color: transparent
-}
-
-.pagination-lg .page-link {
-    padding: 0.75rem 1.5rem;
-    font-size: 1.09375rem;
-    line-height: 1.5
-}
-
-.pagination-lg .page-item:first-child .page-link {
-    border-top-left-radius: 0.3rem;
-    border-bottom-left-radius: 0.3rem
-}
-
-.pagination-lg .page-item:last-child .page-link {
-    border-top-right-radius: 0.3rem;
-    border-bottom-right-radius: 0.3rem
-}
-
-.pagination-sm .page-link {
-    padding: 0.25rem 0.5rem;
-    font-size: 0.765625rem;
-    line-height: 1.5
-}
-
-.pagination-sm .page-item:first-child .page-link {
-    border-top-left-radius: 0.2rem;
-    border-bottom-left-radius: 0.2rem
-}
-
-.pagination-sm .page-item:last-child .page-link {
-    border-top-right-radius: 0.2rem;
-    border-bottom-right-radius: 0.2rem
-}
-
-.badge {
-    display: inline-block;
-    padding: 0.25em 0.4em;
-    font-size: 75%;
-    font-weight: 700;
-    line-height: 1;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    border-radius: 0.25rem;
-    -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .badge {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-a.badge:hover, a.badge:focus {
-    text-decoration: none
-}
-
-.badge:empty {
-    display: none
-}
-
-.btn .badge {
-    position: relative;
-    top: -1px
-}
-
-.badge-pill {
-    padding-right: 0.6em;
-    padding-left: 0.6em;
-    border-radius: 10rem
-}
-
-.badge-primary {
-    color: #fff;
-    background-color: #2A9FD6
-}
-
-a.badge-primary:hover, a.badge-primary:focus {
-    color: #fff;
-    background-color: #2180ac
-}
-
-a.badge-primary:focus, a.badge-primary.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(42,159,214,0.5)
-}
-
-.badge-secondary {
-    color: #fff;
-    background-color: #555
-}
-
-a.badge-secondary:hover, a.badge-secondary:focus {
-    color: #fff;
-    background-color: #3c3b3b
-}
-
-a.badge-secondary:focus, a.badge-secondary.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(85,85,85,0.5)
-}
-
-.badge-success {
-    color: #fff;
-    background-color: #77B300
-}
-
-a.badge-success:hover, a.badge-success:focus {
-    color: #fff;
-    background-color: #558000
-}
-
-a.badge-success:focus, a.badge-success.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(119,179,0,0.5)
-}
-
-.badge-info {
-    color: #fff;
-    background-color: #9933CC
-}
-
-a.badge-info:hover, a.badge-info:focus {
-    color: #fff;
-    background-color: #7a29a3
-}
-
-a.badge-info:focus, a.badge-info.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(153,51,204,0.5)
-}
-
-.badge-warning {
-    color: #fff;
-    background-color: #FF8800
-}
-
-a.badge-warning:hover, a.badge-warning:focus {
-    color: #fff;
-    background-color: #cc6d00
-}
-
-a.badge-warning:focus, a.badge-warning.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(255,136,0,0.5)
-}
-
-.badge-danger {
-    color: #fff;
-    background-color: #CC0000
-}
-
-a.badge-danger:hover, a.badge-danger:focus {
-    color: #fff;
-    background-color: #990000
-}
-
-a.badge-danger:focus, a.badge-danger.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(204,0,0,0.5)
-}
-
-.badge-light {
-    color: #fff;
-    background-color: #222
-}
-
-a.badge-light:hover, a.badge-light:focus {
-    color: #fff;
-    background-color: #090808
-}
-
-a.badge-light:focus, a.badge-light.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(34,34,34,0.5)
-}
-
-.badge-dark {
-    color: #fff;
-    background-color: #ADAFAE
-}
-
-a.badge-dark:hover, a.badge-dark:focus {
-    color: #fff;
-    background-color: #939695
-}
-
-a.badge-dark:focus, a.badge-dark.focus {
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5);
-    box-shadow: 0 0 0 0.2rem rgba(173,175,174,0.5)
-}
-
-.jumbotron {
-    padding: 2rem 1rem;
-    margin-bottom: 2rem;
-    background-color: #282828;
-    border-radius: 0.3rem
-}
-
-@media (min-width: 576px) {
-    .jumbotron {
-        padding: 4rem 2rem
-    }
-}
-
-.jumbotron-fluid {
-    padding-right: 0;
-    padding-left: 0;
-    border-radius: 0
-}
-
-.alert {
-    position: relative;
-    padding: 0.75rem 1.25rem;
-    margin-bottom: 1rem;
-    border: 1px solid transparent;
-    border-radius: 0.25rem
-}
-
-.alert-heading {
-    color: inherit
-}
-
-.alert-link {
-    font-weight: 700
-}
-
-.alert-dismissible {
-    padding-right: 3.8125rem
-}
-
-    .alert-dismissible .close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        padding: 0.75rem 1.25rem;
-        color: inherit
-    }
-
-.alert-primary {
-    color: #16536f;
-    background-color: #d4ecf7;
-    border-color: #c3e4f4
-}
-
-    .alert-primary hr {
-        border-top-color: #addaf0
-    }
-
-    .alert-primary .alert-link {
-        color: #0e3344
-    }
-
-.alert-secondary {
-    color: #2c2c2c;
-    background-color: #dddddd;
-    border-color: #cfcfcf
-}
-
-    .alert-secondary hr {
-        border-top-color: #c2c2c2
-    }
-
-    .alert-secondary .alert-link {
-        color: #131212
-    }
-
-.alert-success {
-    color: #3e5d00;
-    background-color: #e4f0cc;
-    border-color: #d9eab8
-}
-
-    .alert-success hr {
-        border-top-color: #cee4a4
-    }
-
-    .alert-success .alert-link {
-        color: #1c2a00
-    }
-
-.alert-info {
-    color: #501b6a;
-    background-color: #ebd6f5;
-    border-color: #e2c6f1
-}
-
-    .alert-info hr {
-        border-top-color: #d8b2ec
-    }
-
-    .alert-info .alert-link {
-        color: #311141
-    }
-
-.alert-warning {
-    color: #854700;
-    background-color: #ffe7cc;
-    border-color: #ffdeb8
-}
-
-    .alert-warning hr {
-        border-top-color: #ffd29f
-    }
-
-    .alert-warning .alert-link {
-        color: #522c00
-    }
-
-.alert-danger {
-    color: #6a0000;
-    background-color: #f5cccc;
-    border-color: #f1b8b8
-}
-
-    .alert-danger hr {
-        border-top-color: #eda3a3
-    }
-
-    .alert-danger .alert-link {
-        color: #370000
-    }
-
-.alert-light {
-    color: #121212;
-    background-color: lightgray;
-    border-color: #c1c1c1
-}
-
-    .alert-light hr {
-        border-top-color: #b4b4b4
-    }
-
-    .alert-light .alert-link {
-        color: black
-    }
-
-.alert-dark {
-    color: #5a5b5a;
-    background-color: #efefef;
-    border-color: #e8e9e8
-}
-
-    .alert-dark hr {
-        border-top-color: #dbdddb
-    }
-
-    .alert-dark .alert-link {
-        color: #414141
-    }
-
-@-webkit-keyframes progress-bar-stripes {
-    from {
-        background-position: 1rem 0
-    }
-
-    to {
-        background-position: 0 0
-    }
-}
-
-@keyframes progress-bar-stripes {
-    from {
-        background-position: 1rem 0
-    }
-
-    to {
-        background-position: 0 0
-    }
-}
-
-.progress {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    height: 1rem;
-    overflow: hidden;
-    font-size: 0.65625rem;
-    background-color: #282828;
-    border-radius: 0.25rem
-}
-
-.progress-bar {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    overflow: hidden;
-    color: #fff;
-    text-align: center;
-    white-space: nowrap;
-    background-color: #2A9FD6;
-    -webkit-transition: width 0.6s ease;
-    transition: width 0.6s ease
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .progress-bar {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.progress-bar-striped {
-    background-image: linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);
-    background-size: 1rem 1rem
-}
-
-.progress-bar-animated {
-    -webkit-animation: progress-bar-stripes 1s linear infinite;
-    animation: progress-bar-stripes 1s linear infinite
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .progress-bar-animated {
-        -webkit-animation: none;
-        animation: none
-    }
-}
-
-.media {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: start;
-    -ms-flex-align: start;
-    align-items: flex-start
-}
-
-.media-body {
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1
-}
-
-.list-group {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    padding-left: 0;
-    margin-bottom: 0
-}
-
-.list-group-item-action {
-    width: 100%;
-    color: #282828;
-    text-align: inherit
-}
-
-    .list-group-item-action:hover, .list-group-item-action:focus {
-        z-index: 1;
-        color: #282828;
-        text-decoration: none;
-        background-color: #2A9FD6
-    }
-
-    .list-group-item-action:active {
-        color: #ADAFAE;
-        background-color: #2A9FD6
-    }
-
-.list-group-item {
-    position: relative;
-    display: block;
-    padding: 0.75rem 1.25rem;
-    background-color: #222;
-    border: 1px solid #282828
-}
-
-    .list-group-item:first-child {
-        border-top-left-radius: 0.25rem;
-        border-top-right-radius: 0.25rem
-    }
-
-    .list-group-item:last-child {
-        border-bottom-right-radius: 0.25rem;
-        border-bottom-left-radius: 0.25rem
-    }
-
-    .list-group-item.disabled, .list-group-item:disabled {
-        color: #555;
-        pointer-events: none;
-        background-color: #282828
-    }
-
-    .list-group-item.active {
-        z-index: 2;
-        color: #fff;
-        background-color: #2A9FD6;
-        border-color: #2A9FD6
-    }
-
-    .list-group-item + .list-group-item {
-        border-top-width: 0
-    }
-
-        .list-group-item + .list-group-item.active {
-            margin-top: -1px;
-            border-top-width: 1px
-        }
-
-.list-group-horizontal {
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: row;
-    flex-direction: row
-}
-
-    .list-group-horizontal .list-group-item:first-child {
-        border-bottom-left-radius: 0.25rem;
-        border-top-right-radius: 0
-    }
-
-    .list-group-horizontal .list-group-item:last-child {
-        border-top-right-radius: 0.25rem;
-        border-bottom-left-radius: 0
-    }
-
-    .list-group-horizontal .list-group-item.active {
-        margin-top: 0
-    }
-
-    .list-group-horizontal .list-group-item + .list-group-item {
-        border-top-width: 1px;
-        border-left-width: 0
-    }
-
-        .list-group-horizontal .list-group-item + .list-group-item.active {
-            margin-left: -1px;
-            border-left-width: 1px
-        }
-
-@media (min-width: 576px) {
-    .list-group-horizontal-sm {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-        flex-direction: row
-    }
-
-        .list-group-horizontal-sm .list-group-item:first-child {
-            border-bottom-left-radius: 0.25rem;
-            border-top-right-radius: 0
-        }
-
-        .list-group-horizontal-sm .list-group-item:last-child {
-            border-top-right-radius: 0.25rem;
-            border-bottom-left-radius: 0
-        }
-
-        .list-group-horizontal-sm .list-group-item.active {
-            margin-top: 0
-        }
-
-        .list-group-horizontal-sm .list-group-item + .list-group-item {
-            border-top-width: 1px;
-            border-left-width: 0
-        }
-
-            .list-group-horizontal-sm .list-group-item + .list-group-item.active {
-                margin-left: -1px;
-                border-left-width: 1px
-            }
-}
-
-@media (min-width: 768px) {
-    .list-group-horizontal-md {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-        flex-direction: row
-    }
-
-        .list-group-horizontal-md .list-group-item:first-child {
-            border-bottom-left-radius: 0.25rem;
-            border-top-right-radius: 0
-        }
-
-        .list-group-horizontal-md .list-group-item:last-child {
-            border-top-right-radius: 0.25rem;
-            border-bottom-left-radius: 0
-        }
-
-        .list-group-horizontal-md .list-group-item.active {
-            margin-top: 0
-        }
-
-        .list-group-horizontal-md .list-group-item + .list-group-item {
-            border-top-width: 1px;
-            border-left-width: 0
-        }
-
-            .list-group-horizontal-md .list-group-item + .list-group-item.active {
-                margin-left: -1px;
-                border-left-width: 1px
-            }
-}
-
-@media (min-width: 992px) {
-    .list-group-horizontal-lg {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-        flex-direction: row
-    }
-
-        .list-group-horizontal-lg .list-group-item:first-child {
-            border-bottom-left-radius: 0.25rem;
-            border-top-right-radius: 0
-        }
-
-        .list-group-horizontal-lg .list-group-item:last-child {
-            border-top-right-radius: 0.25rem;
-            border-bottom-left-radius: 0
-        }
-
-        .list-group-horizontal-lg .list-group-item.active {
-            margin-top: 0
-        }
-
-        .list-group-horizontal-lg .list-group-item + .list-group-item {
-            border-top-width: 1px;
-            border-left-width: 0
-        }
-
-            .list-group-horizontal-lg .list-group-item + .list-group-item.active {
-                margin-left: -1px;
-                border-left-width: 1px
-            }
-}
-
-@media (min-width: 1200px) {
-    .list-group-horizontal-xl {
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-        flex-direction: row
-    }
-
-        .list-group-horizontal-xl .list-group-item:first-child {
-            border-bottom-left-radius: 0.25rem;
-            border-top-right-radius: 0
-        }
-
-        .list-group-horizontal-xl .list-group-item:last-child {
-            border-top-right-radius: 0.25rem;
-            border-bottom-left-radius: 0
-        }
-
-        .list-group-horizontal-xl .list-group-item.active {
-            margin-top: 0
-        }
-
-        .list-group-horizontal-xl .list-group-item + .list-group-item {
-            border-top-width: 1px;
-            border-left-width: 0
-        }
-
-            .list-group-horizontal-xl .list-group-item + .list-group-item.active {
-                margin-left: -1px;
-                border-left-width: 1px
-            }
-}
-
-.list-group-flush .list-group-item {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0
-}
-
-    .list-group-flush .list-group-item:first-child {
-        border-top-width: 0
-    }
-
-.list-group-flush:last-child .list-group-item:last-child {
-    border-bottom-width: 0
-}
-
-.list-group-item-primary {
-    color: #16536f;
-    background-color: #c3e4f4
-}
-
-    .list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus {
-        color: #16536f;
-        background-color: #addaf0
-    }
-
-    .list-group-item-primary.list-group-item-action.active {
-        color: #fff;
-        background-color: #16536f;
-        border-color: #16536f
-    }
-
-.list-group-item-secondary {
-    color: #2c2c2c;
-    background-color: #cfcfcf
-}
-
-    .list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {
-        color: #2c2c2c;
-        background-color: #c2c2c2
-    }
-
-    .list-group-item-secondary.list-group-item-action.active {
-        color: #fff;
-        background-color: #2c2c2c;
-        border-color: #2c2c2c
-    }
-
-.list-group-item-success {
-    color: #3e5d00;
-    background-color: #d9eab8
-}
-
-    .list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {
-        color: #3e5d00;
-        background-color: #cee4a4
-    }
-
-    .list-group-item-success.list-group-item-action.active {
-        color: #fff;
-        background-color: #3e5d00;
-        border-color: #3e5d00
-    }
-
-.list-group-item-info {
-    color: #501b6a;
-    background-color: #e2c6f1
-}
-
-    .list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {
-        color: #501b6a;
-        background-color: #d8b2ec
-    }
-
-    .list-group-item-info.list-group-item-action.active {
-        color: #fff;
-        background-color: #501b6a;
-        border-color: #501b6a
-    }
-
-.list-group-item-warning {
-    color: #854700;
-    background-color: #ffdeb8
-}
-
-    .list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus {
-        color: #854700;
-        background-color: #ffd29f
-    }
-
-    .list-group-item-warning.list-group-item-action.active {
-        color: #fff;
-        background-color: #854700;
-        border-color: #854700
-    }
-
-.list-group-item-danger {
-    color: #6a0000;
-    background-color: #f1b8b8
-}
-
-    .list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus {
-        color: #6a0000;
-        background-color: #eda3a3
-    }
-
-    .list-group-item-danger.list-group-item-action.active {
-        color: #fff;
-        background-color: #6a0000;
-        border-color: #6a0000
-    }
-
-.list-group-item-light {
-    color: #121212;
-    background-color: #c1c1c1
-}
-
-    .list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {
-        color: #121212;
-        background-color: #b4b4b4
-    }
-
-    .list-group-item-light.list-group-item-action.active {
-        color: #fff;
-        background-color: #121212;
-        border-color: #121212
-    }
-
-.list-group-item-dark {
-    color: #5a5b5a;
-    background-color: #e8e9e8
-}
-
-    .list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {
-        color: #5a5b5a;
-        background-color: #dbdddb
-    }
-
-    .list-group-item-dark.list-group-item-action.active {
-        color: #fff;
-        background-color: #5a5b5a;
-        border-color: #5a5b5a
-    }
-
-.close {
-    float: right;
-    font-size: 1.3125rem;
-    font-weight: 700;
-    line-height: 1;
-    color: #fff;
-    text-shadow: none;
-    opacity: .5
-}
-
-    .close:hover {
-        color: #fff;
-        text-decoration: none
-    }
-
-    .close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {
-        opacity: .75
-    }
-
-button.close {
-    padding: 0;
-    background-color: transparent;
-    border: 0;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none
-}
-
-a.close.disabled {
-    pointer-events: none
-}
-
-.toast {
-    max-width: 350px;
-    overflow: hidden;
-    font-size: 0.875rem;
-    background-color: rgba(255,255,255,0.85);
-    background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,0.1);
-    -webkit-box-shadow: 0 0.25rem 0.75rem rgba(0,0,0,0.1);
-    box-shadow: 0 0.25rem 0.75rem rgba(0,0,0,0.1);
-    -webkit-backdrop-filter: blur(10px);
-    backdrop-filter: blur(10px);
-    opacity: 0;
-    border-radius: 0.25rem
-}
-
-    .toast:not(:last-child) {
-        margin-bottom: 0.75rem
-    }
-
-    .toast.showing {
-        opacity: 1
-    }
-
-    .toast.show {
-        display: block;
-        opacity: 1
-    }
-
-    .toast.hide {
-        display: none
-    }
-
-.toast-header {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    padding: 0.25rem 0.75rem;
-    color: #555;
-    background-color: rgba(255,255,255,0.85);
-    background-clip: padding-box;
-    border-bottom: 1px solid rgba(0,0,0,0.05)
-}
-
-.toast-body {
-    padding: 0.75rem
-}
-
-.modal-open {
-    overflow: hidden
-}
-
-    .modal-open .modal {
-        overflow-x: hidden;
-        overflow-y: auto
-    }
-
-.modal {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 1050;
-    display: none;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    outline: 0
-}
-
-.modal-dialog {
-    position: relative;
-    width: auto;
-    margin: 0.5rem;
-    pointer-events: none
-}
-
-.modal.fade .modal-dialog {
-    -webkit-transition: -webkit-transform 0.3s ease-out;
-    transition: -webkit-transform 0.3s ease-out;
-    transition: transform 0.3s ease-out;
-    transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out;
-    -webkit-transform: translate(0, -50px);
-    transform: translate(0, -50px)
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .modal.fade .modal-dialog {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.modal.show .modal-dialog {
-    -webkit-transform: none;
-    transform: none
-}
-
-.modal.modal-static .modal-dialog {
-    -webkit-transform: scale(1.02);
-    transform: scale(1.02)
-}
-
-.modal-dialog-scrollable {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    max-height: calc(100% - 1rem)
-}
-
-    .modal-dialog-scrollable .modal-content {
-        max-height: calc(100vh - 1rem);
-        overflow: hidden
-    }
-
-    .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .modal-footer {
-        -ms-flex-negative: 0;
-        flex-shrink: 0
-    }
-
-    .modal-dialog-scrollable .modal-body {
-        overflow-y: auto
-    }
-
-.modal-dialog-centered {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    min-height: calc(100% - 1rem)
-}
-
-    .modal-dialog-centered::before {
-        display: block;
-        height: calc(100vh - 1rem);
-        content: ""
-    }
-
-    .modal-dialog-centered.modal-dialog-scrollable {
-        -webkit-box-orient: vertical;
-        -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-        flex-direction: column;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        height: 100%
-    }
-
-        .modal-dialog-centered.modal-dialog-scrollable .modal-content {
-            max-height: none
-        }
-
-        .modal-dialog-centered.modal-dialog-scrollable::before {
-            content: none
-        }
-
-.modal-content {
-    position: relative;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    width: 100%;
-    pointer-events: auto;
-    background-color: #222;
-    background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,0.2);
-    border-radius: 0.3rem;
-    outline: 0
-}
-
-.modal-backdrop {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 1040;
-    width: 100vw;
-    height: 100vh;
-    background-color: #000
-}
-
-    .modal-backdrop.fade {
-        opacity: 0
-    }
-
-    .modal-backdrop.show {
-        opacity: 0.5
-    }
-
-.modal-header {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: start;
-    -ms-flex-align: start;
-    align-items: flex-start;
-    -webkit-box-pack: justify;
-    -ms-flex-pack: justify;
-    justify-content: space-between;
-    padding: 1rem 1rem;
-    border-bottom: 1px solid #282828;
-    border-top-left-radius: calc(0.3rem - 1px);
-    border-top-right-radius: calc(0.3rem - 1px)
-}
-
-    .modal-header .close {
-        padding: 1rem 1rem;
-        margin: -1rem -1rem -1rem auto
-    }
-
-.modal-title {
-    margin-bottom: 0;
-    line-height: 1.5
-}
-
-.modal-body {
-    position: relative;
-    -webkit-box-flex: 1;
-    -ms-flex: 1 1 auto;
-    flex: 1 1 auto;
-    padding: 1rem
-}
-
-.modal-footer {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    -webkit-box-pack: end;
-    -ms-flex-pack: end;
-    justify-content: flex-end;
-    padding: 0.75rem;
-    border-top: 1px solid #282828;
-    border-bottom-right-radius: calc(0.3rem - 1px);
-    border-bottom-left-radius: calc(0.3rem - 1px)
-}
-
-    .modal-footer > * {
-        margin: 0.25rem
-    }
-
-.modal-scrollbar-measure {
-    position: absolute;
-    top: -9999px;
-    width: 50px;
-    height: 50px;
-    overflow: scroll
-}
-
-@media (min-width: 576px) {
-    .modal-dialog {
-        max-width: 500px;
-        margin: 1.75rem auto
-    }
-
-    .modal-dialog-scrollable {
-        max-height: calc(100% - 3.5rem)
-    }
-
-        .modal-dialog-scrollable .modal-content {
-            max-height: calc(100vh - 3.5rem)
-        }
-
-    .modal-dialog-centered {
-        min-height: calc(100% - 3.5rem)
-    }
-
-        .modal-dialog-centered::before {
-            height: calc(100vh - 3.5rem)
-        }
-
-    .modal-sm {
-        max-width: 300px
-    }
-}
-
-@media (min-width: 992px) {
-    .modal-lg, .modal-xl {
-        max-width: 800px
-    }
-}
-
-@media (min-width: 1200px) {
-    .modal-xl {
-        max-width: 1140px
-    }
-}
-
-.tooltip {
-    position: absolute;
-    z-index: 1070;
-    display: block;
-    margin: 0;
-    font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-    font-style: normal;
-    font-weight: 400;
-    line-height: 1.5;
-    text-align: left;
-    text-align: start;
-    text-decoration: none;
-    text-shadow: none;
-    text-transform: none;
-    letter-spacing: normal;
-    word-break: normal;
-    word-spacing: normal;
-    white-space: normal;
-    line-break: auto;
-    font-size: 0.765625rem;
-    word-wrap: break-word;
-    opacity: 0
-}
-
-    .tooltip.show {
-        opacity: 1
-    }
-
-    .tooltip .arrow {
-        position: absolute;
-        display: block;
-        width: 0.8rem;
-        height: 0.4rem
-    }
-
-        .tooltip .arrow::before {
-            position: absolute;
-            content: "";
-            border-color: transparent;
-            border-style: solid
-        }
-
-.bs-tooltip-top, .bs-tooltip-auto[x-placement^="top"] {
-    padding: 0.4rem 0
-}
-
-    .bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^="top"] .arrow {
-        bottom: 0
-    }
-
-        .bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^="top"] .arrow::before {
-            top: 0;
-            border-width: 0.4rem 0.4rem 0;
-            border-top-color: #282828
-        }
-
-.bs-tooltip-right, .bs-tooltip-auto[x-placement^="right"] {
-    padding: 0 0.4rem
-}
-
-    .bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^="right"] .arrow {
-        left: 0;
-        width: 0.4rem;
-        height: 0.8rem
-    }
-
-        .bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^="right"] .arrow::before {
-            right: 0;
-            border-width: 0.4rem 0.4rem 0.4rem 0;
-            border-right-color: #282828
-        }
-
-.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^="bottom"] {
-    padding: 0.4rem 0
-}
-
-    .bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^="bottom"] .arrow {
-        top: 0
-    }
-
-        .bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
-            bottom: 0;
-            border-width: 0 0.4rem 0.4rem;
-            border-bottom-color: #282828
-        }
-
-.bs-tooltip-left, .bs-tooltip-auto[x-placement^="left"] {
-    padding: 0 0.4rem
-}
-
-    .bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^="left"] .arrow {
-        right: 0;
-        width: 0.4rem;
-        height: 0.8rem
-    }
-
-        .bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^="left"] .arrow::before {
-            left: 0;
-            border-width: 0.4rem 0 0.4rem 0.4rem;
-            border-left-color: #282828
-        }
-
-.tooltip-inner {
-    max-width: 200px;
-    padding: 0.25rem 0.5rem;
-    color: #fff;
-    text-align: center;
-    background-color: #282828;
-    border-radius: 0.25rem
-}
-
-.popover {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1060;
-    display: block;
-    max-width: 276px;
-    font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-    font-style: normal;
-    font-weight: 400;
-    line-height: 1.5;
-    text-align: left;
-    text-align: start;
-    text-decoration: none;
-    text-shadow: none;
-    text-transform: none;
-    letter-spacing: normal;
-    word-break: normal;
-    word-spacing: normal;
-    white-space: normal;
-    line-break: auto;
-    font-size: 0.765625rem;
-    word-wrap: break-word;
-    background-color: #282828;
-    background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,0.2);
-    border-radius: 0.3rem
-}
-
-    .popover .arrow {
-        position: absolute;
-        display: block;
-        width: 1rem;
-        height: 0.5rem;
-        margin: 0 0.3rem
-    }
-
-        .popover .arrow::before, .popover .arrow::after {
-            position: absolute;
-            display: block;
-            content: "";
-            border-color: transparent;
-            border-style: solid
-        }
-
-.bs-popover-top, .bs-popover-auto[x-placement^="top"] {
-    margin-bottom: 0.5rem
-}
-
-    .bs-popover-top > .arrow, .bs-popover-auto[x-placement^="top"] > .arrow {
-        bottom: calc(-0.5rem - 1px)
-    }
-
-        .bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^="top"] > .arrow::before {
-            bottom: 0;
-            border-width: 0.5rem 0.5rem 0;
-            border-top-color: rgba(0,0,0,0.25)
-        }
-
-        .bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^="top"] > .arrow::after {
-            bottom: 1px;
-            border-width: 0.5rem 0.5rem 0;
-            border-top-color: #282828
-        }
-
-.bs-popover-right, .bs-popover-auto[x-placement^="right"] {
-    margin-left: 0.5rem
-}
-
-    .bs-popover-right > .arrow, .bs-popover-auto[x-placement^="right"] > .arrow {
-        left: calc(-0.5rem - 1px);
-        width: 0.5rem;
-        height: 1rem;
-        margin: 0.3rem 0
-    }
-
-        .bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^="right"] > .arrow::before {
-            left: 0;
-            border-width: 0.5rem 0.5rem 0.5rem 0;
-            border-right-color: rgba(0,0,0,0.25)
-        }
-
-        .bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^="right"] > .arrow::after {
-            left: 1px;
-            border-width: 0.5rem 0.5rem 0.5rem 0;
-            border-right-color: #282828
-        }
-
-.bs-popover-bottom, .bs-popover-auto[x-placement^="bottom"] {
-    margin-top: 0.5rem
-}
-
-    .bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^="bottom"] > .arrow {
-        top: calc(-0.5rem - 1px)
-    }
-
-        .bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^="bottom"] > .arrow::before {
-            top: 0;
-            border-width: 0 0.5rem 0.5rem 0.5rem;
-            border-bottom-color: rgba(0,0,0,0.25)
-        }
-
-        .bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^="bottom"] > .arrow::after {
-            top: 1px;
-            border-width: 0 0.5rem 0.5rem 0.5rem;
-            border-bottom-color: #282828
-        }
-
-    .bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before {
-        position: absolute;
-        top: 0;
-        left: 50%;
-        display: block;
-        width: 1rem;
-        margin-left: -0.5rem;
-        content: "";
-        border-bottom: 1px solid #202020
-    }
-
-.bs-popover-left, .bs-popover-auto[x-placement^="left"] {
-    margin-right: 0.5rem
-}
-
-    .bs-popover-left > .arrow, .bs-popover-auto[x-placement^="left"] > .arrow {
-        right: calc(-0.5rem - 1px);
-        width: 0.5rem;
-        height: 1rem;
-        margin: 0.3rem 0
-    }
-
-        .bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^="left"] > .arrow::before {
-            right: 0;
-            border-width: 0.5rem 0 0.5rem 0.5rem;
-            border-left-color: rgba(0,0,0,0.25)
-        }
-
-        .bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^="left"] > .arrow::after {
-            right: 1px;
-            border-width: 0.5rem 0 0.5rem 0.5rem;
-            border-left-color: #282828
-        }
-
-.popover-header {
-    padding: 0.5rem 0.75rem;
-    margin-bottom: 0;
-    font-size: 0.875rem;
-    color: #fff;
-    background-color: #202020;
-    border-bottom: 1px solid #141414;
-    border-top-left-radius: calc(0.3rem - 1px);
-    border-top-right-radius: calc(0.3rem - 1px)
-}
-
-    .popover-header:empty {
-        display: none
-    }
-
-.popover-body {
-    padding: 0.5rem 0.75rem;
-    color: #ADAFAE
-}
-
-.carousel {
-    position: relative
-}
-
-    .carousel.pointer-event {
-        -ms-touch-action: pan-y;
-        touch-action: pan-y
-    }
-
-.carousel-inner {
-    position: relative;
-    width: 100%;
-    overflow: hidden
-}
-
-    .carousel-inner::after {
-        display: block;
-        clear: both;
-        content: ""
-    }
-
-.carousel-item {
-    position: relative;
-    display: none;
-    float: left;
-    width: 100%;
-    margin-right: -100%;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    -webkit-transition: -webkit-transform 0.6s ease-in-out;
-    transition: -webkit-transform 0.6s ease-in-out;
-    transition: transform 0.6s ease-in-out;
-    transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .carousel-item {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.carousel-item.active, .carousel-item-next, .carousel-item-prev {
-    display: block
-}
-
-    .carousel-item-next:not(.carousel-item-left), .active.carousel-item-right {
-        -webkit-transform: translateX(100%);
-        transform: translateX(100%)
-    }
-
-    .carousel-item-prev:not(.carousel-item-right), .active.carousel-item-left {
-        -webkit-transform: translateX(-100%);
-        transform: translateX(-100%)
-    }
-
-.carousel-fade .carousel-item {
-    opacity: 0;
-    -webkit-transition-property: opacity;
-    transition-property: opacity;
-    -webkit-transform: none;
-    transform: none
-}
-
-    .carousel-fade .carousel-item.active, .carousel-fade .carousel-item-next.carousel-item-left, .carousel-fade .carousel-item-prev.carousel-item-right {
-        z-index: 1;
-        opacity: 1
-    }
-
-.carousel-fade .active.carousel-item-left, .carousel-fade .active.carousel-item-right {
-    z-index: 0;
-    opacity: 0;
-    -webkit-transition: opacity 0s 0.6s;
-    transition: opacity 0s 0.6s
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .carousel-fade .active.carousel-item-left, .carousel-fade .active.carousel-item-right {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.carousel-control-prev, .carousel-control-next {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    z-index: 1;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    width: 15%;
-    color: #fff;
-    text-align: center;
-    opacity: 0.5;
-    -webkit-transition: opacity 0.15s ease;
-    transition: opacity 0.15s ease
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .carousel-control-prev, .carousel-control-next {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.carousel-control-prev:hover, .carousel-control-prev:focus, .carousel-control-next:hover, .carousel-control-next:focus {
-    color: #fff;
-    text-decoration: none;
-    outline: 0;
-    opacity: 0.9
-}
-
-.carousel-control-prev {
-    left: 0
-}
-
-.carousel-control-next {
-    right: 0
-}
-
-.carousel-control-prev-icon, .carousel-control-next-icon {
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    background: no-repeat 50% / 100% 100%
-}
-
-.carousel-control-prev-icon {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e")
-}
-
-.carousel-control-next-icon {
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e")
-}
-
-.carousel-indicators {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 15;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    padding-left: 0;
-    margin-right: 15%;
-    margin-left: 15%;
-    list-style: none
-}
-
-    .carousel-indicators li {
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        -webkit-box-flex: 0;
-        -ms-flex: 0 1 auto;
-        flex: 0 1 auto;
-        width: 30px;
-        height: 3px;
-        margin-right: 3px;
-        margin-left: 3px;
-        text-indent: -999px;
-        cursor: pointer;
-        background-color: #fff;
-        background-clip: padding-box;
-        border-top: 10px solid transparent;
-        border-bottom: 10px solid transparent;
-        opacity: .5;
-        -webkit-transition: opacity 0.6s ease;
-        transition: opacity 0.6s ease
-    }
-
-@media (prefers-reduced-motion: reduce) {
-    .carousel-indicators li {
-        -webkit-transition: none;
-        transition: none
-    }
-}
-
-.carousel-indicators .active {
-    opacity: 1
-}
-
-.carousel-caption {
-    position: absolute;
-    right: 15%;
-    bottom: 20px;
-    left: 15%;
-    z-index: 10;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    color: #fff;
-    text-align: center
-}
-
-@-webkit-keyframes spinner-border {
-    to {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg)
-    }
-}
-
-@keyframes spinner-border {
-    to {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg)
-    }
-}
-
-.spinner-border {
-    display: inline-block;
-    width: 2rem;
-    height: 2rem;
-    vertical-align: text-bottom;
-    border: 0.25em solid currentColor;
-    border-right-color: transparent;
-    border-radius: 50%;
-    -webkit-animation: spinner-border .75s linear infinite;
-    animation: spinner-border .75s linear infinite
-}
-
-.spinner-border-sm {
-    width: 1rem;
-    height: 1rem;
-    border-width: 0.2em
-}
-
-@-webkit-keyframes spinner-grow {
-    0% {
-        -webkit-transform: scale(0);
-        transform: scale(0)
-    }
-
-    50% {
-        opacity: 1
-    }
-}
-
-@keyframes spinner-grow {
-    0% {
-        -webkit-transform: scale(0);
-        transform: scale(0)
-    }
-
-    50% {
-        opacity: 1
-    }
-}
-
-.spinner-grow {
-    display: inline-block;
-    width: 2rem;
-    height: 2rem;
-    vertical-align: text-bottom;
-    background-color: currentColor;
-    border-radius: 50%;
-    opacity: 0;
-    -webkit-animation: spinner-grow .75s linear infinite;
-    animation: spinner-grow .75s linear infinite
-}
-
-.spinner-grow-sm {
-    width: 1rem;
-    height: 1rem
-}
-
-.align-baseline {
-    vertical-align: baseline !important
-}
-
-.align-top {
-    vertical-align: top !important
-}
-
-.align-middle {
-    vertical-align: middle !important
-}
-
-.align-bottom {
-    vertical-align: bottom !important
-}
-
-.align-text-bottom {
-    vertical-align: text-bottom !important
-}
-
-.align-text-top {
-    vertical-align: text-top !important
-}
-
-.bg-primary {
-    background-color: #2A9FD6 !important
-}
-
-a.bg-primary:hover, a.bg-primary:focus, button.bg-primary:hover, button.bg-primary:focus {
-    background-color: #2180ac !important
-}
-
-.bg-secondary {
-    background-color: #555 !important
-}
-
-a.bg-secondary:hover, a.bg-secondary:focus, button.bg-secondary:hover, button.bg-secondary:focus {
-    background-color: #3c3b3b !important
-}
-
-.bg-success {
-    background-color: #77B300 !important
-}
-
-a.bg-success:hover, a.bg-success:focus, button.bg-success:hover, button.bg-success:focus {
-    background-color: #558000 !important
-}
-
-.bg-info {
-    background-color: #9933CC !important
-}
-
-a.bg-info:hover, a.bg-info:focus, button.bg-info:hover, button.bg-info:focus {
-    background-color: #7a29a3 !important
-}
-
-.bg-warning {
-    background-color: #FF8800 !important
-}
-
-a.bg-warning:hover, a.bg-warning:focus, button.bg-warning:hover, button.bg-warning:focus {
-    background-color: #cc6d00 !important
-}
-
-.bg-danger {
-    background-color: #CC0000 !important
-}
-
-a.bg-danger:hover, a.bg-danger:focus, button.bg-danger:hover, button.bg-danger:focus {
-    background-color: #990000 !important
-}
-
-.bg-light {
-    background-color: #222 !important
-}
-
-a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus {
-    background-color: #090808 !important
-}
-
-.bg-dark {
-    background-color: #ADAFAE !important
-}
-
-a.bg-dark:hover, a.bg-dark:focus, button.bg-dark:hover, button.bg-dark:focus {
-    background-color: #939695 !important
-}
-
-.bg-white {
-    background-color: #fff !important
-}
-
-.bg-transparent {
-    background-color: transparent !important
-}
-
-.border {
-    border: 1px solid #dee2e6 !important
-}
-
-.border-top {
-    border-top: 1px solid #dee2e6 !important
-}
-
-.border-right {
-    border-right: 1px solid #dee2e6 !important
-}
-
-.border-bottom {
-    border-bottom: 1px solid #dee2e6 !important
-}
-
-.border-left {
-    border-left: 1px solid #dee2e6 !important
-}
-
-.border-0 {
-    border: 0 !important
-}
-
-.border-top-0 {
-    border-top: 0 !important
-}
-
-.border-right-0 {
-    border-right: 0 !important
-}
-
-.border-bottom-0 {
-    border-bottom: 0 !important
-}
-
-.border-left-0 {
-    border-left: 0 !important
-}
-
-.border-primary {
-    border-color: #2A9FD6 !important
-}
-
-.border-secondary {
-    border-color: #555 !important
-}
-
-.border-success {
-    border-color: #77B300 !important
-}
-
-.border-info {
-    border-color: #9933CC !important
-}
-
-.border-warning {
-    border-color: #FF8800 !important
-}
-
-.border-danger {
-    border-color: #CC0000 !important
-}
-
-.border-light {
-    border-color: #222 !important
-}
-
-.border-dark {
-    border-color: #ADAFAE !important
-}
-
-.border-white {
-    border-color: #fff !important
-}
-
-.rounded-sm {
-    border-radius: 0.2rem !important
-}
-
-.rounded {
-    border-radius: 0.25rem !important
-}
-
-.rounded-top {
-    border-top-left-radius: 0.25rem !important;
-    border-top-right-radius: 0.25rem !important
-}
-
-.rounded-right {
-    border-top-right-radius: 0.25rem !important;
-    border-bottom-right-radius: 0.25rem !important
-}
-
-.rounded-bottom {
-    border-bottom-right-radius: 0.25rem !important;
-    border-bottom-left-radius: 0.25rem !important
-}
-
-.rounded-left {
-    border-top-left-radius: 0.25rem !important;
-    border-bottom-left-radius: 0.25rem !important
-}
-
-.rounded-lg {
-    border-radius: 0.3rem !important
-}
-
-.rounded-circle {
-    border-radius: 50% !important
-}
-
-.rounded-pill {
-    border-radius: 50rem !important
-}
-
-.rounded-0 {
-    border-radius: 0 !important
-}
-
-.clearfix::after {
-    display: block;
-    clear: both;
-    content: ""
-}
-
-.d-none {
-    display: none !important
-}
-
-.d-inline {
-    display: inline !important
-}
-
-.d-inline-block {
-    display: inline-block !important
-}
-
-.d-block {
-    display: block !important
-}
-
-.d-table {
-    display: table !important
-}
-
-.d-table-row {
-    display: table-row !important
-}
-
-.d-table-cell {
-    display: table-cell !important
-}
-
-.d-flex {
-    display: -webkit-box !important;
-    display: -ms-flexbox !important;
-    display: flex !important
-}
-
-.d-inline-flex {
-    display: -webkit-inline-box !important;
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important
-}
-
-@media (min-width: 576px) {
-    .d-sm-none {
-        display: none !important
-    }
-
-    .d-sm-inline {
-        display: inline !important
-    }
-
-    .d-sm-inline-block {
-        display: inline-block !important
-    }
-
-    .d-sm-block {
-        display: block !important
-    }
-
-    .d-sm-table {
-        display: table !important
-    }
-
-    .d-sm-table-row {
-        display: table-row !important
-    }
-
-    .d-sm-table-cell {
-        display: table-cell !important
-    }
-
-    .d-sm-flex {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important
-    }
-
-    .d-sm-inline-flex {
-        display: -webkit-inline-box !important;
-        display: -ms-inline-flexbox !important;
-        display: inline-flex !important
-    }
-}
-
-@media (min-width: 768px) {
-    .d-md-none {
-        display: none !important
-    }
-
-    .d-md-inline {
-        display: inline !important
-    }
-
-    .d-md-inline-block {
-        display: inline-block !important
-    }
-
-    .d-md-block {
-        display: block !important
-    }
-
-    .d-md-table {
-        display: table !important
-    }
-
-    .d-md-table-row {
-        display: table-row !important
-    }
-
-    .d-md-table-cell {
-        display: table-cell !important
-    }
-
-    .d-md-flex {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important
-    }
-
-    .d-md-inline-flex {
-        display: -webkit-inline-box !important;
-        display: -ms-inline-flexbox !important;
-        display: inline-flex !important
-    }
-}
-
-@media (min-width: 992px) {
-    .d-lg-none {
-        display: none !important
-    }
-
-    .d-lg-inline {
-        display: inline !important
-    }
-
-    .d-lg-inline-block {
-        display: inline-block !important
-    }
-
-    .d-lg-block {
-        display: block !important
-    }
-
-    .d-lg-table {
-        display: table !important
-    }
-
-    .d-lg-table-row {
-        display: table-row !important
-    }
-
-    .d-lg-table-cell {
-        display: table-cell !important
-    }
-
-    .d-lg-flex {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important
-    }
-
-    .d-lg-inline-flex {
-        display: -webkit-inline-box !important;
-        display: -ms-inline-flexbox !important;
-        display: inline-flex !important
-    }
-}
-
-@media (min-width: 1200px) {
-    .d-xl-none {
-        display: none !important
-    }
-
-    .d-xl-inline {
-        display: inline !important
-    }
-
-    .d-xl-inline-block {
-        display: inline-block !important
-    }
-
-    .d-xl-block {
-        display: block !important
-    }
-
-    .d-xl-table {
-        display: table !important
-    }
-
-    .d-xl-table-row {
-        display: table-row !important
-    }
-
-    .d-xl-table-cell {
-        display: table-cell !important
-    }
-
-    .d-xl-flex {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important
-    }
-
-    .d-xl-inline-flex {
-        display: -webkit-inline-box !important;
-        display: -ms-inline-flexbox !important;
-        display: inline-flex !important
-    }
-}
-
-@media print {
-    .d-print-none {
-        display: none !important
-    }
-
-    .d-print-inline {
-        display: inline !important
-    }
-
-    .d-print-inline-block {
-        display: inline-block !important
-    }
-
-    .d-print-block {
-        display: block !important
-    }
-
-    .d-print-table {
-        display: table !important
-    }
-
-    .d-print-table-row {
-        display: table-row !important
-    }
-
-    .d-print-table-cell {
-        display: table-cell !important
-    }
-
-    .d-print-flex {
-        display: -webkit-box !important;
-        display: -ms-flexbox !important;
-        display: flex !important
-    }
-
-    .d-print-inline-flex {
-        display: -webkit-inline-box !important;
-        display: -ms-inline-flexbox !important;
-        display: inline-flex !important
-    }
-}
-
-.embed-responsive {
-    position: relative;
-    display: block;
-    width: 100%;
-    padding: 0;
-    overflow: hidden
-}
-
-    .embed-responsive::before {
-        display: block;
-        content: ""
-    }
-
-    .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, .embed-responsive object, .embed-responsive video {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        border: 0
-    }
-
-.embed-responsive-21by9::before {
-    padding-top: 42.8571428571%
-}
-
-.embed-responsive-16by9::before {
-    padding-top: 56.25%
-}
-
-.embed-responsive-4by3::before {
-    padding-top: 75%
-}
-
-.embed-responsive-1by1::before {
-    padding-top: 100%
-}
-
-.flex-row {
-    -webkit-box-orient: horizontal !important;
-    -webkit-box-direction: normal !important;
-    -ms-flex-direction: row !important;
-    flex-direction: row !important
-}
-
-.flex-column {
-    -webkit-box-orient: vertical !important;
-    -webkit-box-direction: normal !important;
-    -ms-flex-direction: column !important;
-    flex-direction: column !important
-}
-
-.flex-row-reverse {
-    -webkit-box-orient: horizontal !important;
-    -webkit-box-direction: reverse !important;
-    -ms-flex-direction: row-reverse !important;
-    flex-direction: row-reverse !important
-}
-
-.flex-column-reverse {
-    -webkit-box-orient: vertical !important;
-    -webkit-box-direction: reverse !important;
-    -ms-flex-direction: column-reverse !important;
-    flex-direction: column-reverse !important
-}
-
-.flex-wrap {
-    -ms-flex-wrap: wrap !important;
-    flex-wrap: wrap !important
-}
-
-.flex-nowrap {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important
-}
-
-.flex-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
-    flex-wrap: wrap-reverse !important
-}
-
-.flex-fill {
-    -webkit-box-flex: 1 !important;
-    -ms-flex: 1 1 auto !important;
-    flex: 1 1 auto !important
-}
-
-.flex-grow-0 {
-    -webkit-box-flex: 0 !important;
-    -ms-flex-positive: 0 !important;
-    flex-grow: 0 !important
-}
-
-.flex-grow-1 {
-    -webkit-box-flex: 1 !important;
-    -ms-flex-positive: 1 !important;
-    flex-grow: 1 !important
-}
-
-.flex-shrink-0 {
-    -ms-flex-negative: 0 !important;
-    flex-shrink: 0 !important
-}
-
-.flex-shrink-1 {
-    -ms-flex-negative: 1 !important;
-    flex-shrink: 1 !important
-}
-
-.justify-content-start {
-    -webkit-box-pack: start !important;
-    -ms-flex-pack: start !important;
-    justify-content: flex-start !important
-}
-
-.justify-content-end {
-    -webkit-box-pack: end !important;
-    -ms-flex-pack: end !important;
-    justify-content: flex-end !important
-}
-
-.justify-content-center {
-    -webkit-box-pack: center !important;
-    -ms-flex-pack: center !important;
-    justify-content: center !important
-}
-
-.justify-content-between {
-    -webkit-box-pack: justify !important;
-    -ms-flex-pack: justify !important;
-    justify-content: space-between !important
-}
-
-.justify-content-around {
-    -ms-flex-pack: distribute !important;
-    justify-content: space-around !important
-}
-
-.align-items-start {
-    -webkit-box-align: start !important;
-    -ms-flex-align: start !important;
-    align-items: flex-start !important
-}
-
-.align-items-end {
-    -webkit-box-align: end !important;
-    -ms-flex-align: end !important;
-    align-items: flex-end !important
-}
-
-.align-items-center {
-    -webkit-box-align: center !important;
-    -ms-flex-align: center !important;
-    align-items: center !important
-}
-
-.align-items-baseline {
-    -webkit-box-align: baseline !important;
-    -ms-flex-align: baseline !important;
-    align-items: baseline !important
-}
-
-.align-items-stretch {
-    -webkit-box-align: stretch !important;
-    -ms-flex-align: stretch !important;
-    align-items: stretch !important
-}
-
-.align-content-start {
-    -ms-flex-line-pack: start !important;
-    align-content: flex-start !important
-}
-
-.align-content-end {
-    -ms-flex-line-pack: end !important;
-    align-content: flex-end !important
-}
-
-.align-content-center {
-    -ms-flex-line-pack: center !important;
-    align-content: center !important
-}
-
-.align-content-between {
-    -ms-flex-line-pack: justify !important;
-    align-content: space-between !important
-}
-
-.align-content-around {
-    -ms-flex-line-pack: distribute !important;
-    align-content: space-around !important
-}
-
-.align-content-stretch {
-    -ms-flex-line-pack: stretch !important;
-    align-content: stretch !important
-}
-
-.align-self-auto {
-    -ms-flex-item-align: auto !important;
-    align-self: auto !important
-}
-
-.align-self-start {
-    -ms-flex-item-align: start !important;
-    align-self: flex-start !important
-}
-
-.align-self-end {
-    -ms-flex-item-align: end !important;
-    align-self: flex-end !important
-}
-
-.align-self-center {
-    -ms-flex-item-align: center !important;
-    align-self: center !important
-}
-
-.align-self-baseline {
-    -ms-flex-item-align: baseline !important;
-    align-self: baseline !important
-}
-
-.align-self-stretch {
-    -ms-flex-item-align: stretch !important;
-    align-self: stretch !important
-}
-
-@media (min-width: 576px) {
-    .flex-sm-row {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: row !important;
-        flex-direction: row !important
-    }
-
-    .flex-sm-column {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: column !important;
-        flex-direction: column !important
-    }
-
-    .flex-sm-row-reverse {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: row-reverse !important;
-        flex-direction: row-reverse !important
-    }
-
-    .flex-sm-column-reverse {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: column-reverse !important;
-        flex-direction: column-reverse !important
-    }
-
-    .flex-sm-wrap {
-        -ms-flex-wrap: wrap !important;
-        flex-wrap: wrap !important
-    }
-
-    .flex-sm-nowrap {
-        -ms-flex-wrap: nowrap !important;
-        flex-wrap: nowrap !important
-    }
-
-    .flex-sm-wrap-reverse {
-        -ms-flex-wrap: wrap-reverse !important;
-        flex-wrap: wrap-reverse !important
-    }
-
-    .flex-sm-fill {
-        -webkit-box-flex: 1 !important;
-        -ms-flex: 1 1 auto !important;
-        flex: 1 1 auto !important
-    }
-
-    .flex-sm-grow-0 {
-        -webkit-box-flex: 0 !important;
-        -ms-flex-positive: 0 !important;
-        flex-grow: 0 !important
-    }
-
-    .flex-sm-grow-1 {
-        -webkit-box-flex: 1 !important;
-        -ms-flex-positive: 1 !important;
-        flex-grow: 1 !important
-    }
-
-    .flex-sm-shrink-0 {
-        -ms-flex-negative: 0 !important;
-        flex-shrink: 0 !important
-    }
-
-    .flex-sm-shrink-1 {
-        -ms-flex-negative: 1 !important;
-        flex-shrink: 1 !important
-    }
-
-    .justify-content-sm-start {
-        -webkit-box-pack: start !important;
-        -ms-flex-pack: start !important;
-        justify-content: flex-start !important
-    }
-
-    .justify-content-sm-end {
-        -webkit-box-pack: end !important;
-        -ms-flex-pack: end !important;
-        justify-content: flex-end !important
-    }
-
-    .justify-content-sm-center {
-        -webkit-box-pack: center !important;
-        -ms-flex-pack: center !important;
-        justify-content: center !important
-    }
-
-    .justify-content-sm-between {
-        -webkit-box-pack: justify !important;
-        -ms-flex-pack: justify !important;
-        justify-content: space-between !important
-    }
-
-    .justify-content-sm-around {
-        -ms-flex-pack: distribute !important;
-        justify-content: space-around !important
-    }
-
-    .align-items-sm-start {
-        -webkit-box-align: start !important;
-        -ms-flex-align: start !important;
-        align-items: flex-start !important
-    }
-
-    .align-items-sm-end {
-        -webkit-box-align: end !important;
-        -ms-flex-align: end !important;
-        align-items: flex-end !important
-    }
-
-    .align-items-sm-center {
-        -webkit-box-align: center !important;
-        -ms-flex-align: center !important;
-        align-items: center !important
-    }
-
-    .align-items-sm-baseline {
-        -webkit-box-align: baseline !important;
-        -ms-flex-align: baseline !important;
-        align-items: baseline !important
-    }
-
-    .align-items-sm-stretch {
-        -webkit-box-align: stretch !important;
-        -ms-flex-align: stretch !important;
-        align-items: stretch !important
-    }
-
-    .align-content-sm-start {
-        -ms-flex-line-pack: start !important;
-        align-content: flex-start !important
-    }
-
-    .align-content-sm-end {
-        -ms-flex-line-pack: end !important;
-        align-content: flex-end !important
-    }
-
-    .align-content-sm-center {
-        -ms-flex-line-pack: center !important;
-        align-content: center !important
-    }
-
-    .align-content-sm-between {
-        -ms-flex-line-pack: justify !important;
-        align-content: space-between !important
-    }
-
-    .align-content-sm-around {
-        -ms-flex-line-pack: distribute !important;
-        align-content: space-around !important
-    }
-
-    .align-content-sm-stretch {
-        -ms-flex-line-pack: stretch !important;
-        align-content: stretch !important
-    }
-
-    .align-self-sm-auto {
-        -ms-flex-item-align: auto !important;
-        align-self: auto !important
-    }
-
-    .align-self-sm-start {
-        -ms-flex-item-align: start !important;
-        align-self: flex-start !important
-    }
-
-    .align-self-sm-end {
-        -ms-flex-item-align: end !important;
-        align-self: flex-end !important
-    }
-
-    .align-self-sm-center {
-        -ms-flex-item-align: center !important;
-        align-self: center !important
-    }
-
-    .align-self-sm-baseline {
-        -ms-flex-item-align: baseline !important;
-        align-self: baseline !important
-    }
-
-    .align-self-sm-stretch {
-        -ms-flex-item-align: stretch !important;
-        align-self: stretch !important
-    }
-}
-
-@media (min-width: 768px) {
-    .flex-md-row {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: row !important;
-        flex-direction: row !important
-    }
-
-    .flex-md-column {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: column !important;
-        flex-direction: column !important
-    }
-
-    .flex-md-row-reverse {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: row-reverse !important;
-        flex-direction: row-reverse !important
-    }
-
-    .flex-md-column-reverse {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: column-reverse !important;
-        flex-direction: column-reverse !important
-    }
-
-    .flex-md-wrap {
-        -ms-flex-wrap: wrap !important;
-        flex-wrap: wrap !important
-    }
-
-    .flex-md-nowrap {
-        -ms-flex-wrap: nowrap !important;
-        flex-wrap: nowrap !important
-    }
-
-    .flex-md-wrap-reverse {
-        -ms-flex-wrap: wrap-reverse !important;
-        flex-wrap: wrap-reverse !important
-    }
-
-    .flex-md-fill {
-        -webkit-box-flex: 1 !important;
-        -ms-flex: 1 1 auto !important;
-        flex: 1 1 auto !important
-    }
-
-    .flex-md-grow-0 {
-        -webkit-box-flex: 0 !important;
-        -ms-flex-positive: 0 !important;
-        flex-grow: 0 !important
-    }
-
-    .flex-md-grow-1 {
-        -webkit-box-flex: 1 !important;
-        -ms-flex-positive: 1 !important;
-        flex-grow: 1 !important
-    }
-
-    .flex-md-shrink-0 {
-        -ms-flex-negative: 0 !important;
-        flex-shrink: 0 !important
-    }
-
-    .flex-md-shrink-1 {
-        -ms-flex-negative: 1 !important;
-        flex-shrink: 1 !important
-    }
-
-    .justify-content-md-start {
-        -webkit-box-pack: start !important;
-        -ms-flex-pack: start !important;
-        justify-content: flex-start !important
-    }
-
-    .justify-content-md-end {
-        -webkit-box-pack: end !important;
-        -ms-flex-pack: end !important;
-        justify-content: flex-end !important
-    }
-
-    .justify-content-md-center {
-        -webkit-box-pack: center !important;
-        -ms-flex-pack: center !important;
-        justify-content: center !important
-    }
-
-    .justify-content-md-between {
-        -webkit-box-pack: justify !important;
-        -ms-flex-pack: justify !important;
-        justify-content: space-between !important
-    }
-
-    .justify-content-md-around {
-        -ms-flex-pack: distribute !important;
-        justify-content: space-around !important
-    }
-
-    .align-items-md-start {
-        -webkit-box-align: start !important;
-        -ms-flex-align: start !important;
-        align-items: flex-start !important
-    }
-
-    .align-items-md-end {
-        -webkit-box-align: end !important;
-        -ms-flex-align: end !important;
-        align-items: flex-end !important
-    }
-
-    .align-items-md-center {
-        -webkit-box-align: center !important;
-        -ms-flex-align: center !important;
-        align-items: center !important
-    }
-
-    .align-items-md-baseline {
-        -webkit-box-align: baseline !important;
-        -ms-flex-align: baseline !important;
-        align-items: baseline !important
-    }
-
-    .align-items-md-stretch {
-        -webkit-box-align: stretch !important;
-        -ms-flex-align: stretch !important;
-        align-items: stretch !important
-    }
-
-    .align-content-md-start {
-        -ms-flex-line-pack: start !important;
-        align-content: flex-start !important
-    }
-
-    .align-content-md-end {
-        -ms-flex-line-pack: end !important;
-        align-content: flex-end !important
-    }
-
-    .align-content-md-center {
-        -ms-flex-line-pack: center !important;
-        align-content: center !important
-    }
-
-    .align-content-md-between {
-        -ms-flex-line-pack: justify !important;
-        align-content: space-between !important
-    }
-
-    .align-content-md-around {
-        -ms-flex-line-pack: distribute !important;
-        align-content: space-around !important
-    }
-
-    .align-content-md-stretch {
-        -ms-flex-line-pack: stretch !important;
-        align-content: stretch !important
-    }
-
-    .align-self-md-auto {
-        -ms-flex-item-align: auto !important;
-        align-self: auto !important
-    }
-
-    .align-self-md-start {
-        -ms-flex-item-align: start !important;
-        align-self: flex-start !important
-    }
-
-    .align-self-md-end {
-        -ms-flex-item-align: end !important;
-        align-self: flex-end !important
-    }
-
-    .align-self-md-center {
-        -ms-flex-item-align: center !important;
-        align-self: center !important
-    }
-
-    .align-self-md-baseline {
-        -ms-flex-item-align: baseline !important;
-        align-self: baseline !important
-    }
-
-    .align-self-md-stretch {
-        -ms-flex-item-align: stretch !important;
-        align-self: stretch !important
-    }
-}
-
-@media (min-width: 992px) {
-    .flex-lg-row {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: row !important;
-        flex-direction: row !important
-    }
-
-    .flex-lg-column {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: column !important;
-        flex-direction: column !important
-    }
-
-    .flex-lg-row-reverse {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: row-reverse !important;
-        flex-direction: row-reverse !important
-    }
-
-    .flex-lg-column-reverse {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: column-reverse !important;
-        flex-direction: column-reverse !important
-    }
-
-    .flex-lg-wrap {
-        -ms-flex-wrap: wrap !important;
-        flex-wrap: wrap !important
-    }
-
-    .flex-lg-nowrap {
-        -ms-flex-wrap: nowrap !important;
-        flex-wrap: nowrap !important
-    }
-
-    .flex-lg-wrap-reverse {
-        -ms-flex-wrap: wrap-reverse !important;
-        flex-wrap: wrap-reverse !important
-    }
-
-    .flex-lg-fill {
-        -webkit-box-flex: 1 !important;
-        -ms-flex: 1 1 auto !important;
-        flex: 1 1 auto !important
-    }
-
-    .flex-lg-grow-0 {
-        -webkit-box-flex: 0 !important;
-        -ms-flex-positive: 0 !important;
-        flex-grow: 0 !important
-    }
-
-    .flex-lg-grow-1 {
-        -webkit-box-flex: 1 !important;
-        -ms-flex-positive: 1 !important;
-        flex-grow: 1 !important
-    }
-
-    .flex-lg-shrink-0 {
-        -ms-flex-negative: 0 !important;
-        flex-shrink: 0 !important
-    }
-
-    .flex-lg-shrink-1 {
-        -ms-flex-negative: 1 !important;
-        flex-shrink: 1 !important
-    }
-
-    .justify-content-lg-start {
-        -webkit-box-pack: start !important;
-        -ms-flex-pack: start !important;
-        justify-content: flex-start !important
-    }
-
-    .justify-content-lg-end {
-        -webkit-box-pack: end !important;
-        -ms-flex-pack: end !important;
-        justify-content: flex-end !important
-    }
-
-    .justify-content-lg-center {
-        -webkit-box-pack: center !important;
-        -ms-flex-pack: center !important;
-        justify-content: center !important
-    }
-
-    .justify-content-lg-between {
-        -webkit-box-pack: justify !important;
-        -ms-flex-pack: justify !important;
-        justify-content: space-between !important
-    }
-
-    .justify-content-lg-around {
-        -ms-flex-pack: distribute !important;
-        justify-content: space-around !important
-    }
-
-    .align-items-lg-start {
-        -webkit-box-align: start !important;
-        -ms-flex-align: start !important;
-        align-items: flex-start !important
-    }
-
-    .align-items-lg-end {
-        -webkit-box-align: end !important;
-        -ms-flex-align: end !important;
-        align-items: flex-end !important
-    }
-
-    .align-items-lg-center {
-        -webkit-box-align: center !important;
-        -ms-flex-align: center !important;
-        align-items: center !important
-    }
-
-    .align-items-lg-baseline {
-        -webkit-box-align: baseline !important;
-        -ms-flex-align: baseline !important;
-        align-items: baseline !important
-    }
-
-    .align-items-lg-stretch {
-        -webkit-box-align: stretch !important;
-        -ms-flex-align: stretch !important;
-        align-items: stretch !important
-    }
-
-    .align-content-lg-start {
-        -ms-flex-line-pack: start !important;
-        align-content: flex-start !important
-    }
-
-    .align-content-lg-end {
-        -ms-flex-line-pack: end !important;
-        align-content: flex-end !important
-    }
-
-    .align-content-lg-center {
-        -ms-flex-line-pack: center !important;
-        align-content: center !important
-    }
-
-    .align-content-lg-between {
-        -ms-flex-line-pack: justify !important;
-        align-content: space-between !important
-    }
-
-    .align-content-lg-around {
-        -ms-flex-line-pack: distribute !important;
-        align-content: space-around !important
-    }
-
-    .align-content-lg-stretch {
-        -ms-flex-line-pack: stretch !important;
-        align-content: stretch !important
-    }
-
-    .align-self-lg-auto {
-        -ms-flex-item-align: auto !important;
-        align-self: auto !important
-    }
-
-    .align-self-lg-start {
-        -ms-flex-item-align: start !important;
-        align-self: flex-start !important
-    }
-
-    .align-self-lg-end {
-        -ms-flex-item-align: end !important;
-        align-self: flex-end !important
-    }
-
-    .align-self-lg-center {
-        -ms-flex-item-align: center !important;
-        align-self: center !important
-    }
-
-    .align-self-lg-baseline {
-        -ms-flex-item-align: baseline !important;
-        align-self: baseline !important
-    }
-
-    .align-self-lg-stretch {
-        -ms-flex-item-align: stretch !important;
-        align-self: stretch !important
-    }
-}
-
-@media (min-width: 1200px) {
-    .flex-xl-row {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: row !important;
-        flex-direction: row !important
-    }
-
-    .flex-xl-column {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: normal !important;
-        -ms-flex-direction: column !important;
-        flex-direction: column !important
-    }
-
-    .flex-xl-row-reverse {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: row-reverse !important;
-        flex-direction: row-reverse !important
-    }
-
-    .flex-xl-column-reverse {
-        -webkit-box-orient: vertical !important;
-        -webkit-box-direction: reverse !important;
-        -ms-flex-direction: column-reverse !important;
-        flex-direction: column-reverse !important
-    }
-
-    .flex-xl-wrap {
-        -ms-flex-wrap: wrap !important;
-        flex-wrap: wrap !important
-    }
-
-    .flex-xl-nowrap {
-        -ms-flex-wrap: nowrap !important;
-        flex-wrap: nowrap !important
-    }
-
-    .flex-xl-wrap-reverse {
-        -ms-flex-wrap: wrap-reverse !important;
-        flex-wrap: wrap-reverse !important
-    }
-
-    .flex-xl-fill {
-        -webkit-box-flex: 1 !important;
-        -ms-flex: 1 1 auto !important;
-        flex: 1 1 auto !important
-    }
-
-    .flex-xl-grow-0 {
-        -webkit-box-flex: 0 !important;
-        -ms-flex-positive: 0 !important;
-        flex-grow: 0 !important
-    }
-
-    .flex-xl-grow-1 {
-        -webkit-box-flex: 1 !important;
-        -ms-flex-positive: 1 !important;
-        flex-grow: 1 !important
-    }
-
-    .flex-xl-shrink-0 {
-        -ms-flex-negative: 0 !important;
-        flex-shrink: 0 !important
-    }
-
-    .flex-xl-shrink-1 {
-        -ms-flex-negative: 1 !important;
-        flex-shrink: 1 !important
-    }
-
-    .justify-content-xl-start {
-        -webkit-box-pack: start !important;
-        -ms-flex-pack: start !important;
-        justify-content: flex-start !important
-    }
-
-    .justify-content-xl-end {
-        -webkit-box-pack: end !important;
-        -ms-flex-pack: end !important;
-        justify-content: flex-end !important
-    }
-
-    .justify-content-xl-center {
-        -webkit-box-pack: center !important;
-        -ms-flex-pack: center !important;
-        justify-content: center !important
-    }
-
-    .justify-content-xl-between {
-        -webkit-box-pack: justify !important;
-        -ms-flex-pack: justify !important;
-        justify-content: space-between !important
-    }
-
-    .justify-content-xl-around {
-        -ms-flex-pack: distribute !important;
-        justify-content: space-around !important
-    }
-
-    .align-items-xl-start {
-        -webkit-box-align: start !important;
-        -ms-flex-align: start !important;
-        align-items: flex-start !important
-    }
-
-    .align-items-xl-end {
-        -webkit-box-align: end !important;
-        -ms-flex-align: end !important;
-        align-items: flex-end !important
-    }
-
-    .align-items-xl-center {
-        -webkit-box-align: center !important;
-        -ms-flex-align: center !important;
-        align-items: center !important
-    }
-
-    .align-items-xl-baseline {
-        -webkit-box-align: baseline !important;
-        -ms-flex-align: baseline !important;
-        align-items: baseline !important
-    }
-
-    .align-items-xl-stretch {
-        -webkit-box-align: stretch !important;
-        -ms-flex-align: stretch !important;
-        align-items: stretch !important
-    }
-
-    .align-content-xl-start {
-        -ms-flex-line-pack: start !important;
-        align-content: flex-start !important
-    }
-
-    .align-content-xl-end {
-        -ms-flex-line-pack: end !important;
-        align-content: flex-end !important
-    }
-
-    .align-content-xl-center {
-        -ms-flex-line-pack: center !important;
-        align-content: center !important
-    }
-
-    .align-content-xl-between {
-        -ms-flex-line-pack: justify !important;
-        align-content: space-between !important
-    }
-
-    .align-content-xl-around {
-        -ms-flex-line-pack: distribute !important;
-        align-content: space-around !important
-    }
-
-    .align-content-xl-stretch {
-        -ms-flex-line-pack: stretch !important;
-        align-content: stretch !important
-    }
-
-    .align-self-xl-auto {
-        -ms-flex-item-align: auto !important;
-        align-self: auto !important
-    }
-
-    .align-self-xl-start {
-        -ms-flex-item-align: start !important;
-        align-self: flex-start !important
-    }
-
-    .align-self-xl-end {
-        -ms-flex-item-align: end !important;
-        align-self: flex-end !important
-    }
-
-    .align-self-xl-center {
-        -ms-flex-item-align: center !important;
-        align-self: center !important
-    }
-
-    .align-self-xl-baseline {
-        -ms-flex-item-align: baseline !important;
-        align-self: baseline !important
-    }
-
-    .align-self-xl-stretch {
-        -ms-flex-item-align: stretch !important;
-        align-self: stretch !important
-    }
-}
-
-.float-left {
-    float: left !important
-}
-
-.float-right {
-    float: right !important
-}
-
-.float-none {
-    float: none !important
-}
-
-@media (min-width: 576px) {
-    .float-sm-left {
-        float: left !important
-    }
-
-    .float-sm-right {
-        float: right !important
-    }
-
-    .float-sm-none {
-        float: none !important
-    }
-}
-
-@media (min-width: 768px) {
-    .float-md-left {
-        float: left !important
-    }
-
-    .float-md-right {
-        float: right !important
-    }
-
-    .float-md-none {
-        float: none !important
-    }
-}
-
-@media (min-width: 992px) {
-    .float-lg-left {
-        float: left !important
-    }
-
-    .float-lg-right {
-        float: right !important
-    }
-
-    .float-lg-none {
-        float: none !important
-    }
-}
-
-@media (min-width: 1200px) {
-    .float-xl-left {
-        float: left !important
-    }
-
-    .float-xl-right {
-        float: right !important
-    }
-
-    .float-xl-none {
-        float: none !important
-    }
-}
-
-.overflow-auto {
-    overflow: auto !important
-}
-
-.overflow-hidden {
-    overflow: hidden !important
-}
-
-.position-static {
-    position: static !important
-}
-
-.position-relative {
-    position: relative !important
-}
-
-.position-absolute {
-    position: absolute !important
-}
-
-.position-fixed {
-    position: fixed !important
-}
-
-.position-sticky {
-    position: -webkit-sticky !important;
-    position: sticky !important
-}
-
-.fixed-top {
-    position: fixed;
-    top: 0;
-    right: 0;
-    left: 0;
-    z-index: 1030
-}
-
-.fixed-bottom {
-    position: fixed;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1030
-}
-
-@supports (position: -webkit-sticky) or (position: sticky) {
-    .sticky-top {
-        position: -webkit-sticky;
-        position: sticky;
-        top: 0;
-        z-index: 1020
-    }
-}
-
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0, 0, 0, 0);
-    white-space: nowrap;
-    border: 0
-}
-
-.sr-only-focusable:active, .sr-only-focusable:focus {
-    position: static;
-    width: auto;
-    height: auto;
-    overflow: visible;
-    clip: auto;
-    white-space: normal
-}
-
-.shadow-sm {
-    -webkit-box-shadow: 0 0.125rem 0.25rem rgba(0,0,0,0.075) !important;
-    box-shadow: 0 0.125rem 0.25rem rgba(0,0,0,0.075) !important
-}
-
-.shadow {
-    -webkit-box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15) !important;
-    box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15) !important
-}
-
-.shadow-lg {
-    -webkit-box-shadow: 0 1rem 3rem rgba(0,0,0,0.175) !important;
-    box-shadow: 0 1rem 3rem rgba(0,0,0,0.175) !important
-}
-
-.shadow-none {
-    -webkit-box-shadow: none !important;
-    box-shadow: none !important
-}
-
-.w-25 {
-    width: 25% !important
-}
-
-.w-50 {
-    width: 50% !important
-}
-
-.w-75 {
-    width: 75% !important
-}
-
-.w-100 {
-    width: 100% !important
-}
-
-.w-auto {
-    width: auto !important
-}
-
-.h-25 {
-    height: 25% !important
-}
-
-.h-50 {
-    height: 50% !important
-}
-
-.h-75 {
-    height: 75% !important
-}
-
-.h-100 {
-    height: 100% !important
-}
-
-.h-auto {
-    height: auto !important
-}
-
-.mw-100 {
-    max-width: 100% !important
-}
-
-.mh-100 {
-    max-height: 100% !important
-}
-
-.min-vw-100 {
-    min-width: 100vw !important
-}
-
-.min-vh-100 {
-    min-height: 100vh !important
-}
-
-.vw-100 {
-    width: 100vw !important
-}
-
-.vh-100 {
-    height: 100vh !important
-}
-
-.stretched-link::after {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1;
-    pointer-events: auto;
-    content: "";
-    background-color: rgba(0,0,0,0)
-}
-
-.m-0 {
-    margin: 0 !important
-}
-
-.mt-0, .my-0 {
-    margin-top: 0 !important
-}
-
-.mr-0, .mx-0 {
-    margin-right: 0 !important
-}
-
-.mb-0, .my-0 {
-    margin-bottom: 0 !important
-}
-
-.ml-0, .mx-0 {
-    margin-left: 0 !important
-}
-
-.m-1 {
-    margin: 0.25rem !important
-}
-
-.mt-1, .my-1 {
-    margin-top: 0.25rem !important
-}
-
-.mr-1, .mx-1 {
-    margin-right: 0.25rem !important
-}
-
-.mb-1, .my-1 {
-    margin-bottom: 0.25rem !important
-}
-
-.ml-1, .mx-1 {
-    margin-left: 0.25rem !important
-}
-
-.m-2 {
-    margin: 0.5rem !important
-}
-
-.mt-2, .my-2 {
-    margin-top: 0.5rem !important
-}
-
-.mr-2, .mx-2 {
-    margin-right: 0.5rem !important
-}
-
-.mb-2, .my-2 {
-    margin-bottom: 0.5rem !important
-}
-
-.ml-2, .mx-2 {
-    margin-left: 0.5rem !important
-}
-
-.m-3 {
-    margin: 1rem !important
-}
-
-.mt-3, .my-3 {
-    margin-top: 1rem !important
-}
-
-.mr-3, .mx-3 {
-    margin-right: 1rem !important
-}
-
-.mb-3, .my-3 {
-    margin-bottom: 1rem !important
-}
-
-.ml-3, .mx-3 {
-    margin-left: 1rem !important
-}
-
-.m-4 {
-    margin: 1.5rem !important
-}
-
-.mt-4, .my-4 {
-    margin-top: 1.5rem !important
-}
-
-.mr-4, .mx-4 {
-    margin-right: 1.5rem !important
-}
-
-.mb-4, .my-4 {
-    margin-bottom: 1.5rem !important
-}
-
-.ml-4, .mx-4 {
-    margin-left: 1.5rem !important
-}
-
-.m-5 {
-    margin: 3rem !important
-}
-
-.mt-5, .my-5 {
-    margin-top: 3rem !important
-}
-
-.mr-5, .mx-5 {
-    margin-right: 3rem !important
-}
-
-.mb-5, .my-5 {
-    margin-bottom: 3rem !important
-}
-
-.ml-5, .mx-5 {
-    margin-left: 3rem !important
-}
-
-.p-0 {
-    padding: 0 !important
-}
-
-.pt-0, .py-0 {
-    padding-top: 0 !important
-}
-
-.pr-0, .px-0 {
-    padding-right: 0 !important
-}
-
-.pb-0, .py-0 {
-    padding-bottom: 0 !important
-}
-
-.pl-0, .px-0 {
-    padding-left: 0 !important
-}
-
-.p-1 {
-    padding: 0.25rem !important
-}
-
-.pt-1, .py-1 {
-    padding-top: 0.25rem !important
-}
-
-.pr-1, .px-1 {
-    padding-right: 0.25rem !important
-}
-
-.pb-1, .py-1 {
-    padding-bottom: 0.25rem !important
-}
-
-.pl-1, .px-1 {
-    padding-left: 0.25rem !important
-}
-
-.p-2 {
-    padding: 0.5rem !important
-}
-
-.pt-2, .py-2 {
-    padding-top: 0.5rem !important
-}
-
-.pr-2, .px-2 {
-    padding-right: 0.5rem !important
-}
-
-.pb-2, .py-2 {
-    padding-bottom: 0.5rem !important
-}
-
-.pl-2, .px-2 {
-    padding-left: 0.5rem !important
-}
-
-.p-3 {
-    padding: 1rem !important
-}
-
-.pt-3, .py-3 {
-    padding-top: 1rem !important
-}
-
-.pr-3, .px-3 {
-    padding-right: 1rem !important
-}
-
-.pb-3, .py-3 {
-    padding-bottom: 1rem !important
-}
-
-.pl-3, .px-3 {
-    padding-left: 1rem !important
-}
-
-.p-4 {
-    padding: 1.5rem !important
-}
-
-.pt-4, .py-4 {
-    padding-top: 1.5rem !important
-}
-
-.pr-4, .px-4 {
-    padding-right: 1.5rem !important
-}
-
-.pb-4, .py-4 {
-    padding-bottom: 1.5rem !important
-}
-
-.pl-4, .px-4 {
-    padding-left: 1.5rem !important
-}
-
-.p-5 {
-    padding: 3rem !important
-}
-
-.pt-5, .py-5 {
-    padding-top: 3rem !important
-}
-
-.pr-5, .px-5 {
-    padding-right: 3rem !important
-}
-
-.pb-5, .py-5 {
-    padding-bottom: 3rem !important
-}
-
-.pl-5, .px-5 {
-    padding-left: 3rem !important
-}
-
-.m-n1 {
-    margin: -0.25rem !important
-}
-
-.mt-n1, .my-n1 {
-    margin-top: -0.25rem !important
-}
-
-.mr-n1, .mx-n1 {
-    margin-right: -0.25rem !important
-}
-
-.mb-n1, .my-n1 {
-    margin-bottom: -0.25rem !important
-}
-
-.ml-n1, .mx-n1 {
-    margin-left: -0.25rem !important
-}
-
-.m-n2 {
-    margin: -0.5rem !important
-}
-
-.mt-n2, .my-n2 {
-    margin-top: -0.5rem !important
-}
-
-.mr-n2, .mx-n2 {
-    margin-right: -0.5rem !important
-}
-
-.mb-n2, .my-n2 {
-    margin-bottom: -0.5rem !important
-}
-
-.ml-n2, .mx-n2 {
-    margin-left: -0.5rem !important
-}
-
-.m-n3 {
-    margin: -1rem !important
-}
-
-.mt-n3, .my-n3 {
-    margin-top: -1rem !important
-}
-
-.mr-n3, .mx-n3 {
-    margin-right: -1rem !important
-}
-
-.mb-n3, .my-n3 {
-    margin-bottom: -1rem !important
-}
-
-.ml-n3, .mx-n3 {
-    margin-left: -1rem !important
-}
-
-.m-n4 {
-    margin: -1.5rem !important
-}
-
-.mt-n4, .my-n4 {
-    margin-top: -1.5rem !important
-}
-
-.mr-n4, .mx-n4 {
-    margin-right: -1.5rem !important
-}
-
-.mb-n4, .my-n4 {
-    margin-bottom: -1.5rem !important
-}
-
-.ml-n4, .mx-n4 {
-    margin-left: -1.5rem !important
-}
-
-.m-n5 {
-    margin: -3rem !important
-}
-
-.mt-n5, .my-n5 {
-    margin-top: -3rem !important
-}
-
-.mr-n5, .mx-n5 {
-    margin-right: -3rem !important
-}
-
-.mb-n5, .my-n5 {
-    margin-bottom: -3rem !important
-}
-
-.ml-n5, .mx-n5 {
-    margin-left: -3rem !important
-}
-
-.m-auto {
-    margin: auto !important
-}
-
-.mt-auto, .my-auto {
-    margin-top: auto !important
-}
-
-.mr-auto, .mx-auto {
-    margin-right: auto !important
-}
-
-.mb-auto, .my-auto {
-    margin-bottom: auto !important
-}
-
-.ml-auto, .mx-auto {
-    margin-left: auto !important
-}
-
-@media (min-width: 576px) {
-    .m-sm-0 {
-        margin: 0 !important
-    }
-
-    .mt-sm-0, .my-sm-0 {
-        margin-top: 0 !important
-    }
-
-    .mr-sm-0, .mx-sm-0 {
-        margin-right: 0 !important
-    }
-
-    .mb-sm-0, .my-sm-0 {
-        margin-bottom: 0 !important
-    }
-
-    .ml-sm-0, .mx-sm-0 {
-        margin-left: 0 !important
-    }
-
-    .m-sm-1 {
-        margin: 0.25rem !important
-    }
-
-    .mt-sm-1, .my-sm-1 {
-        margin-top: 0.25rem !important
-    }
-
-    .mr-sm-1, .mx-sm-1 {
-        margin-right: 0.25rem !important
-    }
-
-    .mb-sm-1, .my-sm-1 {
-        margin-bottom: 0.25rem !important
-    }
-
-    .ml-sm-1, .mx-sm-1 {
-        margin-left: 0.25rem !important
-    }
-
-    .m-sm-2 {
-        margin: 0.5rem !important
-    }
-
-    .mt-sm-2, .my-sm-2 {
-        margin-top: 0.5rem !important
-    }
-
-    .mr-sm-2, .mx-sm-2 {
-        margin-right: 0.5rem !important
-    }
-
-    .mb-sm-2, .my-sm-2 {
-        margin-bottom: 0.5rem !important
-    }
-
-    .ml-sm-2, .mx-sm-2 {
-        margin-left: 0.5rem !important
-    }
-
-    .m-sm-3 {
-        margin: 1rem !important
-    }
-
-    .mt-sm-3, .my-sm-3 {
-        margin-top: 1rem !important
-    }
-
-    .mr-sm-3, .mx-sm-3 {
-        margin-right: 1rem !important
-    }
-
-    .mb-sm-3, .my-sm-3 {
-        margin-bottom: 1rem !important
-    }
-
-    .ml-sm-3, .mx-sm-3 {
-        margin-left: 1rem !important
-    }
-
-    .m-sm-4 {
-        margin: 1.5rem !important
-    }
-
-    .mt-sm-4, .my-sm-4 {
-        margin-top: 1.5rem !important
-    }
-
-    .mr-sm-4, .mx-sm-4 {
-        margin-right: 1.5rem !important
-    }
-
-    .mb-sm-4, .my-sm-4 {
-        margin-bottom: 1.5rem !important
-    }
-
-    .ml-sm-4, .mx-sm-4 {
-        margin-left: 1.5rem !important
-    }
-
-    .m-sm-5 {
-        margin: 3rem !important
-    }
-
-    .mt-sm-5, .my-sm-5 {
-        margin-top: 3rem !important
-    }
-
-    .mr-sm-5, .mx-sm-5 {
-        margin-right: 3rem !important
-    }
-
-    .mb-sm-5, .my-sm-5 {
-        margin-bottom: 3rem !important
-    }
-
-    .ml-sm-5, .mx-sm-5 {
-        margin-left: 3rem !important
-    }
-
-    .p-sm-0 {
-        padding: 0 !important
-    }
-
-    .pt-sm-0, .py-sm-0 {
-        padding-top: 0 !important
-    }
-
-    .pr-sm-0, .px-sm-0 {
-        padding-right: 0 !important
-    }
-
-    .pb-sm-0, .py-sm-0 {
-        padding-bottom: 0 !important
-    }
-
-    .pl-sm-0, .px-sm-0 {
-        padding-left: 0 !important
-    }
-
-    .p-sm-1 {
-        padding: 0.25rem !important
-    }
-
-    .pt-sm-1, .py-sm-1 {
-        padding-top: 0.25rem !important
-    }
-
-    .pr-sm-1, .px-sm-1 {
-        padding-right: 0.25rem !important
-    }
-
-    .pb-sm-1, .py-sm-1 {
-        padding-bottom: 0.25rem !important
-    }
-
-    .pl-sm-1, .px-sm-1 {
-        padding-left: 0.25rem !important
-    }
-
-    .p-sm-2 {
-        padding: 0.5rem !important
-    }
-
-    .pt-sm-2, .py-sm-2 {
-        padding-top: 0.5rem !important
-    }
-
-    .pr-sm-2, .px-sm-2 {
-        padding-right: 0.5rem !important
-    }
-
-    .pb-sm-2, .py-sm-2 {
-        padding-bottom: 0.5rem !important
-    }
-
-    .pl-sm-2, .px-sm-2 {
-        padding-left: 0.5rem !important
-    }
-
-    .p-sm-3 {
-        padding: 1rem !important
-    }
-
-    .pt-sm-3, .py-sm-3 {
-        padding-top: 1rem !important
-    }
-
-    .pr-sm-3, .px-sm-3 {
-        padding-right: 1rem !important
-    }
-
-    .pb-sm-3, .py-sm-3 {
-        padding-bottom: 1rem !important
-    }
-
-    .pl-sm-3, .px-sm-3 {
-        padding-left: 1rem !important
-    }
-
-    .p-sm-4 {
-        padding: 1.5rem !important
-    }
-
-    .pt-sm-4, .py-sm-4 {
-        padding-top: 1.5rem !important
-    }
-
-    .pr-sm-4, .px-sm-4 {
-        padding-right: 1.5rem !important
-    }
-
-    .pb-sm-4, .py-sm-4 {
-        padding-bottom: 1.5rem !important
-    }
-
-    .pl-sm-4, .px-sm-4 {
-        padding-left: 1.5rem !important
-    }
-
-    .p-sm-5 {
-        padding: 3rem !important
-    }
-
-    .pt-sm-5, .py-sm-5 {
-        padding-top: 3rem !important
-    }
-
-    .pr-sm-5, .px-sm-5 {
-        padding-right: 3rem !important
-    }
-
-    .pb-sm-5, .py-sm-5 {
-        padding-bottom: 3rem !important
-    }
-
-    .pl-sm-5, .px-sm-5 {
-        padding-left: 3rem !important
-    }
-
-    .m-sm-n1 {
-        margin: -0.25rem !important
-    }
-
-    .mt-sm-n1, .my-sm-n1 {
-        margin-top: -0.25rem !important
-    }
-
-    .mr-sm-n1, .mx-sm-n1 {
-        margin-right: -0.25rem !important
-    }
-
-    .mb-sm-n1, .my-sm-n1 {
-        margin-bottom: -0.25rem !important
-    }
-
-    .ml-sm-n1, .mx-sm-n1 {
-        margin-left: -0.25rem !important
-    }
-
-    .m-sm-n2 {
-        margin: -0.5rem !important
-    }
-
-    .mt-sm-n2, .my-sm-n2 {
-        margin-top: -0.5rem !important
-    }
-
-    .mr-sm-n2, .mx-sm-n2 {
-        margin-right: -0.5rem !important
-    }
-
-    .mb-sm-n2, .my-sm-n2 {
-        margin-bottom: -0.5rem !important
-    }
-
-    .ml-sm-n2, .mx-sm-n2 {
-        margin-left: -0.5rem !important
-    }
-
-    .m-sm-n3 {
-        margin: -1rem !important
-    }
-
-    .mt-sm-n3, .my-sm-n3 {
-        margin-top: -1rem !important
-    }
-
-    .mr-sm-n3, .mx-sm-n3 {
-        margin-right: -1rem !important
-    }
-
-    .mb-sm-n3, .my-sm-n3 {
-        margin-bottom: -1rem !important
-    }
-
-    .ml-sm-n3, .mx-sm-n3 {
-        margin-left: -1rem !important
-    }
-
-    .m-sm-n4 {
-        margin: -1.5rem !important
-    }
-
-    .mt-sm-n4, .my-sm-n4 {
-        margin-top: -1.5rem !important
-    }
-
-    .mr-sm-n4, .mx-sm-n4 {
-        margin-right: -1.5rem !important
-    }
-
-    .mb-sm-n4, .my-sm-n4 {
-        margin-bottom: -1.5rem !important
-    }
-
-    .ml-sm-n4, .mx-sm-n4 {
-        margin-left: -1.5rem !important
-    }
-
-    .m-sm-n5 {
-        margin: -3rem !important
-    }
-
-    .mt-sm-n5, .my-sm-n5 {
-        margin-top: -3rem !important
-    }
-
-    .mr-sm-n5, .mx-sm-n5 {
-        margin-right: -3rem !important
-    }
-
-    .mb-sm-n5, .my-sm-n5 {
-        margin-bottom: -3rem !important
-    }
-
-    .ml-sm-n5, .mx-sm-n5 {
-        margin-left: -3rem !important
-    }
-
-    .m-sm-auto {
-        margin: auto !important
-    }
-
-    .mt-sm-auto, .my-sm-auto {
-        margin-top: auto !important
-    }
-
-    .mr-sm-auto, .mx-sm-auto {
-        margin-right: auto !important
-    }
-
-    .mb-sm-auto, .my-sm-auto {
-        margin-bottom: auto !important
-    }
-
-    .ml-sm-auto, .mx-sm-auto {
-        margin-left: auto !important
-    }
-}
-
-@media (min-width: 768px) {
-    .m-md-0 {
-        margin: 0 !important
-    }
-
-    .mt-md-0, .my-md-0 {
-        margin-top: 0 !important
-    }
-
-    .mr-md-0, .mx-md-0 {
-        margin-right: 0 !important
-    }
-
-    .mb-md-0, .my-md-0 {
-        margin-bottom: 0 !important
-    }
-
-    .ml-md-0, .mx-md-0 {
-        margin-left: 0 !important
-    }
-
-    .m-md-1 {
-        margin: 0.25rem !important
-    }
-
-    .mt-md-1, .my-md-1 {
-        margin-top: 0.25rem !important
-    }
-
-    .mr-md-1, .mx-md-1 {
-        margin-right: 0.25rem !important
-    }
-
-    .mb-md-1, .my-md-1 {
-        margin-bottom: 0.25rem !important
-    }
-
-    .ml-md-1, .mx-md-1 {
-        margin-left: 0.25rem !important
-    }
-
-    .m-md-2 {
-        margin: 0.5rem !important
-    }
-
-    .mt-md-2, .my-md-2 {
-        margin-top: 0.5rem !important
-    }
-
-    .mr-md-2, .mx-md-2 {
-        margin-right: 0.5rem !important
-    }
-
-    .mb-md-2, .my-md-2 {
-        margin-bottom: 0.5rem !important
-    }
-
-    .ml-md-2, .mx-md-2 {
-        margin-left: 0.5rem !important
-    }
-
-    .m-md-3 {
-        margin: 1rem !important
-    }
-
-    .mt-md-3, .my-md-3 {
-        margin-top: 1rem !important
-    }
-
-    .mr-md-3, .mx-md-3 {
-        margin-right: 1rem !important
-    }
-
-    .mb-md-3, .my-md-3 {
-        margin-bottom: 1rem !important
-    }
-
-    .ml-md-3, .mx-md-3 {
-        margin-left: 1rem !important
-    }
-
-    .m-md-4 {
-        margin: 1.5rem !important
-    }
-
-    .mt-md-4, .my-md-4 {
-        margin-top: 1.5rem !important
-    }
-
-    .mr-md-4, .mx-md-4 {
-        margin-right: 1.5rem !important
-    }
-
-    .mb-md-4, .my-md-4 {
-        margin-bottom: 1.5rem !important
-    }
-
-    .ml-md-4, .mx-md-4 {
-        margin-left: 1.5rem !important
-    }
-
-    .m-md-5 {
-        margin: 3rem !important
-    }
-
-    .mt-md-5, .my-md-5 {
-        margin-top: 3rem !important
-    }
-
-    .mr-md-5, .mx-md-5 {
-        margin-right: 3rem !important
-    }
-
-    .mb-md-5, .my-md-5 {
-        margin-bottom: 3rem !important
-    }
-
-    .ml-md-5, .mx-md-5 {
-        margin-left: 3rem !important
-    }
-
-    .p-md-0 {
-        padding: 0 !important
-    }
-
-    .pt-md-0, .py-md-0 {
-        padding-top: 0 !important
-    }
-
-    .pr-md-0, .px-md-0 {
-        padding-right: 0 !important
-    }
-
-    .pb-md-0, .py-md-0 {
-        padding-bottom: 0 !important
-    }
-
-    .pl-md-0, .px-md-0 {
-        padding-left: 0 !important
-    }
-
-    .p-md-1 {
-        padding: 0.25rem !important
-    }
-
-    .pt-md-1, .py-md-1 {
-        padding-top: 0.25rem !important
-    }
-
-    .pr-md-1, .px-md-1 {
-        padding-right: 0.25rem !important
-    }
-
-    .pb-md-1, .py-md-1 {
-        padding-bottom: 0.25rem !important
-    }
-
-    .pl-md-1, .px-md-1 {
-        padding-left: 0.25rem !important
-    }
-
-    .p-md-2 {
-        padding: 0.5rem !important
-    }
-
-    .pt-md-2, .py-md-2 {
-        padding-top: 0.5rem !important
-    }
-
-    .pr-md-2, .px-md-2 {
-        padding-right: 0.5rem !important
-    }
-
-    .pb-md-2, .py-md-2 {
-        padding-bottom: 0.5rem !important
-    }
-
-    .pl-md-2, .px-md-2 {
-        padding-left: 0.5rem !important
-    }
-
-    .p-md-3 {
-        padding: 1rem !important
-    }
-
-    .pt-md-3, .py-md-3 {
-        padding-top: 1rem !important
-    }
-
-    .pr-md-3, .px-md-3 {
-        padding-right: 1rem !important
-    }
-
-    .pb-md-3, .py-md-3 {
-        padding-bottom: 1rem !important
-    }
-
-    .pl-md-3, .px-md-3 {
-        padding-left: 1rem !important
-    }
-
-    .p-md-4 {
-        padding: 1.5rem !important
-    }
-
-    .pt-md-4, .py-md-4 {
-        padding-top: 1.5rem !important
-    }
-
-    .pr-md-4, .px-md-4 {
-        padding-right: 1.5rem !important
-    }
-
-    .pb-md-4, .py-md-4 {
-        padding-bottom: 1.5rem !important
-    }
-
-    .pl-md-4, .px-md-4 {
-        padding-left: 1.5rem !important
-    }
-
-    .p-md-5 {
-        padding: 3rem !important
-    }
-
-    .pt-md-5, .py-md-5 {
-        padding-top: 3rem !important
-    }
-
-    .pr-md-5, .px-md-5 {
-        padding-right: 3rem !important
-    }
-
-    .pb-md-5, .py-md-5 {
-        padding-bottom: 3rem !important
-    }
-
-    .pl-md-5, .px-md-5 {
-        padding-left: 3rem !important
-    }
-
-    .m-md-n1 {
-        margin: -0.25rem !important
-    }
-
-    .mt-md-n1, .my-md-n1 {
-        margin-top: -0.25rem !important
-    }
-
-    .mr-md-n1, .mx-md-n1 {
-        margin-right: -0.25rem !important
-    }
-
-    .mb-md-n1, .my-md-n1 {
-        margin-bottom: -0.25rem !important
-    }
-
-    .ml-md-n1, .mx-md-n1 {
-        margin-left: -0.25rem !important
-    }
-
-    .m-md-n2 {
-        margin: -0.5rem !important
-    }
-
-    .mt-md-n2, .my-md-n2 {
-        margin-top: -0.5rem !important
-    }
-
-    .mr-md-n2, .mx-md-n2 {
-        margin-right: -0.5rem !important
-    }
-
-    .mb-md-n2, .my-md-n2 {
-        margin-bottom: -0.5rem !important
-    }
-
-    .ml-md-n2, .mx-md-n2 {
-        margin-left: -0.5rem !important
-    }
-
-    .m-md-n3 {
-        margin: -1rem !important
-    }
-
-    .mt-md-n3, .my-md-n3 {
-        margin-top: -1rem !important
-    }
-
-    .mr-md-n3, .mx-md-n3 {
-        margin-right: -1rem !important
-    }
-
-    .mb-md-n3, .my-md-n3 {
-        margin-bottom: -1rem !important
-    }
-
-    .ml-md-n3, .mx-md-n3 {
-        margin-left: -1rem !important
-    }
-
-    .m-md-n4 {
-        margin: -1.5rem !important
-    }
-
-    .mt-md-n4, .my-md-n4 {
-        margin-top: -1.5rem !important
-    }
-
-    .mr-md-n4, .mx-md-n4 {
-        margin-right: -1.5rem !important
-    }
-
-    .mb-md-n4, .my-md-n4 {
-        margin-bottom: -1.5rem !important
-    }
-
-    .ml-md-n4, .mx-md-n4 {
-        margin-left: -1.5rem !important
-    }
-
-    .m-md-n5 {
-        margin: -3rem !important
-    }
-
-    .mt-md-n5, .my-md-n5 {
-        margin-top: -3rem !important
-    }
-
-    .mr-md-n5, .mx-md-n5 {
-        margin-right: -3rem !important
-    }
-
-    .mb-md-n5, .my-md-n5 {
-        margin-bottom: -3rem !important
-    }
-
-    .ml-md-n5, .mx-md-n5 {
-        margin-left: -3rem !important
-    }
-
-    .m-md-auto {
-        margin: auto !important
-    }
-
-    .mt-md-auto, .my-md-auto {
-        margin-top: auto !important
-    }
-
-    .mr-md-auto, .mx-md-auto {
-        margin-right: auto !important
-    }
-
-    .mb-md-auto, .my-md-auto {
-        margin-bottom: auto !important
-    }
-
-    .ml-md-auto, .mx-md-auto {
-        margin-left: auto !important
-    }
-}
-
-@media (min-width: 992px) {
-    .m-lg-0 {
-        margin: 0 !important
-    }
-
-    .mt-lg-0, .my-lg-0 {
-        margin-top: 0 !important
-    }
-
-    .mr-lg-0, .mx-lg-0 {
-        margin-right: 0 !important
-    }
-
-    .mb-lg-0, .my-lg-0 {
-        margin-bottom: 0 !important
-    }
-
-    .ml-lg-0, .mx-lg-0 {
-        margin-left: 0 !important
-    }
-
-    .m-lg-1 {
-        margin: 0.25rem !important
-    }
-
-    .mt-lg-1, .my-lg-1 {
-        margin-top: 0.25rem !important
-    }
-
-    .mr-lg-1, .mx-lg-1 {
-        margin-right: 0.25rem !important
-    }
-
-    .mb-lg-1, .my-lg-1 {
-        margin-bottom: 0.25rem !important
-    }
-
-    .ml-lg-1, .mx-lg-1 {
-        margin-left: 0.25rem !important
-    }
-
-    .m-lg-2 {
-        margin: 0.5rem !important
-    }
-
-    .mt-lg-2, .my-lg-2 {
-        margin-top: 0.5rem !important
-    }
-
-    .mr-lg-2, .mx-lg-2 {
-        margin-right: 0.5rem !important
-    }
-
-    .mb-lg-2, .my-lg-2 {
-        margin-bottom: 0.5rem !important
-    }
-
-    .ml-lg-2, .mx-lg-2 {
-        margin-left: 0.5rem !important
-    }
-
-    .m-lg-3 {
-        margin: 1rem !important
-    }
-
-    .mt-lg-3, .my-lg-3 {
-        margin-top: 1rem !important
-    }
-
-    .mr-lg-3, .mx-lg-3 {
-        margin-right: 1rem !important
-    }
-
-    .mb-lg-3, .my-lg-3 {
-        margin-bottom: 1rem !important
-    }
-
-    .ml-lg-3, .mx-lg-3 {
-        margin-left: 1rem !important
-    }
-
-    .m-lg-4 {
-        margin: 1.5rem !important
-    }
-
-    .mt-lg-4, .my-lg-4 {
-        margin-top: 1.5rem !important
-    }
-
-    .mr-lg-4, .mx-lg-4 {
-        margin-right: 1.5rem !important
-    }
-
-    .mb-lg-4, .my-lg-4 {
-        margin-bottom: 1.5rem !important
-    }
-
-    .ml-lg-4, .mx-lg-4 {
-        margin-left: 1.5rem !important
-    }
-
-    .m-lg-5 {
-        margin: 3rem !important
-    }
-
-    .mt-lg-5, .my-lg-5 {
-        margin-top: 3rem !important
-    }
-
-    .mr-lg-5, .mx-lg-5 {
-        margin-right: 3rem !important
-    }
-
-    .mb-lg-5, .my-lg-5 {
-        margin-bottom: 3rem !important
-    }
-
-    .ml-lg-5, .mx-lg-5 {
-        margin-left: 3rem !important
-    }
-
-    .p-lg-0 {
-        padding: 0 !important
-    }
-
-    .pt-lg-0, .py-lg-0 {
-        padding-top: 0 !important
-    }
-
-    .pr-lg-0, .px-lg-0 {
-        padding-right: 0 !important
-    }
-
-    .pb-lg-0, .py-lg-0 {
-        padding-bottom: 0 !important
-    }
-
-    .pl-lg-0, .px-lg-0 {
-        padding-left: 0 !important
-    }
-
-    .p-lg-1 {
-        padding: 0.25rem !important
-    }
-
-    .pt-lg-1, .py-lg-1 {
-        padding-top: 0.25rem !important
-    }
-
-    .pr-lg-1, .px-lg-1 {
-        padding-right: 0.25rem !important
-    }
-
-    .pb-lg-1, .py-lg-1 {
-        padding-bottom: 0.25rem !important
-    }
-
-    .pl-lg-1, .px-lg-1 {
-        padding-left: 0.25rem !important
-    }
-
-    .p-lg-2 {
-        padding: 0.5rem !important
-    }
-
-    .pt-lg-2, .py-lg-2 {
-        padding-top: 0.5rem !important
-    }
-
-    .pr-lg-2, .px-lg-2 {
-        padding-right: 0.5rem !important
-    }
-
-    .pb-lg-2, .py-lg-2 {
-        padding-bottom: 0.5rem !important
-    }
-
-    .pl-lg-2, .px-lg-2 {
-        padding-left: 0.5rem !important
-    }
-
-    .p-lg-3 {
-        padding: 1rem !important
-    }
-
-    .pt-lg-3, .py-lg-3 {
-        padding-top: 1rem !important
-    }
-
-    .pr-lg-3, .px-lg-3 {
-        padding-right: 1rem !important
-    }
-
-    .pb-lg-3, .py-lg-3 {
-        padding-bottom: 1rem !important
-    }
-
-    .pl-lg-3, .px-lg-3 {
-        padding-left: 1rem !important
-    }
-
-    .p-lg-4 {
-        padding: 1.5rem !important
-    }
-
-    .pt-lg-4, .py-lg-4 {
-        padding-top: 1.5rem !important
-    }
-
-    .pr-lg-4, .px-lg-4 {
-        padding-right: 1.5rem !important
-    }
-
-    .pb-lg-4, .py-lg-4 {
-        padding-bottom: 1.5rem !important
-    }
-
-    .pl-lg-4, .px-lg-4 {
-        padding-left: 1.5rem !important
-    }
-
-    .p-lg-5 {
-        padding: 3rem !important
-    }
-
-    .pt-lg-5, .py-lg-5 {
-        padding-top: 3rem !important
-    }
-
-    .pr-lg-5, .px-lg-5 {
-        padding-right: 3rem !important
-    }
-
-    .pb-lg-5, .py-lg-5 {
-        padding-bottom: 3rem !important
-    }
-
-    .pl-lg-5, .px-lg-5 {
-        padding-left: 3rem !important
-    }
-
-    .m-lg-n1 {
-        margin: -0.25rem !important
-    }
-
-    .mt-lg-n1, .my-lg-n1 {
-        margin-top: -0.25rem !important
-    }
-
-    .mr-lg-n1, .mx-lg-n1 {
-        margin-right: -0.25rem !important
-    }
-
-    .mb-lg-n1, .my-lg-n1 {
-        margin-bottom: -0.25rem !important
-    }
-
-    .ml-lg-n1, .mx-lg-n1 {
-        margin-left: -0.25rem !important
-    }
-
-    .m-lg-n2 {
-        margin: -0.5rem !important
-    }
-
-    .mt-lg-n2, .my-lg-n2 {
-        margin-top: -0.5rem !important
-    }
-
-    .mr-lg-n2, .mx-lg-n2 {
-        margin-right: -0.5rem !important
-    }
-
-    .mb-lg-n2, .my-lg-n2 {
-        margin-bottom: -0.5rem !important
-    }
-
-    .ml-lg-n2, .mx-lg-n2 {
-        margin-left: -0.5rem !important
-    }
-
-    .m-lg-n3 {
-        margin: -1rem !important
-    }
-
-    .mt-lg-n3, .my-lg-n3 {
-        margin-top: -1rem !important
-    }
-
-    .mr-lg-n3, .mx-lg-n3 {
-        margin-right: -1rem !important
-    }
-
-    .mb-lg-n3, .my-lg-n3 {
-        margin-bottom: -1rem !important
-    }
-
-    .ml-lg-n3, .mx-lg-n3 {
-        margin-left: -1rem !important
-    }
-
-    .m-lg-n4 {
-        margin: -1.5rem !important
-    }
-
-    .mt-lg-n4, .my-lg-n4 {
-        margin-top: -1.5rem !important
-    }
-
-    .mr-lg-n4, .mx-lg-n4 {
-        margin-right: -1.5rem !important
-    }
-
-    .mb-lg-n4, .my-lg-n4 {
-        margin-bottom: -1.5rem !important
-    }
-
-    .ml-lg-n4, .mx-lg-n4 {
-        margin-left: -1.5rem !important
-    }
-
-    .m-lg-n5 {
-        margin: -3rem !important
-    }
-
-    .mt-lg-n5, .my-lg-n5 {
-        margin-top: -3rem !important
-    }
-
-    .mr-lg-n5, .mx-lg-n5 {
-        margin-right: -3rem !important
-    }
-
-    .mb-lg-n5, .my-lg-n5 {
-        margin-bottom: -3rem !important
-    }
-
-    .ml-lg-n5, .mx-lg-n5 {
-        margin-left: -3rem !important
-    }
-
-    .m-lg-auto {
-        margin: auto !important
-    }
-
-    .mt-lg-auto, .my-lg-auto {
-        margin-top: auto !important
-    }
-
-    .mr-lg-auto, .mx-lg-auto {
-        margin-right: auto !important
-    }
-
-    .mb-lg-auto, .my-lg-auto {
-        margin-bottom: auto !important
-    }
-
-    .ml-lg-auto, .mx-lg-auto {
-        margin-left: auto !important
-    }
-}
-
-@media (min-width: 1200px) {
-    .m-xl-0 {
-        margin: 0 !important
-    }
-
-    .mt-xl-0, .my-xl-0 {
-        margin-top: 0 !important
-    }
-
-    .mr-xl-0, .mx-xl-0 {
-        margin-right: 0 !important
-    }
-
-    .mb-xl-0, .my-xl-0 {
-        margin-bottom: 0 !important
-    }
-
-    .ml-xl-0, .mx-xl-0 {
-        margin-left: 0 !important
-    }
-
-    .m-xl-1 {
-        margin: 0.25rem !important
-    }
-
-    .mt-xl-1, .my-xl-1 {
-        margin-top: 0.25rem !important
-    }
-
-    .mr-xl-1, .mx-xl-1 {
-        margin-right: 0.25rem !important
-    }
-
-    .mb-xl-1, .my-xl-1 {
-        margin-bottom: 0.25rem !important
-    }
-
-    .ml-xl-1, .mx-xl-1 {
-        margin-left: 0.25rem !important
-    }
-
-    .m-xl-2 {
-        margin: 0.5rem !important
-    }
-
-    .mt-xl-2, .my-xl-2 {
-        margin-top: 0.5rem !important
-    }
-
-    .mr-xl-2, .mx-xl-2 {
-        margin-right: 0.5rem !important
-    }
-
-    .mb-xl-2, .my-xl-2 {
-        margin-bottom: 0.5rem !important
-    }
-
-    .ml-xl-2, .mx-xl-2 {
-        margin-left: 0.5rem !important
-    }
-
-    .m-xl-3 {
-        margin: 1rem !important
-    }
-
-    .mt-xl-3, .my-xl-3 {
-        margin-top: 1rem !important
-    }
-
-    .mr-xl-3, .mx-xl-3 {
-        margin-right: 1rem !important
-    }
-
-    .mb-xl-3, .my-xl-3 {
-        margin-bottom: 1rem !important
-    }
-
-    .ml-xl-3, .mx-xl-3 {
-        margin-left: 1rem !important
-    }
-
-    .m-xl-4 {
-        margin: 1.5rem !important
-    }
-
-    .mt-xl-4, .my-xl-4 {
-        margin-top: 1.5rem !important
-    }
-
-    .mr-xl-4, .mx-xl-4 {
-        margin-right: 1.5rem !important
-    }
-
-    .mb-xl-4, .my-xl-4 {
-        margin-bottom: 1.5rem !important
-    }
-
-    .ml-xl-4, .mx-xl-4 {
-        margin-left: 1.5rem !important
-    }
-
-    .m-xl-5 {
-        margin: 3rem !important
-    }
-
-    .mt-xl-5, .my-xl-5 {
-        margin-top: 3rem !important
-    }
-
-    .mr-xl-5, .mx-xl-5 {
-        margin-right: 3rem !important
-    }
-
-    .mb-xl-5, .my-xl-5 {
-        margin-bottom: 3rem !important
-    }
-
-    .ml-xl-5, .mx-xl-5 {
-        margin-left: 3rem !important
-    }
-
-    .p-xl-0 {
-        padding: 0 !important
-    }
-
-    .pt-xl-0, .py-xl-0 {
-        padding-top: 0 !important
-    }
-
-    .pr-xl-0, .px-xl-0 {
-        padding-right: 0 !important
-    }
-
-    .pb-xl-0, .py-xl-0 {
-        padding-bottom: 0 !important
-    }
-
-    .pl-xl-0, .px-xl-0 {
-        padding-left: 0 !important
-    }
-
-    .p-xl-1 {
-        padding: 0.25rem !important
-    }
-
-    .pt-xl-1, .py-xl-1 {
-        padding-top: 0.25rem !important
-    }
-
-    .pr-xl-1, .px-xl-1 {
-        padding-right: 0.25rem !important
-    }
-
-    .pb-xl-1, .py-xl-1 {
-        padding-bottom: 0.25rem !important
-    }
-
-    .pl-xl-1, .px-xl-1 {
-        padding-left: 0.25rem !important
-    }
-
-    .p-xl-2 {
-        padding: 0.5rem !important
-    }
-
-    .pt-xl-2, .py-xl-2 {
-        padding-top: 0.5rem !important
-    }
-
-    .pr-xl-2, .px-xl-2 {
-        padding-right: 0.5rem !important
-    }
-
-    .pb-xl-2, .py-xl-2 {
-        padding-bottom: 0.5rem !important
-    }
-
-    .pl-xl-2, .px-xl-2 {
-        padding-left: 0.5rem !important
-    }
-
-    .p-xl-3 {
-        padding: 1rem !important
-    }
-
-    .pt-xl-3, .py-xl-3 {
-        padding-top: 1rem !important
-    }
-
-    .pr-xl-3, .px-xl-3 {
-        padding-right: 1rem !important
-    }
-
-    .pb-xl-3, .py-xl-3 {
-        padding-bottom: 1rem !important
-    }
-
-    .pl-xl-3, .px-xl-3 {
-        padding-left: 1rem !important
-    }
-
-    .p-xl-4 {
-        padding: 1.5rem !important
-    }
-
-    .pt-xl-4, .py-xl-4 {
-        padding-top: 1.5rem !important
-    }
-
-    .pr-xl-4, .px-xl-4 {
-        padding-right: 1.5rem !important
-    }
-
-    .pb-xl-4, .py-xl-4 {
-        padding-bottom: 1.5rem !important
-    }
-
-    .pl-xl-4, .px-xl-4 {
-        padding-left: 1.5rem !important
-    }
-
-    .p-xl-5 {
-        padding: 3rem !important
-    }
-
-    .pt-xl-5, .py-xl-5 {
-        padding-top: 3rem !important
-    }
-
-    .pr-xl-5, .px-xl-5 {
-        padding-right: 3rem !important
-    }
-
-    .pb-xl-5, .py-xl-5 {
-        padding-bottom: 3rem !important
-    }
-
-    .pl-xl-5, .px-xl-5 {
-        padding-left: 3rem !important
-    }
-
-    .m-xl-n1 {
-        margin: -0.25rem !important
-    }
-
-    .mt-xl-n1, .my-xl-n1 {
-        margin-top: -0.25rem !important
-    }
-
-    .mr-xl-n1, .mx-xl-n1 {
-        margin-right: -0.25rem !important
-    }
-
-    .mb-xl-n1, .my-xl-n1 {
-        margin-bottom: -0.25rem !important
-    }
-
-    .ml-xl-n1, .mx-xl-n1 {
-        margin-left: -0.25rem !important
-    }
-
-    .m-xl-n2 {
-        margin: -0.5rem !important
-    }
-
-    .mt-xl-n2, .my-xl-n2 {
-        margin-top: -0.5rem !important
-    }
-
-    .mr-xl-n2, .mx-xl-n2 {
-        margin-right: -0.5rem !important
-    }
-
-    .mb-xl-n2, .my-xl-n2 {
-        margin-bottom: -0.5rem !important
-    }
-
-    .ml-xl-n2, .mx-xl-n2 {
-        margin-left: -0.5rem !important
-    }
-
-    .m-xl-n3 {
-        margin: -1rem !important
-    }
-
-    .mt-xl-n3, .my-xl-n3 {
-        margin-top: -1rem !important
-    }
-
-    .mr-xl-n3, .mx-xl-n3 {
-        margin-right: -1rem !important
-    }
-
-    .mb-xl-n3, .my-xl-n3 {
-        margin-bottom: -1rem !important
-    }
-
-    .ml-xl-n3, .mx-xl-n3 {
-        margin-left: -1rem !important
-    }
-
-    .m-xl-n4 {
-        margin: -1.5rem !important
-    }
-
-    .mt-xl-n4, .my-xl-n4 {
-        margin-top: -1.5rem !important
-    }
-
-    .mr-xl-n4, .mx-xl-n4 {
-        margin-right: -1.5rem !important
-    }
-
-    .mb-xl-n4, .my-xl-n4 {
-        margin-bottom: -1.5rem !important
-    }
-
-    .ml-xl-n4, .mx-xl-n4 {
-        margin-left: -1.5rem !important
-    }
-
-    .m-xl-n5 {
-        margin: -3rem !important
-    }
-
-    .mt-xl-n5, .my-xl-n5 {
-        margin-top: -3rem !important
-    }
-
-    .mr-xl-n5, .mx-xl-n5 {
-        margin-right: -3rem !important
-    }
-
-    .mb-xl-n5, .my-xl-n5 {
-        margin-bottom: -3rem !important
-    }
-
-    .ml-xl-n5, .mx-xl-n5 {
-        margin-left: -3rem !important
-    }
-
-    .m-xl-auto {
-        margin: auto !important
-    }
-
-    .mt-xl-auto, .my-xl-auto {
-        margin-top: auto !important
-    }
-
-    .mr-xl-auto, .mx-xl-auto {
-        margin-right: auto !important
-    }
-
-    .mb-xl-auto, .my-xl-auto {
-        margin-bottom: auto !important
-    }
-
-    .ml-xl-auto, .mx-xl-auto {
-        margin-left: auto !important
-    }
-}
-
-.text-monospace {
-    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important
-}
-
-.text-justify {
-    text-align: justify !important
-}
-
-.text-wrap {
-    white-space: normal !important
-}
-
-.text-nowrap {
-    white-space: nowrap !important
-}
-
-.text-truncate {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap
-}
-
-.text-left {
-    text-align: left !important
-}
-
-.text-right {
-    text-align: right !important
-}
-
-.text-center {
-    text-align: center !important
-}
-
-@media (min-width: 576px) {
-    .text-sm-left {
-        text-align: left !important
-    }
-
-    .text-sm-right {
-        text-align: right !important
-    }
-
-    .text-sm-center {
-        text-align: center !important
-    }
-}
-
-@media (min-width: 768px) {
-    .text-md-left {
-        text-align: left !important
-    }
-
-    .text-md-right {
-        text-align: right !important
-    }
-
-    .text-md-center {
-        text-align: center !important
-    }
-}
-
-@media (min-width: 992px) {
-    .text-lg-left {
-        text-align: left !important
-    }
-
-    .text-lg-right {
-        text-align: right !important
-    }
-
-    .text-lg-center {
-        text-align: center !important
-    }
-}
-
-@media (min-width: 1200px) {
-    .text-xl-left {
-        text-align: left !important
-    }
-
-    .text-xl-right {
-        text-align: right !important
-    }
-
-    .text-xl-center {
-        text-align: center !important
-    }
-}
-
-.text-lowercase {
-    text-transform: lowercase !important
-}
-
-.text-uppercase {
-    text-transform: uppercase !important
-}
-
-.text-capitalize {
-    text-transform: capitalize !important
-}
-
-.font-weight-light {
-    font-weight: 300 !important
-}
-
-.font-weight-lighter {
-    font-weight: lighter !important
-}
-
-.font-weight-normal {
-    font-weight: 400 !important
-}
-
-.font-weight-bold {
-    font-weight: 700 !important
-}
-
-.font-weight-bolder {
-    font-weight: bolder !important
-}
-
-.font-italic {
-    font-style: italic !important
-}
-
-.text-white {
-    color: #fff !important
-}
-
-.text-primary {
-    color: #2A9FD6 !important
-}
-
-a.text-primary:hover, a.text-primary:focus {
-    color: #1d7097 !important
-}
-
-.text-secondary {
-    color: #555 !important
-}
-
-a.text-secondary:hover, a.text-secondary:focus {
-    color: #2f2f2f !important
-}
-
-.text-success {
-    color: #77B300 !important
-}
-
-a.text-success:hover, a.text-success:focus {
-    color: #446700 !important
-}
-
-.text-info {
-    color: #9933CC !important
-}
-
-a.text-info:hover, a.text-info:focus {
-    color: #6b248f !important
-}
-
-.text-warning {
-    color: #FF8800 !important
-}
-
-a.text-warning:hover, a.text-warning:focus {
-    color: #b35f00 !important
-}
-
-.text-danger {
-    color: #CC0000 !important
-}
-
-a.text-danger:hover, a.text-danger:focus {
-    color: maroon !important
-}
-
-.text-light {
-    color: #222 !important
-}
-
-a.text-light:hover, a.text-light:focus {
-    color: black !important
-}
-
-.text-dark {
-    color: #ADAFAE !important
-}
-
-a.text-dark:hover, a.text-dark:focus {
-    color: #868988 !important
-}
-
-.text-body {
-    color: #ADAFAE !important
-}
-
-.text-muted {
-    color: #555 !important
-}
-
-.text-black-50 {
-    color: rgba(0,0,0,0.5) !important
-}
-
-.text-white-50 {
-    color: rgba(255,255,255,0.5) !important
-}
-
-.text-hide {
-    font: 0/0 a;
-    color: transparent;
-    text-shadow: none;
-    background-color: transparent;
-    border: 0
-}
-
-.text-decoration-none {
-    text-decoration: none !important
-}
-
-.text-break {
-    word-break: break-word !important;
-    overflow-wrap: break-word !important
-}
-
-.text-reset {
-    color: inherit !important
-}
-
-.visible {
-    visibility: visible !important
-}
-
-.invisible {
-    visibility: hidden !important
-}
-
-@media print {
-    *, *::before, *::after {
-        text-shadow: none !important;
-        -webkit-box-shadow: none !important;
-        box-shadow: none !important
-    }
-
-    a:not(.btn) {
-        text-decoration: underline
-    }
-
-    abbr[title]::after {
-        content: " (" attr(title) ")"
-    }
-
-    pre {
-        white-space: pre-wrap !important
-    }
-
-    pre, blockquote {
-        border: 1px solid #888;
-        page-break-inside: avoid
-    }
-
-    thead {
-        display: table-header-group
-    }
-
-    tr, img {
-        page-break-inside: avoid
-    }
-
-    p, h2, h3 {
-        orphans: 3;
-        widows: 3
-    }
-
-    h2, h3 {
-        page-break-after: avoid
-    }
-
-    @page {
-        size: a3
-    }
-
-    body {
-        min-width: 992px !important
-    }
-
-    .container {
-        min-width: 992px !important
-    }
-
-    .navbar {
-        display: none
-    }
-
-    .badge {
-        border: 1px solid #000
-    }
-
-    .table {
-        border-collapse: collapse !important
-    }
-
-        .table td, .table th {
-            background-color: #fff !important
-        }
-
-    .table-bordered th, .table-bordered td {
-        border: 1px solid #dee2e6 !important
-    }
-
-    .table-dark {
-        color: inherit
-    }
-
-        .table-dark th, .table-dark td, .table-dark thead th, .table-dark tbody + tbody {
-            border-color: #282828
-        }
-
-    .table .thead-dark th {
-        color: inherit;
-        border-color: #282828
-    }
-}
-
-.navbar.bg-primary {
-    border: 1px solid #282828
-}
-
-.navbar.bg-dark {
-    background-color: #060606 !important;
-    border: 1px solid #282828
-}
-
-.navbar.bg-light {
-    background-color: #888 !important
-}
-
-.navbar.fixed-top {
-    border-width: 0 0 1px 0
-}
-
-.navbar.fixed-bottom {
-    border-width: 1px 0 0 0
-}
-
-.btn-primary {
-    background-color: #2A9FD6
-}
-
-.btn-secondary {
-    background-color: #555
-}
-
-.btn-success {
-    background-color: #77B300
-}
-
-.btn-info {
-    background-color: #9933CC
-}
-
-.btn-warning {
-    background-color: #FF8800
-}
-
-.btn-danger {
-    background-color: #CC0000
-}
-
-.btn-light {
-    background-color: #222
-}
-
-.btn-dark {
-    background-color: #ADAFAE
-}
-
-table {
-    color: #fff
-}
-
-.table-primary, .table-primary > th, .table-primary > td {
-    background-color: #2A9FD6
-}
-
-.table-secondary, .table-secondary > th, .table-secondary > td {
-    background-color: #555
-}
-
-.table-light, .table-light > th, .table-light > td {
-    background-color: #222
-}
-
-.table-dark, .table-dark > th, .table-dark > td {
-    background-color: #ADAFAE
-}
-
-.table-success, .table-success > th, .table-success > td {
-    background-color: #77B300
-}
-
-.table-info, .table-info > th, .table-info > td {
-    background-color: #9933CC
-}
-
-.table-danger, .table-danger > th, .table-danger > td {
-    background-color: #CC0000
-}
-
-.table-warning, .table-warning > th, .table-warning > td {
-    background-color: #FF8800
-}
-
-.table-active, .table-active > th, .table-active > td {
-    background-color: rgba(255,255,255,0.075)
-}
-
-.table-hover .table-primary:hover, .table-hover .table-primary:hover > th, .table-hover .table-primary:hover > td {
-    background-color: #258fc1
-}
-
-.table-hover .table-secondary:hover, .table-hover .table-secondary:hover > th, .table-hover .table-secondary:hover > td {
-    background-color: #484848
-}
-
-.table-hover .table-light:hover, .table-hover .table-light:hover > th, .table-hover .table-light:hover > td {
-    background-color: #151515
-}
-
-.table-hover .table-dark:hover, .table-hover .table-dark:hover > th, .table-hover .table-dark:hover > td {
-    background-color: #a0a2a1
-}
-
-.table-hover .table-success:hover, .table-hover .table-success:hover > th, .table-hover .table-success:hover > td {
-    background-color: #669a00
-}
-
-.table-hover .table-info:hover, .table-hover .table-info:hover > th, .table-hover .table-info:hover > td {
-    background-color: #8a2eb8
-}
-
-.table-hover .table-danger:hover, .table-hover .table-danger:hover > th, .table-hover .table-danger:hover > td {
-    background-color: #b30000
-}
-
-.table-hover .table-warning:hover, .table-hover .table-warning:hover > th, .table-hover .table-warning:hover > td {
-    background-color: #e67a00
-}
-
-.table-hover .table-active:hover, .table-hover .table-active:hover > th, .table-hover .table-active:hover > td {
-    background-color: rgba(255,255,255,0.075)
-}
-
-legend {
-    color: #fff
-}
-
-.nav-tabs .nav-link, .nav-pills .nav-link {
-    color: #fff
-}
-
-    .nav-tabs .nav-link:hover, .nav-pills .nav-link:hover {
-        background-color: #282828
-    }
-
-    .nav-tabs .nav-link.disabled, .nav-tabs .nav-link.disabled:hover, .nav-pills .nav-link.disabled, .nav-pills .nav-link.disabled:hover {
-        background-color: transparent;
-        color: #555
-    }
-
-    .nav-tabs .nav-link.active, .nav-pills .nav-link.active {
-        background-color: #2A9FD6
-    }
-
-.breadcrumb a {
-    color: #fff
-}
-
-.pagination a:hover {
-    text-decoration: none
-}
-
-.alert {
-    border: none;
-    color: #fff
-}
-
-    .alert a, .alert .alert-link {
-        color: #fff;
-        text-decoration: underline
-    }
-
-.alert-primary {
-    background-color: #2A9FD6
-}
-
-.alert-secondary {
-    background-color: #555
-}
-
-.alert-success {
-    background-color: #77B300
-}
-
-.alert-info {
-    background-color: #9933CC
-}
-
-.alert-warning {
-    background-color: #FF8800
-}
-
-.alert-danger {
-    background-color: #CC0000
-}
-
-.alert-light {
-    background-color: #222
-}
-
-.alert-dark {
-    background-color: #ADAFAE
-}
-
-.badge-warning {
-    color: #fff
-}
-
-.close {
-    opacity: 0.6
-}
-
-    .close:hover {
-        opacity: 1
-    }
-
-.list-group-item:hover {
-    background-color: #282828;
-    color: #fff
-}
-
-.list-group-item-action {
-    color: #888
-}
-
-    .list-group-item-action .list-group-item-heading {
-        color: #888
-    }
-
-.list-group-item:hover .list-group-item-heading {
-    color: #fff
-}
-
-.card h1, .card h2, .card h3, .card h4, .card h5, .card h6, .list-group-item h1, .list-group-item h2, .list-group-item h3, .list-group-item h4, .list-group-item h5, .list-group-item h6 {
-    color: inherit
-}
-
-.popover-title {
-    border-bottom: none
-}
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
index e95b6d11..947184b6 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
@@ -4,6 +4,34 @@ body {
     padding-top: 7rem;
 }
 
+.table > :not(caption) > * > * {
+    box-shadow: none;
+}
+
+.table .form-control {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .form-select {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .btn-primary {
+    background-color: var(--bs-primary);
+}
+
+.table .btn-secondary {
+    background-color: var(--bs-secondary);
+}
+
+.alert-dismissible .btn-close {
+    z-index: 1;
+}
+
 .controls {
     z-index: 2000;
     padding-top: 15px;
@@ -22,6 +50,7 @@ body {
     display: flex;
     align-items: center;
     line-height: 3rem;
+    padding-left: 1rem;
 }
 
 .app-menu .nav-item a.active {
@@ -43,7 +72,7 @@ body {
 
 .navbar-toggler {
     background-color: rgba(255, 255, 255, 0.1);
-    margin-left: auto;
+    margin: .5rem;
 }
 
 div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
index c9d137bb..bcca040a 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
@@ -100,10 +100,8 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css", Integrity = "sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", Integrity = "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.5.1.slim.min.js", Integrity = "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js", Integrity = "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js", Integrity = "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI", CrossOrigin = "anonymous" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
     };
 }
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
index e3a02d94..dea36379 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
@@ -4,6 +4,34 @@ body {
     padding-top: 7rem;
 }
 
+.table > :not(caption) > * > * {
+    box-shadow: none;
+}
+
+.table .form-control {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .form-select {
+    background-color: #ffffff !important;
+    border-width: 0.5px !important;
+    border-bottom-color: #ccc !important;
+}
+
+.table .btn-primary {
+    background-color: var(--bs-primary);
+}
+
+.table .btn-secondary {
+    background-color: var(--bs-secondary);
+}
+
+.alert-dismissible .btn-close {
+    z-index: 1;
+}
+
 .controls {
     z-index: 2000;
     padding-top: 15px;
@@ -22,6 +50,7 @@ body {
     display: flex;
     align-items: center;
     line-height: 3rem;
+    padding-left: 1rem;
 }
 
 .app-menu .nav-item a.active {
@@ -43,7 +72,7 @@ body {
 
 .navbar-toggler {
     background-color: rgba(255, 255, 255, 0.1);
-    margin-left: auto;
+    margin: .5rem;
 }
 
 div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
index 560c8e51..f8551aa1 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
   "Title": "Default Theme Template",
   "Type": "External",
-  "Version": "2.1.0"
+  "Version": "2.2.0"
 }
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 35a44e3f..185e5256 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -116,6 +116,7 @@ app {
     color: gray;
     height: 1px;
     background-color: gray;
+    margin: 0.5rem;
 }
 
 .app-link-unstyled, .app-link-unstyled:visited, .app-link-unstyled:hover, .app-link-unstyled:active, .app-link-unstyled:focus, .app-link-unstyled:active:hover {
@@ -185,7 +186,7 @@ app {
     .app-tooltip::after {
         background: #3E474F;
         border-radius: .25em;
-        bottom: 180%;
+        bottom: 140%;
         color: #EDEFF0;
         content: attr(data-tip);
         margin-left: -8.75em;
diff --git a/Oqtane.Server/wwwroot/icon.png b/Oqtane.Server/wwwroot/icon.png
new file mode 100644
index 00000000..1ac7cee0
Binary files /dev/null and b/Oqtane.Server/wwwroot/icon.png differ
diff --git a/Oqtane.Shared/Extensions/AssemblyExtensions.cs b/Oqtane.Shared/Extensions/AssemblyExtensions.cs
index db29c5e2..d2b667ea 100644
--- a/Oqtane.Shared/Extensions/AssemblyExtensions.cs
+++ b/Oqtane.Shared/Extensions/AssemblyExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Loader;
@@ -100,7 +101,7 @@ namespace System.Reflection
             }
             catch
             {
-                Console.WriteLine($"Not Assembly : {dll.Name}");
+                Debug.WriteLine($"Oqtane Error: Cannot Get Assembly Name For {dll.Name}");
             }
 
             loadContext.LoadOqtaneAssembly(dll, assemblyName);
@@ -122,11 +123,11 @@ namespace System.Reflection
                 {
                     assembly = loadContext.LoadFromStream(new MemoryStream(File.ReadAllBytes(dll.FullName)));
                 }
-                Console.WriteLine($"Loaded : {assemblyName}");
+                Debug.WriteLine($"Oqtane Info: Loaded Assembly {assemblyName}");
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                Console.WriteLine($"Failed : {assemblyName}\n{e}");
+                Debug.WriteLine($"Oqtane Error: Unable To Load Assembly {assemblyName} - {ex}");
             }
         }
     }
diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs
index 94c340c5..0afad7d2 100644
--- a/Oqtane.Shared/Models/Alias.cs
+++ b/Oqtane.Shared/Models/Alias.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
@@ -43,18 +42,6 @@ namespace Oqtane.Models
         /// <inheritdoc />
         public DateTime ModifiedOn { get; set; }
 
-        /// <summary>
-        /// todoc - unclear what this is for
-        /// </summary>
-        [NotMapped]
-        public DateTime SyncDate { get; set; }
-
-        /// <summary>
-        /// todoc - unclear what this is for
-        /// </summary>
-        [NotMapped]
-        public List<SyncEvent> SyncEvents { get; set; }
-
         /// <summary>
         /// The path contains the url-part after the first slash.
         /// * If the Name is `oqtane.me` the Path is empty
diff --git a/Oqtane.Shared/Models/Database.cs b/Oqtane.Shared/Models/Database.cs
index 334aaddb..b660ca50 100644
--- a/Oqtane.Shared/Models/Database.cs
+++ b/Oqtane.Shared/Models/Database.cs
@@ -19,5 +19,10 @@ namespace Oqtane.Models
         /// Type of DB using the full namespace, like `Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer`
         /// </summary>
         public string DBType { get; set; }
+
+        /// <summary>
+        /// whether this item is the default database provider ( ie. specified by DefaultDBType in appsettings.json )
+        /// </summary>
+        public bool IsDefault { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/Installation.cs b/Oqtane.Shared/Models/Installation.cs
index efa0db31..f3f2f580 100644
--- a/Oqtane.Shared/Models/Installation.cs
+++ b/Oqtane.Shared/Models/Installation.cs
@@ -16,5 +16,10 @@ namespace Oqtane.Models
         /// Message or error in case something failed.
         /// </summary>
         public string Message { get; set; }
+
+        /// <summary>
+        /// current alias value from server
+        /// </summary>
+        public Alias Alias { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/Package.cs b/Oqtane.Shared/Models/Package.cs
index 8d78bdc7..66ecb8b4 100644
--- a/Oqtane.Shared/Models/Package.cs
+++ b/Oqtane.Shared/Models/Package.cs
@@ -1,8 +1,9 @@
+using System;
+
 namespace Oqtane.Models
 {
     /// <summary>
-    /// A software Package which is like an Oqtane Plugin / Extension.
-    /// This is used for creating lists from NuGet to offer for installation. 
+    /// A software Package for installation. 
     /// </summary>
     public class Package
     {
@@ -12,19 +13,29 @@ namespace Oqtane.Models
         public string PackageId { get; set; }
 
         /// <summary>
-        /// Name of the package - may contains part or the entire Namespace.
+        /// Owner of the package
+        /// </summary>
+        public string Owner { get; set; }
+
+        /// <summary>
+        /// Url for the owner of the package
+        /// </summary>
+        public string OwnerUrl { get; set; }
+
+        /// <summary>
+        /// Friendly name of the package
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// Nice description of the Package. 
+        /// Description of the Package. 
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        /// Owner / Creator of the package - usually retrieved from NuGet.
+        /// Friendly name of the package
         /// </summary>
-        public string Owner { get; set; }
+        public string ProductUrl { get; set; }
 
         /// <summary>
         /// Version as defined in the NuGet package. 
@@ -32,8 +43,23 @@ namespace Oqtane.Models
         public string Version { get; set; }
 
         /// <summary>
-        /// Download count on NuGet to show how popular the package is. 
+        /// Download count to show how popular the package is. 
         /// </summary>
         public long Downloads { get; set; }
+
+        /// <summary>
+        /// date the package was released 
+        /// </summary>
+        public DateTime ReleaseDate { get; set; }
+
+        /// <summary>
+        /// The direct Url for downloading the package 
+        /// </summary>
+        public string PackageUrl { get; set; }
+
+        /// <summary>
+        /// Indicates if any known security vulnerabilities exist 
+        /// </summary>
+        public int Vulnerabilities { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs
index 08dac7d7..0ceb2dbb 100644
--- a/Oqtane.Shared/Models/Page.cs
+++ b/Oqtane.Shared/Models/Page.cs
@@ -68,6 +68,7 @@ namespace Oqtane.Models
         /// </summary>
         public string Icon { get; set; }
         public bool IsNavigation { get; set; }
+        public bool IsClickable { get; set; }
         public int? UserId { get; set; }
         public bool IsPersonalizable { get; set; }
 
diff --git a/Oqtane.Shared/Models/SiteTemplate.cs b/Oqtane.Shared/Models/SiteTemplate.cs
index 74d259bb..7ef52696 100644
--- a/Oqtane.Shared/Models/SiteTemplate.cs
+++ b/Oqtane.Shared/Models/SiteTemplate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Oqtane.Models
@@ -13,6 +13,7 @@ namespace Oqtane.Models
     {
         public string Name { get; set; }
         public string Parent { get; set; }
+        public int Order { get; set; }
         public string Path { get; set; }
         public string Icon { get; set; }
         public bool IsNavigation { get; set; }
diff --git a/Oqtane.Shared/Models/SyncEvent.cs b/Oqtane.Shared/Models/Sync.cs
similarity index 57%
rename from Oqtane.Shared/Models/SyncEvent.cs
rename to Oqtane.Shared/Models/Sync.cs
index 1d546d86..9430ab2a 100644
--- a/Oqtane.Shared/Models/SyncEvent.cs
+++ b/Oqtane.Shared/Models/Sync.cs
@@ -1,7 +1,14 @@
-using System;
+using System;
+using System.Collections.Generic;
 
 namespace Oqtane.Models
 {
+    public class Sync
+    {
+        public DateTime SyncDate { get; set; }
+        public List<SyncEvent> SyncEvents { get; set; }
+    }
+
     public class SyncEvent
     {
         public int TenantId { get; set; }
diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj
index 35896670..d2c822da 100644
--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 7590fcf6..27e975d3 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -3,10 +3,11 @@ using System;
 namespace Oqtane.Shared {
 
     public class Constants {
-        public static readonly string Version = "2.1.0";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0";
+        public static readonly string Version = "2.2.0";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0";
         public const string PackageId = "Oqtane.Framework";
         public const string UpdaterPackageId = "Oqtane.Updater";
+        public const string PackageRegistryUrl = "https://www.oqtane.net";
 
         public const string DefaultDBType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer";
 
@@ -76,5 +77,8 @@ namespace Oqtane.Shared {
         public static readonly string DefaultCulture = "en";
 
         public static readonly string AuthenticationScheme = "Identity.Application";
+        public static readonly string RequestVerificationToken = "__RequestVerificationToken";
+        public static readonly string AntiForgeryTokenHeaderName = "X-XSRF-TOKEN-HEADER";
+        public static readonly string AntiForgeryTokenCookieName = "X-XSRF-TOKEN-COOKIE";
     }
 }
diff --git a/Oqtane.Shared/Shared/InstallConfig.cs b/Oqtane.Shared/Shared/InstallConfig.cs
index 358e6465..9a160c3d 100644
--- a/Oqtane.Shared/Shared/InstallConfig.cs
+++ b/Oqtane.Shared/Shared/InstallConfig.cs
@@ -16,5 +16,6 @@ namespace Oqtane.Shared
         public string DefaultTheme { get; set; }
         public string DefaultContainer { get; set; }
         public string DefaultAdminContainer { get; set; }
+        public bool Register { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Shared/SiteState.cs b/Oqtane.Shared/Shared/SiteState.cs
index 159d29e6..475a9d59 100644
--- a/Oqtane.Shared/Shared/SiteState.cs
+++ b/Oqtane.Shared/Shared/SiteState.cs
@@ -1,4 +1,4 @@
-using Oqtane.Models;
+using Oqtane.Models;
 
 namespace Oqtane.Shared
 {
@@ -6,6 +6,7 @@ namespace Oqtane.Shared
     public class SiteState
     {
         public Alias Alias { get; set; }
+        public string AntiForgeryToken { get; set; } // for use in client services
 
     }
 }
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index 23397f89..946b3dc1 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -412,5 +412,10 @@ namespace Oqtane.Shared
 
             return dictionary;
         }
+
+        public static string LogMessage(object @class, string message)
+        {
+            return $"[{@class.GetType()}] {message}";
+        }
     }
 }
diff --git a/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs b/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs
new file mode 100644
index 00000000..4acc1bb9
--- /dev/null
+++ b/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Localization;
+using Xunit;
+
+namespace Oqtane.Oqtane.Client.Tests
+{
+    public class LocalizationCookieTests
+    {
+        [Theory]
+        [InlineData("c=ar|uic=ar", "ar")]
+        [InlineData("c=ar", null)]
+        [InlineData("", null)]
+        [InlineData(null, null)]
+        public void ParseCookie(string localizationCookie, string expectedCulture)
+        {
+            // Arrange
+            var localizationCookieValue = CookieRequestCultureProvider.ParseCookieValue(localizationCookie);
+
+            // Act
+            var culture = localizationCookieValue?.UICultures?[0].Value;
+
+            // Assert
+            Assert.Equal(expectedCulture, culture);
+        }
+    }
+}
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index 2705c3c5..cf742fc3 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,14 +11,15 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>    
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="bunit.web" Version="1.0.0-beta-10" />
     <PackageReference Include="bunit.xunit" Version="1.0.0-beta-10" />
diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj
index 66df439f..ff87e19b 100644
--- a/Oqtane.Updater/Oqtane.Updater.csproj
+++ b/Oqtane.Updater/Oqtane.Updater.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.2.0</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/README.md b/README.md
index 054a95df..98a9b909 100644
--- a/README.md
+++ b/README.md
@@ -53,19 +53,25 @@ V.3.0.0 ( Q4 2021 )
 - [ ] Migration to .NET 6
 
 V.2.2.0 ( Q3 2021 )
-- [ ] Alternate Authentication Providers ( ie. Azure B2C, Social logins, etc... )
+- [ ] Authentication extensibility ( ie. Azure B2C, Social logins, etc... )
 - [ ] Configurable password complexity for local authentication
 
-V.2.1.0 ( June 2021 )
+V.2.2.0 ( Jul 2021 )
+- [x] Bootstrap 5 Upgrade
+- [x] Package Service Integration
+- [x] Default and Shared Resource File Inclusion
+- [x] Startup Error Logging
+- [x] API Controller Validation and Logging
+
+V.2.1.0 ( Jun 4, 2021 )
 - [x] Cross Platform Database Support ( ie. LocalDB, SQL Server, SQLite, MySQL, PostgreSQL ) - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
 - [x] Utilize EF Core Migrations - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
-- [x] Include support for Public content folders
-- [x] Enhance multi-tenant infrastructure
-- [x] Optimize user authorization
-- [x] Centralize package installation and uninstall
-- [x] Enable pre-rendering support for Blazor Server
-- [x] Allow run-time installation of Language packages
-- [x] Add support for Shared localization resources
+- [x] Public Content Folder Support
+- [x] Multi-tenant Infrastructure Improvements
+- [x] User Authorization Optimization
+- [x] Consiolidation of Package Management
+- [x] Blazor Server Pre-rendering
+- [x] Translation Package Installation
 
 V.2.0.2 ( Apr 19, 2021 )
 - [x] Assorted fixes and user experience improvements
@@ -76,9 +82,9 @@ V.2.0.1 ( Feb 27, 2021 )
 V.2.0.0 ( released in conjuntion with .NET 5 on Nov 11, 2020 )
 - [x] Migration to .NET 5
 - [x] Static Localization ( ie. labels, help text, etc.. )
-- [x] Improved JavaScript reference support
-- [x] Performance optimizations
-- [x] Developer productivity enhancements
+- [x] Improved JavaScript Reference Support
+- [x] Performance Optimizations
+- [x] Developer Productivity Enhancements
 
 V.1.0.0 ( released in conjunction with .NET Core 3.2 on May 19, 2020 )
 - [x] Multi-Tenant ( Shared Database & Isolated Database ) 
@@ -117,6 +123,11 @@ The following diagram visualizes the client and server components in the Oqtane
 
 ![Architecture](https://github.com/oqtane/framework/blob/master/screenshots/Architecture.png?raw=true "Oqtane Architecture")
 
+# Databases
+
+As of version 2.1, Oqtane supports multiple relational database providers.
+
+![Databases](https://github.com/oqtane/framework/blob/dev/screenshots/databases.png?raw=true "Oqtane Databases")
 
 # Example Screenshots
 
diff --git a/screenshots/Architecture.png b/screenshots/Architecture.png
index a24815c7..0537c3b4 100644
Binary files a/screenshots/Architecture.png and b/screenshots/Architecture.png differ
diff --git a/screenshots/databases.png b/screenshots/databases.png
new file mode 100644
index 00000000..785d43ef
Binary files /dev/null and b/screenshots/databases.png differ