diff --git a/.gitignore b/.gitignore
index 33c751ad..8f8f91ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ Oqtane.Server/appsettings.json
 Oqtane.Server/Data/*.mdf
 Oqtane.Server/Data/*.ldf
 
+/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
diff --git a/LICENSE b/LICENSE
index 02a0812b..9a5062f7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 .NET Foundation
+Copyright (c) 2018-2020 .NET Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index 66e5b15f..3d13adff 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -19,12 +19,13 @@
 @code {
     private bool _initialized;
     private bool _installed;
+
     private PageState PageState { get; set; }
 
     protected override async Task OnParametersSetAsync()
     {
-        var response = await InstallationService.IsInstalled();
-        _installed = response.Success;
+        var installation = await InstallationService.IsInstalled();
+        _installed = installation.Success;
         _initialized = true;
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index c1776600..7e3004fb 100644
--- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -19,13 +19,13 @@
 </div>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-
-    List<Page> _pages;
+    private List<Page> _pages;
+    
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override void OnInitialized()
     {
-        Page admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
+        var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
         _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor
index 8ecd898c..9e0df574 100644
--- a/Oqtane.Client/Modules/Admin/Error/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Error/Index.razor
@@ -3,7 +3,7 @@
 @inject IModuleService ModuleService
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     protected override async Task OnInitializedAsync()
     {
@@ -13,6 +13,7 @@
             string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName;
             AddModuleMessage(message, MessageType.Error);
         }
+        
         await logger.LogCritical("Error Loading Module {Module}", module);
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor
index 65935a72..a01b9b1c 100644
--- a/Oqtane.Client/Modules/Admin/Files/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Add.razor
@@ -4,77 +4,59 @@
 @inject IFileService FileService
 @inject IFolderService FolderService
 
-@if (_folders != null)
-{
-    <div class="container-fluid">
-        <div class="form-group">
-
-            <ul class="nav nav-tabs" role="tablist">
-                <li class="nav-item">
-                    <a class="nav-link active" data-toggle="tab" href="#Upload" role="tab">
-                        Upload Files
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#Download" role="tab">
-                        Download Files
-                    </a>
-                </li>
-            </ul>
-
-            <div class="tab-content">
-                <div id="Upload" class="tab-pane fade show active" role="tabpanel">
-                    <table class="table table-borderless">
-                        <tr>
-                            <td>
-                                <label  class="control-label">Upload: </label>
-                            </td>
-                            <td>
-                                <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId.ToString()" />
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-                <div id="Download" class="tab-pane fade" role="tabpanel">
-                    <table class="table table-borderless">
-                        <tr>
-                            <td>
-                                <label  class="control-label">Url: </label>
-                            </td>
-                            <td>
-                                <input class="form-control" @bind="@url" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <label  class="control-label">Folder: </label>
-                            </td>
-                            <td>
-                                <select class="form-control" @bind="@_folderId">
-                                    <option value="-1">&lt;Select Folder&gt;</option>
-                                    @foreach (Folder folder in _folders)
-                                    {
-                                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                                    }
-                                </select>
-                            </td>
-                        </tr>
-                    </table>
-                    <button type="button" class="btn btn-primary" @onclick="Download">Download</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <br />
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-}
+<TabStrip>
+    <TabPanel Name="Upload" Heading="Upload Files">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label For="upload" HelpText="Upload the file you want">Upload: </Label>
+                </td>
+                <td>
+                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId.ToString()" />
+                </td>
+            </tr>
+        </table>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    </TabPanel>
+    <TabPanel Name="Download" Heading="Download Files">
+        @if (_folders != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <Label For="url" HelpText="Enter the url of the file you wish to download">Url: </Label>
+                    </td>
+                    <td>
+                        <input id="url" class="form-control" @bind="@url" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="folder" HelpText="Select the folder to save the file in">Folder: </Label>
+                    </td>
+                    <td>
+                        <select id="folder" class="form-control" @bind="@_folderId">
+                            <option value="-1">&lt;Select Folder&gt;</option>
+                            @foreach (Folder folder in _folders)
+                            {
+                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                            }
+                        </select>
+                    </td>
+                </tr>
+            </table>
+            <button type="button" class="btn btn-success" @onclick="Download">Download</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+        }
+    </TabPanel>
+</TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private string url = string.Empty;
+    private List<Folder> _folders;
+    private int _folderId = -1;
 
-    string url = "";
-    List<Folder> _folders;
-    int _folderId = -1;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
@@ -90,7 +72,7 @@
     {
         try
         {
-            if (url != "" && _folderId != -1)
+            if (url != string.Empty && _folderId != -1)
             {
                 await FileService.UploadFileAsync(url, _folderId);
                 await logger.LogInformation("File Downloaded Successfully From Url {Url}", url);
diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index bbe37f9b..0083cce0 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -8,10 +8,10 @@
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Parent: </label>
+                <Label For="parent" HelpText="Select the parent folder">Parent: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@_parentId">
+                <select id="parent" class="form-control" @bind="@_parentId">
                     @if (PageState.QueryString.ContainsKey("id"))
                     {
                         <option value="-1">&lt;No Parent&gt;</option>
@@ -25,18 +25,16 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Name: </label>
+                <Label for="name" HelpText="Enter the file name">Name: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_name" />
+                <input id="name" class="form-control" @bind="@_name" />
             </td>
         </tr>
         <tr>
-            <td>
-                <label  class="control-label">Permissions: </label>
-            </td>
-            <td>
-                <PermissionGrid EntityName="Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
+            <td colspan="2" align="center">
+                <Label For="permissions" HelpText="Select the permissions you want for the folder">Permissions: </Label>
+                <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
             </td>
         </tr>
     </table>
@@ -58,24 +56,25 @@
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-    public override string Title { get { return "Folder Management"; } }
-
-    List<Folder> _folders;
-    int _folderId = -1;
-    string _name;
-    int _parentId = -1;
-    bool _isSystem;
-    string _permissions = "";
-    string _createdBy;
-    DateTime _createdOn;
-    string _modifiedBy;
-    DateTime _modifiedOn;
+    private List<Folder> _folders;
+    private int _folderId = -1;
+    private string _name;
+    private int _parentId = -1;
+    private bool _isSystem;
+    private string _permissions = string.Empty;
+    private string _createdBy;
+    private DateTime _createdOn;
+    private string _modifiedBy;
+    private DateTime _modifiedOn;
 
 #pragma warning disable 649
-    PermissionGrid _permissionGrid;
+    private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    public override string Title => "Folder Management";
+
     protected override async Task OnInitializedAsync()
     {
         try
@@ -101,11 +100,7 @@
             else
             {
                 _parentId = _folders[0].FolderId;
-                List<PermissionString> permissionstrings = new List<PermissionString>();
-                permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Browse, Permissions = Constants.AdminRole });
-                permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = Constants.AdminRole });
-                permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole });
-                _permissions = UserSecurity.SetPermissionStrings(permissionstrings);
+                _permissions = string.Empty;
             }
         }
         catch (Exception ex)
@@ -119,7 +114,7 @@
     {
         try
         {
-            if (_name != "" && _parentId != -1)
+            if (_name != string.Empty && _parentId != -1)
             {
                 Folder folder;
                 if (_folderId != -1)
@@ -132,6 +127,7 @@
                 }
 
                 folder.SiteId = PageState.Site.SiteId;
+
                 if (_parentId == -1)
                 {
                     folder.ParentId = null;
@@ -140,6 +136,7 @@
                 {
                     folder.ParentId = _parentId;
                 }
+
                 folder.Name = _name;
                 folder.IsSystem = _isSystem;
                 folder.Permissions = _permissionGrid.GetPermissions();
@@ -152,6 +149,7 @@
                 {
                     folder = await FolderService.AddFolderAsync(folder);
                 }
+
                 await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
                 await logger.LogInformation("Folder Saved {Folder}", folder);
                 NavigationManager.NavigateTo(NavigateUrl());
diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index 6dd27603..d92e0994 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -49,24 +49,23 @@
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<Folder> _folders;
+    private int _folderId = -1;
+    private List<File> _files;
 
-    List<Folder> _folders;
-    int _folderId = -1;
-    List<File> _files;
-    Uri _uri;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
     {
         try
         {
             _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
+            
             if (_folderId == -1 && _folders.Count > 0)
             {
                 _folderId = _folders[0].FolderId;
                 await GetFiles();
             }
-            _uri = new Uri(NavigationManager.Uri);
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
index a333d0d5..65361e41 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
@@ -3,99 +3,100 @@
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label class="control-label">Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Type: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_jobType" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Enabled? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@_isEnabled">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Runs Every: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_interval" />
-                <select class="form-control" @bind="@_frequency">
-                    <option value="m">Minute(s)</option>
-                    <option value="H">Hour(s)</option>
-                    <option value="d">Day(s)</option>
-                    <option value="M">Month(s)</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Starting: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_startDate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Ending: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_endDate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label class="control-label">Retention Log (Items): </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_retentionHistory" />
-            </td>
-        </tr>
-    </table>
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="name" HelpText="Enter the job name">Name: </Label>
+        </td>
+        <td>
+            <input id="name" class="form-control" @bind="@_name" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="type" HelpText="Enter the job type">Type: </Label>
+        </td>
+        <td>
+            <input id="type" class="form-control" @bind="@_jobType" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+        </td>
+        <td>
+            <select id="enabled" class="form-control" @bind="@_isEnabled">
+                <option value="True">Yes</option>
+                <option value="False">No</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+        </td>
+        <td>
+            <input id="runs-every" class="form-control" @bind="@_interval" />
+            <select id="runs-every" class="form-control" @bind="@_frequency">
+                <option value="m">Minute(s)</option>
+                <option value="H">Hour(s)</option>
+                <option value="d">Day(s)</option>
+                <option value="M">Month(s)</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+        </td>
+        <td>
+            <input id="starting" class="form-control" @bind="@_startDate" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+        </td>
+        <td>
+            <input id="ending" class="form-control" @bind="@_endDate" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
+        </td>
+        <td>
+            <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
+        </td>
+    </tr>
+</table>
 <button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private string _name = string.Empty;
+    private string _jobType = string.Empty;
+    private string _isEnabled = "True";
+    private string _interval = string.Empty;
+    private string _frequency = string.Empty;
+    private string _startDate = string.Empty;
+    private string _endDate = string.Empty;
+    private string _retentionHistory = "10";
 
-    string _name = "";
-    string _jobType = "";
-    string _isEnabled = "True";
-    string _interval = "";
-    string _frequency = "";
-    string _startDate = "";
-    string _endDate = "";
-    string _retentionHistory = "10";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     private async Task SaveJob()
     {
-        if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "")
+        if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty)
         {
-            Job job = new Job();
+            var job = new Job();
             job.Name = _name;
             job.JobType = _jobType;
             job.IsEnabled = Boolean.Parse(_isEnabled);
             job.Frequency = _frequency;
             job.Interval = int.Parse(_interval);
-            if (_startDate == "")
+
+            if (_startDate == string.Empty)
             {
                 job.StartDate = null;
             }
@@ -103,7 +104,8 @@
             {
                 job.StartDate = DateTime.Parse(_startDate);
             }
-            if (_endDate == "")
+
+            if (_endDate == string.Empty)
             {
                 job.EndDate = null;
             }
@@ -111,6 +113,7 @@
             {
                 job.EndDate = DateTime.Parse(_endDate);
             }
+
             job.RetentionHistory = int.Parse(_retentionHistory);
             job.IsStarted = false;
             job.IsExecuting = false;
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 205dda81..ae1f3d9b 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -3,88 +3,88 @@
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Type: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_jobType" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Enabled? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@_isEnabled">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Runs Every: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_interval" />
-                <select class="form-control" @bind="@_frequency">
-                    <option value="m">Minute(s)</option>
-                    <option value="H">Hour(s)</option>
-                    <option value="d">Day(s)</option>
-                    <option value="M">Month(s)</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Starting: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_startDate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Ending: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_endDate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Retention Log (Items): </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_retentionHistory" />
-            </td>
-        </tr>
-    </table>
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="name" HelpText="Enter the job name">Name: </Label>
+        </td>
+        <td>
+            <input id="name" class="form-control" @bind="@_name" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="type" HelpText="Enter the job type">Type: </Label>
+        </td>
+        <td>
+            <input id="type" class="form-control" @bind="@_jobType" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+        </td>
+        <td>
+            <select id="enabled" class="form-control" @bind="@_isEnabled">
+                <option value="True">Yes</option>
+                <option value="False">No</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+        </td>
+        <td>
+            <input id="runs-every" class="form-control" @bind="@_interval" />
+            <select id="runs-every" class="form-control" @bind="@_frequency">
+                <option value="m">Minute(s)</option>
+                <option value="H">Hour(s)</option>
+                <option value="d">Day(s)</option>
+                <option value="M">Month(s)</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+        </td>
+        <td>
+            <input id="starting" class="form-control" @bind="@_startDate" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+        </td>
+        <td>
+            <input id="ending" class="form-control" @bind="@_endDate" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
+        </td>
+        <td>
+            <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
+        </td>
+    </tr>
+</table>
 <button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private int _jobId;
+    private string _name = string.Empty;
+    private string _jobType = string.Empty;
+    private string _isEnabled = "True";
+    private string _interval = string.Empty;
+    private string _frequency = string.Empty;
+    private string _startDate = string.Empty;
+    private string _endDate = string.Empty;
+    private string _retentionHistory = string.Empty;
 
-    int _jobId;
-    string _name = "";
-    string _jobType = "";
-    string _isEnabled = "True";
-    string _interval = "";
-    string _frequency = "";
-    string _startDate = "";
-    string _endDate = "";
-    string _retentionHistory = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
@@ -99,8 +99,8 @@
                 _isEnabled = job.IsEnabled.ToString();
                 _interval = job.Interval.ToString();
                 _frequency = job.Frequency;
-                _startDate = (job.StartDate != null) ? job.StartDate.ToString() : "";
-                _endDate = (job.EndDate != null) ? job.EndDate.ToString() : "";
+                _startDate = (job.StartDate != null) ? job.StartDate.ToString() : string.Empty;
+                _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
                 _retentionHistory = job.RetentionHistory.ToString();
             }
         }
@@ -113,15 +113,16 @@
 
     private async Task SaveJob()
     {
-        if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "")
+        if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty)
         {
-            Job job = await JobService.GetJobAsync(_jobId);
+            var job = await JobService.GetJobAsync(_jobId);
             job.Name = _name;
             job.JobType = _jobType;
             job.IsEnabled = Boolean.Parse(_isEnabled);
             job.Frequency = _frequency;
             job.Interval = int.Parse(_interval);
-            if (_startDate == "")
+
+            if (_startDate == string.Empty)
             {
                 job.StartDate = null;
             }
@@ -129,7 +130,8 @@
             {
                 job.StartDate = DateTime.Parse(_startDate);
             }
-            if (_endDate == "")
+
+            if (_endDate == string.Empty)
             {
                 job.EndDate = null;
             }
@@ -137,6 +139,7 @@
             {
                 job.EndDate = DateTime.Parse(_endDate);
             }
+
             job.RetentionHistory = int.Parse(_retentionHistory);
 
             try
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 602708c9..f15c50df 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -47,10 +47,10 @@ else
 }
 
 @code {
+    private List<Job> _jobs;
+    
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    List<Job> _jobs;
-
     protected override async Task OnParametersSetAsync()
     {
         _jobs = await JobService.GetJobsAsync();
@@ -58,7 +58,7 @@ else
 
     private string DisplayStatus(bool isEnabled, bool isExecuting)
     {
-        string status = "";
+        var status = string.Empty;
         if (!isEnabled)
         {
             status = "Disabled";
@@ -81,7 +81,7 @@ else
 
     private string DisplayFrequency(int interval, string frequency)
     {
-        string result = "Every " + interval.ToString() + " ";
+        var  result = "Every " + interval.ToString() + " ";
         switch (frequency)
         {
             case "m":
@@ -97,10 +97,12 @@ else
                 result += "Month";
                 break;
         }
+        
         if (interval > 1)
         {
             result += "s";
         }
+        
         return result;
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
index af0d5d5e..9efc1486 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
@@ -28,23 +28,25 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
-
-    List<JobLog> _jobLogs;
+    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();
     }
 
     private string DisplayStatus(bool isExecuting, bool? succeeded)
     {
-        string status = "";
+        var status = string.Empty;
         if (isExecuting)
         {
             status = "Executing";
@@ -60,6 +62,7 @@ else
                 status = "Failed";
             }
         }
+        
         return status;
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 5310049d..106ee57f 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -5,7 +5,7 @@
 @inject IUserService UserService
 @inject IServiceProvider ServiceProvider
 
-@if (_message != "")
+@if (_message != string.Empty)
 {
     <ModuleMessage Message="@_message" Type="@_type" />
 }
@@ -14,7 +14,7 @@
         <text>...</text>
     </Authorizing>
     <Authorized>
-        You are already logged in
+        <ModuleMessage Message="You Are Already Logged In" Type="MessageType.Info" />
     </Authorized>
     <NotAuthorized>
         <div class="container">
@@ -41,14 +41,14 @@
 </AuthorizeView>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
+    private string _returnUrl = string.Empty;
+    private string _message = string.Empty;
+    private MessageType _type = MessageType.Info;
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private bool _remember = false;
 
-    string _returnUrl = "";
-    string _message = "";
-    MessageType _type = MessageType.Info;
-    string _username = "";
-    string _password = "";
-    bool _remember = false;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     protected override async Task OnInitializedAsync()
     {
@@ -56,13 +56,15 @@
         {
             _returnUrl = PageState.QueryString["returnurl"];
         }
+        
         if (PageState.QueryString.ContainsKey("name"))
         {
             _username = PageState.QueryString["name"];
         }
+        
         if (PageState.QueryString.ContainsKey("token"))
         {
-            User user = new User();
+            var user = new User();
             user.SiteId = PageState.Site.SiteId;
             user.Username = _username;
             user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
@@ -81,15 +83,15 @@
 
     private async Task Login()
     {
-        var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-        if (authstateprovider == null)
+        if (PageState.Runtime == Runtime.Server)
         {
             // server-side Blazor
-            User user = new User();
+            var user = new User();
             user.SiteId = PageState.Site.SiteId;
             user.Username = _username;
             user.Password = _password;
             user = await UserService.LoginUserAsync(user, false, false);
+            
             if (user.IsAuthenticated)
             {
                 await logger.LogInformation("Login Successful For Username {Username}", _username);
@@ -97,7 +99,7 @@
                 var interop = new Interop(JsRuntime);
                 string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
                 var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
-                await interop.SubmitForm("/pages/login/", fields);
+                await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/login/", fields);
             }
             else
             {
@@ -108,7 +110,7 @@
         else
         {
             // client-side Blazor
-            User user = new User();
+            var user = new User();
             user.SiteId = PageState.Site.SiteId;
             user.Username = _username;
             user.Password = _password;
@@ -116,6 +118,7 @@
             if (user.IsAuthenticated)
             {
                 await logger.LogInformation("Login Successful For Username {Username}", _username);
+                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
                 authstateprovider.NotifyAuthenticationChanged();
                 NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload"));
             }
@@ -134,9 +137,9 @@
 
     private async Task Forgot()
     {
-        if (_username != "")
+        if (_username != string.Empty)
         {
-            User user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+            var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
             if (user != null)
             {
                 await UserService.ForgotPasswordAsync(user);
@@ -152,6 +155,7 @@
         {
             _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
         }
+        
         StateHasChanged();
     }
-    }
+}
diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 0fd6333a..1baac265 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -10,156 +10,156 @@
     <table class="table table-borderless">
         <tr>
             <td>
-                <label class="control-label">Date/Time: </label>
+                <Label For="dateTime" HelpText="The date and time of this log">Date/Time: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_logDate" disabled />
+                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Level: </label>
+                <Label For="level" HelpText="The level of this log">Level: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_level" disabled />
+                <input id="level" class="form-control" @bind="@_level" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Feature: </label>
+                <Label For="feature" HelpText="The feature that was affected">Feature: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_feature" disabled />
+                <input id="feature" class="form-control" @bind="@_feature" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Function: </label>
+                <Label For="function" HelpText="The function that was performed">Function: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_function" disabled />
+                <input id="function" class="form-control" @bind="@_function" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Category: </label>
+                <Label For="category" HelpText="The categories that were affected">Category: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_category" disabled />
+                <input id="category" class="form-control" @bind="@_category" readonly />
             </td>
         </tr>
-        @if (_pageName != "")
+        @if (_pageName != string.Empty)
         {
             <tr>
                 <td>
-                    <label class="control-label">Page: </label>
+                    <Label For="page" HelpText="The page that was affected">Page: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@_pageName" disabled />
+                    <input id="page" class="form-control" @bind="@_pageName" readonly />
                 </td>
             </tr>
         }
-        @if (_moduleTitle != "")
+        @if (_moduleTitle != string.Empty)
         {
             <tr>
                 <td>
-                    <label class="control-label">Module: </label>
+                    <Label For="module" HelpText="The module that was affected">Module: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@_moduleTitle" disabled />
+                    <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
                 </td>
             </tr>
         }
-        @if (_username != "")
+        @if (_username != string.Empty)
         {
             <tr>
                 <td>
-                    <label class="control-label">User: </label>
+                    <Label For="user" HelpText="The user that caused this log">User: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@_username" disabled />
+                    <input id="user" class="form-control" @bind="@_username" readonly />
                 </td>
             </tr>
         }
         <tr>
             <td>
-                <label class="control-label">Url: </label>
+                <Label For="url" HelpText="The url the log comes from">Url: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_url" disabled />
+                <input id="url" class="form-control" @bind="@_url" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Template: </label>
+                <Label For="template" HelpText="What the log is about">Template: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_template" disabled />
+                <input id="template" class="form-control" @bind="@_template" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Message: </label>
+                <Label For="message" HelpText="The message that the system generated"class="control-label">Message: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@_message" rows="5" disabled></textarea>
+                <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
             </td>
         </tr>
         @if (!string.IsNullOrEmpty(_exception))
         {
             <tr>
                 <td>
-                    <label class="control-label">Exception: </label>
+                    <Label For="exception" HelpText="The exceptions generated by the system">Exception: </Label>
                 </td>
                 <td>
-                    <textarea class="form-control" @bind="@_exception" rows="5" disabled></textarea>
+                    <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
                 </td>
             </tr>
         }
         <tr>
             <td>
-                <label class="control-label">Properties: </label>
+                <Label For="properties" HelpText="The properties that were affected">Properties: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@_properties" rows="5" disabled></textarea>
+                <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
             </td>
         </tr>
         <tr>
             <td>
-                <label class="control-label">Server: </label>
+                <Label For="server" HelpText="The server that was affected">Server: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_server" disabled />
+                <input id="server" class="form-control" @bind="@_server" readonly />
             </td>
         </tr>
     </table>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int _logId;
+    private string _logDate = string.Empty;
+    private string _level = string.Empty;
+    private string _feature = string.Empty;
+    private string _function = string.Empty;
+    private string _category = string.Empty;
+    private string _pageName = string.Empty;
+    private string _moduleTitle = string.Empty;
+    private string _username = string.Empty;
+    private string _url = string.Empty;
+    private string _template = string.Empty;
+    private string _message = string.Empty;
+    private string _exception = string.Empty;
+    private string _properties = string.Empty;
+    private string _server = string.Empty;
 
-    int _logId;
-    string _logDate = "";
-    string _level = "";
-    string _feature = "";
-    string _function = "";
-    string _category = "";
-    string _pageName = "";
-    string _moduleTitle = "";
-    string _username = "";
-    string _url = "";
-    string _template = "";
-    string _message = "";
-    string _exception = "";
-    string _properties = "";
-    string _server = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
             _logId = Int32.Parse(PageState.QueryString["id"]);
-            Log log = await LogService.GetLogAsync(_logId);
+            var log = await LogService.GetLogAsync(_logId);
             if (log != null)
             {
                 _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
@@ -167,30 +167,34 @@
                 _feature = log.Feature;
                 _function = log.Function;
                 _category = log.Category;
+                
                 if (log.PageId != null)
                 {
-                    Page page = await PageService.GetPageAsync(log.PageId.Value);
+                    var page = await PageService.GetPageAsync(log.PageId.Value);
                     if (page != null)
                     {
                         _pageName = page.Name;
                     }
                 }
+                
                 if (log.PageId != null && log.ModuleId != null)
                 {
-                    PageModule pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
+                    var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
                     if (pagemodule != null)
                     {
                         _moduleTitle = pagemodule.Title;
                     }
                 }
+                
                 if (log.UserId != null)
                 {
-                    User user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
+                    var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
                     if (user != null)
                     {
                         _username = user.Username;
                     }
                 }
+                
                 _url = log.Url;
                 _template = log.MessageTemplate;
                 _message = log.Message;
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 77fd5d4c..730c6d13 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -71,12 +71,12 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private string _level = "-";
+    private string _function = "-";
+    private string _rows = "10";
+    private List<Log> _logs;
 
-    string _level = "-";
-    string _function = "-";
-    string _rows = "10";
-    List<Log> _logs;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
@@ -139,12 +139,12 @@ else
 
     private async Task GetLogs()
     {
-        _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? "" : _level), ((_function == "-") ? "" : _function), int.Parse(_rows));
+        _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows));
     }
 
     private string GetClass(string function)
     {
-        string classname = "";
+        string classname = string.Empty;
         switch (function)
         {
             case "Create":
@@ -163,7 +163,7 @@ else
                 classname = "table-secondary";
                 break;
             default:
-                classname = "";
+                classname = string.Empty;
                 break;
         }
         return classname;
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
new file mode 100644
index 00000000..8b4cb758
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -0,0 +1,80 @@
+@namespace Oqtane.Modules.Admin.ModuleCreator
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IModuleDefinitionService ModuleDefinitionService
+@inject IModuleService ModuleService
+
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.">Owner Name: </Label>
+            </td>
+            <td>
+                <input id="owner" class="form-control" @bind="@_owner" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="module" HelpText="Enter a name for this module. It should be in singular form (ie. Car) and not contain spaces or punctuation.">Module Name: </Label>
+            </td>
+            <td>
+                <input id="module" class="form-control" @bind="@_module" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="description" HelpText="Enter s short description for the module">Description: </Label>
+            </td>
+            <td>
+                <textarea id="description" class="form-control" @bind="@_description" rows="3"></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="template" HelpText="Select a module template. Internal modules are created inside of the Oqtane solution. External modules are created outside of the Oqtane solution.">Template: </Label>
+            </td>
+            <td>
+                <select id="template" class="form-control" @bind="@_template">
+                    <option value="">&lt;Select Template&gt;</option>
+                    <option value="internal">Internal</option>
+                    <option value="external">External</option>
+                </select>
+            </td>
+        </tr>
+    </table>
+
+<button type="button" class="btn btn-success" @onclick="CreateModule">Create Module</button>
+
+@code {    
+    private string _owner = string.Empty;
+    private string _module = string.Empty;
+    private string _description = string.Empty;
+    private string _template = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override void OnInitialized()
+    {
+        AddModuleMessage("Please Note That Once You Select The Create Module Button The Application Must Restart In Order To Complete The Process. If You Create An External Module You Will Need To Compile The Source Code In Order To Make It Functional.", MessageType.Info);
+    }
+
+    private async Task CreateModule()
+    {
+        try
+        {
+            if (!string.IsNullOrEmpty(_owner) && !string.IsNullOrEmpty(_module) && !string.IsNullOrEmpty(_template))
+            {
+                var moduleDefinition = new ModuleDefinition { Owner = _owner.Replace(" ",""), Name = _module.Replace(" ", ""), Description = _description, Template = _template };
+                await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId);
+            }
+            else
+            {
+                AddModuleMessage("You Must Provide An Owner, Module Name, And Template", MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Creating Module");
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs
new file mode 100644
index 00000000..81b82a6d
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs
@@ -0,0 +1,15 @@
+using Oqtane.Models;
+
+namespace Oqtane.Modules.Admin.ModuleCreator
+{
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Module Creator",
+            Description = "Enables software developers to quickly create modules by automating many of the initial module creation tasks",
+            Version = "1.0.0",
+            Categories = "Developer"
+        };
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Edit.razor
new file mode 100644
index 00000000..84e83aae
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Edit.razor
@@ -0,0 +1,95 @@
+@using Oqtane.Modules.Controls
+@using [Owner].[Module]s.Services
+@using [Owner].[Module]s.Models
+
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject HttpClient http
+@inject SiteState sitestate
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <label class="control-label">Name: </label>
+        </td>
+        <td>
+            <input id="_name" class="form-control" @bind="@_name" />
+        </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 />
+@if (PageState.Action == "Edit")
+{
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+}
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Actions => "Add,Edit";
+
+    I[Module]Service [Module]Service;
+    int _id;
+    string _name;
+    string _createdby;
+    DateTime _createdon;
+    string _modifiedby;
+    DateTime _modifiedon;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            [Module]Service = new [Module]Service(http, sitestate);
+            if (PageState.Action == "Edit")
+            {
+                _id = Int32.Parse(PageState.QueryString["id"]);
+                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
+                if ([Module] != null)
+                {
+                    _name = [Module].Name;
+                    _createdby = [Module].CreatedBy;
+                    _createdon = [Module].CreatedOn;
+                    _modifiedby = [Module].ModifiedBy;
+                    _modifiedon = [Module].ModifiedOn;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
+            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+        }
+    }
+
+    private async Task Save()
+    {
+        try
+        {
+            if (PageState.Action == "Add")
+            {
+                [Module] [Module] = new [Module]();
+                [Module].ModuleId = ModuleState.ModuleId;
+                [Module].Name = _name;
+                [Module] = await [Module]Service.Add[Module]Async([Module]);
+                await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+            }
+            else
+            {
+                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
+                [Module].Name = _name;
+                await [Module]Service.Update[Module]Async([Module]);
+                await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+            }
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
+            AddModuleMessage("Error Saving [Module]", MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor
new file mode 100644
index 00000000..78e7c079
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor
@@ -0,0 +1,106 @@
+@using [Owner].[Module]s.Services
+@using [Owner].[Module]s.Models
+
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject HttpClient http
+@inject SiteState sitestate
+
+@if (_[Module]s == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" />
+    <br />
+    <br />
+    @if (@_[Module]s.Count != 0)
+    {
+        <Pager Items="@_[Module]s" Format="Grid">
+            <Header>
+                <div class="col"><strong>[Module]s</strong></div>
+            </Header>
+            <Row>
+                <div class="col">
+                    <ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" />
+                    <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))" />
+                    @context.Name
+                </div>
+            </Row>
+        </Pager>
+    }
+    else
+    {
+        <p>No [Module]s To Display</p>
+    }
+}
+
+<!-- The content below is for informational purposes only and can be safely removed -->
+
+<hr />
+[Module] Module Created Successfully. Use Edit Mode To Add A [Module]. You Can Access The Files At The Following Locations:<br /><br />
+[RootPath]Client\<br />
+- [Owner].[Module]s.Module.Client.csproj - client project<br />
+- _Imports.razor - global imports for module components<br />
+- Edit.razor - component for adding or editing content<br />
+- Index.razor - main component for your module **the content you are reading is in this file**<br />
+- ModuleInfo.cs - implements IModule interface to provide configuration settings for your module<br />
+- Settings.razor - component for managing module settings<br />
+- Services\I[Module]Service.cs - interface for defining service API methods<br />
+- Services\[Module]Service.cs - implements service API interface methods<br /><br />
+[RootPath]Package\<br />
+- [Owner].[Module]s.Module.nuspec - nuget manifest for packaging module<br />
+- [Owner].[Module]s.Module.Package.csproj - packaging project<br />
+- debug.cmd - copies assemblies to Oqtane bin folder when in Debug mode<br />
+- release.cmd - creates nuget package and deploys to Oqtane wwwroot/modules folder when in Release mode<br /><br />
+[RootPath]Server\<br />
+- [Owner].[Module]s.Module.Server.csproj - server project<br />
+- Controllers\[Module]Controller.cs - API methods implemented using a REST pattern<br />
+- Manager\[Module]Manager.cs - implements optional module interfaces for features such as import/export of content<br />
+- Repository\I[Module]Repository.cs - interface for defining repository methods<br />
+- Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
+- Repository\[Module]Context.cs - provides a DB Context for data access<br />
+- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
+[RootPath]Shared\<br />
+- [Owner].[Module]s.Module.Shared.csproj - shared project<br />
+- Models\[Module].cs - model definition<br /><br />
+
+<!-- The content above is for informational purposes only and can be safely removed -->
+
+@code {
+    I[Module]Service [Module]Service;
+    List<[Module]> _[Module]s;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            [Module]Service = new [Module]Service(http, sitestate);
+            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
+            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+        }
+    }
+
+    private async Task Delete([Module] [Module])
+    {
+        try
+        {
+            await [Module]Service.Delete[Module]Async([Module].[Module]Id);
+            await logger.LogInformation("[Module] Deleted {[Module]}", [Module]);
+            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
+            AddModuleMessage("Error Deleting [Module]", MessageType.Error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/ModuleInfo.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/ModuleInfo.cs
new file mode 100644
index 00000000..a95a461e
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/ModuleInfo.cs
@@ -0,0 +1,18 @@
+using Oqtane.Models;
+using Oqtane.Modules;
+
+namespace [Owner].[Module]s.Modules
+{
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "[Module]",
+            Description = "[Module]",
+            Version = "1.0.0",
+            Dependencies = "[Owner].[Module]s.Module.Shared",
+            ServerManagerType = "[ServerManagerType]",
+            ReleaseVersions = "1.0.0"
+        };
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/I[Module]Service.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/I[Module]Service.cs
new file mode 100644
index 00000000..e98da06d
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/I[Module]Service.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Services
+{
+    public interface I[Module]Service 
+    {
+        Task<List<[Module]>> Get[Module]sAsync(int ModuleId);
+
+        Task<[Module]> Get[Module]Async(int [Module]Id);
+
+        Task<[Module]> Add[Module]Async([Module] [Module]);
+
+        Task<[Module]> Update[Module]Async([Module] [Module]);
+
+        Task Delete[Module]Async(int [Module]Id);
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/[Module]Service.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/[Module]Service.cs
new file mode 100644
index 00000000..f95c41b9
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/[Module]Service.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Oqtane.Modules;
+using Oqtane.Services;
+using Oqtane.Shared;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Services
+{
+    public class [Module]Service : ServiceBase, I[Module]Service, IService
+    {
+        private readonly SiteState _siteState;
+
+        public [Module]Service(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+         private string Apiurl=> CreateApiUrl(_siteState.Alias, "[Module]");
+
+        public async Task<List<[Module]>> Get[Module]sAsync(int ModuleId)
+        {
+            List<[Module]> [Module]s = await GetJsonAsync<List<[Module]>>($"{Apiurl}?moduleid={ModuleId}");
+            return [Module]s.OrderBy(item => item.Name).ToList();
+        }
+
+        public async Task<[Module]> Get[Module]Async(int [Module]Id)
+        {
+            return await GetJsonAsync<[Module]>($"{Apiurl}/{[Module]Id}");
+        }
+
+        public async Task<[Module]> Add[Module]Async([Module] [Module])
+        {
+            return await PostJsonAsync<[Module]>($"{Apiurl}?entityid={[Module].ModuleId}", [Module]);
+        }
+
+        public async Task<[Module]> Update[Module]Async([Module] [Module])
+        {
+            return await PutJsonAsync<[Module]>($"{Apiurl}/{[Module].[Module]Id}?entityid={[Module].ModuleId}", [Module]);
+        }
+
+        public async Task Delete[Module]Async(int [Module]Id)
+        {
+            await DeleteAsync($"{Apiurl}/{[Module]Id}");
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Settings.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Settings.razor
new file mode 100644
index 00000000..a53dc57c
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Settings.razor
@@ -0,0 +1,47 @@
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject ISettingService SettingService
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <label for="Setting" class="control-label">Setting: </label>
+        </td>
+        <td>
+            <input type="text" class="form-control" @bind="_value" />
+        </td>
+    </tr>
+</table>
+
+@code {
+    public override string Title => "[Module] Settings";
+
+    string _value;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            _value = SettingService.GetSetting(settings, "SettingName", "");
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            SettingService.SetSetting(settings, "SettingName", _value);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/[Owner].[Module]s.Module.Client.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/[Owner].[Module]s.Module.Client.csproj
new file mode 100644
index 00000000..cc286603
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/[Owner].[Module]s.Module.Client.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <Version>1.0.0</Version>
+    <Authors>[Owner]</Authors>
+    <Company>[Owner]</Company>
+    <Description>[Description]</Description>
+    <Product>[Owner].[Module]s.Module</Product>
+    <Copyright>[Owner]</Copyright>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\[Owner].[Module]s.Module.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Oqtane.Client">
+      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Oqtane.Shared">
+      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- there may be other elements here -->
+    <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/_Imports.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/_Imports.razor
new file mode 100644
index 00000000..147a5eee
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/_Imports.razor
@@ -0,0 +1,18 @@
+@using System
+@using System.Linq
+@using System.Collections.Generic
+@using System.Net.Http
+
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.JSInterop
+
+@using Oqtane.Models
+@using Oqtane.Modules
+@using Oqtane.Modules.Controls
+@using Oqtane.Providers
+@using Oqtane.Security
+@using Oqtane.Services
+@using Oqtane.Shared
+@using Oqtane.Themes
+@using Oqtane.Themes.Controls
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.Package.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.Package.csproj
new file mode 100644
index 00000000..0689d66f
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.Package.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Client\[Owner].[Module]s.Module.Client.csproj" />
+    <ProjectReference Include="..\Server\[Owner].[Module]s.Module.Server.csproj" />
+    <ProjectReference Include="..\Shared\[Owner].[Module]s.Module.Shared.csproj" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="IF $(ConfigurationName) == Debug (debug.cmd)" />
+    <Exec Command="IF $(ConfigurationName) == Release (release.cmd)" />
+  </Target>
+
+</Project>
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.nuspec b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.nuspec
new file mode 100644
index 00000000..607f2ff3
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.Module.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>[Owner].[Module]s.Module</id>
+    <version>1.0.0</version>
+    <authors>[Owner]</authors>
+    <owners>[Owner]</owners>
+    <title>[Module]s</title>
+    <description>[Module]s</description>
+    <copyright>[Owner]</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
+    <iconUrl>https://www.oqtane.org/Portals/0/icon.jpg</iconUrl>
+    <tags>oqtane module</tags>
+    <releaseNotes></releaseNotes>
+    <summary></summary>
+    <dependencies>
+      <dependency id="Oqtane.Framework" version="[FrameworkVersion]" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Module.Client.dll" target="lib" /> 
+    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Module.Client.pdb" target="lib" /> 
+    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Module.Server.dll" target="lib" /> 
+    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Module.Server.pdb" target="lib" /> 
+    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Module.Shared.dll" target="lib" /> 
+    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Module.Shared.pdb" target="lib" /> 
+    <file src="..\wwwroot\**\*.*" target="wwwroot" /> 
+  </files>
+</package>
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/debug.cmd b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/debug.cmd
new file mode 100644
index 00000000..37f0dd87
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/debug.cmd
@@ -0,0 +1,6 @@
+XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module]s.Module.Client.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module]s.Module.Client.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module]s.Module.Server.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module]s.Module.Server.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module]s.Module.Shared.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module]s.Module.Shared.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/release.cmd b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/release.cmd
new file mode 100644
index 00000000..71f2c513
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/release.cmd
@@ -0,0 +1,2 @@
+"..\..\[RootFolder]\oqtane.package\nuget.exe" pack [Owner].[Module]s.Module.nuspec 
+XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\wwwroot\Modules\" /Y
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Controllers/[Module]Controller.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Controllers/[Module]Controller.cs
new file mode 100644
index 00000000..1ff6a0ab
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Controllers/[Module]Controller.cs
@@ -0,0 +1,75 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using System.Collections.Generic;
+using Oqtane.Shared;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using [Owner].[Module]s.Models;
+using [Owner].[Module]s.Repository;
+
+namespace [Owner].[Module]s.Controllers
+{
+    [Route("{site}/api/[controller]")]
+    public class [Module]Controller : Controller
+    {
+        private readonly I[Module]Repository _[Module]s;
+        private readonly ILogManager _logger;
+
+        public [Module]Controller(I[Module]Repository [Module]s, ILogManager logger)
+        {
+            _[Module]s = [Module]s;
+            _logger = logger;
+        }
+
+        // GET: api/<controller>?moduleid=x
+        [HttpGet]
+        [Authorize(Roles = Constants.RegisteredRole)]
+        public IEnumerable<[Module]> Get(string moduleid)
+        {
+            return _[Module]s.Get[Module]s(int.Parse(moduleid));
+        }
+
+        // GET api/<controller>/5
+        [HttpGet("{id}")]
+        [Authorize(Roles = Constants.RegisteredRole)]
+        public [Module] Get(int id)
+        {
+            return _[Module]s.Get[Module](id);
+        }
+
+        // POST api/<controller>
+        [HttpPost]
+        [Authorize(Roles = Constants.AdminRole)]
+        public [Module] Post([FromBody] [Module] [Module])
+        {
+            if (ModelState.IsValid)
+            {
+                [Module] = _[Module]s.Add[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
+            }
+            return [Module];
+        }
+
+        // PUT api/<controller>/5
+        [HttpPut("{id}")]
+        [Authorize(Roles = Constants.AdminRole)]
+        public [Module] Put(int id, [FromBody] [Module] [Module])
+        {
+            if (ModelState.IsValid)
+            {
+                [Module] = _[Module]s.Update[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
+            }
+            return [Module];
+        }
+
+        // DELETE api/<controller>/5
+        [HttpDelete("{id}")]
+        [Authorize(Roles = Constants.AdminRole)]
+        public void Delete(int id)
+        {
+            _[Module]s.Delete[Module](id);
+            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Manager/[Module]Manager.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Manager/[Module]Manager.cs
new file mode 100644
index 00000000..0b987600
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Manager/[Module]Manager.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using Oqtane.Modules;
+using Oqtane.Models;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+using [Owner].[Module]s.Models;
+using [Owner].[Module]s.Repository;
+
+namespace [Owner].[Module]s.Manager
+{
+    public class [Module]Manager : IInstallable, IPortable
+    {
+        private I[Module]Repository _[Module]s;
+        private ISqlRepository _sql;
+
+        public [Module]Manager(I[Module]Repository [Module]s, ISqlRepository sql)
+        {
+            _[Module]s = [Module]s;
+            _sql = sql;
+        }
+
+        public bool Install(Tenant tenant, string version)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]." + version + ".sql");
+        }
+
+        public bool Uninstall(Tenant tenant)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module].Uninstall.sql");
+        }
+
+        public string ExportModule(Module module)
+        {
+            string content = "";
+            List<[Module]> [Module]s = _[Module]s.Get[Module]s(module.ModuleId).ToList();
+            if ([Module]s != null)
+            {
+                content = JsonSerializer.Serialize([Module]s);
+            }
+            return content;
+        }
+
+        public void ImportModule(Module module, string content, string version)
+        {
+            List<[Module]> [Module]s = null;
+            if (!string.IsNullOrEmpty(content))
+            {
+                [Module]s = JsonSerializer.Deserialize<List<[Module]>>(content);
+            }
+            if ([Module]s != null)
+            {
+                foreach([Module] [Module] in [Module]s)
+                {
+                    [Module] _[Module] = new [Module]();
+                    _[Module].ModuleId = module.ModuleId;
+                    _[Module].Name = [Module].Name;
+                    _[Module]s.Add[Module](_[Module]);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/I[Module]Repository.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/I[Module]Repository.cs
new file mode 100644
index 00000000..f38a60d5
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/I[Module]Repository.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public interface I[Module]Repository
+    {
+        IEnumerable<[Module]> Get[Module]s(int ModuleId);
+        [Module] Get[Module](int [Module]Id);
+        [Module] Add[Module]([Module] [Module]);
+        [Module] Update[Module]([Module] [Module]);
+        void Delete[Module](int [Module]Id);
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Context.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Context.cs
new file mode 100644
index 00000000..2a14bbf4
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Context.cs
@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http;
+using Oqtane.Modules;
+using Oqtane.Repository;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public class [Module]Context : DBContextBase, IService
+    {
+        public virtual DbSet<[Module]> [Module] { get; set; }
+
+        public [Module]Context(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
+        {
+            // ContextBase handles multi-tenant database connections
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Repository.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Repository.cs
new file mode 100644
index 00000000..9b83b239
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Repository.cs
@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Modules;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public class [Module]Repository : I[Module]Repository, IService
+    {
+        private readonly [Module]Context _db;
+
+        public [Module]Repository([Module]Context context)
+        {
+            _db = context;
+        }
+
+        public IEnumerable<[Module]> Get[Module]s(int ModuleId)
+        {
+            return _db.[Module].Where(item => item.ModuleId == ModuleId);
+        }
+
+        public [Module] Get[Module](int [Module]Id)
+        {
+            return _db.[Module].Find([Module]Id);
+        }
+
+        public [Module] Add[Module]([Module] [Module])
+        {
+            _db.[Module].Add([Module]);
+            _db.SaveChanges();
+            return [Module];
+        }
+
+        public [Module] Update[Module]([Module] [Module])
+        {
+            _db.Entry([Module]).State = EntityState.Modified;
+            _db.SaveChanges();
+            return [Module];
+        }
+
+        public void Delete[Module](int [Module]Id)
+        {
+            [Module] [Module] = _db.[Module].Find([Module]Id);
+            _db.[Module].Remove([Module]);
+            _db.SaveChanges();
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql
new file mode 100644
index 00000000..7a1b99ea
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql
@@ -0,0 +1,26 @@
+/*  
+Create [Owner][Module] table
+*/
+
+CREATE TABLE [dbo].[[Owner][Module]](
+	[[Module]Id] [int] IDENTITY(1,1) NOT NULL,
+	[ModuleId] [int] NOT NULL,
+	[Name] [nvarchar](256) NOT NULL,
+	[CreatedBy] [nvarchar](256) NOT NULL,
+	[CreatedOn] [datetime] NOT NULL,
+	[ModifiedBy] [nvarchar](256) NOT NULL,
+	[ModifiedOn] [datetime] NOT NULL,
+  CONSTRAINT [PK_[Owner][Module]] PRIMARY KEY CLUSTERED 
+  (
+	[[Module]Id] ASC
+  )
+)
+GO
+
+/*  
+Create foreign key relationships
+*/
+ALTER TABLE [dbo].[[Owner][Module]]  WITH CHECK ADD  CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
+REFERENCES [dbo].Module ([ModuleId])
+ON DELETE CASCADE
+GO
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].Uninstall.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].Uninstall.sql
new file mode 100644
index 00000000..47baecc9
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].Uninstall.sql
@@ -0,0 +1,6 @@
+/*  
+Remove [Owner][Module] table
+*/
+
+DROP TABLE [dbo].[[Owner][Module]]
+GO
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj
new file mode 100644
index 00000000..96d4154f
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Module.Server.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <Version>1.0.0</Version>
+    <Product>[Owner].[Module]s.Module</Product>
+    <Authors>[Owner]</Authors>
+    <Company>[Owner]</Company>
+    <Description>[Description]</Description>
+    <Copyright>[Owner]</Copyright>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Scripts\[Owner].[Module].1.0.0.sql" />
+    <EmbeddedResource Include="Scripts\[Owner].[Module].Uninstall.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\[Owner].[Module]s.Module.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Oqtane.Server">
+      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Server.dll</HintPath>
+    </Reference>
+    <Reference Include="Oqtane.Shared">
+      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Shared.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/Models/[Module].cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/Models/[Module].cs
new file mode 100644
index 00000000..5a6d7896
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/Models/[Module].cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using Oqtane.Models;
+
+namespace [Owner].[Module]s.Models
+{
+    [Table("[Owner][Module]")]
+    public class [Module] : IAuditable
+    {
+        public int [Module]Id { get; set; }
+        public int ModuleId { get; set; }
+        public string Name { get; set; }
+
+        public string CreatedBy { get; set; }
+        public DateTime CreatedOn { get; set; }
+        public string ModifiedBy { get; set; }
+        public DateTime ModifiedOn { get; set; }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/[Owner].[Module]s.Module.Shared.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/[Owner].[Module]s.Module.Shared.csproj
new file mode 100644
index 00000000..2482b4fa
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/[Owner].[Module]s.Module.Shared.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>    
+    <LangVersion>7.3</LangVersion>
+    <Version>1.0.0</Version>
+    <Product>[Owner].[Module].Module</Product>
+    <Authors>[Owner]</Authors>
+    <Company>[Owner]</Company>
+    <Description>[Description]</Description>
+    <Copyright>[Owner]</Copyright>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Oqtane.Shared">
+      <HintPath>..\..\[RootFolder]\Oqtane.Shared\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/[Owner].[Module]s.Module.sln b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/[Owner].[Module]s.Module.sln
new file mode 100644
index 00000000..9879eac6
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/[Owner].[Module]s.Module.sln
@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28621.142
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module]s.Module.Client", "Client\[Owner].[Module]s.Module.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module]s.Module.Server", "Server\[Owner].[Module]s.Module.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module]s.Module.Shared", "Shared\[Owner].[Module]s.Module.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "[Owner].[Module]s.Module.Package", "Package\[Owner].[Module]s.Module.Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Wasm|Any CPU = Wasm|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Wasm|Any CPU.ActiveCfg = Release|Any CPU
+		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Wasm|Any CPU.Build.0 = Release|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Wasm|Any CPU.ActiveCfg = Release|Any CPU
+		{04B05448-788F-433D-92C0-FED35122D45A}.Wasm|Any CPU.Build.0 = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Wasm|Any CPU.ActiveCfg = Release|Any CPU
+		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Wasm|Any CPU.Build.0 = Release|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Wasm|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Wasm|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668}
+	EndGlobalSection
+EndGlobal
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/wwwroot/resources.txt b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/wwwroot/resources.txt
new file mode 100644
index 00000000..2542de03
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/wwwroot/resources.txt
@@ -0,0 +1 @@
+This is the location where static resources such as images or style sheets should be located
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Edit.razor
new file mode 100644
index 00000000..84e83aae
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Edit.razor
@@ -0,0 +1,95 @@
+@using Oqtane.Modules.Controls
+@using [Owner].[Module]s.Services
+@using [Owner].[Module]s.Models
+
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject HttpClient http
+@inject SiteState sitestate
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <label class="control-label">Name: </label>
+        </td>
+        <td>
+            <input id="_name" class="form-control" @bind="@_name" />
+        </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 />
+@if (PageState.Action == "Edit")
+{
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+}
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Actions => "Add,Edit";
+
+    I[Module]Service [Module]Service;
+    int _id;
+    string _name;
+    string _createdby;
+    DateTime _createdon;
+    string _modifiedby;
+    DateTime _modifiedon;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            [Module]Service = new [Module]Service(http, sitestate);
+            if (PageState.Action == "Edit")
+            {
+                _id = Int32.Parse(PageState.QueryString["id"]);
+                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
+                if ([Module] != null)
+                {
+                    _name = [Module].Name;
+                    _createdby = [Module].CreatedBy;
+                    _createdon = [Module].CreatedOn;
+                    _modifiedby = [Module].ModifiedBy;
+                    _modifiedon = [Module].ModifiedOn;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
+            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+        }
+    }
+
+    private async Task Save()
+    {
+        try
+        {
+            if (PageState.Action == "Add")
+            {
+                [Module] [Module] = new [Module]();
+                [Module].ModuleId = ModuleState.ModuleId;
+                [Module].Name = _name;
+                [Module] = await [Module]Service.Add[Module]Async([Module]);
+                await logger.LogInformation("[Module] Added {[Module]}", [Module]);
+            }
+            else
+            {
+                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
+                [Module].Name = _name;
+                await [Module]Service.Update[Module]Async([Module]);
+                await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
+            }
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
+            AddModuleMessage("Error Saving [Module]", MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
new file mode 100644
index 00000000..fdb11b98
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
@@ -0,0 +1,97 @@
+@using [Owner].[Module]s.Services
+@using [Owner].[Module]s.Models
+
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject HttpClient http
+@inject SiteState sitestate
+
+@if (_[Module]s == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" />
+    <br />
+    <br />
+    @if (@_[Module]s.Count != 0)
+    {
+        <Pager Items="@_[Module]s" Format="Grid">
+            <Header>
+                <div class="col"><strong>[Module]s</strong></div>
+            </Header>
+            <Row>
+                <div class="col">
+                    <ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" />
+                    <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))" />
+                    @context.Name
+                </div>
+            </Row>
+        </Pager>
+    }
+    else
+    {
+        <p>No [Module]s To Display</p>
+    }
+}
+
+<!-- The content below is for informational purposes only and can be safely removed -->
+
+<hr />
+[Module] Module Created Successfully. Use Edit Mode To Add A [Module]. You Can Access The Files At The Following Locations:<br /><br />
+[RootPath]Oqtane.Client\Modules\[Module]\<br />
+- Edit.razor - component for adding or editing content<br />
+- Index.razor - main component for your module **the content you are reading is in this file**<br />
+- ModuleInfo.cs - implements IModule interface to provide configuration settings for your module<br />
+- Settings.razor - component for managing module settings<br />
+- Services\I[Module]Service.cs - interface for defining service API methods<br />
+- Services\[Module]Service.cs - implements service API interface methods<br /><br />
+[RootPath]Oqtane.Server\Modules\[Module]\<br />
+- Controllers\[Module]Controller.cs - API methods implemented using a REST pattern<br />
+- Manager\[Module]Manager.cs - implements optional module interfaces for features such as import/export of content<br />
+- Repository\I[Module]Repository.cs - interface for defining repository methods<br />
+- Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
+- Repository\[Module]Context.cs - provides a DB Context for data access<br />
+- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
+- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
+[RootPath]Oqtane.Shared\Modules\[Module]\<br />
+- Models\[Module].cs - model definition<br /><br />
+
+<!-- The content above is for informational purposes only and can be safely removed -->
+
+@code {
+    I[Module]Service [Module]Service;
+    List<[Module]> _[Module]s;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            [Module]Service = new [Module]Service(http, sitestate);
+            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
+            AddModuleMessage("Error Loading [Module]", MessageType.Error);
+        }
+    }
+
+    private async Task Delete([Module] [Module])
+    {
+        try
+        {
+            await [Module]Service.Delete[Module]Async([Module].[Module]Id);
+            await logger.LogInformation("[Module] Deleted {[Module]}", [Module]);
+            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
+            AddModuleMessage("Error Deleting [Module]", MessageType.Error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/ModuleInfo.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/ModuleInfo.cs
new file mode 100644
index 00000000..a95a461e
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/ModuleInfo.cs
@@ -0,0 +1,18 @@
+using Oqtane.Models;
+using Oqtane.Modules;
+
+namespace [Owner].[Module]s.Modules
+{
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "[Module]",
+            Description = "[Module]",
+            Version = "1.0.0",
+            Dependencies = "[Owner].[Module]s.Module.Shared",
+            ServerManagerType = "[ServerManagerType]",
+            ReleaseVersions = "1.0.0"
+        };
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/I[Module]Service.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/I[Module]Service.cs
new file mode 100644
index 00000000..e98da06d
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/I[Module]Service.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Services
+{
+    public interface I[Module]Service 
+    {
+        Task<List<[Module]>> Get[Module]sAsync(int ModuleId);
+
+        Task<[Module]> Get[Module]Async(int [Module]Id);
+
+        Task<[Module]> Add[Module]Async([Module] [Module]);
+
+        Task<[Module]> Update[Module]Async([Module] [Module]);
+
+        Task Delete[Module]Async(int [Module]Id);
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/[Module]Service.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/[Module]Service.cs
new file mode 100644
index 00000000..f95c41b9
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/[Module]Service.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Oqtane.Modules;
+using Oqtane.Services;
+using Oqtane.Shared;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Services
+{
+    public class [Module]Service : ServiceBase, I[Module]Service, IService
+    {
+        private readonly SiteState _siteState;
+
+        public [Module]Service(HttpClient http, SiteState siteState) : base(http)
+        {
+            _siteState = siteState;
+        }
+
+         private string Apiurl=> CreateApiUrl(_siteState.Alias, "[Module]");
+
+        public async Task<List<[Module]>> Get[Module]sAsync(int ModuleId)
+        {
+            List<[Module]> [Module]s = await GetJsonAsync<List<[Module]>>($"{Apiurl}?moduleid={ModuleId}");
+            return [Module]s.OrderBy(item => item.Name).ToList();
+        }
+
+        public async Task<[Module]> Get[Module]Async(int [Module]Id)
+        {
+            return await GetJsonAsync<[Module]>($"{Apiurl}/{[Module]Id}");
+        }
+
+        public async Task<[Module]> Add[Module]Async([Module] [Module])
+        {
+            return await PostJsonAsync<[Module]>($"{Apiurl}?entityid={[Module].ModuleId}", [Module]);
+        }
+
+        public async Task<[Module]> Update[Module]Async([Module] [Module])
+        {
+            return await PutJsonAsync<[Module]>($"{Apiurl}/{[Module].[Module]Id}?entityid={[Module].ModuleId}", [Module]);
+        }
+
+        public async Task Delete[Module]Async(int [Module]Id)
+        {
+            await DeleteAsync($"{Apiurl}/{[Module]Id}");
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Settings.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Settings.razor
new file mode 100644
index 00000000..a53dc57c
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Settings.razor
@@ -0,0 +1,47 @@
+@namespace [Owner].[Module]s.Modules
+@inherits ModuleBase
+@inject ISettingService SettingService
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <label for="Setting" class="control-label">Setting: </label>
+        </td>
+        <td>
+            <input type="text" class="form-control" @bind="_value" />
+        </td>
+    </tr>
+</table>
+
+@code {
+    public override string Title => "[Module] Settings";
+
+    string _value;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            _value = SettingService.GetSetting(settings, "SettingName", "");
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            SettingService.SetSetting(settings, "SettingName", _value);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs
new file mode 100644
index 00000000..1ff6a0ab
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs
@@ -0,0 +1,75 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using System.Collections.Generic;
+using Oqtane.Shared;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using [Owner].[Module]s.Models;
+using [Owner].[Module]s.Repository;
+
+namespace [Owner].[Module]s.Controllers
+{
+    [Route("{site}/api/[controller]")]
+    public class [Module]Controller : Controller
+    {
+        private readonly I[Module]Repository _[Module]s;
+        private readonly ILogManager _logger;
+
+        public [Module]Controller(I[Module]Repository [Module]s, ILogManager logger)
+        {
+            _[Module]s = [Module]s;
+            _logger = logger;
+        }
+
+        // GET: api/<controller>?moduleid=x
+        [HttpGet]
+        [Authorize(Roles = Constants.RegisteredRole)]
+        public IEnumerable<[Module]> Get(string moduleid)
+        {
+            return _[Module]s.Get[Module]s(int.Parse(moduleid));
+        }
+
+        // GET api/<controller>/5
+        [HttpGet("{id}")]
+        [Authorize(Roles = Constants.RegisteredRole)]
+        public [Module] Get(int id)
+        {
+            return _[Module]s.Get[Module](id);
+        }
+
+        // POST api/<controller>
+        [HttpPost]
+        [Authorize(Roles = Constants.AdminRole)]
+        public [Module] Post([FromBody] [Module] [Module])
+        {
+            if (ModelState.IsValid)
+            {
+                [Module] = _[Module]s.Add[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
+            }
+            return [Module];
+        }
+
+        // PUT api/<controller>/5
+        [HttpPut("{id}")]
+        [Authorize(Roles = Constants.AdminRole)]
+        public [Module] Put(int id, [FromBody] [Module] [Module])
+        {
+            if (ModelState.IsValid)
+            {
+                [Module] = _[Module]s.Update[Module]([Module]);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
+            }
+            return [Module];
+        }
+
+        // DELETE api/<controller>/5
+        [HttpDelete("{id}")]
+        [Authorize(Roles = Constants.AdminRole)]
+        public void Delete(int id)
+        {
+            _[Module]s.Delete[Module](id);
+            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Manager/[Module]Manager.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Manager/[Module]Manager.cs
new file mode 100644
index 00000000..0b987600
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Manager/[Module]Manager.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using Oqtane.Modules;
+using Oqtane.Models;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+using [Owner].[Module]s.Models;
+using [Owner].[Module]s.Repository;
+
+namespace [Owner].[Module]s.Manager
+{
+    public class [Module]Manager : IInstallable, IPortable
+    {
+        private I[Module]Repository _[Module]s;
+        private ISqlRepository _sql;
+
+        public [Module]Manager(I[Module]Repository [Module]s, ISqlRepository sql)
+        {
+            _[Module]s = [Module]s;
+            _sql = sql;
+        }
+
+        public bool Install(Tenant tenant, string version)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]." + version + ".sql");
+        }
+
+        public bool Uninstall(Tenant tenant)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module].Uninstall.sql");
+        }
+
+        public string ExportModule(Module module)
+        {
+            string content = "";
+            List<[Module]> [Module]s = _[Module]s.Get[Module]s(module.ModuleId).ToList();
+            if ([Module]s != null)
+            {
+                content = JsonSerializer.Serialize([Module]s);
+            }
+            return content;
+        }
+
+        public void ImportModule(Module module, string content, string version)
+        {
+            List<[Module]> [Module]s = null;
+            if (!string.IsNullOrEmpty(content))
+            {
+                [Module]s = JsonSerializer.Deserialize<List<[Module]>>(content);
+            }
+            if ([Module]s != null)
+            {
+                foreach([Module] [Module] in [Module]s)
+                {
+                    [Module] _[Module] = new [Module]();
+                    _[Module].ModuleId = module.ModuleId;
+                    _[Module].Name = [Module].Name;
+                    _[Module]s.Add[Module](_[Module]);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/I[Module]Repository.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/I[Module]Repository.cs
new file mode 100644
index 00000000..f38a60d5
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/I[Module]Repository.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public interface I[Module]Repository
+    {
+        IEnumerable<[Module]> Get[Module]s(int ModuleId);
+        [Module] Get[Module](int [Module]Id);
+        [Module] Add[Module]([Module] [Module]);
+        [Module] Update[Module]([Module] [Module]);
+        void Delete[Module](int [Module]Id);
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Context.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Context.cs
new file mode 100644
index 00000000..2a14bbf4
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Context.cs
@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http;
+using Oqtane.Modules;
+using Oqtane.Repository;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public class [Module]Context : DBContextBase, IService
+    {
+        public virtual DbSet<[Module]> [Module] { get; set; }
+
+        public [Module]Context(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
+        {
+            // ContextBase handles multi-tenant database connections
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Repository.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Repository.cs
new file mode 100644
index 00000000..9b83b239
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Repository.cs
@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Modules;
+using [Owner].[Module]s.Models;
+
+namespace [Owner].[Module]s.Repository
+{
+    public class [Module]Repository : I[Module]Repository, IService
+    {
+        private readonly [Module]Context _db;
+
+        public [Module]Repository([Module]Context context)
+        {
+            _db = context;
+        }
+
+        public IEnumerable<[Module]> Get[Module]s(int ModuleId)
+        {
+            return _db.[Module].Where(item => item.ModuleId == ModuleId);
+        }
+
+        public [Module] Get[Module](int [Module]Id)
+        {
+            return _db.[Module].Find([Module]Id);
+        }
+
+        public [Module] Add[Module]([Module] [Module])
+        {
+            _db.[Module].Add([Module]);
+            _db.SaveChanges();
+            return [Module];
+        }
+
+        public [Module] Update[Module]([Module] [Module])
+        {
+            _db.Entry([Module]).State = EntityState.Modified;
+            _db.SaveChanges();
+            return [Module];
+        }
+
+        public void Delete[Module](int [Module]Id)
+        {
+            [Module] [Module] = _db.[Module].Find([Module]Id);
+            _db.[Module].Remove([Module]);
+            _db.SaveChanges();
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].1.0.0.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].1.0.0.sql
new file mode 100644
index 00000000..7a1b99ea
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].1.0.0.sql
@@ -0,0 +1,26 @@
+/*  
+Create [Owner][Module] table
+*/
+
+CREATE TABLE [dbo].[[Owner][Module]](
+	[[Module]Id] [int] IDENTITY(1,1) NOT NULL,
+	[ModuleId] [int] NOT NULL,
+	[Name] [nvarchar](256) NOT NULL,
+	[CreatedBy] [nvarchar](256) NOT NULL,
+	[CreatedOn] [datetime] NOT NULL,
+	[ModifiedBy] [nvarchar](256) NOT NULL,
+	[ModifiedOn] [datetime] NOT NULL,
+  CONSTRAINT [PK_[Owner][Module]] PRIMARY KEY CLUSTERED 
+  (
+	[[Module]Id] ASC
+  )
+)
+GO
+
+/*  
+Create foreign key relationships
+*/
+ALTER TABLE [dbo].[[Owner][Module]]  WITH CHECK ADD  CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
+REFERENCES [dbo].Module ([ModuleId])
+ON DELETE CASCADE
+GO
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].Uninstall.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].Uninstall.sql
new file mode 100644
index 00000000..47baecc9
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].Uninstall.sql
@@ -0,0 +1,6 @@
+/*  
+Remove [Owner][Module] table
+*/
+
+DROP TABLE [dbo].[[Owner][Module]]
+GO
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/[Module]/Models/[Module].cs b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/[Module]/Models/[Module].cs
new file mode 100644
index 00000000..5a6d7896
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/[Module]/Models/[Module].cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using Oqtane.Models;
+
+namespace [Owner].[Module]s.Models
+{
+    [Table("[Owner][Module]")]
+    public class [Module] : IAuditable
+    {
+        public int [Module]Id { get; set; }
+        public int ModuleId { get; set; }
+        public string Name { get; set; }
+
+        public string CreatedBy { get; set; }
+        public DateTime CreatedOn { get; set; }
+        public string ModifiedBy { get; set; }
+        public DateTime ModifiedOn { get; set; }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index bce9e1eb..a63784bc 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -5,54 +5,60 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label  class="control-label">Module: </label>
-        </td>
-        <td>
-            <FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" />
-        </td>
-    </tr>
-</table>
-
 @if (_packages != null)
 {
-    <hr class="app-rule" />
-    <div class="mx-auto text-center"><h2>Available Modules</h2></div>
+    <TabStrip>
+        @if (_packages.Count > 0)
+        {
+        <TabPanel Name="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>
+            <Pager Items="@_packages">
+                <Header>
+                    <th>Name</th>
+                    <th>Version</th>
+                    <th></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))>Download</button>
+                    </td>
+                </Row>
+            </Pager>
+        </TabPanel>
+        }
+        <TabPanel Name="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.">Module: </Label>
+                    </td>
+                    <td>
+                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" UploadMultiple="True" />
+                    </td>
+                </tr>
+            </table>
+        </TabPanel>
+    </TabStrip>
 
-    <Pager Items="@_packages">
-        <Header>
-            <th>Name</th>
-            <th>Version</th>
-            <th></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))>Download Module</button>
-            </td>
-        </Row>
-    </Pager>
+    <button type="button" class="btn btn-success" @onclick="InstallModules">Install</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 }
 
-<button type="button" class="btn btn-success" @onclick="InstallModules">Install</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-
-
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<Package> _packages;
 
-    List<Package> _packages;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            List<ModuleDefinition> moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+            var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
             _packages = await PackageService.GetPackagesAsync("module");
-            foreach(Package package in _packages.ToArray())
+
+            foreach (Package package in _packages.ToArray())
             {
                 if (moduledefinitions.Exists(item => Utilities.GetTypeName(item.ModuleDefinitionName) == package.PackageId))
                 {
@@ -80,18 +86,18 @@
         }
     }
 
-    private async Task DownloadModule(string moduledefinitionname, string version)
+    private async Task DownloadModule(string packageid, string version)
     {
         try
         {
-            await PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules");
-            await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", moduledefinitionname, version);
-            AddModuleMessage("Module Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
+            await PackageService.DownloadPackageAsync(packageid, version, "Modules");
+            await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version);
+            AddModuleMessage("Modules Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", moduledefinitionname, version);
+            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version);
             AddModuleMessage("Error Downloading Module", MessageType.Error);
         }
     }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 3b4ad4df..743938bf 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -3,54 +3,142 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject NavigationManager NavigationManager
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label  class="control-label">Name: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">Permissions: </label>
-        </td>
-        <td>
-            <PermissionGrid EntityName="ModuleDefinition" PermissionNames=PermissionNames.Utilize Permissions="@_permissions" @ref="_permissionGrid" />
-        </td>
-    </tr>
-</table>
+<TabStrip>
+    <TabPanel Name="Definition">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label For="name" HelpText="The name of the module">Name: </Label>
+                </td>
+                <td>
+                    <input id="name" class="form-control" @bind="@_name" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="description" HelpText="The description of the module">Description: </Label>
+                </td>
+                <td>
+                    <textarea id="description" class="form-control" @bind="@_description" rows="2"></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="categories" HelpText="Comma delimited list of module categories">Categories: </Label>
+                </td>
+                <td>
+                    <input id="categories" class="form-control" @bind="@_categories" />
+                </td>
+            </tr>
+        </table>
+        <Section Name="Information">
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <Label For="moduledefinitionname" HelpText="The internal name of the module">Internal Name: </Label>
+                    </td>
+                    <td>
+                        <input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="version" HelpText="The version of the module">Version: </Label>
+                    </td>
+                    <td>
+                        <input id="version" class="form-control" @bind="@_version" disabled />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="owner" HelpText="The owner or creator of the module">Owner: </Label>
+                    </td>
+                    <td>
+                        <input id="owner" class="form-control" @bind="@_owner" disabled />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="url" HelpText="The reference url of the module">Reference Url: </Label>
+                    </td>
+                    <td>
+                        <input id="url" class="form-control" @bind="@_url" disabled />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="contact" HelpText="The contact for the module">Contact: </Label>
+                    </td>
+                    <td>
+                        <input id="contact" class="form-control" @bind="@_contact" disabled />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="license" HelpText="The license of the module">License: </Label>
+                    </td>
+                    <td>
+                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                    </td>
+                </tr>
+            </table>
+        </Section>
+    </TabPanel>
+    <TabPanel Name="Permissions">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
 <button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br />
-<br />
+<br /><br />
 <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-
-    int _moduleDefinitionId;
-    string _name;
-    string _permissions;
-    string _createdby;
-    DateTime _createdon;
-    string _modifiedby;
-    DateTime _modifiedon;
+    private int _moduleDefinitionId;
+    private string _name;
+    private string _version;
+    private string _categories;
+    private string _moduledefinitionname = "";
+    private string _description = "";
+    private string _owner = "";
+    private string _url = "";
+    private string _contact = "";
+    private string _license = "";
+    private string _permissions;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
 
 #pragma warning disable 649
-    PermissionGrid _permissionGrid;
+    private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
     protected override async Task OnInitializedAsync()
     {
         try
         {
             _moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]);
-            ModuleDefinition moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+            var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
             if (moduleDefinition != null)
             {
                 _name = moduleDefinition.Name;
+                _version = moduleDefinition.Version;
+                _categories = moduleDefinition.Categories;
+                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
+                _description = moduleDefinition.Description;
+                _owner = moduleDefinition.Owner;
+                _url = moduleDefinition.Url;
+                _contact = moduleDefinition.Contact;
+                _license = moduleDefinition.License;
                 _permissions = moduleDefinition.Permissions;
                 _createdby = moduleDefinition.CreatedBy;
                 _createdon = moduleDefinition.CreatedOn;
@@ -69,7 +157,19 @@
     {
         try
         {
-            ModuleDefinition moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+            var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+            if (moduledefinition.Name != _name)
+            {
+                moduledefinition.Name = _name;
+            }
+            if (moduledefinition.Description != _description)
+            {
+                moduledefinition.Description = _description;
+            }
+            if (moduledefinition.Categories != _categories)
+            {
+                moduledefinition.Categories = _categories;
+            }
             moduledefinition.Permissions = _permissionGrid.GetPermissions();
             await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
             await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 3efd4ff8..d348ddb4 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -41,10 +41,10 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<ModuleDefinition> _moduleDefinitions;
+    private List<Package> _packages;
 
-    List<ModuleDefinition> _moduleDefinitions;
-    List<Package> _packages;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
@@ -62,12 +62,13 @@ else
 
     private bool UpgradeAvailable(string moduledefinitionname, string version)
     {
-        bool upgradeavailable = false;
-        Package package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
+        var upgradeavailable = false;
+        var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
         if (package != null)
         {
             upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
         }
+        
         return upgradeavailable;
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor
index 5ac95386..eaa0bc92 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Export.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor
@@ -7,10 +7,10 @@
     <tbody>
         <tr>
             <td>
-                <label class="control-label">Content: </label>
+                <Label For="content" HelpText="Enter the module content">Content: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@_content" rows="5"></textarea>
+                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
             </td>
         </tr>
     </tbody>
@@ -20,10 +20,11 @@
 
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-    public override string Title { get { return "Export Module"; } }
+    private string _content = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override string Title => "Export Module";
 
-    string _content = "";
 
     private async Task ExportModule()
     {
diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor
index 5fe730fd..e341ad78 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Import.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor
@@ -7,10 +7,10 @@
     <tbody>
         <tr>
             <td>
-                <label for="Title" class="control-label">Content: </label>
+                <Label For="content" HelpText="Enter the module content">Content: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@_content" rows="5"></textarea>
+                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
             </td>
         </tr>
     </tbody>
@@ -20,15 +20,14 @@
 
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-    public override string Title { get { return "Import Module"; } }
-
-    string _content = "";
+    private string _content = string.Empty;
 
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override string Title => "Import Module";
 
     private async Task ImportModule()
     {
-        if (_content != "")
+        if (_content != string.Empty)
         {
             try
             {
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index ae515412..c8a90d23 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -5,77 +5,90 @@
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
 
-<table class="table table-borderless">
-    <tbody>
-        <tr>
-            <td>
-                <label for="Title" class="control-label">Title: </label>
-            </td>
-            <td>
-                <input type="text" name="Title" class="form-control" @bind="@_title" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Container" class="control-label">Container: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@_containerType">
-                    <option value="">&lt;Select Container&gt;</option>
-                    @foreach (KeyValuePair<string, string> container in _containers)
-                    {
-                        <option value="@container.Key">@container.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Permissions: </label>
-            </td>
-            <td>
-                <PermissionGrid EntityName="Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Page" class="control-label">Page: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@_pageId">
-                    @foreach (Page p in PageState.Pages)
-                    {
-                        <option value="@p.PageId">@p.Name</option>
-                    }
-                </select>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-@DynamicComponent
-
+<TabStrip>
+    <TabPanel Name="Settings" Heading="Module Settings">
+        @if (_containers != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <Label For="title" HelpText="Enter the title of the module">Title: </Label>
+                    </td>
+                    <td>
+                        <input id="title" type="text" name="Title" class="form-control" @bind="@_title" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="container" HelpText="Select the module's container">Container: </Label>
+                    </td>
+                    <td>
+                        <select id="container" class="form-control" @bind="@_containerType">
+                            <option value="">&lt;Select Container&gt;</option>
+                            @foreach (KeyValuePair<string, string> container in _containers)
+                            {
+                                <option value="@container.Key">@container.Value</option>
+                            }
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="page" HelpText="The page that the module is on">Page: </Label>
+                    </td>
+                    <td>
+                        <select id="page" class="form-control" @bind="@_pageId">
+                            @foreach (Page p in PageState.Pages)
+                            {
+                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                                {
+                                    <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                }
+                            }
+                        </select>
+                    </td>
+                </tr>
+            </table>
+        }
+    </TabPanel>
+    <TabPanel Name="Permissions">
+        @if (_containers != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
+                    </td>
+                </tr>
+            </table>
+        }
+    </TabPanel>
+    @if (_settingsModuleType != null)
+    {
+        <TabPanel Name="ModuleSettings" Heading="@_settingstitle">
+            @DynamicComponent
+        </TabPanel>
+    }
+</TabStrip>
 <button type="button" class="btn btn-success" @onclick="SaveModule">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
-    public override string Title { get { return "Module Settings"; } }
+    private Dictionary<string, string> _containers;
+    private string _title;
+    private string _containerType;
+    private string _permissionNames = "";
+    private string _permissions;
+    private string _pageId;
+    private PermissionGrid _permissionGrid;
+    private Type _settingsModuleType;
+    private string _settingstitle = "Other Settings";
+    private object _settings;
 
-    Dictionary<string, string> _containers = new Dictionary<string, string>();
-    string _title;
-    string _containerType;
-    string _permissionNames = "";
-    string _permissions;
-    string _pageId;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Title => "Module Settings";
 
-#pragma warning disable 649
-    PermissionGrid _permissionGrid;
-#pragma warning restore 649
-
-    RenderFragment DynamicComponent { get; set; }
-    object _settings;
+    private RenderFragment DynamicComponent { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -86,35 +99,46 @@
         _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
         _pageId = ModuleState.PageId.ToString();
 
-        DynamicComponent = builder =>
+        _settingsModuleType = Type.GetType(ModuleState.ModuleType);
+        if (_settingsModuleType != null)
         {
-            Type moduleType = Type.GetType(ModuleState.ModuleType);
-            if (moduleType != null)
+            var moduleobject = Activator.CreateInstance(_settingsModuleType);
+            _settingstitle = (string)_settingsModuleType.GetProperty("Title").GetValue(moduleobject, null);
+            if (string.IsNullOrEmpty(_settingstitle))
             {
-                builder.OpenComponent(0, moduleType);
-                builder.AddComponentReferenceCapture(1, inst => { _settings = Convert.ChangeType(inst, moduleType); });
-                builder.CloseComponent();
+                _settingstitle = "Other Settings";
             }
-        };
+
+            DynamicComponent = builder =>
+            {
+                builder.OpenComponent(0, _settingsModuleType);
+                builder.AddComponentReferenceCapture(1, inst => { _settings = Convert.ChangeType(inst, _settingsModuleType); });
+                builder.CloseComponent();
+            };
+        }
     }
 
     private async Task SaveModule()
     {
-        Module module = ModuleState;
+        var module = ModuleState;
         module.Permissions = _permissionGrid.GetPermissions();
         await ModuleService.UpdateModuleAsync(module);
 
-        PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
         pagemodule.PageId = int.Parse(_pageId);
         pagemodule.Title = _title;
         pagemodule.ContainerType = _containerType;
+
         await PageModuleService.UpdatePageModuleAsync(pagemodule);
         await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-        Type moduleType = Type.GetType(ModuleState.ModuleType);
-        if (moduleType != null)
+        if (_settingsModuleType != null)
         {
-            moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component
+            var moduleType = Type.GetType(ModuleState.ModuleType);
+            if (moduleType != null)
+            {
+                moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component
+            }
         }
 
         NavigationManager.NavigateTo(NavigateUrl());
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 17a785dc..f7e3c20f 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -4,189 +4,225 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-@if (Themes != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Path: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@path" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Parent: </label>
-            </td>
-            <td>
-                <select class="form-control" @onchange="(e => ParentChanged(e))">
-                    <option value="-1">&lt;Site Root&gt;</option>
-                    @foreach (Page page in pages)
-                    {
-                        <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Insert: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@insert">
-                    <option value="<<">At Beginning</option>
-                    @if (children != null && children.Count > 0)
-                    {
-                        <option value="<">Before</option>
-                        <option value=">">After</option>
-                    }
-                    <option value=">>">At End</option>
-                </select>
-                @if (children != null && children.Count > 0 && (insert == "<" || insert == ">"))
-                {
-                    <select class="form-control" @bind="@childid">
-                        <option value="-1">&lt;Select Page&gt;</option>
-                        @foreach (Page page in children)
+<TabStrip>
+    <TabPanel Name="Settings">
+        @if (_themeList != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <Label For="Name" HelpText="Enter the page name">Name: </Label>
+                    </td>
+                    <td>
+                        <input id="Name" class="form-control" @bind="@_name" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy">Parent: </Label>
+                    </td>
+                    <td>
+                        <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
+                            <option value="-1">&lt;Site Root&gt;</option>
+                            @foreach (Page page in _pageList)
+                            {
+                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                            }
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages">Insert: </Label>
+                    </td>
+                    <td>
+                        <select id="Insert" class="form-control" @bind="@_insert">
+                            <option value="<<">At Beginning</option>
+                            @if (_children != null && _children.Count > 0)
+                            {
+                                <option value="<">Before</option>
+                                <option value=">">After</option>
+                            }
+                            <option value=">>">At End</option>
+                        </select>
+                        @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
-                            <option value="@(page.PageId)">@(page.Name)</option>
+                            <select class="form-control" @bind="@_childid">
+                                <option value="-1">&lt;Select Page&gt;</option>
+                                @foreach (Page page in _children)
+                                {
+                                    <option value="@(page.PageId)">@(page.Name)</option>
+                                }
+                            </select>
                         }
-                    </select>
-                }
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Navigation? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@isnavigation">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Personalizable? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@ispersonalizable">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Default Mode? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@mode">
-                    <option value="view">View Mode</option>
-                    <option value="edit">Edit Mode</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Theme: </label>
-            </td>
-            <td>
-                <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value="">&lt;Select Theme&gt;</option>
-                    @foreach (KeyValuePair<string, string> item in themes)
-                    {
-                        <option value="@item.Key">@item.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Layout: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@layouttype">
-                    <option value="">&lt;Select Layout&gt;</option>
-                    @foreach (KeyValuePair<string, string> panelayout in panelayouts)
-                    {
-                        <option value="@panelayout.Key">@panelayout.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Icon: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@icon" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Permissions: </label>
-            </td>
-            <td>
-                <PermissionGrid EntityName="Page" Permissions="@permissions" @ref="permissiongrid" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden">Navigation? </Label>
+                    </td>
+                    <td>
+                        <select id="Navigation" class="form-control" @bind="@_isnavigation">
+                            <option value="True">Yes</option>
+                            <option value="False">No</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.">Url Path: </Label>
+                    </td>
+                    <td>
+                        <input id="Path" class="form-control" @bind="@_path" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it">Redirect: </Label>
+                    </td>
+                    <td>
+                        <input id="Url" class="form-control" @bind="@_url" />
+                    </td>
+                </tr>
+            </table>
+            <Section Name="Appearance">
+                <table class="table table-borderless">
+                    <tr>
+                        <td>
+                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used.">Title: </Label>
+                        </td>
+                        <td>
+                            <input id="Title" class="form-control" @bind="@_title" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Theme" HelpText="Select the theme for this page">Theme: </Label>
+                        </td>
+                        <td>
+                            <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
+                                <option value="-">&lt;Select Theme&gt;</option>
+                                @foreach (KeyValuePair<string, string> item in _themes)
+                                {
+                                    if (item.Key == _themetype)
+                                    {
+                                        <option value="@item.Key" selected>@item.Value</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@item.Key">@item.Value</option>
+                                    }
+                                }
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)">Layout: </Label>
+                        </td>
+                        <td>
+                            <select id="Layout" class="form-control" @bind="@_layouttype">
+                                <option value="-">&lt;Select Layout&gt;</option>
+                                @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
+                                {
+                                    if (panelayout.Key == _layouttype)
+                                    {
+                                        <option value="@panelayout.Key" selected>@panelayout.Value</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@panelayout.Key">@panelayout.Value</option>
+                                    }
+                                }
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation">Icon: </Label>
+                        </td>
+                        <td>
+                            <input id="Icon" class="form-control" @bind="@_icon" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Default-Mode" HelpText="Select the default administration mode you want for this page">Default Mode? </Label>
+                        </td>
+                        <td>
+                            <select id="Default-Mode" class="form-control" @bind="@_mode">
+                                <option value="view">View Mode</option>
+                                <option value="edit">Edit Mode</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content">Personalizable? </Label>
+                        </td>
+                        <td>
+                            <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
+                                <option value="True">Yes</option>
+                                <option value="False">No</option>
+                            </select>
+                        </td>
+                    </tr>
+                </table>
+            </Section>
+        }
+    </TabPanel>
+    <TabPanel Name="Permissions">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
+<button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private Dictionary<string, string> _themes;
+    private Dictionary<string, string> _panelayouts;
+    private List<Theme> _themeList;
+    private List<Page> _pageList;
+    private string _name;
+    private string _title;
+    private string _path = string.Empty;
+    private string _parentid;
+    private string _insert = ">>";
+    private List<Page> _children;
+    private int _childid = -1;
+    private string _isnavigation = "True";
+    private string _url;
+    private string _ispersonalizable = "False";
+    private string _mode = "view";
+    private string _themetype = "-";
+    private string _layouttype = "-";
+    private string _icon = string.Empty;
+    private string _permissions = string.Empty;
+    private PermissionGrid _permissionGrid;
 
-    Dictionary<string, string> themes = new Dictionary<string, string>();
-    Dictionary<string, string> panelayouts = new Dictionary<string, string>();
-
-    List<Theme> Themes;
-    List<Page> pages;
-    string name;
-    string path = "";
-    string parentid;
-    string insert = ">>";
-    List<Page> children;
-    int childid = -1;
-    string isnavigation = "True";
-    string ispersonalizable = "False";
-    string mode = "view";
-    string themetype = "";
-    string layouttype = "";
-    string icon = "";
-    string permissions = ""; 
-
-    PermissionGrid permissiongrid;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            Themes = await ThemeService.GetThemesAsync();
-            pages = PageState.Pages;
-            children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+            _themeList = await ThemeService.GetThemesAsync();
+            _pageList = PageState.Pages;
+            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
 
-            themes = ThemeService.GetThemeTypes(Themes);
-            themetype = PageState.Site.DefaultThemeType;
+            _themetype = PageState.Site.DefaultThemeType;
+            _layouttype = PageState.Site.DefaultLayoutType;
 
-            panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
-            layouttype = PageState.Site.DefaultLayoutType;
+            _themes = ThemeService.GetThemeTypes(_themeList);
+            _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
 
-            List<PermissionString> permissionstrings = new List<PermissionString>();
-            permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = Constants.AdminRole });
-            permissionstrings.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole });
-            permissions = UserSecurity.SetPermissionStrings(permissionstrings);
+            _permissions = string.Empty;
         }
         catch (Exception ex)
         {
@@ -199,20 +235,33 @@
     {
         try
         {
-            parentid = (string)e.Value;
-            if (parentid == "-1")
+            _parentid = (string)e.Value;
+            _children = new List<Page>();
+            if (_parentid == "-1")
             {
-                children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                    {
+                        _children.Add(p);
+                    }
+                }
             }
             else
             {
-                children = PageState.Pages.Where(item => item.ParentId == int.Parse(parentid)).ToList();
+                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                    {
+                        _children.Add(p);
+                    }
+                }
             }
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", parentid, ex.Message);
+            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
             AddModuleMessage("Error Loading Child Pages For Parent", MessageType.Error);
         }
     }
@@ -221,20 +270,20 @@
     {
         try
         {
-            themetype = (string)e.Value;
-            if (themetype != "")
+            _themetype = (string)e.Value;
+            if (_themetype != "-")
             {
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
             }
             else
             {
-                panelayouts = new Dictionary<string, string>();
+                _panelayouts = new Dictionary<string, string>();
             }
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", themetype, ex.Message);
+            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
             AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
         }
     }
@@ -244,71 +293,77 @@
         Page page = null;
         try
         {
-            if (name != "" && !string.IsNullOrEmpty(themetype) && (panelayouts.Count == 0 || !string.IsNullOrEmpty(layouttype)))
+            if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)))
             {
                 page = new Page();
                 page.SiteId = PageState.Page.SiteId;
-                page.Name = name;
-                if (path == "")
+                page.Name = _name;
+                page.Title = _title;
+                if (_path == "")
                 {
-                    path = name;
+                    _path = _name;
                 }
-                if (path.Contains("/"))
+
+                if (_path.Contains("/"))
                 {
-                    path = path.Substring(path.LastIndexOf("/") + 1);
+                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
                 }
-                if (string.IsNullOrEmpty(parentid))
+
+                if (string.IsNullOrEmpty(_parentid))
                 {
                     page.ParentId = null;
-                    page.Path = Utilities.GetFriendlyUrl(path);
+                    page.Path = Utilities.GetFriendlyUrl(_path);
                 }
                 else
                 {
-                    page.ParentId = Int32.Parse(parentid);
-                    Page parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
-                    if (parent.Path == "")
+                    page.ParentId = Int32.Parse(_parentid);
+                    var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
+                    if (parent.Path == string.Empty)
                     {
-                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(path);
+                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
                     }
                     else
                     {
-                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(path);
+                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
                     }
                 }
+
                 Page child;
-                switch (insert)
+                switch (_insert)
                 {
                     case "<<":
                         page.Order = 0;
                         break;
                     case "<":
-                        child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                        child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
                         page.Order = child.Order - 1;
                         break;
                     case ">":
-                        child = PageState.Pages.Where(item => item.PageId == childid).FirstOrDefault();
+                        child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
                         page.Order = child.Order + 1;
                         break;
                     case ">>":
                         page.Order = int.MaxValue;
                         break;
                 }
-                page.IsNavigation = (isnavigation == null ? true : Boolean.Parse(isnavigation));
-                page.EditMode = (mode == "edit" ? true : false);
-                page.ThemeType = themetype;
-                page.LayoutType = (layouttype == null ? "" : layouttype);
-                page.Icon = (icon == null ? "" : icon);
-                page.Permissions = permissiongrid.GetPermissions();
 
+                page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+                page.Url = _url;
+                page.EditMode = (_mode == "edit" ? true : false);
+                page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+                page.LayoutType = (_layouttype != "-") ? _layouttype : string.Empty;
                 if (page.ThemeType == PageState.Site.DefaultThemeType)
                 {
-                    page.ThemeType = "";
+                    page.ThemeType = string.Empty;
                 }
+
                 if (page.LayoutType == PageState.Site.DefaultLayoutType)
                 {
-                    page.LayoutType = "";
+                    page.LayoutType = string.Empty;
                 }
-                page.IsPersonalizable = (ispersonalizable == null ? false : Boolean.Parse(ispersonalizable));
+                page.Icon = (_icon == null ? string.Empty : _icon);
+                page.Permissions = _permissionGrid.GetPermissions();
+                page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
                 page.UserId = null;
 
                 page = await PageService.AddPageAsync(page);
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index cad64681..8132696d 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -4,248 +4,295 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-@if (Themes != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Path: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@path" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Parent: </label>
-            </td>
-            <td>
-                <select class="form-control" @onchange="(e => ParentChanged(e))">
-                    <option value="-1">&lt;Site Root&gt;</option>
-                    @foreach (Page page in pages)
-                    {
-                        if (page.PageId.ToString() == parentid)
+<TabStrip>
+    <TabPanel Name="Settings">
+        @if (_themeList != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <Label For="Name" HelpText="Enter the page name">Name: </Label>
+                    </td>
+                    <td>
+                        <input id="Name" class="form-control" @bind="@_name" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy">Parent: </Label>
+                    </td>
+                    <td>
+                        <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
+                            <option value="-1">&lt;Site Root&gt;</option>
+                            @foreach (Page page in _pageList)
+                            {
+                                if (page.PageId.ToString() == _parentid)
+                                {
+                                    <option value="@(page.PageId)" selected>@(new string('-', page.Level * 2))@(page.Name)</option>
+                                }
+                                else
+                                {
+                                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                                }
+                            }
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages">Move: </Label>
+                    </td>
+                    <td>
+                        <select id="Move" class="form-control" @bind="@_insert">
+                            @if (_parentid == _currentparentid)
+                            {
+                                <option value="=">&lt;Maintain Current Location&gt;</option>
+                            }
+                            <option value="<<">To Beginning</option>
+                            @if (_children != null && _children.Count > 0)
+                            {
+                                <option value="<">Before</option>
+                                <option value=">">After</option>
+                            }
+                            <option value=">>">To End</option>
+                        </select>
+                        @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
-                            <option value="@(page.PageId)" selected>@(new string('-', page.Level * 2))@(page.Name)</option>
+                            <select class="form-control" @bind="@_childid">
+                                <option value="-1">&lt;Select Page&gt;</option>
+                                @foreach (Page page in _children)
+                                {
+                                    <option value="@(page.PageId)">@(page.Name)</option>
+                                }
+                            </select>
                         }
-                        else
-                        {
-                            <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                        }
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Move: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@insert">
-                    @if (parentid == currentparentid)
-                    {
-                        <option value="=">&lt;Maintain Current Location&gt;</option>
-                    }
-                    <option value="<<">To Beginning</option>
-                    @if (children != null && children.Count > 0)
-                    {
-                        <option value="<">Before</option>
-                        <option value=">">After</option>
-                    }
-                    <option value=">>">To End</option>
-                </select>
-                @if (children != null && children.Count > 0 && (insert == "<" || insert == ">"))
-                {
-                    <select class="form-control" @bind="@childid">
-                        <option value="-1">&lt;Select Page&gt;</option>
-                        @foreach (Page page in children)
-                        {
-                            <option value="@(page.PageId)">@(page.Name)</option>
-                        }
-                    </select>
-                }
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Navigation? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@isnavigation">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Personalizable? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@ispersonalizable">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Default Mode? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@mode">
-                    <option value="view">View Mode</option>
-                    <option value="edit">Edit Mode</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Theme: </label>
-            </td>
-            <td>
-                <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value="">&lt;Select Theme&gt;</option>
-                    @foreach (KeyValuePair<string, string> item in themes)
-                    {
-                        if (item.Key == themetype)
-                        {
-                            <option value="@item.Key" selected>@item.Value</option>
-                        }
-                        else
-                        {
-                            <option value="@item.Key">@item.Value</option>
-                        }
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Layout: </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@layouttype">
-                    <option value="">&lt;Select Layout&gt;</option>
-                    @foreach (KeyValuePair<string, string> panelayout in panelayouts)
-                    {
-                        <option value="@panelayout.Key">@panelayout.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Icon: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@icon" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Name" class="control-label">Permissions: </label>
-            </td>
-            <td>
-                <PermissionGrid EntityName="Page" Permissions="@permissions" @ref="permissiongrid" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-    <br />
-    <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
-}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden">Navigation? </Label>
+                    </td>
+                    <td>
+                        <select id="Navigation" class="form-control" @bind="@_isnavigation">
+                            <option value="True">Yes</option>
+                            <option value="False">No</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.">Url Path: </Label>
+                    </td>
+                    <td>
+                        <input id="Path" class="form-control" @bind="@_path" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it">Redirect: </Label>
+                    </td>
+                    <td>
+                        <input id="Url" class="form-control" @bind="@_url" />
+                    </td>
+                </tr>
+            </table>
+            <Section Name="Appearance">
+                <table class="table table-borderless">
+                    <tr>
+                        <td>
+                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used.">Title: </Label>
+                        </td>
+                        <td>
+                            <input id="Title" class="form-control" @bind="@_title" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Theme" HelpText="Select the theme for this page">Theme: </Label>
+                        </td>
+                        <td>
+                            <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
+                                <option value="-">&lt;Select Theme&gt;</option>
+                                @foreach (KeyValuePair<string, string> item in _themes)
+                                {
+                                    if (item.Key == _themetype)
+                                    {
+                                        <option value="@item.Key" selected>@item.Value</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@item.Key">@item.Value</option>
+                                    }
+                                }
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)">Layout: </Label>
+                        </td>
+                        <td>
+                            <select id="Layout" class="form-control" @bind="@_layouttype">
+                                <option value="-">&lt;Select Layout&gt;</option>
+                                @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
+                                {
+                                    if (panelayout.Key == _layouttype)
+                                    {
+                                        <option value="@panelayout.Key" selected>@panelayout.Value</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@panelayout.Key">@panelayout.Value</option>
+                                    }
+                                }
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation">Icon: </Label>
+                        </td>
+                        <td>
+                            <input id="Icon" class="form-control" @bind="@_icon" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Default-Mode" HelpText="Select the default administration mode you want for this page">Default Mode? </Label>
+                        </td>
+                        <td>
+                            <select id="Default-Mode" class="form-control" @bind="@_mode">
+                                <option value="view">View Mode</option>
+                                <option value="edit">Edit Mode</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content">Personalizable? </Label>
+                        </td>
+                        <td>
+                            <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
+                                <option value="True">Yes</option>
+                                <option value="False">No</option>
+                            </select>
+                        </td>
+                    </tr>
+                </table>
+            </Section>
+            <br /><br />
+            <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
+        }
+    </TabPanel>
+    <TabPanel Name="Permissions">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
+<button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private Dictionary<string, string> _themes;
+    private Dictionary<string, string> _panelayouts;
+    private List<Theme> _themeList;
+    private List<Page> _pageList;
+    private int _pageId;
+    private string _name;
+    private string _title;
+    private string _path;
+    private string _currentparentid;
+    private string _parentid;
+    private string _insert = "=";
+    private List<Page> _children;
+    private int _childid = -1;
+    private string _isnavigation;
+    private string _url;
+    private string _ispersonalizable;
+    private string _mode;
+    private string _themetype = "-";
+    private string _layouttype = "-";
+    private string _icon;
+    private string _permissions;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
 
-    Dictionary<string, string> themes = new Dictionary<string, string>();
-    Dictionary<string, string> panelayouts = new Dictionary<string, string>();
+#pragma warning disable 649
+    private PermissionGrid _permissionGrid;
+#pragma warning restore 649
 
-    List<Theme> Themes;
-    List<Page> pages;
-    int PageId;
-    string name;
-    string path;
-    string currentparentid;
-    string parentid;
-    string insert = "=";
-    List<Page> children;
-    int childid = -1;
-    string isnavigation;
-    string ispersonalizable;
-    string mode;
-    string themetype;
-    string layouttype;
-    string icon;
-    string permissions;
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-    string deletedby;
-    DateTime? deletedon;
-
-    PermissionGrid permissiongrid;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            Themes = await ThemeService.GetThemesAsync();
-            pages = PageState.Pages;
-            children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+            _themeList = await ThemeService.GetThemesAsync();
+            _pageList = PageState.Pages;
+            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
 
-            themes = ThemeService.GetThemeTypes(Themes);
+            _themes = ThemeService.GetThemeTypes(_themeList);
 
-            PageId = Int32.Parse(PageState.QueryString["id"]);
-            Page page = PageState.Pages.FirstOrDefault(item => item.PageId == PageId);
+            _pageId = Int32.Parse(PageState.QueryString["id"]);
+            var page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
             if (page != null)
             {
-                name = page.Name;
-                path = page.Path;
-                if (path.Contains("/"))
+                _name = page.Name;
+                _title = page.Title;
+                _path = page.Path;
+
+                if (_path.Contains("/"))
                 {
-                    path = path.Substring(path.LastIndexOf("/") + 1);
+                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
                 }
+
                 if (page.ParentId == null)
                 {
-                    parentid = "";
+                    _parentid = string.Empty;
                 }
                 else
                 {
-                    parentid = page.ParentId.ToString();
+                    _parentid = page.ParentId.ToString();
                 }
-                currentparentid = parentid;
-                isnavigation = page.IsNavigation.ToString();
-                ispersonalizable = page.IsPersonalizable.ToString();
-                mode = (page.EditMode) ? "edit" : "view";
-                themetype = page.ThemeType;
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
-                layouttype = page.LayoutType;
-                icon = page.Icon;
-                permissions = page.Permissions;
-                createdby = page.CreatedBy;
-                createdon = page.CreatedOn;
-                modifiedby = page.ModifiedBy;
-                modifiedon = page.ModifiedOn;
-                deletedby = page.DeletedBy;
-                deletedon = page.DeletedOn;
+
+                _currentparentid = _parentid;
+                _isnavigation = page.IsNavigation.ToString();
+                _url = page.Url;
+                _ispersonalizable = page.IsPersonalizable.ToString();
+                _mode = (page.EditMode) ? "edit" : "view";
+                _themetype = page.ThemeType;
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
+                _layouttype = page.LayoutType;
+                if (_themetype == PageState.Site.DefaultThemeType)
+                {
+                    _themetype = "-";
+                }
+                if (_layouttype == PageState.Site.DefaultLayoutType)
+                {
+                    _layouttype = "-";
+                }
+                _icon = page.Icon;
+                _permissions = page.Permissions;
+                _createdby = page.CreatedBy;
+                _createdon = page.CreatedOn;
+                _modifiedby = page.ModifiedBy;
+                _modifiedon = page.ModifiedOn;
+                _deletedby = page.DeletedBy;
+                _deletedon = page.DeletedOn;
             }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Page {PageId} {Error}", PageId, ex.Message);
+            await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
             AddModuleMessage("Error Loading Page", MessageType.Error);
         }
     }
@@ -254,28 +301,41 @@
     {
         try
         {
-            parentid = (string)e.Value;
-            if (parentid == "-1")
+            _parentid = (string)e.Value;
+            _children = new List<Page>();
+            if (_parentid == "-1")
             {
-                children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+                foreach(Page p in PageState.Pages.Where(item => item.ParentId == null))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                    {
+                        _children.Add(p);
+                    }
+                }
             }
             else
             {
-                children = PageState.Pages.Where(item => item.ParentId == int.Parse(parentid)).ToList();
+                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                    {
+                        _children.Add(p);
+                    }
+                }
             }
-            if (parentid == currentparentid)
+            if (_parentid == _currentparentid)
             {
-                insert = "=";
+                _insert = "=";
             }
             else
             {
-                insert = ">>";
+                _insert = ">>";
             }
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", parentid, ex.Message);
+            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
             AddModuleMessage("Error Loading Child Pages For Parent", MessageType.Error);
         }
     }
@@ -284,20 +344,20 @@
     {
         try
         {
-            themetype = (string)e.Value;
-            if (themetype != "")
+            _themetype = (string)e.Value;
+            if (_themetype != "-")
             {
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
             }
             else
             {
-                panelayouts = new Dictionary<string, string>();
+                _panelayouts = new Dictionary<string, string>();
             }
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", themetype, ex.Message);
+            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
             AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
         }
     }
@@ -307,52 +367,54 @@
         Page page = null;
         try
         {
-            if (name != "" && !string.IsNullOrEmpty(themetype) && (panelayouts.Count == 0 || !string.IsNullOrEmpty(layouttype)))
+            if (_name != string.Empty)
             {
-                page = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault();
+                page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
                 string currentPath = page.Path;
 
-                page.Name = name;
-                if (path == "" && name.ToLower() != "home")
+                page.Name = _name;
+                page.Title = _title;
+                if (_path == "" && _name.ToLower() != "home")
+                    if (_path == string.Empty && _name.ToLower() != "home")
+                    {
+                        _path = _name;
+                    }
+                if (_path.Contains("/"))
                 {
-                    path = name;
+                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
                 }
-                if (path.Contains("/"))
-                {
-                    path = path.Substring(path.LastIndexOf("/") + 1);
-                }
-                if (string.IsNullOrEmpty(parentid))
+                if (string.IsNullOrEmpty(_parentid) || _parentid == "-1")
                 {
                     page.ParentId = null;
-                    page.Path = Utilities.GetFriendlyUrl(path);
+                    page.Path = Utilities.GetFriendlyUrl(_path);
                 }
                 else
                 {
-                    page.ParentId = Int32.Parse(parentid);
+                    page.ParentId = Int32.Parse(_parentid);
                     Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId);
-                    if (parent.Path == "")
+                    if (parent.Path == string.Empty)
                     {
-                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(path);
+                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
                     }
                     else
                     {
-                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(path);
+                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
                     }
                 }
-                if (insert != "=")
+                if (_insert != "=")
                 {
                     Page child;
-                    switch (insert)
+                    switch (_insert)
                     {
                         case "<<":
                             page.Order = 0;
                             break;
                         case "<":
-                            child = PageState.Pages.FirstOrDefault(item => item.PageId == childid);
+                            child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
                             if (child != null) page.Order = child.Order - 1;
                             break;
                         case ">":
-                            child = PageState.Pages.FirstOrDefault(item => item.PageId == childid);
+                            child = PageState.Pages.FirstOrDefault(item => item.PageId == _childid);
                             if (child != null) page.Order = child.Order + 1;
                             break;
                         case ">>":
@@ -360,37 +422,37 @@
                             break;
                     }
                 }
-                page.IsNavigation = (isnavigation == null ? true : Boolean.Parse(isnavigation));
-                page.EditMode = (mode == "edit" ? true : false);
-                page.ThemeType = themetype;
-                page.LayoutType = layouttype ?? "";
-                page.Icon = icon ?? "";
-                page.Permissions = permissiongrid.GetPermissions();
-
+                page.IsNavigation = (_isnavigation == null || Boolean.Parse(_isnavigation));
+                page.Url = _url;
+                page.EditMode = (_mode == "edit");
+                page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+                page.LayoutType = (_layouttype != "-") ? _layouttype : string.Empty;
                 if (page.ThemeType == PageState.Site.DefaultThemeType)
                 {
-                    page.ThemeType = "";
+                    page.ThemeType = string.Empty;
                 }
                 if (page.LayoutType == PageState.Site.DefaultLayoutType)
                 {
-                    page.LayoutType = "";
+                    page.LayoutType = string.Empty;
                 }
-                page.IsPersonalizable = (ispersonalizable != null && Boolean.Parse(ispersonalizable));
+                page.Icon = _icon ?? string.Empty;
+                page.Permissions = _permissionGrid.GetPermissions();
+                page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable));
                 page.UserId = null;
 
                 page = await PageService.UpdatePageAsync(page);
                 await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
-                if (currentparentid == "")
+                if (_currentparentid == string.Empty)
                 {
                     await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, null);
                 }
                 else
                 {
-                    await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, int.Parse(currentparentid));
+                    await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, int.Parse(_currentparentid));
                 }
 
                 // update child paths
-                if (parentid != currentparentid)
+                if (_parentid != _currentparentid)
                 {
                     foreach (Page p in PageState.Pages.Where(item => item.Path.StartsWith(currentPath)))
                     {
@@ -404,7 +466,7 @@
             }
             else
             {
-                AddModuleMessage("You Must Provide Page Name And Theme", MessageType.Warning);
+                AddModuleMessage("You Must Provide Page Name", MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index ce546547..b53f3811 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -22,13 +22,14 @@
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     private async Task DeletePage(Page page)
     {
         try
         {
             page.IsDeleted = true;
+            
             await PageService.UpdatePageAsync(page);
             await logger.LogInformation("Page Deleted {Page}", page);
             NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
index bfba2d25..96a65b18 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
@@ -6,66 +6,66 @@
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Name: </label>
+                <Label For="name" HelpText="The name of this field">Name: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_name" />
+                <input id="name" class="form-control" @bind="@_name" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Title: </label>
+                <Label For="title" HelpText="The title of the field">Title: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_title" />
+                <input id="title" class="form-control" @bind="@_title" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Description: </label>
+                <Label For="description" HelpText="What the profile field is">Description: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@_description" rows="5"></textarea>
+                <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Category: </label>
+                <Label For="category" HelpText="What larger category does this field belong to">Category: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_category" />
+                <input id="category" class="form-control" @bind="@_category" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Order: </label>
+                <Label For="order" HelpText="What place is this field in a larger category list">Order: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_vieworder" />
+                <input id="order" class="form-control" @bind="@_vieworder" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Length: </label>
+                <Label For="length" HelpText="What is the max amount of characters should this field accept">Length: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_maxlength" />
+                <input id="length" class="form-control" @bind="@_maxlength" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Value: </label>
+                <Label For="defaultVal" HelpText="What value do you want this field to start with">Default Value: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@_defaultvalue" />
+                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Required? </label>
+                <Label For="required" HelpText="Is a user required to input something into this field?">Required? </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@_isrequired">
+                <select id="required" class="form-control" @bind="@_isrequired">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
@@ -73,10 +73,10 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Private? </label>
+                <Label For="private" HelpText="Is this field private?">Private? </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@_isprivate">
+                <select id="private" class="form-control" @bind="@_isprivate">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
@@ -87,19 +87,20 @@
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
-    public override string Actions { get { return "Add,Edit"; } }
+    private int _profileid = -1;
+    private string _name = string.Empty;
+    private string _title = string.Empty;
+    private string _description = string.Empty;
+    private string _category = string.Empty;
+    private string _vieworder = "0";
+    private string _maxlength = "0";
+    private string _defaultvalue = string.Empty;
+    private string _isrequired = "False";
+    private string _isprivate = "False";
 
-    int _profileid = -1;
-    string _name = "";
-    string _title = "";
-    string _description = "";
-    string _category = "";
-    string _vieworder = "0";
-    string _maxlength = "0";
-    string _defaultvalue = "";
-    string _isrequired = "False";
-    string _isprivate = "False";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    public override string Actions => "Add,Edit";
 
     protected override async Task OnInitializedAsync()
     {
@@ -108,7 +109,7 @@
             if (PageState.QueryString.ContainsKey("id"))
             {
                 _profileid = Int32.Parse(PageState.QueryString["id"]);
-                Profile profile = await ProfileService.GetProfileAsync(_profileid);
+                var profile = await ProfileService.GetProfileAsync(_profileid);
                 if (profile != null)
                 {
                     _name = profile.Name;
@@ -143,6 +144,7 @@
             {
                 profile = new Profile();
             }
+
             profile.Name = _name;
             profile.Title = _title;
             profile.Description = _description;
@@ -152,7 +154,14 @@
             profile.DefaultValue = _defaultvalue;
             profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
             profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
-            profile = await ProfileService.UpdateProfileAsync(profile);
+            if (_profileid != -1)
+            {
+                profile = await ProfileService.UpdateProfileAsync(profile);
+            }else
+            {
+                profile = await ProfileService.AddProfileAsync(profile);
+            }
+
             await logger.LogInformation("Profile Saved {Profile}", profile);
             NavigationManager.NavigateTo(NavigateUrl());
         }
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index 593ccca4..e3cefdaa 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -25,9 +25,9 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<Profile> _profiles;
 
-    List<Profile> _profiles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 012a5495..d3955307 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -5,86 +5,68 @@
 @inject IModuleService ModuleService
 @inject IPageService PageService
 
-<div class="container-fluid">
-    <div class="form-group">
-
-        <ul class="nav nav-tabs" role="tablist">
-            <li class="nav-item">
-                <a class="nav-link active" data-toggle="tab" href="#Pages" role="tab">
-                    Pages
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#Modules" role="tab">
-                    Modules
-                </a>
-            </li>
-        </ul>
-
-        <div class="tab-content">
-            <div id="Pages" class="tab-pane fade show active" role="tabpanel">
-                @if (_pages == null)
-                {
-                    <br />
-                    <p>No Deleted Pages</p>
-                }
-                else
-                {
-                    <Pager Items="@_pages">
-                        <Header>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
-                            <th>Name</th>
-                            <th>Deleted By</th>
-                            <th>Deleted On</th>
-                        </Header>
-                        <Row>
-                            <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                            <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
-                            <td>@context.Name</td>
-                            <td>@context.DeletedBy</td>
-                            <td>@context.DeletedOn</td>
-                        </Row>
-                    </Pager>
-                }
-            </div>
-            <div id="Modules" class="tab-pane fade" role="tabpanel">
-                @if (_modules == null)
-                {
-                    <br />
-                    <p>No Deleted Modules</p>
-                }
-                else
-                {
-                    <Pager Items="@_modules">
-                        <Header>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
-                            <th>Page</th>
-                            <th>Module</th>
-                            <th>Deleted By</th>
-                            <th>Deleted On</th>
-                        </Header>
-                        <Row>
-                            <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                            <td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" /></td>
-                            <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
-                            <td>@context.Title</td>
-                            <td>@context.DeletedBy</td>
-                            <td>@context.DeletedOn</td>
-                        </Row>
-                    </Pager>
-                }
-            </div>
-        </div>
-    </div>
-</div>
+<TabStrip>
+    <TabPanel Name="Pages">
+        @if (_pages == null)
+        {
+            <br />
+            <p>No Deleted Pages</p>
+        }
+        else
+        {
+            <Pager Items="@_pages">
+                <Header>
+                    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
+                    <th>Name</th>
+                    <th>Deleted By</th>
+                    <th>Deleted On</th>
+                </Header>
+                <Row>
+                    <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
+                    <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
+                    <td>@context.Name</td>
+                    <td>@context.DeletedBy</td>
+                    <td>@context.DeletedOn</td>
+                </Row>
+            </Pager>
+        }
+    </TabPanel>
+    <TabPanel Name="Modules">
+        @if (_modules == null)
+        {
+            <br />
+            <p>No Deleted Modules</p>
+        }
+        else
+        {
+            <Pager Items="@_modules">
+                <Header>
+                    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
+                    <th>Page</th>
+                    <th>Module</th>
+                    <th>Deleted By</th>
+                    <th>Deleted On</th>
+                </Header>
+                <Row>
+                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">Restore</button></td>
+                    <td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" /></td>
+                    <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
+                    <td>@context.Title</td>
+                    <td>@context.DeletedBy</td>
+                    <td>@context.DeletedOn</td>
+                </Row>
+            </Pager>
+        }
+    </TabPanel>
+</TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<Page> _pages;
+    private List<Module> _modules;
 
-    List<Page> _pages;
-    List<Module> _modules;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
@@ -147,7 +129,7 @@
     {
         try
         {
-            PageModule pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId);
+            var pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId);
             pagemodule.IsDeleted = false;
             await PageModuleService.UpdatePageModuleAsync(pagemodule);
             await logger.LogInformation("Module Restored {Module}", module);
@@ -168,10 +150,12 @@
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
             // check if there are any remaining module instances in the site
             _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+            
             if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
             }
+            
             await logger.LogInformation("Module Permanently Deleted {Module}", module);
             await Load();
             StateHasChanged();
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 46fdca01..2ea64944 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -3,60 +3,74 @@
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 
-@if  (_message != "")
+@if (PageState.Site.AllowRegistration)
 {
-    <ModuleMessage Message="@_message" Type="MessageType.Info" />
+    <AuthorizeView>
+        <Authorizing>
+            <text>...</text>
+        </Authorizing>
+        <Authorized>
+            <ModuleMessage Message="You Are Already Registered" Type="MessageType.Info" />            
+        </Authorized>
+        <NotAuthorized>
+            <ModuleMessage Message="Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity" Type="MessageType.Info" />
+
+            <div class="container">
+                <div class="form-group">
+                    <label for="Username" class="control-label">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">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">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">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">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">Register</button>
+                <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+            </div>
+        </NotAuthorized>
+    </AuthorizeView>
+}
+else
+{
+    <ModuleMessage Message="Registration is Disabled For This Site" Type="MessageType.Info" />
 }
 
-<div class="container">
-    <div class="form-group">
-        <label for="Username" class="control-label">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">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">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">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">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">Register</button>
-    <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-</div>
-
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private string _confirm = string.Empty;
+    private string _email = string.Empty;
+    private string _displayName = string.Empty;
 
-    string _message = "Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity";
-    string _username = "";
-    string _password = "";
-    string _confirm = "";
-    string _email = "";
-    string _displayName = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     private async Task Register()
     {
         try
         {
-            _message = "";
-            if (_username != "" && _password != "" && _confirm != "" && _email != "")
+            bool _isEmailValid = Utilities.IsValidEmail(_email);
+
+            if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
             {
                 if (_password == _confirm)
                 {
-                    User user = new User
+                    var user = new User
                     {
                         SiteId = PageState.Site.SiteId,
                         Username = _username,
-                        DisplayName = (_displayName == "" ? _username : _displayName),
+                        DisplayName = (_displayName == string.Empty ? _username : _displayName),
                         Email = _email,
                         Password = _password
                     };
@@ -92,6 +106,6 @@
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(""));
+        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
-}
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index 3fbb1556..b6e4eb66 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -21,11 +21,11 @@
 </div>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private string _confirm = string.Empty;
 
-    string _username = "";
-    string _password = "";
-    string _confirm = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
     protected override void OnInitialized()
     {
@@ -35,7 +35,7 @@
         }
         else
         { 
-            NavigationManager.NavigateTo(NavigateUrl(""));
+            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
         }
     }
 
@@ -43,11 +43,11 @@
     {
         try
         {
-            if (_username != "" && _password != "" && _confirm != "")
+            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
             {
                 if (_password == _confirm)
                 {
-                    User user = new User
+                    var user = new User
                     {
                         SiteId = PageState.Site.SiteId,
                         Username = _username,
@@ -85,6 +85,6 @@
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(""));
+        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index e908dd1c..34e93e2d 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -6,37 +6,26 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label  class="control-label">Name: </label>
+            <Label For="name" HelpText="Name Of The Role">Name:</Label>
         </td>
         <td>
-            <input class="form-control" @bind="@name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Description: </label>
+            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
         </td>
         <td>
-            <textarea class="form-control" @bind="@description" rows="5"></textarea>
+            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Auto Assigned? </label>
+            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
         </td>
         <td>
-            <select class="form-control" @bind="@isautoassigned">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">System Role? </label>
-        </td>
-        <td>
-            <select class="form-control" @bind="@issystem">
+            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
                 <option value="True">Yes</option>
                 <option value="False">No</option>
             </select>
@@ -46,22 +35,21 @@
 <button type="button" class="btn btn-success" @onclick="SaveRole">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+@code { 
+    private string _name = string.Empty;
+    private string _description = string.Empty;
+    private string _isautoassigned = "False";
 
-    string name = "";
-    string description = "";
-    string isautoassigned = "False";
-    string issystem = "False";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     private async Task SaveRole()
     {
-        Role role = new 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 = (issystem == null ? false : Boolean.Parse(issystem));
+        role.Name = _name;
+        role.Description = _description;
+        role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
+        role.IsSystem = false;
 
         try
         {
diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
index 71bc826a..4b0dd0e0 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
@@ -6,37 +6,26 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label  class="control-label">Name: </label>
+            <Label For="name" HelpText="Name Of The Role">Name:</Label>
         </td>
         <td>
-            <input class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Description: </label>
+            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
         </td>
         <td>
-            <textarea class="form-control" @bind="@_description" rows="5"></textarea>
+            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Auto Assigned? </label>
+            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
         </td>
         <td>
-            <select class="form-control" @bind="@_isautoassigned">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">System Role? </label>
-        </td>
-        <td>
-            <select class="form-control" @bind="@_issystem">
+            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
                 <option value="True">Yes</option>
                 <option value="False">No</option>
             </select>
@@ -47,26 +36,24 @@
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int _roleid;
+    private string _name = string.Empty;
+    private string _description = string.Empty;
+    private string _isautoassigned = "False";
 
-    int _roleid;
-    string _name = "";
-    string _description = "";
-    string _isautoassigned = "False";
-    string _issystem = "False";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
             _roleid = Int32.Parse(PageState.QueryString["id"]);
-            Role role = await RoleService.GetRoleAsync(_roleid);
+            var role = await RoleService.GetRoleAsync(_roleid);
             if (role != null)
             {
                 _name = role.Name;
                 _description = role.Description;
                 _isautoassigned = role.IsAutoAssigned.ToString();
-                _issystem = role.IsSystem.ToString();
             }
         }
         catch (Exception ex)
@@ -78,11 +65,11 @@
 
     private async Task SaveRole()
     {
-        Role role = await RoleService.GetRoleAsync(_roleid);
+        var role = await RoleService.GetRoleAsync(_roleid);
         role.Name = _name;
         role.Description = _description;
         role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
-        role.IsSystem = (_issystem != null && Boolean.Parse(_issystem));
+        role.IsSystem = false;
 
         try
         {
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 29378752..881a9348 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -12,22 +12,24 @@ else
 
     <Pager Items="@_roles">
         <Header>
+            <th>&nbsp;</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" /></td>
+            <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<Role> _roles;
 
-    List<Role> _roles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
     {
diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor
new file mode 100644
index 00000000..c292d3d5
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor
@@ -0,0 +1,201 @@
+@namespace Oqtane.Modules.Admin.Roles
+@inherits ModuleBase
+@inject IRoleService RoleService
+@inject IUserRoleService UserRoleService
+
+@if (userroles == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <Label For="role" HelpText="The role you are assigning users to">Role: </Label>
+            </td>
+            <td>
+                <input id="role" class="form-control" @bind="@name" disabled />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="user" HelpText="Select a user">User: </Label>
+            </td>
+            <td>
+                <select id="user" class="form-control" @bind="@userid">
+                    <option value="-1">&lt;Select User&gt;</option>
+                    @foreach (UserRole userrole in users)
+                    {
+                        <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="effectiveDate" HelpText="The date that this role assignment is active">Effective Date: </Label>
+            </td>
+            <td>
+                <input id="effectiveDate" class="form-control" @bind="@effectivedate" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="expiryDate" HelpText="The date that this role assignment expires">Expiry Date: </Label>
+            </td>
+            <td>
+                <input id="expiryDate" class="form-control" @bind="@expirydate" />
+            </td>
+        </tr>
+    </table>
+    <button type="button" class="btn btn-success" @onclick="SaveUserRole">Save</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+
+    <hr class="app-rule" />
+    <p align="center">
+        <Pager Items="@userroles">
+            <Header>
+                <th>Users</th>
+                <th>&nbsp;</th>
+            </Header>
+            <Row>
+                <td>@context.User.DisplayName</td>
+                <td>
+                    <button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button>
+                </td>
+            </Row>
+        </Pager>
+    </p>
+}
+
+@code {
+    private int roleid;
+    private string name = string.Empty;
+    private List<UserRole> users;
+    private int userid = -1;
+    private string effectivedate = string.Empty;
+    private string expirydate = string.Empty;
+    private List<UserRole> userroles;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            roleid = Int32.Parse(PageState.QueryString["id"]);
+            Role role = await RoleService.GetRoleAsync(roleid);
+            name = role.Name;
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+            users = users.Where(item => item.Role.Name == Constants.RegisteredRole).ToList();
+            await GetUserRoles();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
+            AddModuleMessage("Error Loading Users", MessageType.Error);
+        }
+    }
+
+    private async Task GetUserRoles()
+    {
+        try
+        {
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
+            userroles = userroles.Where(item => item.RoleId == roleid).ToList();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message);
+            AddModuleMessage("Error Loading User Roles", MessageType.Error);
+        }
+    }
+
+    private async Task SaveUserRole()
+    {
+        try
+        {
+            if (userid != -1)
+            {
+                var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+                if (userrole != null)
+                {
+                    if (string.IsNullOrEmpty(effectivedate))
+                    {
+                        userrole.EffectiveDate = null;
+                    }
+                    else
+                    {
+                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
+                    }
+
+                    if (string.IsNullOrEmpty(expirydate))
+                    {
+                        userrole.ExpiryDate = null;
+                    }
+                    else
+                    {
+                        userrole.ExpiryDate = DateTime.Parse(expirydate);
+                    }
+                    await UserRoleService.UpdateUserRoleAsync(userrole);
+                }
+                else
+                {
+                    userrole = new UserRole();
+                    userrole.UserId = userid;
+                    userrole.RoleId = roleid;
+
+                    if (string.IsNullOrEmpty(effectivedate))
+                    {
+                        userrole.EffectiveDate = null;
+                    }
+                    else
+                    {
+                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
+                    }
+
+                    if (string.IsNullOrEmpty(expirydate))
+                    {
+                        userrole.ExpiryDate = null;
+                    }
+                    else
+                    {
+                        userrole.ExpiryDate = DateTime.Parse(expirydate);
+                    }
+
+                    await UserRoleService.AddUserRoleAsync(userrole);
+                }
+
+                await GetUserRoles();
+                await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
+                AddModuleMessage("User Assigned To Role", MessageType.Success);
+            }
+            else
+            {
+                AddModuleMessage("You Must Select A User", MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
+            AddModuleMessage("Error Saving User Roles", MessageType.Error);
+        }
+    }
+
+    private async Task DeleteUserRole(int UserRoleId)
+    {
+        try
+        {
+            await UserRoleService.DeleteUserRoleAsync(UserRoleId);
+            await GetUserRoles();
+            await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
+            AddModuleMessage("User Removed From Role", MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
+            AddModuleMessage("Error Removing User From Role", MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index b3692a49..e4bae61e 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -7,51 +7,59 @@
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
 
-@if (themes != null)
+@if (_themes != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Name: </label>
+                <Label For="name" HelpText="Enter the site name">Name: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@name" />
+                <input id="name" class="form-control" @bind="@_name" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Tenant: </label>
+                <Label For="tenant" HelpText="Enter the tenant for the site">Tenant: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@tenant" readonly />
+                <input id="tenant" class="form-control" @bind="@_tenant" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Aliases: </label>
+                <Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@urls" rows="3"></textarea>
+                <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Logo: </label>
+                <Label For="logo" HelpText="Upload a logo for the site">Logo: </Label>
             </td>
             <td>
-                <FileManager FileId="@logofileid.ToString()" @ref="filemanager" />
+                <FileManager FileId="@_logofileid.ToString()" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Theme: </label>
+                <Label For="favicon" HelpText="Select Your default icon">Favicon: </Label>
             </td>
             <td>
-                <select class="form-control" @onchange="(e => ThemeChanged(e))">
+                <FileManager FileId="@_faviconfileid.ToString()" Filter="ico" @ref="_faviconfilemanager" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="defaultTheme" HelpText="Select the sites default theme">Default Theme: </Label>
+            </td>
+            <td>
+                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
                     <option value="">&lt;Select Theme&gt;</option>
-                    @foreach (KeyValuePair<string, string> item in themes)
+                    @foreach (KeyValuePair<string, string> item in _themes)
                     {
-                        if (item.Key == themetype)
+                        if (item.Key == _themetype)
                         {
                             <option value="@item.Key" selected>@item.Value</option>
                         }
@@ -65,12 +73,12 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Layout: </label>
+                <Label For="defaultLayout" HelpText="Select the sites default layout">Default Layout: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@layouttype">
+                <select id="defaultLayout" class="form-control" @bind="@_layouttype">
                     <option value="">&lt;Select Layout&gt;</option>
-                    @foreach (KeyValuePair<string, string> panelayout in panelayouts)
+                    @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
                     }
@@ -79,12 +87,12 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Container: </label>
+                <Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@containertype">
+                <select id="defaultContainer" class="form-control" @bind="@_containertype">
                     <option value="">&lt;Select Container&gt;</option>
-                    @foreach (KeyValuePair<string, string> container in containers)
+                    @foreach (KeyValuePair<string, string> container in _containers)
                     {
                         <option value="@container.Key">@container.Value</option>
                     }
@@ -93,10 +101,21 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Is Deleted? </label>
+                <Label For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site">Allow User Registration? </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@isdeleted">
+                <select id="allowRegister" class="form-control" @bind="@_allowregistration">
+                    <option value="True">Yes</option>
+                    <option value="False">No</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="isDeleted" HelpText="Is this site deleted?">Is Deleted? </Label>
+            </td>
+            <td>
+                <select id="isDeleted" class="form-control" @bind="@_isdeleted">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
@@ -104,137 +123,200 @@
         </tr>
     </table>
 
-    <a data-toggle="collapse" class="app-link-unstyled" href="#SMTP" aria-expanded="false" aria-controls="SMTP">
-        <h5><i class="oi oi-chevron-bottom"></i>&nbsp;SMTP Settings</h5><hr class="app-rule" />
-    </a>
-    <div class="collapse" id="SMTP">
+    <Section Name="SMTP" Heading="SMTP Settings">
         <table class="table table-borderless">
             <tr>
                 <td>
-                    <label  class="control-label">Host: </label>
+                    <Label For="host" HelpText="Enter the host name of the server">Host: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@smtphost" />
+                    <input id="host" class="form-control" @bind="@_smtphost" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <label  class="control-label">Port: </label>
+                    <Label For="port" HelpText="Enter the port number for the server">Port: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@smtpport" />
+                    <input id="port" class="form-control" @bind="@_smtpport" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <label  class="control-label">SSL Enabled: </label>
+                    <Label For="enabledSSl" HelpText="Specifiy if SSL is enabled for your server">SSL Enabled: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@smtpssl" />
+                    <input id="enabledSSl" class="form-control" @bind="@_smtpssl" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <label  class="control-label">Username: </label>
+                    <Label For="username" HelpText="Enter the username for the server">Username: </Label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@smtpusername" />
+                    <input id="username" class="form-control" @bind="@_smtpusername" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <label  class="control-label">Password: </label>
+                    <Label For="password" HelpText="Enter the password for the server">Password: </Label>
                 </td>
                 <td>
-                    <input type="password" class="form-control" @bind="@smtppassword" />
+                    <input id="password" type="password" class="form-control" @bind="@_smtppassword" />
                 </td>
             </tr>
         </table>
-    </div>
+    </Section>
+    <Section Name="PWA" Heading="Progressive Web Application Settings">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)">Is Enabled? </Label>
+                </td>
+                <td>
+                    <select id="isEnabled" class="form-control" @bind="@_pwaisenabled">
+                        <option value="True">Yes</option>
+                        <option value="False">No</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="appIcon" HelpText="Include an application icon for your PWA. It should be a PNG which is 192 X 192 pixels in dimension.">App Icon: </Label>
+                </td>
+                <td>
+                    <FileManager FileId="@_pwaappiconfileid.ToString()" Filter="png" @ref="_pwaappiconfilemanager" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="splashIcon" HelpText="Include a splash icon for your PWA. It should be a PNG which is 512 X 512 pixels in dimension.">Splash Icon: </Label>
+                </td>
+                <td>
+                    <FileManager FileId="@_pwasplashiconfileid.ToString()" Filter="png" @ref="_pwasplashiconfilemanager" />
+                </td>
+            </tr>
+        </table>
+    </Section>
+
     <br />
     <button type="button" class="btn btn-success" @onclick="SaveSite">Save</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     <br />
     <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private Dictionary<string, string> _themes;
+    private Dictionary<string, string> _panelayouts;
+    private Dictionary<string, string> _containers;
+    private List<Theme> _themeList;
+    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;
+    private FileManager _logofilemanager;
+    private int _faviconfileid = -1;
+    private FileManager _faviconfilemanager;
+    private string _themetype;
+    private string _layouttype;
+    private string _containertype;
+    private string _allowregistration;
+    private string _smtphost = string.Empty;
+    private string _smtpport = string.Empty;
+    private string _smtpssl = string.Empty;
+    private string _smtpusername = string.Empty;
+    private string _smtppassword = string.Empty;
+    private string _pwaisenabled;
+    private int _pwaappiconfileid = -1;
+    private FileManager _pwaappiconfilemanager;
+    private int _pwasplashiconfileid = -1;
+    private FileManager _pwasplashiconfilemanager;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
+    private string _isdeleted;
 
-    Dictionary<string, string> themes;
-    Dictionary<string, string> panelayouts;
-    Dictionary<string, string> containers;
-
-    List<Theme> Themes;
-    string name = "";
-    List<Tenant> tenants;
-    string tenant = "";
-    List<Alias> aliases;
-    string urls = "";
-    int logofileid = -1;
-    FileManager filemanager;
-    string themetype;
-    string layouttype;
-    string containertype;
-
-    string smtphost = "";
-    string smtpport = "";
-    string smtpssl = "";
-    string smtpusername = "";
-    string smtppassword = "";
-
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-    string deletedby;
-    DateTime? deletedon;
-    string isdeleted;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            Themes = await ThemeService.GetThemesAsync();
-            aliases = await AliasService.GetAliasesAsync();
-            Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId, PageState.Alias);
+            _themeList = await ThemeService.GetThemesAsync();
+            _aliasList = await AliasService.GetAliasesAsync();
+            Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
             if (site != null)
             {
-                name = site.Name;
-                tenants = await TenantService.GetTenantsAsync();
-                tenant = tenants.Find(item => item.TenantId == site.TenantId).Name;
-                foreach (Alias alias in aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                _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())
                 {
-                    urls += alias.Name + "\n";
+                    _urls += alias.Name + "\n";
                 }
                 if (site.LogoFileId != null)
                 {
-                    logofileid = site.LogoFileId.Value;
+                    _logofileid = site.LogoFileId.Value;
                 }
-                themetype = site.DefaultThemeType;
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
-                layouttype = site.DefaultLayoutType;
-                containertype = site.DefaultContainerType;
 
-                Dictionary<string, string> settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                smtphost = SettingService.GetSetting(settings, "SMTPHost", "");
-                smtpport = SettingService.GetSetting(settings, "SMTPPort", "");
-                smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "");
-                smtpusername = SettingService.GetSetting(settings, "SMTPUsername", "");
-                smtppassword = SettingService.GetSetting(settings, "SMTPPassword", "");
+                if (site.FaviconFileId != null)
+                {
+                    _faviconfileid = site.FaviconFileId.Value;
+                }
 
-                createdby = site.CreatedBy;
-                createdon = site.CreatedOn;
-                modifiedby = site.ModifiedBy;
-                modifiedon = site.ModifiedOn;
-                deletedby = site.DeletedBy;
-                deletedon = site.DeletedOn;
-                isdeleted = site.IsDeleted.ToString();
+                _themetype = site.DefaultThemeType;
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
+                _layouttype = site.DefaultLayoutType;
+                _containertype = site.DefaultContainerType;
+                _allowregistration = site.AllowRegistration.ToString();
+
+                var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+                _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
+                _smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
+                _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", string.Empty);
+                _smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
+                _smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
+
+                _pwaisenabled = site.PwaIsEnabled.ToString();
+
+                if (site.PwaAppIconFileId != null)
+                {
+                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
+                }
+
+                if (site.PwaSplashIconFileId != null)
+                {
+                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+                }
+
+                _pwaisenabled = site.PwaIsEnabled.ToString();
+                if (site.PwaAppIconFileId != null)
+                {
+                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
+                }
+                if (site.PwaSplashIconFileId != null)
+                {
+                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+                }
+
+                _createdby = site.CreatedBy;
+                _createdon = site.CreatedOn;
+                _modifiedby = site.ModifiedBy;
+                _modifiedon = site.ModifiedOn;
+                _deletedby = site.DeletedBy;
+                _deletedon = site.DeletedOn;
+                _isdeleted = site.IsDeleted.ToString();
             }
 
-            themes = ThemeService.GetThemeTypes(Themes);
-            containers = ThemeService.GetContainerTypes(Themes);
+            _themes = ThemeService.GetThemeTypes(_themeList);
+            _containers = ThemeService.GetContainerTypes(_themeList);
         }
         catch (Exception ex)
         {
@@ -247,20 +329,20 @@
     {
         try
         {
-            themetype = (string)e.Value;
-            if (themetype != "")
+            _themetype = (string)e.Value;
+            if (_themetype != string.Empty)
             {
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
             }
             else
             {
-                panelayouts = new Dictionary<string, string>();
+                _panelayouts = new Dictionary<string, string>();
             }
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", themetype, ex.Message);
+            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
             AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
         }
     }
@@ -269,47 +351,65 @@
     {
         try
         {
-            if (name != "" && urls != "" && !string.IsNullOrEmpty(themetype) && (panelayouts.Count == 0 || !string.IsNullOrEmpty(layouttype)) && !string.IsNullOrEmpty(containertype))
+            if (_name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype))
             {
-                bool unique = true;
-                foreach (string name in urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                var unique = true;
+                foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                 {
-                    if (aliases.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+                    if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
                     {
                         unique = false;
                     }
                 }
+
                 if (unique)
                 {
-                    Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId, PageState.Alias);
+                    var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
                     if (site != null)
                     {
-                        site.Name = name;
+                        site.Name = _name;
                         site.LogoFileId = null;
-                        int logofileid = filemanager.GetFileId();
+                        var logofileid = _logofilemanager.GetFileId();
                         if (logofileid != -1)
                         {
                             site.LogoFileId = logofileid;
                         }
-                        site.DefaultThemeType = themetype;
-                        site.DefaultLayoutType = (layouttype == null ? "" : layouttype);
-                        site.DefaultContainerType = containertype;
-                        site.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
 
-                        site = await SiteService.UpdateSiteAsync(site, PageState.Alias);
+                        site.DefaultThemeType = _themetype;
+                        site.DefaultLayoutType = (_layouttype == null ? string.Empty : _layouttype);
+                        site.DefaultContainerType = _containertype;
+                        site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration));
+                        site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
-                        urls = urls.Replace("\n", ",");
-                        string[] names = urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                        foreach (Alias alias in aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                        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)
+                        {
+                            site.PwaSplashIconFileId = pwasplashiconfileid;
+                        }
+
+                        site = await SiteService.UpdateSiteAsync(site);
+
+                        _urls = _urls.Replace("\n", ",");
+                        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 (!aliases.Exists(item => item.Name == name))
+                            if (!_aliasList.Exists(item => item.Name == name))
                             {
                                 Alias alias = new Alias();
                                 alias.Name = name;
@@ -319,12 +419,12 @@
                             }
                         }
 
-                        Dictionary<string, string> settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                        SettingService.SetSetting(settings, "SMTPHost", smtphost);
-                        SettingService.SetSetting(settings, "SMTPPort", smtpport);
-                        SettingService.SetSetting(settings, "SMTPSSL", smtpssl);
-                        SettingService.SetSetting(settings, "SMTPUsername", smtpusername);
-                        SettingService.SetSetting(settings, "SMTPPassword", smtppassword);
+                        var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+                        SettingService.SetSetting(settings, "SMTPHost", _smtphost);
+                        SettingService.SetSetting(settings, "SMTPPort", _smtpport);
+                        SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
+                        SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
+                        SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
                         await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
                         await logger.LogInformation("Site Saved {Site}", site);
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index a692d081..40ac6f39 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -5,7 +5,9 @@
 @inject IAliasService AliasService
 @inject ISiteService SiteService
 @inject IThemeService  ThemeService
+@inject ISiteTemplateService SiteTemplateService
 @inject IUserService UserService
+@inject IInstallationService InstallationService
 
 @if (_tenants == null)
 {
@@ -16,40 +18,26 @@ else
 <table class="table table-borderless">
     <tr>
         <td>
-            <label  class="control-label">Tenant: </label>
+            <Label For="name" HelpText="Enter the name of the site">Site Name: </Label>
         </td>
         <td>
-            <select class="form-control" @onchange="(e => TenantChanged(e))">
-                <option value="-1">&lt;Select Tenant&gt;</option>
-                @foreach (Tenant tenant in _tenants)
-                {
-                    <option value="@tenant.TenantId">@tenant.Name</option>
-                }
-            </select>
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Name: </label>
+            <Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
         </td>
         <td>
-            <input class="form-control" @bind="@_name" />
+            <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Aliases: </label>
+            <Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
         </td>
         <td>
-            <textarea class="form-control" @bind="@_urls" rows="3"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">Default Theme: </label>
-        </td>
-        <td>
-            <select class="form-control" @onchange="(e => ThemeChanged(e))">
+            <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
                 <option value="">&lt;Select Theme&gt;</option>
                 @foreach (KeyValuePair<string, string> item in _themes)
                 {
@@ -60,10 +48,10 @@ else
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Default Layout: </label>
+            <Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
         </td>
         <td>
-            <select class="form-control" @bind="@_layouttype">
+            <select id="defaultLayout" class="form-control" @bind="@_layouttype">
                 <option value="">&lt;Select Layout&gt;</option>
                 @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                 {
@@ -74,34 +62,133 @@ else
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Default Container: </label>
+            <Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
         </td>
         <td>
-            <select class="form-control" @bind="@_containertype">
+            <select id="defaultContainer" class="form-control" @bind="@_containertype">
                 <option value="">&lt;Select Container&gt;</option>
-                @foreach (KeyValuePair<string, string>container in _containers)
+                @foreach (KeyValuePair<string, string> container in _containers)
                 {
                     <option value="@container.Key">@container.Value</option>
                 }
             </select>
         </td>
     </tr>
-    @if (!_isinitialized)
+    <tr>
+        <td>
+            <Label For="siteTemplate" HelpText="Select the site template">Site Template: </Label>
+        </td>
+        <td>
+            <select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype">
+                <option value="">&lt;Select Site Template&gt;</option>
+                @foreach (SiteTemplate siteTemplate in _siteTemplates)
+                {
+                    <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
+                }
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="tenant" HelpText="Select the tenant for the site">Tenant: </Label>
+        </td>
+        <td>
+            <select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))">
+                <option value="-">&lt;Select Tenant&gt;</option>
+                <option value="+">&lt;Create New Tenant&gt;</option>
+                @foreach (Tenant tenant in _tenants)
+                {
+                    <option value="@tenant.TenantId">@tenant.Name</option>
+                }
+            </select>
+        </td>
+    </tr>
+    @if (_tenantid == "+")
     {
         <tr>
-            <td>
-                <label  class="control-label">Host Username:</label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@_username" readonly />
+            <td colspan="2">
+                <hr class="app-rule" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Host Password:</label>
+                <Label For="name" HelpText="Enter the name for the tenant">Tenant Name: </Label>
             </td>
             <td>
-                <input type="password" class="form-control" @bind="@_password" />
+                <input id="name" class="form-control" @bind="@_tenantname" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="databaseType" HelpText="Select the database type for the tenant">Database Type: </Label>
+            </td>
+            <td>
+                <select id="databaseType" class="custom-select" @bind="@_databasetype">
+                    <option value="LocalDB">Local Database</option>
+                    <option value="SQLServer">SQL Server</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="server" HelpText="Enter the server for the tenant">Server: </Label>
+            </td>
+            <td>
+                <input id="server" type="text" class="form-control" @bind="@_server" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="database" HelpText="Enter the database for the tenant">Database: </Label>
+            </td>
+            <td>
+                <input id="database" type="text" class="form-control" @bind="@_database" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="integratedSecurity" HelpText="Select if you want integrated security or not">Integrated Security: </Label>
+            </td>
+            <td>
+                <select id="integratedSecurity" class="custom-select" @onchange="SetIntegratedSecurity">
+                    <option value="true" selected>True</option>
+                    <option value="false">False</option>
+                </select>
+            </td>
+        </tr>
+        @if (!_integratedsecurity)
+        {
+            <tr>
+                <td>
+                    <Label For="username" HelpText="Enter the username for the integrated security">Database Username: </Label>
+                </td>
+                <td>
+                    <input id="username" type="text" class="form-control" @bind="@_username" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="password" HelpText="Enter the password for the integrated security">Database Password: </Label>
+                </td>
+                <td>
+                    <input id="password" type="password" class="form-control" @bind="@_password" />
+                </td>
+            </tr>
+        }
+        <tr>
+            <td>
+                <Label For="hostUsername" HelpText="Enter the username of the host for this site">Host Username:</Label>
+            </td>
+            <td>
+                <input id="hostUsername" class="form-control" @bind="@_hostusername" readonly />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="hostPassword" HelpText="Enter the password for the host of this site">Host Password:</Label>
+            </td>
+            <td>
+                <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" />
             </td>
         </tr>
     }
@@ -111,23 +198,32 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private Dictionary<string, string> _themes = new Dictionary<string, string>();
+    private Dictionary<string, string> _panelayouts = new Dictionary<string, string>();
+    private Dictionary<string, string> _containers = new Dictionary<string, string>();
+    private List<SiteTemplate> _siteTemplates;
+    private List<Theme> _themeList;
+    private List<Tenant> _tenants;
+    private string _tenantid = "-";
 
-    Dictionary<string, string> _themes = new Dictionary<string, string>();
-    Dictionary<string, string> _panelayouts = new Dictionary<string, string>();
-    Dictionary<string, string> _containers = new Dictionary<string, string>();
+    private string _tenantname = string.Empty;
+    private string _databasetype = "LocalDB";
+    private string _server = "(LocalDb)\\MSSQLLocalDB";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _username = string.Empty;
+    private string _password = string.Empty;
+    private bool _integratedsecurity = true;
+    private string _hostusername = Constants.HostUser;
+    private string _hostpassword = string.Empty;
 
-    List<Theme> _themeList;
-    List<Tenant> _tenants;
-    string _tenantid = "-1";
-    string _name = "";
-    string _urls = "";
-    string _themetype = "";
-    string _layouttype = "";
-    string _containertype = "";
-    bool _isinitialized = true;
-    string _username = "";
-    string _password = "";
+    private string _name = string.Empty;
+    private string _urls = string.Empty;
+    private string _themetype = string.Empty;
+    private string _layouttype = string.Empty;
+    private string _containertype = string.Empty;
+    private string _sitetemplatetype = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
@@ -136,29 +232,30 @@ else
         _urls = PageState.Alias.Name;
         _themes = ThemeService.GetThemeTypes(_themeList);
         _containers = ThemeService.GetContainerTypes(_themeList);
-        _username = Constants.HostUser;
+        _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
     }
 
-    private async void TenantChanged(ChangeEventArgs e)
+    private void TenantChanged(ChangeEventArgs e)
     {
-        try
+        _tenantid = (string)e.Value;
+        if (string.IsNullOrEmpty(_tenantname))
         {
-            _tenantid = (string)e.Value;
-            if (_tenantid != "-1")
-            {
-                Tenant tenant = _tenants.Where(item => item.TenantId == int.Parse(_tenantid)).FirstOrDefault();
-                if (tenant != null)
-                {
-                    _isinitialized = tenant.IsInitialized;
-                    StateHasChanged();
-                }
-            }
+            _tenantname = _name;
         }
-        catch (Exception ex)
+        StateHasChanged();
+    }
+
+    private void SetIntegratedSecurity(ChangeEventArgs e)
+    {
+        if (Convert.ToBoolean((string)e.Value))
         {
-            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", _tenantid, ex.Message);
-            AddModuleMessage("Error Loading Tenant", MessageType.Error);
+            _integratedsecurity = true;
         }
+        else
+        {
+            _integratedsecurity = false;
+        }
+        StateHasChanged();
     }
 
     private async void ThemeChanged(ChangeEventArgs e)
@@ -166,7 +263,7 @@ else
         try
         {
             _themetype = (string)e.Value;
-            if (_themetype != "")
+            if (_themetype != string.Empty)
             {
                 _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
             }
@@ -174,6 +271,7 @@ else
             {
                 _panelayouts = new Dictionary<string, string>();
             }
+
             StateHasChanged();
         }
         catch (Exception ex)
@@ -185,99 +283,121 @@ else
 
     private async Task SaveSite()
     {
-        if (_tenantid != "-1" && _name != "" && _urls != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype))
+        if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype) && !string.IsNullOrEmpty(_sitetemplatetype))
         {
-            bool unique = true;
-            List<Alias> aliases = await AliasService.GetAliasesAsync();
+            var duplicates = new List<string>();
+            var aliases = await AliasService.GetAliasesAsync();
             foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
             {
                 if (aliases.Exists(item => item.Name == name))
                 {
-                    unique = false;
+                    duplicates.Add(name);
                 }
             }
-            if (unique)
+
+            if (duplicates.Count == 0)
             {
-                bool isvalid = true;
+                InstallConfig config = new InstallConfig();
 
-                if (!_isinitialized)
+                if (_tenantid == "+")
                 {
-                    User user = new User();
-                    user.SiteId = PageState.Site.SiteId;
-                    user.Username = _username;
-                    user.Password = _password;
-                    user = await UserService.LoginUserAsync(user, false, false);
-                    isvalid = user.IsAuthenticated;
-                }
-
-                if (isvalid)
-                {
-                    ShowProgressIndicator();
-
-                    aliases = new List<Alias>();
-                    _urls = _urls.Replace("\n", ",");
-                    foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                    if (!string.IsNullOrEmpty(_tenantname) && _tenants.FirstOrDefault(item => item.Name == _tenantname) == null)
                     {
-                        Alias alias = new Alias();
-                        alias.Name = name;
-                        alias.TenantId = int.Parse(_tenantid);
-                        alias.SiteId = -1;
-                        alias = await AliasService.AddAliasAsync(alias);
-                        aliases.Add(alias);
-                    }
-
-                    Site site = new Site();
-                    site.TenantId = int.Parse(_tenantid);
-                    site.Name = _name;
-                    site.LogoFileId = null;
-                    site.DefaultThemeType = _themetype;
-                    site.DefaultLayoutType = (_layouttype == null ? "" : _layouttype);
-                    site.DefaultContainerType = _containertype;
-                    site = await SiteService.AddSiteAsync(site, aliases[0]);
-
-                    foreach (Alias alias in aliases)
-                    {
-                        alias.SiteId = site.SiteId;
-                        await AliasService.UpdateAliasAsync(alias);
-                    }
-
-                    if (!_isinitialized)
-                    {
-                        User user = new User();
-                        user.SiteId = site.SiteId;
-                        user.Username = _username;
-                        user.Password = _password;
-                        user.Email = PageState.User.Email;
-                        user.DisplayName = PageState.User.DisplayName;
-                        user = await UserService.AddUserAsync(user, aliases[0]);
-
-                        if (user != null)
+                        // validate host credentials
+                        var user = new User();
+                        user.SiteId = PageState.Site.SiteId;
+                        user.Username = Constants.HostUser;
+                        user.Password = _hostpassword;
+                        user = await UserService.LoginUserAsync(user, false, false);
+                        if (user.IsAuthenticated)
                         {
-                            Tenant tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
-                            tenant.IsInitialized = true;
-                            await TenantService.UpdateTenantAsync(tenant);
+                            if (!string.IsNullOrEmpty(_server) && !string.IsNullOrEmpty(_database))
+                            {
+                                var connectionString = string.Empty;
+                                if (_databasetype == "LocalDB")
+                                {
+                                    connectionString = "Data Source=" + _server + ";AttachDbFilename=|DataDirectory|\\" + _database + ".mdf;Initial Catalog=" + _database + ";Integrated Security=SSPI;";
+                                }
+                                else
+                                {
+                                    connectionString = "Data Source=" + _server + ";Initial Catalog=" + _database + ";";
+
+                                    if (_integratedsecurity)
+                                    {
+                                        connectionString += "Integrated Security=SSPI;";
+                                    }
+                                    else
+                                    {
+                                        connectionString += "User ID=" + _username + ";Password=" + _password;
+                                    }
+                                }
+
+                                config.ConnectionString = connectionString;
+                                config.HostPassword = _hostpassword;
+                                config.HostEmail = user.Email;
+                                config.HostName = user.DisplayName;
+                                config.TenantName = _tenantname;
+                                config.IsNewTenant = true;
+                            }
+                            else
+                            {
+                                AddModuleMessage("You Must Specify A Server And Database", MessageType.Error);
+                            }
+                        }
+                        else
+                        {
+                            AddModuleMessage("Invalid Host Password", MessageType.Error);
                         }
                     }
-                    await Log(aliases[0], LogLevel.Information, "", null, "Site Created {Site}", site);
-
-                    Uri uri = new Uri(NavigationManager.Uri);
-                    NavigationManager.NavigateTo(uri.Scheme + "://" + aliases[0].Name, true);
+                    else
+                    {
+                        AddModuleMessage("Tenant Name Is Missing Or Already Exists", MessageType.Error);
+                    }
                 }
                 else
                 {
-                    await logger.LogError("Invalid Password Entered For Host {Username}", _username);
-                    AddModuleMessage("Invalid Host Password", MessageType.Error);
+                    var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
+                    if (tenant != null)
+                    {
+                        config.TenantName = tenant.Name;
+                        config.ConnectionString= tenant.DBConnectionString;
+                        config.IsNewTenant = false;
+                    }
+                }
+
+                if  (!string.IsNullOrEmpty(config.TenantName))
+                {
+                    config.SiteName = _name;
+                    config.Aliases = _urls.Replace("\n", ",");
+                    config.DefaultTheme = _themetype;
+                    config.DefaultLayout = _layouttype;
+                    config.DefaultContainer = _containertype;
+                    config.SiteTemplate = _sitetemplatetype;
+
+                    ShowProgressIndicator();
+
+                    var installation = await InstallationService.Install(config);
+                    if (installation.Success)
+                    {
+                        var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
+                        var uri = new Uri(NavigationManager.Uri);
+                        NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
+                    }
+                    else
+                    {
+                        await logger.LogError("Error Creating Site {Error}", installation.Message);
+                        AddModuleMessage(installation.Message, MessageType.Error);
+                    }
                 }
             }
             else
             {
-                AddModuleMessage("An Alias Specified Has Already Been Used For Another Site", MessageType.Warning);
+                AddModuleMessage(string.Join(", ", duplicates.ToArray()) + " Already Used For Another Site", MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, And Default Theme/Container", MessageType.Warning);
+            AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template", MessageType.Warning);
         }
-
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index bc3b499c..698892a7 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -6,43 +6,43 @@
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 
-@if (themes != null)
+@if (_themes != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Name: </label>
+                <Label For="name" HelpText="Enter the name of the site">Name: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@name" />
+                <input id="name" class="form-control" @bind="@_name" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Tenant: </label>
+                <Label For="tenant" HelpText="Enter the tenant for the site">Tenant: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@tenant" readonly />
+                <input id="tenant" class="form-control" @bind="@_tenant" readonly />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Aliases: </label>
+                <Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@urls" rows="3" />
+                <textarea id="alias" class="form-control" @bind="@_urls" rows="3" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Theme: </label>
+                <Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
             </td>
             <td>
-                <select class="form-control" @onchange="(e => ThemeChanged(e))">
+                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
                     <option value="">&lt;Select Theme&gt;</option>
-                    @foreach (KeyValuePair<string, string> item in themes)
+                    @foreach (KeyValuePair<string, string> item in _themes)
                     {
-                        if (item.Key == themetype)
+                        if (item.Key == _themetype)
                         {
                             <option value="@item.Key" selected>@item.Value</option>
                         }
@@ -56,12 +56,12 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Layout: </label>
+                <Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@layouttype">
+                <select id="defaultLayout" class="form-control" @bind="@_layouttype">
                     <option value="">&lt;Select Layout&gt;</option>
-                    @foreach (KeyValuePair<string, string> panelayout in panelayouts)
+                    @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
                     }
@@ -70,12 +70,12 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Default Container: </label>
+                <Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@containertype">
+                <select id="defaultIdea" class="form-control" @bind="@_containertype">
                     <option value="">&lt;Select Container&gt;</option>
-                    @foreach (KeyValuePair<string, string> container in containers)
+                    @foreach (KeyValuePair<string, string> container in _containers)
                     {
                         <option value="@container.Key">@container.Value</option>
                     }
@@ -84,10 +84,10 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Is Deleted? </label>
+                <Label For="isDeleted" HelpText="Has this site been deleted?">Is Deleted? </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@isdeleted">
+                <select id="isDeleted" class="form-control" @bind="@_isdeleted">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
@@ -99,73 +99,73 @@
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     <br />
     <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private Dictionary<string, string> _themes;
+    private Dictionary<string, string> _panelayouts;
+    private Dictionary<string, string> _containers;
+    private Alias _alias;
+    private List<Theme> _themeList;
+    private string _name = string.Empty;
+    private List<Tenant> _tenantList;
+    private string _tenant = string.Empty;
+    private List<Alias> _aliasList;
+    private string _urls = string.Empty;
+    private string _themetype;
+    private string _layouttype;
+    private string _containertype;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
+    private string _isdeleted;
 
-    Dictionary<string, string> themes;
-    Dictionary<string, string> panelayouts;
-    Dictionary<string, string> containers;
-
-    Alias Alias;
-    List<Theme> Themes;
-    string name = "";
-    List<Tenant> tenants;
-    string tenant = "";
-    List<Alias> aliases;
-    string urls = "";
-    string themetype;
-    string layouttype;
-    string containertype;
-
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-    string deletedby;
-    DateTime? deletedon;
-    string isdeleted;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            Themes = await ThemeService.GetThemesAsync();
-            aliases = await AliasService.GetAliasesAsync();
+            _themeList = await ThemeService.GetThemesAsync();
+            _aliasList = await AliasService.GetAliasesAsync();
 
-            Alias = aliases.Find(item => item.AliasId == Int32.Parse(PageState.QueryString["id"]));
-            Site site = await SiteService.GetSiteAsync(Alias.SiteId, Alias);
+            _alias = _aliasList.Find(item => item.AliasId == Int32.Parse(PageState.QueryString["id"]));
+            SiteService.SetAlias(_alias);
+            var site = await SiteService.GetSiteAsync(_alias.SiteId);
             if (site != null)
             {
-                name = site.Name;
-                tenants = await TenantService.GetTenantsAsync();
-                tenant = tenants.Find(item => item.TenantId == site.TenantId).Name;
-                foreach (Alias alias in aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                {
-                    urls += alias.Name + "\n";
-                }
-                themetype = site.DefaultThemeType;
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
-                layouttype = site.DefaultLayoutType;
-                containertype = site.DefaultContainerType;
+                _name = site.Name;
+                _tenantList = await TenantService.GetTenantsAsync();
+                _tenant = _tenantList.Find(item => item.TenantId == site.TenantId).Name;
 
-                createdby = site.CreatedBy;
-                createdon = site.CreatedOn;
-                modifiedby = site.ModifiedBy;
-                modifiedon = site.ModifiedOn;
-                deletedby = site.DeletedBy;
-                deletedon = site.DeletedOn;
-                isdeleted = site.IsDeleted.ToString();
+                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                {
+                    _urls += alias.Name + "\n";
+                }
+
+                _themetype = site.DefaultThemeType;
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
+                _layouttype = site.DefaultLayoutType;
+                _containertype = site.DefaultContainerType;
+                _createdby = site.CreatedBy;
+                _createdon = site.CreatedOn;
+                _modifiedby = site.ModifiedBy;
+                _modifiedon = site.ModifiedOn;
+                _deletedby = site.DeletedBy;
+                _deletedon = site.DeletedOn;
+                _isdeleted = site.IsDeleted.ToString();
             }
 
-            themes = ThemeService.GetThemeTypes(Themes);
-            containers = ThemeService.GetContainerTypes(Themes);
+            _themes = ThemeService.GetThemeTypes(_themeList);
+            _containers = ThemeService.GetContainerTypes(_themeList);
         }
         catch (Exception ex)
         {
-            await Log(Alias, LogLevel.Error, "", ex, "Error Loading Site {SiteId} {Error}", Alias.SiteId, ex.Message);
+            await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Loading Site {SiteId} {Error}", _alias.SiteId, ex.Message);
             AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
@@ -174,20 +174,21 @@
     {
         try
         {
-            themetype = (string)e.Value;
-            if (themetype != "")
+            _themetype = (string)e.Value;
+            if (_themetype != string.Empty)
             {
-                panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
+                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
             }
             else
             {
-                panelayouts = new Dictionary<string, string>();
+                _panelayouts = new Dictionary<string, string>();
             }
+
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", themetype, ex.Message);
+            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
             AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
         }
     }
@@ -196,52 +197,58 @@
     {
         try
         {
-            if (name != "" && urls != "" && !string.IsNullOrEmpty(themetype) && (panelayouts.Count == 0 || !string.IsNullOrEmpty(layouttype)) && !string.IsNullOrEmpty(containertype))
+            if (_name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype))
             {
-                bool unique = true;
-                foreach (string name in urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                var unique = true;
+                foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                 {
-                    if (aliases.Exists(item => item.Name == name && item.SiteId != Alias.SiteId && item.TenantId != Alias.TenantId))
+                    if (_aliasList.Exists(item => item.Name == name && item.SiteId != _alias.SiteId && item.TenantId != _alias.TenantId))
                     {
                         unique = false;
                     }
                 }
+
                 if (unique)
                 {
-                    Site site = await SiteService.GetSiteAsync(Alias.SiteId, Alias);
+                    SiteService.SetAlias(_alias);
+                    var site = await SiteService.GetSiteAsync(_alias.SiteId);
                     if (site != null)
                     {
-                        site.Name = name;
+                        site.Name = _name;
                         site.LogoFileId = null;
-                        site.DefaultThemeType = themetype;
-                        site.DefaultLayoutType = (layouttype == null ? "" : layouttype);
-                        site.DefaultContainerType = containertype;
-                        site.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
+                        site.DefaultThemeType = _themetype;
+                        site.DefaultLayoutType = _layouttype ?? string.Empty;
+                        site.DefaultContainerType = _containertype;
+                        site.IsDeleted = (_isdeleted == null || Boolean.Parse(_isdeleted));
 
-                        site = await SiteService.UpdateSiteAsync(site, Alias);
+                        site = await SiteService.UpdateSiteAsync(site);
 
-                        urls = urls.Replace("\n", ",");
-                        string[] names = urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                        foreach (Alias alias in aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
+                        _urls = _urls.Replace("\n", ",");
+                        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 (!aliases.Exists(item => item.Name == name))
+                            if (!_aliasList.Exists(item => item.Name == name))
                             {
-                                Alias alias = new Alias();
-                                alias.Name = name;
-                                alias.TenantId = site.TenantId;
-                                alias.SiteId = site.SiteId;
+                                Alias alias = new Alias
+                                {
+                                    Name = name,
+                                    TenantId = site.TenantId,
+                                    SiteId = site.SiteId
+                                };
                                 await AliasService.AddAliasAsync(alias);
                             }
                         }
 
-                        await Log(Alias, LogLevel.Information,PermissionNames.Edit, null, "Site Saved {Site}", site);
+                        await Log(_alias, LogLevel.Information,PermissionNames.Edit, null, "Site Saved {Site}", site);
 
                         NavigationManager.NavigateTo(NavigateUrl());
                     }
@@ -258,7 +265,7 @@
         }
         catch (Exception ex)
         {
-            await Log(Alias, LogLevel.Error, "", ex, "Error Saving Site {SiteId} {Error}", Alias.SiteId, ex.Message);
+            await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message);
             AddModuleMessage("Error Saving Site", MessageType.Error);
         }
     }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index b00730fa..d8b79632 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -4,7 +4,7 @@
 @inject IAliasService AliasService
 @inject ISiteService SiteService
 
-@if (sites == null)
+@if (_sites == null)
 {
     <p><em>Loading...</em></p>
 }
@@ -12,7 +12,7 @@ else
 {
     <ActionLink Action="Add" Text="Add Site" />
 
-    <Pager Items="@sites">
+    <Pager Items="@_sites">
         <Header>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
@@ -21,46 +21,49 @@ else
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.AliasId.ToString())" /></td>
             <td><ActionDialog Header="Delete Site" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Site?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteSite(context))" /></td>
-            <td><a href="@(scheme + context.Name)">@context.Name</a></td>
+            <td><a href="@(_scheme + context.Name)">@context.Name</a></td>
         </Row>
     </Pager>
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<Alias> _sites;
+    private string _scheme;
 
-    List<Alias> sites;
-    string scheme;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        Uri uri = new Uri(NavigationManager.Uri);
-        scheme = uri.Scheme + "://";
+        var uri = new Uri(NavigationManager.Uri);
+        _scheme = uri.Scheme + "://";
 
-        List<Alias> aliases = await AliasService.GetAliasesAsync();
-        sites = new List<Alias>();
+        var aliases = await AliasService.GetAliasesAsync();
+        _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
-                sites.Add(alias);
+                _sites.Add(alias);
             }
         }
     }
 
-    private async Task DeleteSite(Alias Alias)
+    private async Task DeleteSite(Alias alias)
     {
         try
         {
-            if (Alias.SiteId != PageState.Site.SiteId || Alias.TenantId != PageState.Site.TenantId)
+            if (alias.SiteId != PageState.Site.SiteId || alias.TenantId != PageState.Site.TenantId)
             {
-                await SiteService.DeleteSiteAsync(Alias.SiteId, Alias);
-                await Log(Alias, LogLevel.Information, "", null, "Site Deleted {SiteId}", Alias.SiteId);
-                List<Alias> aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias alias in aliases.Where(item => item.SiteId == Alias.SiteId && item.TenantId == Alias.TenantId).ToList())
+                SiteService.SetAlias(alias);
+                await SiteService.DeleteSiteAsync(alias.SiteId);
+                await Log(alias, LogLevel.Information, "", null, "Site Deleted {SiteId}", alias.SiteId);
+                
+                var aliases = await AliasService.GetAliasesAsync();
+                foreach (Alias a in aliases.Where(item => item.SiteId == alias.SiteId && item.TenantId == alias.TenantId))
                 {
-                    await AliasService.DeleteAliasAsync(alias.AliasId);
+                    await AliasService.DeleteAliasAsync(a.AliasId);
                 }
+                
                 NavigationManager.NavigateTo(NavigateUrl());
             }
             else
@@ -70,8 +73,8 @@ else
         }
         catch (Exception ex)
         {
-            await Log(Alias, LogLevel.Error, "", ex, "Error Deleting Site {SiteId} {Error}", Alias.SiteId, ex.Message);
+            await Log(alias, LogLevel.Error, "", ex, "Error Deleting Site {SiteId} {Error}", alias.SiteId, ex.Message);
             AddModuleMessage("Error Deleting Site", MessageType.Error);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor
new file mode 100644
index 00000000..e27350f8
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor
@@ -0,0 +1,111 @@
+@namespace Oqtane.Modules.Admin.Sql
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject ITenantService TenantService
+@inject ISqlService SqlService
+
+@if (_tenants == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table table-borderless">
+        <tr>
+            <td>
+                <Label For="tenant" HelpText="Select the tenant for the SQL server">Tenant: </Label>
+            </td>
+            <td>
+                <select id="teneant" class="form-control" @bind="_tenantid">
+                    <option value="-1">&lt;Select Tenant&gt;</option>
+                    @foreach (Tenant tenant in _tenants)
+                    {
+                        <option value="@tenant.TenantId">@tenant.Name</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="sqlQeury" HelpText="Enter the query for the SQL server">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">Execute</button>
+    <br /><br />
+    @if (!string.IsNullOrEmpty(_results))
+    {
+        @((MarkupString)_results)
+    }
+}
+
+@code {
+    private List<Tenant> _tenants;
+    private string _tenantid = "-1";
+    private string _sql = string.Empty;
+    private string _results = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _tenants = await TenantService.GetTenantsAsync();
+    }
+
+    private async Task Execute()
+    {
+        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);
+        }
+        else
+        {
+            AddModuleMessage("You Must Select A Tenant And Provide A SQL Query", MessageType.Warning);
+        }
+    }
+
+    private string DisplayResults(List<Dictionary<string, string>> results)
+    {
+        var table = string.Empty;
+        foreach (Dictionary<string, string> item in results)
+        {
+            if (table == string.Empty)
+            {
+                table = "<div class=\"table-responsive\">";
+                table += "<table class=\"table table-bordered\"><thead><tr>";
+                
+                foreach (KeyValuePair<string, string> kvp in item)
+                {
+                    table += "<th scope=\"col\">" + kvp.Key + "</th>";
+                }
+                
+                table += "</tr></thead><tbody>";
+            }
+            
+            table += "<tr>";
+            
+            foreach (KeyValuePair<string, string> kvp in item)
+            {
+                table += "<td>" + kvp.Value + "</td>";
+            }
+            
+            table += "</tr>";
+        }
+        
+        if (table != string.Empty)
+        {
+            table += "</tbody></table></div>";
+        }
+        else
+        {
+            table = "No Results Returned";
+        }
+        
+        return table;
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
new file mode 100644
index 00000000..8e19125f
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -0,0 +1,81 @@
+@namespace Oqtane.Modules.Admin.SystemInfo
+@inherits ModuleBase
+@inject ISystemService SystemService
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="version" HelpText="Framework Version">Framework Version: </Label>
+        </td>
+        <td>
+            <input id="version" class="form-control" @bind="@_version" disabled />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)">Blazor Runtime: </Label>
+        </td>
+        <td>
+            <input id="runtime" class="form-control" @bind="@_runtime" disabled />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="clrversion" HelpText="Common Language Runtime Version">CLR Version: </Label>
+        </td>
+        <td>
+            <input id="clrversion" class="form-control" @bind="@_clrversion" disabled />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="osversion" HelpText="Operating System Version">OS Version: </Label>
+        </td>
+        <td>
+            <input id="osversion" class="form-control" @bind="@_osversion" disabled />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="serverpath" HelpText="Server Path">Server Path: </Label>
+        </td>
+        <td>
+            <input id="serverpath" class="form-control" @bind="@_serverpath" disabled />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="servertime" HelpText="Server Time">Server Time: </Label>
+        </td>
+        <td>
+            <input id="servertime" class="form-control" @bind="@_servertime" disabled />
+        </td>
+    </tr>
+</table>
+<a class="btn btn-primary" href="swagger/index.html" target="_new">Access Framework API</a>
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    private string _version = string.Empty;
+    private string _runtime = string.Empty;
+    private string _clrversion = string.Empty;
+    private string _osversion = string.Empty;
+    private string _serverpath = string.Empty;
+    private string _servertime = string.Empty;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _version = Constants.Version;
+        _runtime = PageState.Runtime.ToString();
+
+        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+        if (systeminfo != null)
+        {
+            _clrversion = systeminfo["clrversion"];
+            _osversion = systeminfo["osversion"];
+            _serverpath = systeminfo["serverpath"];
+            _servertime = systeminfo["servertime"];
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor
deleted file mode 100644
index baccdfa8..00000000
--- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor
+++ /dev/null
@@ -1,154 +0,0 @@
-@namespace Oqtane.Modules.Admin.Tenants
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject ITenantService TenantService
-@inject IInstallationService InstallationService
-
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Title" class="control-label">Database Type: </label>
-            </td>
-            <td>
-                <select class="custom-select" @bind="@type">
-                    <option value="LocalDB">Local Database</option>
-                    <option value="SQLServer">SQL Server</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Title" class="control-label">Server: </label>
-            </td>
-            <td>
-                <input type="text" class="form-control" @bind="@server" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Title" class="control-label">Database: </label>
-            </td>
-            <td>
-                <input type="text" class="form-control" @bind="@database" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="Title" class="control-label">Integrated Security: </label>
-            </td>
-            <td>
-                <select class="custom-select" @onchange="SetIntegratedSecurity">
-                    <option value="true" selected>True</option>
-                    <option value="false">False</option>
-                </select>
-            </td>
-        </tr>
-        <tr style="@integratedsecurity">
-            <td>
-                <label for="Title" class="control-label">Username: </label>
-            </td>
-            <td>
-                <input type="text" class="form-control" @bind="@username" />
-            </td>
-        </tr>
-        <tr style="@integratedsecurity">
-            <td>
-                <label for="Title" class="control-label">Password: </label>
-            </td>
-            <td>
-                <input type="password" class="form-control" @bind="@password" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Schema: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@schema" />
-            </td>
-        </tr>
-    </table>
-<button type="button" class="btn btn-success" @onclick="SaveTenant">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-
-@code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
-
-    string name = "";
-    string type = "LocalDB";
-    string server = "(LocalDb)\\MSSQLLocalDB";
-    string database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
-    string username = "";
-    string password = "";
-    string schema = "";
-    string integratedsecurity = "display: none;";
-
-    private void SetIntegratedSecurity(ChangeEventArgs e)
-    {
-        if (Convert.ToBoolean((string)e.Value))
-        {
-            integratedsecurity = "display: none;";
-        }
-        else
-        {
-            integratedsecurity = "";
-        }
-    }
-
-    private async Task SaveTenant()
-    {
-        if (!string.IsNullOrEmpty(name))
-        {
-            ShowProgressIndicator();
-
-            string connectionstring = "";
-            if (type == "LocalDB")
-            {
-                connectionstring = "Data Source=" + server + ";AttachDbFilename=|DataDirectory|\\" + database + ".mdf;Initial Catalog=" + database + ";Integrated Security=SSPI;";
-            }
-            else
-            {
-                connectionstring = "Data Source=" + server + ";Initial Catalog=" + database + ";";
-                if (integratedsecurity == "display: none;")
-                {
-                    connectionstring += "Integrated Security=SSPI;";
-                }
-                else
-                {
-                    connectionstring += "User ID=" + username + ";Password=" + password;
-
-                }
-            }
-            GenericResponse response = await InstallationService.Install(connectionstring);
-            if (response.Success)
-            {
-                Tenant tenant = new Tenant();
-                tenant.Name = name;
-                tenant.DBConnectionString = connectionstring;
-                tenant.DBSchema = schema;
-                tenant.IsInitialized = false;
-                await TenantService.AddTenantAsync(tenant);
-                await logger.LogInformation("Tenant Created {Tenant}", tenant);
-
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                await logger.LogError("Error Creating Tenant {Error}", response.Message);
-                AddModuleMessage(response.Message, MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage("You Must Provide A Name For The Tenant", MessageType.Warning);
-        }
-    }
-}
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
index 0224cd1e..94ee91d6 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor
@@ -6,51 +6,50 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label  class="control-label">Name: </label>
+            <Label For="name" HelpText="The name of the tenant">Name: </Label>
         </td>
         <td>
-            <input class="form-control" @bind="@name" />
+            @if (name == Constants.MasterTenant)
+            {
+                <input id="name" class="form-control" @bind="@name" readonly />
+            }
+            else
+            {
+                <input id="name" class="form-control" @bind="@name" />
+            }
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Connection String: </label>
+            <Label For="connectionstring" HelpText="The database connection string">Connection String: </Label>
         </td>
         <td>
-            <input class="form-control" @bind="@connectionstring" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">Schema: </label>
-        </td>
-        <td>
-            <input class="form-control" @bind="@schema" />
+            <textarea id="connectionstring" class="form-control" @bind="@connectionstring" rows="3" readonly></textarea>
         </td>
     </tr>
+
 </table>
 <button type="button" class="btn btn-success" @onclick="SaveTenant">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private int tenantid;
+    private string name = string.Empty;
+    private string connectionstring = string.Empty;
+    private string schema = string.Empty;
 
-    int tenantid;
-    string name = "";
-    string connectionstring = "";
-    string schema = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
             tenantid = Int32.Parse(PageState.QueryString["id"]);
-            Tenant tenant = await TenantService.GetTenantAsync(tenantid);
+            var tenant = await TenantService.GetTenantAsync(tenantid);
             if (tenant != null)
             {
                 name = tenant.Name;
                 connectionstring = tenant.DBConnectionString;
-                schema = tenant.DBSchema;
             }
         }
         catch (Exception ex)
@@ -65,12 +64,12 @@
         try
         {
             connectionstring = connectionstring.Replace("\\\\", "\\");
-            Tenant tenant = await TenantService.GetTenantAsync(tenantid);
+            var tenant = await TenantService.GetTenantAsync(tenantid);
             if (tenant != null)
             {
                 tenant.Name = name;
                 tenant.DBConnectionString = connectionstring;
-                tenant.DBSchema = schema;
+                
                 await TenantService.UpdateTenantAsync(tenant);
                 await logger.LogInformation("Tenant Saved {TenantId}", tenantid);
 
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
index 5c22fcbf..ead272dc 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Tenants
 @inherits ModuleBase
 @inject ITenantService TenantService
+@inject IAliasService AliasService
 
 @if (tenants == null)
 {
@@ -8,8 +9,6 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Tenant" />
-
     <Pager Items="@tenants">
         <Header>
             <th>&nbsp;</th>
@@ -18,7 +17,7 @@ else
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" /></td>
+            <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == Constants.MasterTenant)" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -26,9 +25,9 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<Tenant> tenants;
 
-    List<Tenant> tenants;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
@@ -39,9 +38,25 @@ else
     {
         try
         {
-            await TenantService.DeleteTenantAsync(Tenant.TenantId);
-            await logger.LogInformation("Tenant Deleted {Tenant}", Tenant);
-            StateHasChanged();
+            string message = string.Empty;
+            var aliases = await AliasService.GetAliasesAsync();
+            foreach (var alias in aliases)
+            {
+                if (alias.TenantId == Tenant.TenantId)
+                {
+                    message += ", " + alias.Name;
+                }
+            }
+            if (string.IsNullOrEmpty(message))
+            {
+                await TenantService.DeleteTenantAsync(Tenant.TenantId);
+                await logger.LogInformation("Tenant Deleted {Tenant}", Tenant);
+                StateHasChanged();
+            }
+            else
+            {
+                AddModuleMessage("Tenant Cannot Be Deleted Until The Following Sites Are Deleted: " + message.Substring(2), MessageType.Warning);
+            }
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index a802b838..5ad4f5c6 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -5,69 +5,100 @@
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label  class="control-label">Theme: </label>
-        </td>
-        <td>
-            <FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" />
-        </td>
-    </tr>
-</table>
-
-@if (packages != null)
+@if (_packages != null)
 {
-    <hr class="app-rule" />
-    <div class="mx-auto text-center"><h2>Available Themes</h2></div>
-
-    <Pager Items="@packages">
-        <Header>
-            <th>Name</th>
-            <th>Version</th>
-            <th></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))>Download Theme</button>
-            </td>
-        </Row>
-    </Pager>
-}
+<TabStrip>
+    @if (_packages.Count > 0)
+    {
+    <TabPanel Name="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>
+        <Pager Items="@_packages">
+            <Header>
+                <th>Name</th>
+                <th>Version</th>
+                <th></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))>Download</button>
+                </td>
+            </Row>
+        </Pager>
+    </TabPanel>
+    }
+    <TabPanel Name="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.">Theme: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" UploadMultiple="True" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
 
 <button type="button" class="btn btn-success" @onclick="InstallThemes">Install</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+}
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<Package> _packages;
 
-    List<Package> packages;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
-        List<Theme> themes = await ThemeService.GetThemesAsync();
-        packages = await PackageService.GetPackagesAsync("theme");
-        foreach(Package package in packages.ToArray())
+        try
         {
-            if (themes.Exists(item => Utilities.GetTypeName(item.ThemeName) == package.PackageId))
+            var themes = await ThemeService.GetThemesAsync();
+            _packages = await PackageService.GetPackagesAsync("theme");
+
+            foreach (Package package in _packages.ToArray())
             {
-                packages.Remove(package);
+                if (themes.Exists(item => Utilities.GetTypeName(item.ThemeName) == package.PackageId))
+                {
+                    _packages.Remove(package);
+                }
             }
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+            AddModuleMessage("Error Loading Packages", MessageType.Error);
+        }
     }
 
     private async Task InstallThemes()
     {
-        await ThemeService.InstallThemesAsync();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await ThemeService.InstallThemesAsync();
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Installating Theme");
+        }
     }
 
     private async Task DownloadTheme(string packageid, string version)
     {
-        await PackageService.DownloadPackageAsync(packageid, version, "Themes");
-        AddModuleMessage("Theme Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
-        StateHasChanged();
+        try
+        {
+            await PackageService.DownloadPackageAsync(packageid, version, "Themes");
+            await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version);
+            AddModuleMessage("Themes Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version);
+            AddModuleMessage("Error Downloading Theme", MessageType.Error);
+        }
+    }
     }
-}
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index 09ec9823..4a3113b6 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -39,10 +39,10 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private List<Theme> themes;
+    private List<Package> packages;
 
-    List<Theme> themes;
-    List<Package> packages;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
@@ -52,12 +52,13 @@ else
 
     private bool UpgradeAvailable(string themename, string version)
     {
-        bool upgradeavailable = false;
-        Package package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
+        var upgradeavailable = false;
+        var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
         if (package != null)
         {
             upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
         }
+        
         return upgradeavailable;
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index 36dad205..2aa2ce86 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -5,42 +5,55 @@
 @inject IPackageService PackageService
 @inject IInstallationService InstallationService
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label  class="control-label">Framework: </label>
-        </td>
-        <td>
-            <FileManager Filter="nupkg" ShowFiles="false" Folder="Framework" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="Upgrade">Upgrade</button>
-
-@if (upgradeavailable)
+@if (_package != null)
 {
-    <hr class="app-rule" />
-    <div class="mx-auto text-center"><h2>Upgrade Available</h2></div>
-
-    <button type="button" class="btn btn-success" @onclick=@(async () => await Download(Constants.PackageId, Constants.Version))>Upgrade Framework</button>
+<TabStrip>
+    <TabPanel Name="Download">
+        @if (_upgradeavailable)
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Download a new version of the framework. Once you are ready click Install to complete the installation."></ModuleMessage>
+            @("Framework") @_package.Version <button type="button" class="btn btn-success" @onclick=@(async () => await Download(Constants.PackageId, Constants.Version))>Download</button>
+        }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
+        }
+    </TabPanel>
+    @if (_upgradeavailable)
+    {
+    <TabPanel Name="Upload">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload a new framework package. Once it is uploaded click Install to complete the installation.">Framework: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Framework" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+    }
+</TabStrip>
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+    private Package _package;
+    private bool _upgradeavailable = false;
 
-    bool upgradeavailable = false;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         List<Package> packages = await PackageService.GetPackagesAsync("framework");
-        Package package = packages.FirstOrDefault();
-        if (package != null)
+        _package = packages.FirstOrDefault();
+        if (_package != null)
         {
-            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+            _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
         }
-        if (!upgradeavailable)
+        else
         {
-            AddModuleMessage("Framework Is Up To Date", MessageType.Info);
+            _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
index 5da04ebd..e6ae6b68 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor
@@ -9,10 +9,10 @@
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">To: </label>
+                <Label  For="to" HelpText="Select the user it is going to">To: </Label>
             </td>
             <td>
-                <select class="form-control"  @bind="@userid">
+                <select id="to" class="form-control"  @bind="@userid">
                     <option value="-1">&lt;Select User&gt;</option>
                     @if (userroles != null)
                     {
@@ -26,18 +26,18 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Subject: </label>
+                <Label For="subject" HelpText="Enter the subject of the message">Subject: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@subject" />
+                <input id="subject" class="form-control" @bind="@subject" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Message: </label>
+                <Label For="message" HelpText="Enter the message">Message: </Label>
             </td>
             <td>
-                <textarea class="form-control" @bind="@body" rows="5" />
+                <textarea id="message" class="form-control" @bind="@body" rows="5" />
             </td>
         </tr>
     </table>
@@ -46,13 +46,14 @@
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } }
-    public override string Title { get { return "Send Notification"; } }
+    private List<UserRole> userroles;
+    private string userid = "-1";
+    private string subject = "";
+    private string body = "";
 
-    List<UserRole> userroles;
-    string userid = "-1";
-    string subject = "";
-    string body = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+
+    public override string Title => "Send Notification";
 
     protected override async Task OnInitializedAsync()
     {
@@ -71,7 +72,7 @@
 
     private async Task Send()
     {
-        Notification notification = new Notification();
+        var notification = new Notification();
         try
         {
             notification.SiteId = PageState.Site.SiteId;
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 00c22dbd..6f3ab545 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -6,186 +6,177 @@
 @inject ISettingService SettingService
 @inject INotificationService NotificationService
 
-@if (PageState.User != null && profiles != null)
+@if (PageState.User != null && photofileid != -1)
 {
-<div class="container-fluid">
-    <div class="form-group">
-
-        <ul class="nav nav-tabs" role="tablist">
-            <li class="nav-item">
-                <a class="nav-link active" data-toggle="tab" href="#Profile" role="tab">
-                    Profile
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#Notifications" role="tab">
-                    Notifications
-                </a>
-            </li>
-        </ul>
-
-        <div class="tab-content">
-            <div id="Profile" class="tab-pane fade show active" role="tabpanel">
-                @if (photofileid != -1)
-                {
-                    <img src="@(ContentUrl(photofileid))" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-                }
-                else
-                {
-                    <br />
-                }
-                <table class="table table-borderless">
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Username: </label>
-                        </td>
-                        <td>
-                            <input class="form-control" @bind="@username" readonly />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Password: </label>
-                        </td>
-                        <td>
-                            <input type="password" class="form-control" @bind="@password" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Confirm Password: </label>
-                        </td>
-                        <td>
-                            <input type="password" class="form-control" @bind="@confirm" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Email: </label>
-                        </td>
-                        <td>
-                            <input class="form-control" @bind="@email" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Full Name: </label>
-                        </td>
-                        <td>
-                            <input class="form-control" @bind="@displayname" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Name" class="control-label">Photo: </label>
-                        </td>
-                        <td>
-                            <FileManager FileId="@photofileid.ToString()" @ref="filemanager" />
-                        </td>
-                    </tr>
-
-                    @foreach (Profile profile in profiles)
-                    {
-                        var p = profile;
-                        if (p.Category != category)
-                        {
-                            <tr>
-                                <th colspan="2" style="text-align: center;">
-                                    @p.Category
-                                </th>
-                            </tr>
-                            category = p.Category;
-                        }
-                        <tr>
-                            <td>
-                                <label for="@p.Name" class="control-label">@p.Title: </label>
-                            </td>
-                            <td>
-                                <input class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                            </td>
-                        </tr>
-                    }
-                </table>
-                <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-            </div>
-
-            <div id="Notifications" class="tab-pane fade" role="tabpanel">
-                <br />
-                <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" />
-                <br /><br />
-                @if (filter == "to")
-                {
-                    <Pager Items="@notifications">
-                        <Header>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
-                            <th>From</th>
-                            <th>Subject</th>
-                            <th>Received</th>
-                        </Header>
-                        <Row>
-                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
-                            <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
-                            <td>@(context.FromUser == null ? "System" : context.FromUser.DisplayName)</td>
-                            <td>@context.Subject</td>
-                            <td>@context.CreatedOn</td>
-                        </Row>
-                        <Detail>
-                            <td colspan="2"></td>
-                            <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0,100) : context.Body)</td>
-                        </Detail>
-                    </Pager>
-                }
-                else
-                {
-                    <Pager Items="@notifications">
-                        <Header>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
-                            <th>To</th>
-                            <th>Subject</th>
-                            <th>Sent</th>
-                        </Header>
-                        <Row>
-                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
-                            <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
-                            <td>@(context.ToUser == null ? context.ToEmail : context.ToUser.DisplayName)</td>
-                            <td>@context.Subject</td>
-                            <td>@context.CreatedOn</td>
-                        </Row>
-                        <Detail>
-                            <td colspan="2"></td>
-                            <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0,100) : context.Body)</td>
-                        </Detail>
-                    </Pager>
-                }
-                <br /><hr />
-                <select class="form-control" @onchange="(e => FilterChanged(e))">
-                    <option value="to">Inbox</option>
-                    <option value="from">Sent Items</option>
-                </select>
-            </div>
-        </div>
-    </div>
-</div>
+    <img src="@(ContentUrl(photofileid))" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
+else
+{
+    <br />
+}
+<TabStrip>
+    <TabPanel Name="Identity">
+        @if (PageState.User != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Username: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@username" readonly />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@password" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Confirm Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@confirm" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Email: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@email" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Full Name: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@displayname" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label">Photo: </label>
+                    </td>
+                    <td>
+                        <FileManager FileId="@photofileid.ToString()" @ref="filemanager" />
+                    </td>
+                </tr>
+            </table>
+            <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+        }
+    </TabPanel>
+    <TabPanel Name="Profile">
+        @if (profiles != null)
+        {
+            <table class="table table-borderless">
+                @foreach (Profile profile in profiles)
+                {
+                    var p = profile;
+                    if (p.Category != category)
+                    {
+                        <tr>
+                            <th colspan="2" style="text-align: center;">
+                                @p.Category
+                            </th>
+                        </tr>
+                        category = p.Category;
+                    }
+                    <tr>
+                        <td>
+                            <label for="@p.Name" class="control-label">@p.Title: </label>
+                        </td>
+                        <td>
+                            <input class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                        </td>
+                    </tr>
+                }
+            </table>
+            <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+        }
+    </TabPanel>
+    <TabPanel Name="Notifications">
+        @if (notifications != null)
+        {
+            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" />
+            <br /><br />
+            @if (filter == "to")
+            {
+                <Pager Items="@notifications">
+                    <Header>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>From</th>
+                        <th>Subject</th>
+                        <th>Received</th>
+                    </Header>
+                    <Row>
+                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
+                        <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
+                        <td>@(context.FromUser == null ? "System" : context.FromUser.DisplayName)</td>
+                        <td>@context.Subject</td>
+                        <td>@context.CreatedOn</td>
+                    </Row>
+                    <Detail>
+                        <td colspan="2"></td>
+                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                    </Detail>
+                </Pager>
+            }
+            else
+            {
+                <Pager Items="@notifications">
+                    <Header>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>To</th>
+                        <th>Subject</th>
+                        <th>Sent</th>
+                    </Header>
+                    <Row>
+                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
+                        <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
+                        <td>@(context.ToUser == null ? context.ToEmail : context.ToUser.DisplayName)</td>
+                        <td>@context.Subject</td>
+                        <td>@context.CreatedOn</td>
+                    </Row>
+                    <Detail>
+                        <td colspan="2"></td>
+                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                    </Detail>
+                </Pager>
+            }
+            <br /><hr />
+            <select class="form-control" @onchange="(e => FilterChanged(e))">
+                <option value="to">Inbox</option>
+                <option value="from">Sent Items</option>
+            </select>
+        }
+    </TabPanel>
+</TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } }
+    private string username = string.Empty;
+    private string password = string.Empty;
+    private string confirm = string.Empty;
+    private string email = string.Empty;
+    private string displayname = string.Empty;
+    private FileManager filemanager;
+    private int photofileid = -1;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;
+    private string filter = "to";
+    private List<Notification> notifications;
 
-    string username = "";
-    string password = "";
-    string confirm = "";
-    string email = "";
-    string displayname = "";
-    FileManager filemanager;
-    int photofileid = -1;
-    List<Profile> profiles;
-    Dictionary<string, string> settings;
-    string category = "";
-    string filter = "to";
-    List<Notification> notifications;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnInitializedAsync()
     {
@@ -196,12 +187,15 @@
                 username = PageState.User.Username;
                 email = PageState.User.Email;
                 displayname = PageState.User.DisplayName;
+
                 if (PageState.User.PhotoFileId != null)
                 {
                     photofileid = PageState.User.PhotoFileId.Value;
                 }
+
                 profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
                 settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
+
                 await LoadNotificationsAsync();
             }
             else
@@ -223,29 +217,29 @@
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-    {
-        return SettingService.GetSetting(settings, SettingName, DefaultValue);
-    }
+        => SettingService.GetSetting(settings, SettingName, DefaultValue);
 
     private async Task Save()
     {
         try
         {
-            if (username != "" && email != "")
+            if (username != string.Empty && email != string.Empty)
             {
                 if (password == confirm)
                 {
-                    User user = PageState.User;
+                    var user = PageState.User;
                     user.Username = username;
                     user.Password = password;
                     user.Email = email;
-                    user.DisplayName = (displayname == "" ? username : displayname);
+                    user.DisplayName = (displayname == string.Empty ? username : displayname);
                     user.PhotoFileId = null;
                     photofileid = filemanager.GetFileId();
+
                     if (photofileid != -1)
                     {
                         user.PhotoFileId = photofileid;
                     }
+
                     await UserService.UpdateUserAsync(user);
                     await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
                     await logger.LogInformation("User Profile Saved");
@@ -269,12 +263,12 @@
 
     private void Cancel()
     {
-        NavigationManager.NavigateTo(NavigateUrl(""));
+        NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
-        string value = (string)e.Value;
+        var value = (string)e.Value;
         settings = SettingService.SetSetting(settings, SettingName, value);
     }
 
@@ -291,6 +285,7 @@
             {
                 await NotificationService.DeleteNotificationAsync(Notification.NotificationId);
             }
+
             await logger.LogInformation("Notification Deleted {Notification}", Notification);
             await LoadNotificationsAsync();
             StateHasChanged();
@@ -305,6 +300,7 @@
     private async void FilterChanged(ChangeEventArgs e)
     {
         filter = (string)e.Value;
+
         await LoadNotificationsAsync();
         StateHasChanged();
     }
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index bc018124..07140f63 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -52,7 +52,7 @@
             </td>
         </tr>
     </table>
-    @if (reply != "")
+    @if (reply != string.Empty)
     {
         <button type="button" class="btn btn-primary" @onclick="Send">Send</button>
     }
@@ -70,17 +70,17 @@
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } }
-    public override string Title { get { return "View Notification"; } }
+    private int notificationid;
+    private string title = string.Empty;
+    private List<UserRole> userroles;
+    private string userid = "-1";
+    private string subject = string.Empty;
+    private string createdon = string.Empty;
+    private string body = string.Empty;
+    private string reply = string.Empty;
 
-    int notificationid;
-    string title = "";
-    List<UserRole> userroles;
-    string userid = "-1";
-    string subject = "";
-    string createdon = "";
-    string body = "";
-    string reply = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+    public override string Title => "View Notification";
 
     protected override async Task OnInitializedAsync()
     {
@@ -110,6 +110,7 @@
                         userid = notification.ToUserId.ToString();
                     }
                 }
+                
                 subject = notification.Subject;
                 createdon = notification.CreatedOn.ToString();
                 body = notification.Body;
@@ -132,11 +133,11 @@
 
     private async Task Send()
     {
-        Notification notification = new Notification();
+        var notification = new Notification();
         notification.SiteId = PageState.Site.SiteId;
         notification.FromUserId = PageState.User.UserId;
         notification.ToUserId = int.Parse(userid);
-        notification.ToEmail = "";
+        notification.ToEmail = string.Empty;
         notification.Subject = subject;
         notification.Body = body;
         notification.ParentId = notificationid;
diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor
index 66ad5c12..b6aa116a 100644
--- a/Oqtane.Client/Modules/Admin/Users/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Add.razor
@@ -5,87 +5,98 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 
-@if (profiles != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">Username: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@username" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Password: </label>
-            </td>
-            <td>
-                <input type="password" class="form-control" @bind="@password" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Confirm Password: </label>
-            </td>
-            <td>
-                <input type="password" class="form-control" @bind="@confirm" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Email: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@email" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Full Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@displayname" />
-            </td>
-        </tr>
-
-        @foreach (Profile profile in profiles)
+<TabStrip>
+    <TabPanel Name="Identity">
+        @if (profiles != null)
         {
-            var p = profile;
-            if (p.Category != category)
-            {
+            <table class="table table-borderless">
                 <tr>
-                    <th colspan="2" style="text-align: center;">
-                        @p.Category
-                    </th>
+                    <td>
+                        <label class="control-label">Username: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@username" />
+                    </td>
                 </tr>
-                category = p.Category;
-            }
-            <tr>
-                <td>
-                    <label for="@p.Name" class="control-label">@p.Title: </label>
-                </td>
-                <td>
-                    <input class="form-control" maxlength="@p.MaxLength" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                </td>
-            </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@password" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Confirm Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@confirm" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Email: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@email" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Full Name: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@displayname" />
+                    </td>
+                </tr>
+            </table>
         }
-    </table>
-    <button type="button" class="btn btn-primary" @onclick="SaveUser">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-}
+    </TabPanel>
+    <TabPanel Name="Profile">
+        @if (profiles != null)
+        {
+        <table class="table table-borderless">
+            @foreach (Profile profile in profiles)
+            {
+                var p = profile;
+                if (p.Category != category)
+                {
+                    <tr>
+                        <th colspan="2" style="text-align: center;">
+                            @p.Category
+                        </th>
+                    </tr>
+                    category = p.Category;
+                }
+                <tr>
+                    <td>
+                        <label for="@p.Name" class="control-label">@p.Title: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" maxlength="@p.MaxLength" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                    </td>
+                </tr>
+            }
+        </table>
+        }
+    </TabPanel>
+</TabStrip>
+
+<button type="button" class="btn btn-primary" @onclick="SaveUser">Save</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private string username = string.Empty;
+    private string password = string.Empty;
+    private string confirm = string.Empty;
+    private string email = string.Empty;
+    private string displayname = string.Empty;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;
 
-    string username = "";
-    string password = "";
-    string confirm = "";
-    string email = "";
-    string displayname = "";
-    List<Profile> profiles;
-    Dictionary<string, string> settings;
-    string category = "";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
@@ -105,11 +116,11 @@
     {
         try
         {
-            if (username != "" && password != "" && confirm != "" && email != "")
+            if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty)
             {
                 if (password == confirm)
                 {
-                    User user = new User();
+                    var user = new User();
                     user.SiteId = PageState.Site.SiteId;
                     user.Username = username;
                     user.Password = password;
@@ -150,7 +161,7 @@
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
-        string value = (string)e.Value;
+        var value = (string)e.Value;
         settings = SettingService.SetSetting(settings, SettingName, value);
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor
index 6c072d8c..3aa30e1b 100644
--- a/Oqtane.Client/Modules/Admin/Users/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor
@@ -5,127 +5,137 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 
-@if (profiles != null)
+@if (PageState.User != null && photofileid != -1)
 {
-    @if (photofileid != -1)
-    {
-        <img src="@(ContentUrl(photofileid))" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
-    }
-    else
-    {
-        <br />
-    }
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">Username: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@username" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Password: </label>
-            </td>
-            <td>
-                <input type="password" class="form-control" @bind="@password" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Confirm Password: </label>
-            </td>
-            <td>
-                <input type="password" class="form-control" @bind="@confirm" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Email: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@email" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Full Name: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@displayname" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Photo: </label>
-            </td>
-            <td>
-                <FileManager FileId="@photofileid.ToString()" @ref="filemanager" />
-            </td>
-        </tr>
-
-        @foreach (Profile profile in profiles)
-        {
-            var p = profile;
-            if (p.Category != category)
-            {
-                <tr>
-                    <th colspan="2" style="text-align: center;">
-                        @p.Category
-                    </th>
-                </tr>
-                category = p.Category;
-            }
-            <tr>
-                <td>
-                    <label for="@p.Name" class="control-label">@p.Title: </label>
-                </td>
-                <td>
-                    <input class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <label  class="control-label">Is Deleted? </label>
-            </td>
-            <td>
-                <select class="form-control" @bind="@isdeleted">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-primary" @onclick="SaveUser">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-    <br />
-    <br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <img src="@(ContentUrl(photofileid))" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
+else
+{
+    <br />
+}
+<TabStrip>
+    <TabPanel Name="Identity">
+        @if (profiles != null)
+        {
+            <table class="table table-borderless">
+                <tr>
+                    <td>
+                        <label class="control-label">Username: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@username" readonly />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@password" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Confirm Password: </label>
+                    </td>
+                    <td>
+                        <input type="password" class="form-control" @bind="@confirm" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Email: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@email" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Full Name: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" @bind="@displayname" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Photo: </label>
+                    </td>
+                    <td>
+                        <FileManager FileId="@photofileid.ToString()" @ref="filemanager" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label class="control-label">Is Deleted? </label>
+                    </td>
+                    <td>
+                        <select class="form-control" @bind="@isdeleted">
+                            <option value="True">Yes</option>
+                            <option value="False">No</option>
+                        </select>
+                    </td>
+                </tr>
+            </table>
+        }
+    </TabPanel>
+    <TabPanel Name="Profile">
+        @if (profiles != null)
+        {
+        <table class="table table-borderless">
+            @foreach (Profile profile in profiles)
+            {
+                var p = profile;
+                if (p.Category != category)
+                {
+                    <tr>
+                        <th colspan="2" style="text-align: center;">
+                            @p.Category
+                        </th>
+                    </tr>
+                    category = p.Category;
+                }
+                <tr>
+                    <td>
+                        <label for="@p.Name" class="control-label">@p.Title: </label>
+                    </td>
+                    <td>
+                        <input class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                    </td>
+                </tr>
+            }
+        </table>
+        }
+    </TabPanel>
+</TabStrip>
+
+<button type="button" class="btn btn-primary" @onclick="SaveUser">Save</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<br /><br />
+<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int userid;
+    private string username = string.Empty;
+    private string password = string.Empty;
+    private string confirm = string.Empty;
+    private string email = string.Empty;
+    private string displayname = string.Empty;
+    private FileManager filemanager;
+    private int photofileid = -1;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
+    private string deletedby;
+    private DateTime? deletedon;
+    private string isdeleted;
 
-    int userid;
-    string username = "";
-    string password = "";
-    string confirm = "";
-    string email = "";
-    string displayname = "";
-    FileManager filemanager;
-    int photofileid = -1;
-    List<Profile> profiles;
-    Dictionary<string, string> settings;
-    string category = "";
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-    string deletedby;
-    DateTime? deletedon;
-    string isdeleted;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
@@ -134,16 +144,18 @@
             profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
 
             userid = Int32.Parse(PageState.QueryString["id"]);
-            User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+            var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
             if (user != null)
             {
                 username = user.Username;
                 email = user.Email;
                 displayname = user.DisplayName;
+
                 if (user.PhotoFileId != null)
                 {
                     photofileid = user.PhotoFileId.Value;
                 }
+
                 settings = await SettingService.GetUserSettingsAsync(user.UserId);
                 createdby = user.CreatedBy;
                 createdon = user.CreatedOn;
@@ -162,19 +174,17 @@
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-    {
-        return SettingService.GetSetting(settings, SettingName, DefaultValue);
-    }
+        => SettingService.GetSetting(settings, SettingName, DefaultValue);
 
     private async Task SaveUser()
     {
         try
         {
-            if (username != "" && password != "" && confirm != "" && email != "")
+            if (username != string.Empty && email != string.Empty)
             {
                 if (password == confirm)
                 {
-                    User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
                     user.SiteId = PageState.Site.SiteId;
                     user.Username = username;
                     user.Password = password;
@@ -182,10 +192,12 @@
                     user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
                     user.PhotoFileId = null;
                     photofileid = filemanager.GetFileId();
+
                     if (photofileid != -1)
                     {
                         user.PhotoFileId = photofileid;
                     }
+
                     user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
 
                     user = await UserService.UpdateUserAsync(user);
@@ -213,7 +225,7 @@
 
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
-        string value = (string)e.Value;
+        var value = (string)e.Value;
         settings = SettingService.SetSetting(settings, SettingName, value);
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index c6e52c6e..a9d4366f 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -28,9 +28,9 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private List<UserRole> userroles;
 
-    List<UserRole> userroles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
@@ -42,7 +42,7 @@ else
     {
         try
         {
-            User user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
+            var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId);
             if (user != null)
             {
                 await UserService.DeleteUserAsync(user.UserId);
diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor
index 9477bbbd..a4e946df 100644
--- a/Oqtane.Client/Modules/Admin/Users/Roles.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Users
 @inherits ModuleBase
 @inject IRoleService RoleService
+@inject IUserService UserService
 @inject IUserRoleService UserRoleService
 
 @if (userroles == null)
@@ -12,10 +13,18 @@ else
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Role: </label>
+                <Label For="user" HelpText="The user you are assigning roles to">User: </Label>
             </td>
             <td>
-                <select class="form-control" @bind="@roleid">
+                <input id="user" class="form-control" @bind="@name" disabled />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <Label For="role" HelpText="Select a role">Role: </Label>
+            </td>
+            <td>
+                <select id="role" class="form-control" @bind="@roleid">
                     <option value="-1">&lt;Select Role&gt;</option>
                     @foreach (Role role in roles)
                     {
@@ -26,18 +35,18 @@ else
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Effective Date: </label>
+                <Label For="effectiveDate" HelpText="The date that this role assignment is active">Effective Date: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@effectivedate" />
+                <input id="effectiveDate" class="form-control" @bind="@effectivedate" />
             </td>
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Expiry Date: </label>
+                <Label For="expiryDate" HelpText="The date that this role assignment expires">Expiry Date: </Label>
             </td>
             <td>
-                <input class="form-control" @bind="@expirydate" />
+                <input id="expiryDate" class="form-control" @bind="@expirydate" />
             </td>
         </tr>
     </table>
@@ -48,16 +57,16 @@ else
     <p align="center">
         <Pager Items="@userroles">
             <Header>
-                <th>Role</th>
+                <th>Roles</th>
                 <th>&nbsp;</th>
             </Header>
             <Row>
                 <td>@context.Role.Name</td>
                 <td>
-                    @if (!context.Role.IsSystem)
-                    {
+                    @if (context.Role.Name != Constants.RegisteredRole)
+                        {
                         <button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button>
-                    }
+                        }
                 </td>
             </Row>
         </Pager>
@@ -65,20 +74,23 @@ else
 }
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
+    private int userid;
+    private string name = string.Empty;
+    private List<Role> roles;
+    private int roleid = -1;
+    private string effectivedate = string.Empty;
+    private string expirydate = string.Empty;
+    private List<UserRole> userroles;
 
-    int userid;
-    List<Role> roles;
-    int roleid = -1;
-    string effectivedate = "";
-    string expirydate = "";
-    List<UserRole> userroles;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
             userid = Int32.Parse(PageState.QueryString["id"]);
+            User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+            name = user.DisplayName;
             roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
             await GetUserRoles();
         }
@@ -109,7 +121,7 @@ else
         {
             if (roleid != -1)
             {
-                UserRole userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+                var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
                 if (userrole != null)
                 {
                     if (string.IsNullOrEmpty(effectivedate))
@@ -120,6 +132,7 @@ else
                     {
                         userrole.EffectiveDate = DateTime.Parse(effectivedate);
                     }
+
                     if (string.IsNullOrEmpty(expirydate))
                     {
                         userrole.ExpiryDate = null;
@@ -135,6 +148,7 @@ else
                     userrole = new UserRole();
                     userrole.UserId = userid;
                     userrole.RoleId = roleid;
+
                     if (string.IsNullOrEmpty(effectivedate))
                     {
                         userrole.EffectiveDate = null;
@@ -143,6 +157,7 @@ else
                     {
                         userrole.EffectiveDate = DateTime.Parse(effectivedate);
                     }
+
                     if (string.IsNullOrEmpty(expirydate))
                     {
                         userrole.ExpiryDate = null;
@@ -151,8 +166,10 @@ else
                     {
                         userrole.ExpiryDate = DateTime.Parse(expirydate);
                     }
+
                     await UserRoleService.AddUserRoleAsync(userrole);
                 }
+
                 await GetUserRoles();
                 await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
                 AddModuleMessage("User Assigned To Role", MessageType.Success);
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 9b781360..08b2d77d 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -1,7 +1,7 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
-@if (visible)
+@if (_visible)
 {
     <div class="app-admin-modal">
         <div class="modal" tabindex="-1" role="dialog">
@@ -17,7 +17,7 @@
                     <div class="modal-footer">
                         @if (!string.IsNullOrEmpty(Action))
                         {
-                            <button type="button" class="@Class" @onclick="Confirm">@Action</button>
+                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Action</button>
                         }
                         <button type="button" class="btn btn-secondary" @onclick="DisplayModal">Cancel</button>
                     </div>
@@ -26,19 +26,24 @@
         </div>
     </div>
 }
-@if (authorized)
+@if (_authorized)
 {
     if (Disabled)
     {
-        <button class="@Class" disabled @onclick="DisplayModal">@Text</button>
+        <button class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
     }
     else
     {
-        <button class="@Class" @onclick="DisplayModal">@Text</button>
+        <button class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
     }
 }
 
 @code {
+    private bool _visible = false;
+    private bool _editmode = true;
+    private bool _authorized = false;
+    private string _iconSpan = string.Empty;
+
     [Parameter]
     public string Header { get; set; } // required
 
@@ -66,9 +71,8 @@
     [Parameter]
     public Action OnClick { get; set; } // required if an Action is specified - executes a method in the calling component
 
-    bool visible = false;
-    bool editmode = true;
-    bool authorized = false;
+    [Parameter]
+    public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
     protected override void OnParametersSet()
     {
@@ -82,15 +86,21 @@
         }
         if (!string.IsNullOrEmpty(EditMode))
         {
-            editmode = bool.Parse(EditMode);
+            _editmode = bool.Parse(EditMode);
         }
-        authorized = IsAuthorized();
+
+        if (!string.IsNullOrEmpty(IconName))
+        {
+            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
+        }
+
+        _authorized = IsAuthorized();
     }
 
     private bool IsAuthorized()
     {
         bool authorized = false;
-        if (PageState.EditMode || !editmode)
+        if (PageState.EditMode || !_editmode)
         {
             SecurityAccessLevel security = SecurityAccessLevel.Host;
             if (Security == null)
@@ -135,7 +145,7 @@
 
     private void DisplayModal()
     {
-        visible = !visible;
+        _visible = !_visible;
         StateHasChanged();
     }
 
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 8b12c8cc..cf588579 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -2,19 +2,28 @@
 @inherits ModuleBase
 @inject IUserService UserService
 
-@if (authorized)
+@if (_authorized)
 {
     if (Disabled)
     {
-        <NavLink class="@classname" href="@url" style="@style" disabled>@text</NavLink>
+        <button class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
     }
     else
     {
-        <NavLink class="@classname" href="@url" style="@style">@text</NavLink>
+        <NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
     }
 }
 
 @code {
+    private string _text = string.Empty;
+    private string _url = string.Empty;
+    private string _parameters = string.Empty;
+    private string _classname = "btn btn-primary";
+    private string _style = string.Empty;
+    private bool _editmode = true;
+    private bool _authorized = false;
+    private string _iconSpan = string.Empty;
+
     [Parameter]
     public string Action { get; set; } // required
 
@@ -33,62 +42,62 @@
     [Parameter]
     public string Style { get; set; } // optional
 
-	[Parameter]
-	public bool Disabled { get; set; } // optional
-	
+    [Parameter]
+    public bool Disabled { get; set; } // optional
+
     [Parameter]
     public string EditMode { get; set; } // optional - specifies if a user must be in edit mode to see the action - default is true
 
-    string text = "";
-    string url = "";
-    string parameters = "";
-    string classname = "btn btn-primary";
-    string style = "";
-    bool editmode = true;
-    bool authorized = false;
+    [Parameter]
+    public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
     protected override void OnParametersSet()
     {
-        text = Action;
+        _text = Action;
         if (!string.IsNullOrEmpty(Text))
         {
-            text = Text;
+            _text = Text;
         }
 
         if (!string.IsNullOrEmpty(Parameters))
         {
-            parameters = Parameters;
+            _parameters = Parameters;
         }
 
         if (!string.IsNullOrEmpty(Class))
         {
-            classname = Class;
+            _classname = Class;
         }
 
         if (!string.IsNullOrEmpty(Style))
         {
-            style = Style;
+            _style = Style;
         }
 
         if (!string.IsNullOrEmpty(EditMode))
         {
-            editmode = bool.Parse(EditMode);
+            _editmode = bool.Parse(EditMode);
         }
 
-        url = EditUrl(Action, parameters);
-        authorized = IsAuthorized();
+        if (!string.IsNullOrEmpty(IconName))
+        {
+            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
+        }
+
+        _url = EditUrl(Action, _parameters);
+        _authorized = IsAuthorized();
     }
 
     private bool IsAuthorized()
     {
-        bool authorized = false;
-        if (PageState.EditMode || !editmode)
+        var authorized = false;
+        if (PageState.EditMode || !_editmode)
         {
-            SecurityAccessLevel security = SecurityAccessLevel.Host;
+            var security = SecurityAccessLevel.Host;
             if (Security == null)
             {
-                string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ",");
-                Type moduleType = Type.GetType(typename);
+                var typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ",");
+                var moduleType = Type.GetType(typename);
                 if (moduleType != null)
                 {
                     var moduleobject = Activator.CreateInstance(moduleType);
@@ -104,16 +113,17 @@
             {
                 security = Security.Value;
             }
+            
             switch (security)
             {
                 case SecurityAccessLevel.Anonymous:
                     authorized = true;
                     break;
                 case SecurityAccessLevel.View:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
                     break;
                 case SecurityAccessLevel.Edit:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
                     break;
                 case SecurityAccessLevel.Admin:
                     authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole);
@@ -123,6 +133,7 @@
                     break;
             }
         }
+        
         return authorized;
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index 40938da3..75079c6c 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,12 +1,15 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
-@if (text != "")
+@if (_text != string.Empty)
 {
-    @((MarkupString)@text)
+    @((MarkupString)_text)
 }
 
 @code {
+   
+    private string _text = string.Empty;
+
     [Parameter]
     public string CreatedBy { get; set; }
 
@@ -31,51 +34,58 @@
     [Parameter]
     public string Style { get; set; }
 
-    string text = "";
-
     protected override void OnParametersSet()
     {
-        text = "";
+        _text = string.Empty;
         if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null)
         {
-            text += "<p style=\"" + Style + "\">Created ";
+            _text += "<p style=\"" + Style + "\">Created ";
+            
             if (!String.IsNullOrEmpty(CreatedBy))
             {
-                text += " by <b>" + CreatedBy + "</b>";
+                _text += " by <b>" + CreatedBy + "</b>";
             }
+            
             if (CreatedOn != null)
             {
-                text += " on <b>" + CreatedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
+                _text += " on <b>" + CreatedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
             }
-            text += "</p>";
+            
+            _text += "</p>";
         }
 
         if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn != null)
         {
-            text += "<p style=\"" + Style + "\">Last modified ";
+            _text += "<p style=\"" + Style + "\">Last modified ";
+            
             if (!String.IsNullOrEmpty(ModifiedBy))
             {
-                text += " by <b>" + ModifiedBy + "</b>";
+                _text += " by <b>" + ModifiedBy + "</b>";
             }
+            
             if (ModifiedOn != null)
             {
-                text += " on <b>" + ModifiedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
+                _text += " on <b>" + ModifiedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
             }
-            text += "</p>";
+            
+            _text += "</p>";
         }
 
         if (!String.IsNullOrEmpty(DeletedBy) || DeletedOn.HasValue)
         {
-            text += "<p style=\"" + Style + "\">Deleted ";
+            _text += "<p style=\"" + Style + "\">Deleted ";
+            
             if (!String.IsNullOrEmpty(DeletedBy))
             {
-                text += " by <b>" + DeletedBy + "</b>";
+                _text += " by <b>" + DeletedBy + "</b>";
             }
+            
             if (DeletedOn != null)
             {
-                text += " on <b>" + DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
+                _text += " on <b>" + DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
             }
-            text += "</p>";
+            
+            _text += "</p>";
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 49abc7d0..0519e1b5 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -2,11 +2,11 @@
 @inherits ModuleBase
 @inject IFolderService FolderService
 @inject IFileService FileService
-@inject IJSRuntime jsRuntime
+@inject IJSRuntime JsRuntime
 
-@if (folders != null)
+@if (_folders != null)
 {
-    <div class="container-fluid px-0">
+    <div id="@Id" class="container-fluid px-0">
         <div class="row">
             <div class="col">
                 <div>
@@ -15,9 +15,9 @@
                         {
                             <option value="-1">&lt;Select Folder&gt;</option>
                         }
-                        @foreach (Folder folder in folders)
+                        @foreach (Folder folder in _folders)
                         {
-                            if (folder.FolderId == folderid)
+                            if (folder.FolderId == _folderid)
                             {
                                 <option value="@(folder.FolderId)" selected>@(new string('-', folder.Level * 2))@(folder.Name)</option>
                             }
@@ -28,14 +28,14 @@
                         }
                     </select>
                 </div>
-                @if (showfiles)
+                @if (_showfiles)
                 {
                     <div>
                         <select class="form-control" @onchange="(e => FileChanged(e))">
                             <option value="-1">&lt;Select File&gt;</option>
-                            @foreach (File file in files)
+                            @foreach (File file in _files)
                             {
-                                if (file.FileId == fileid)
+                                if (file.FileId == _fileid)
                                 {
                                     <option value="@(file.FileId)" selected>@(file.Name)</option>
                                 }
@@ -47,33 +47,33 @@
                         </select>
                     </div>
                 }
-                @if (haseditpermission)
+                @if (_haseditpermission)
                 {
                     <div>
-                        @if (uploadmultiple)
+                        @if (_uploadmultiple)
                         {
-                            <input type="file" id="@fileinputid" name="file" accept="@filter" multiple />
+                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
                         }
                         else
                         {
-                            <input type="file" id="@fileinputid" name="file" accept="@filter" />
+                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
                         }
-                        <span id="@progressinfoid"></span><progress id="@progressbarid" style="width: 150px; visibility: hidden;"></progress>
+                        <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">Upload</button>
-                        @if (showfiles && GetFileId() != -1)
+                        @if (_showfiles && GetFileId() != -1)
                         {
                             <button type="button" class="btn btn-danger" @onclick="DeleteFile">Delete</button>
                         }
                         </span>
                     </div>
-                    @((MarkupString)@message)
+                    @((MarkupString)_message)
                 }
             </div>
-            @if (@image != "")
+            @if (_image != string.Empty)
             {
                 <div class="col-auto">
-                    @((MarkupString)@image)
+                    @((MarkupString)_image)
                 </div>
             }
         </div>
@@ -81,6 +81,25 @@
 }
 
 @code {
+    private string _id;
+    private List<Folder> _folders;
+    private int _folderid = -1;
+    private List<File> _files = new List<File>();
+    private int _fileid = -1;
+    private bool _showfiles = true;
+    private string _fileinputid = string.Empty;
+    private string _progressinfoid = string.Empty;
+    private string _progressbarid = string.Empty;
+    private string _filter = "*";
+    private bool _uploadmultiple = false;
+    private bool _haseditpermission = false;
+    private string _message = string.Empty;
+    private string _image = string.Empty;
+    private string _guid;
+
+    [Parameter]
+    public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
+
     [Parameter]
     public string Folder { get; set; } // optional - for setting a specific folder by default
 
@@ -99,153 +118,147 @@
     [Parameter]
     public string UploadMultiple { get; set; } // optional - enable multiple file uploads - default false
 
-    string id;
-    List<Folder> folders;
-    int folderid = -1;
-    List<File> files = new List<File>();
-    int fileid = -1;
-    bool showfiles = true;
-    string fileinputid = "";
-    string progressinfoid = "";
-    string progressbarid = "";
-    string filter = "*";
-    bool uploadmultiple = false;
-    bool haseditpermission = false;
-    string message = "";
-    string image = "";
-
     protected override async Task OnInitializedAsync()
     {
+        if (!string.IsNullOrEmpty(Id))
+        {
+            _id = Id;
+        }
+
         if (!string.IsNullOrEmpty(Folder))
         {
-            folders = new List<Folder>();
-            folders.Add(new Folder { FolderId = -1, Name = Folder });
-            folderid = -1;
+            _folders = new List<Folder> {new Folder {FolderId = -1, Name = Folder}};
+            _folderid = -1;
         }
         else
         {
-            folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
             if (!string.IsNullOrEmpty(FolderId))
             {
-                folderid = int.Parse(FolderId);
+                _folderid = int.Parse(FolderId);
             }
         }
 
         if (!string.IsNullOrEmpty(FileId))
         {
-            fileid = int.Parse(FileId);
-            await SetImage();
-            if (fileid != -1)
+            _fileid = int.Parse(FileId);
+            if (_fileid != -1)
             {
                 File file = await FileService.GetFileAsync(int.Parse(FileId));
                 if (file != null)
                 {
-                    folderid = file.FolderId;
+                    _folderid = file.FolderId;
+                }
+                else
+                {
+                    _fileid = -1; // file does not exist
                 }
             }
+            await SetImage();
         }
         if (!string.IsNullOrEmpty(ShowFiles))
         {
-            showfiles = bool.Parse(ShowFiles);
+            _showfiles = bool.Parse(ShowFiles);
         }
 
         if (!string.IsNullOrEmpty(Filter))
         {
-            filter = "." + Filter.Replace(",",",.");
+            _filter = "." + Filter.Replace(",",",.");
         }
 
         await GetFiles();
 
         // create unique id for component
-        id = Guid.NewGuid().ToString("N");
-        fileinputid = id + "FileInput";
-        progressinfoid = id + "ProgressInfo";
-        progressbarid = id + "ProgressBar";
+        _guid = Guid.NewGuid().ToString("N");
+        _fileinputid = _guid + "FileInput";
+        _progressinfoid = _guid + "ProgressInfo";
+        _progressbarid = _guid + "ProgressBar";
 
         if (!string.IsNullOrEmpty(UploadMultiple))
         {
-            uploadmultiple = bool.Parse(UploadMultiple);
+            _uploadmultiple = bool.Parse(UploadMultiple);
         }
     }
 
     private async Task GetFiles()
     {
-        haseditpermission = false;
+        _haseditpermission = false;
         if (!string.IsNullOrEmpty(Folder))
         {
-            haseditpermission = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole);
-            files = await FileService.GetFilesAsync(Folder);
+            _haseditpermission = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole);
+            _files = await FileService.GetFilesAsync(Folder);
         }
         else
         {
-            Folder folder = folders.Where(item => item.FolderId == folderid).FirstOrDefault();
+            Folder folder = _folders.FirstOrDefault(item => item.FolderId == _folderid);
             if (folder != null)
             {
-                haseditpermission = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, folder.Permissions);
-                files = await FileService.GetFilesAsync(folderid);
+                _haseditpermission = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, folder.Permissions);
+                _files = await FileService.GetFilesAsync(_folderid);
             }
             else
             {
-                haseditpermission = false;
-                files = new List<File>();
+                _haseditpermission = false;
+                _files = new List<File>();
             }
         }
-        if (filter != "*")
+        if (_filter != "*")
         {
             List<File> filtered = new List<File>();
-            foreach (File file in files)
+            foreach (File file in _files)
             {
-                if (filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
                 {
                     filtered.Add(file);
                 }
             }
-            files = filtered;
+            _files = filtered;
         }
     }
 
     private async Task FolderChanged(ChangeEventArgs e)
     {
-        message = "";
+        _message = string.Empty;
         try
         {
-            folderid = int.Parse((string)e.Value);
+            _folderid = int.Parse((string)e.Value);
             await GetFiles();
-            fileid = -1;
-            image = "";
+            _fileid = -1;
+            _image = string.Empty;
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            message = "<br /><div class=\"alert alert-danger\" role=\"alert\">Error Loading Files</div>";
+            _message = "<br /><div class=\"alert alert-danger\" role=\"alert\">Error Loading Files</div>";
         }
     }
 
     private async Task FileChanged(ChangeEventArgs e)
     {
-        message = "";
-        fileid = int.Parse((string)e.Value);
+        _message = string.Empty;
+        _fileid = int.Parse((string)e.Value);
+
         await SetImage();
         StateHasChanged();
     }
 
     private async Task SetImage()
     {
-        image = "";
-        if (fileid != -1)
+        _image = string.Empty;
+        if (_fileid != -1)
         {
-            File file = await FileService.GetFileAsync(fileid);
-            if (file.ImageHeight != 0 && file.ImageWidth != 0)
+            File file = await FileService.GetFileAsync(_fileid);
+            if (file != null && file.ImageHeight != 0 && file.ImageWidth != 0)
             {
-                int maxwidth = 200;
-                int maxheight = 200;
+                var maxwidth = 200;
+                var maxheight = 200;
 
-                double ratioX = (double)maxwidth / (double)file.ImageWidth;
-                double ratioY = (double)maxheight / (double)file.ImageHeight;
-                double ratio = ratioX < ratioY ? ratioX : ratioY;
+                var ratioX = (double)maxwidth / (double)file.ImageWidth;
+                var ratioY = (double)maxheight / (double)file.ImageHeight;
+                var ratio = ratioX < ratioY ? ratioX : ratioY;
 
-                image = "<img src=\"" + ContentUrl(fileid) + "\" alt=\"" + file.Name +
+                _image = "<img src=\"" + ContentUrl(_fileid) + "\" alt=\"" + file.Name +
                     "\" width=\"" + Convert.ToInt32(file.ImageWidth * ratio).ToString() +
                     "\" height=\"" + Convert.ToInt32(file.ImageHeight * ratio).ToString() + "\" />";
             }
@@ -254,8 +267,8 @@
 
     private async Task UploadFile()
     {
-        var interop = new Interop(jsRuntime);
-        string[] upload = await interop.GetFiles(fileinputid);
+        var interop = new Interop(JsRuntime);
+        var upload = await interop.GetFiles(_fileinputid);
         if (upload.Length > 0)
         {
             try
@@ -263,23 +276,25 @@
                 string result;
                 if (!string.IsNullOrEmpty(Folder))
                 {
-                    result = await FileService.UploadFilesAsync(Folder, upload, id);
+                    result = await FileService.UploadFilesAsync(Folder, upload, _guid);
                 }
                 else
                 {
-                    result = await FileService.UploadFilesAsync(folderid, upload, id);
+                    result = await FileService.UploadFilesAsync(_folderid, upload, _guid);
                 }
-                if (result == "")
+
+                if (result == string.Empty)
                 {
                     await logger.LogInformation("File Upload Succeeded {Files}", upload);
-                    message = "<br /><div class=\"alert alert-success\" role=\"alert\">File Upload Succeeded</div>";
+                    _message = "<br /><div class=\"alert alert-success\" role=\"alert\">File Upload Succeeded</div>";
                     await GetFiles();
+
                     if (upload.Length == 1)
                     {
-                        File file = files.Where(item => item.Name == upload[0]).FirstOrDefault();
+                        var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
                         if (file != null)
                         {
-                            fileid = file.FileId;
+                            _fileid = file.FileId;
                             await SetImage();
                         }
                     }
@@ -288,44 +303,42 @@
                 else
                 {
                     await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
-                    message = "<br /><div class=\"alert alert-danger\" role=\"alert\">File Upload Failed</div>";
+                    _message = "<br /><div class=\"alert alert-danger\" role=\"alert\">File Upload Failed</div>";
                 }
             }
             catch (Exception ex)
             {
                 await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
-                message = "<br /><div class=\"alert alert-danger\" role=\"alert\">File Upload Failed</div>";
+                _message = "<br /><div class=\"alert alert-danger\" role=\"alert\">File Upload Failed</div>";
             }
         }
         else
         {
-            message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Have Not Selected A File To Upload</div>";
+            _message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Have Not Selected A File To Upload</div>";
         }
     }
 
     private async Task DeleteFile()
     {
-        message = "";
+        _message = string.Empty;
+
         try
         {
-            await FileService.DeleteFileAsync(fileid);
-            await logger.LogInformation("File Deleted {File}", fileid);
-            message = "<br /><div class=\"alert alert-success\" role=\"alert\">File Deleted</div>";
+            await FileService.DeleteFileAsync(_fileid);
+            await logger.LogInformation("File Deleted {File}", _fileid);
+            _message = "<br /><div class=\"alert alert-success\" role=\"alert\">File Deleted</div>";
             await GetFiles();
-            fileid = -1;
+            _fileid = -1;
             await SetImage();
             StateHasChanged();
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Deleting File {File} {Error}", fileid, ex.Message);
-            message = "<br /><div class=\"alert alert-danger\" role=\"alert\">Error Deleting File</div>";
+            await logger.LogError(ex, "Error Deleting File {File} {Error}", _fileid, ex.Message);
+            _message = "<br /><div class=\"alert alert-danger\" role=\"alert\">Error Deleting File</div>";
         }
     }
 
-    public int GetFileId()
-    {
-        return fileid;
-    }
+    public int GetFileId() => _fileid;
 
 }
diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor
new file mode 100644
index 00000000..0826e0cb
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/Label.razor
@@ -0,0 +1,44 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleBase
+
+@if (!string.IsNullOrEmpty(HelpText))
+{
+    <span class="app-tooltip" data-tip="@((MarkupString)HelpText)">@((MarkupString)_openLabel)@ChildContent@((MarkupString)_closeLabel) <img src="images/help.png" /></span>
+}
+else
+{
+    @((MarkupString)_openLabel)@ChildContent@((MarkupString)_closeLabel)
+}
+
+@code {
+    private string _openLabel = string.Empty;
+    private string _closeLabel = "</label>";
+
+    [Parameter]
+    public RenderFragment ChildContent { get; set; } 
+
+    [Parameter]
+    public string For { get; set; } // optional - the id of the associated input control for accessibility
+
+    [Parameter]
+    public string Class { get; set; } // optional - the class for the label ( ie. control-label )
+
+    [Parameter]
+    public string HelpText { get; set; } // optional - tooltip for this label
+
+    protected override void OnParametersSet()
+    {
+        _openLabel = "<label";
+        if (!string.IsNullOrEmpty(For))
+        {
+            _openLabel += " for=\"" + For + "\"";
+        }
+        
+        if (!string.IsNullOrEmpty(Class))
+        {
+            _openLabel += " class=\"" + Class + "\"";
+        }
+        
+        _openLabel += ">";
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index a957506d..67f3f50d 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -8,15 +8,15 @@
 }
 
 @code {
+    private string _message = string.Empty;
+    private string _classname = "alert alert-danger";
+
     [Parameter]
     public string Message { get; set; }
 
     [Parameter]
     public MessageType Type { get; set; }
 
-    string _message = "";
-    string _classname = "alert alert-danger";
-
     protected override void OnParametersSet()
     {
         if (!string.IsNullOrEmpty(Message))
@@ -35,7 +35,7 @@
 
     private string GetMessageType(MessageType type)
     {
-        string classname = "";
+        var classname = string.Empty;
         switch (type)
         {
             case MessageType.Success:
@@ -51,6 +51,7 @@
                 classname = "alert alert-danger";
                 break;
         }
+        
         return classname;
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 59547490..184eaa8a 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -36,40 +36,40 @@
     </div>
     }
     <div class="mx-auto text-center">
-        @if (Page > MaxPages)
+        @if (_page > _maxPages)
         {
             <button class="btn btn-secondary" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
         }
-        @if (EndPage > 1)
+        @if (_endPage > 1)
         {
             <button class="btn btn-secondary" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>            
-            @for (int i = StartPage; i <= EndPage; i++)
+            @for (int i = _startPage; i <= _endPage; i++)
             {
                 var pager = i;
-                <button class="btn @((pager == Page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
+                <button class="btn @((pager == _page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
                     @pager
                 </button>
             }
             <button class="btn btn-secondary" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
         }
-        @if (EndPage < Pages)
+        @if (_endPage < _pages)
         {
             <button class="btn btn-secondary" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
         }
-        @if (EndPage > 1)
+        @if (_endPage > 1)
         {
-            <span class="btn btn-link disabled">Page @Page of @Pages</span>
+            <span class="btn btn-link disabled">Page @_page of @_pages</span>
         }
     </div>
 </p>
 
 @code {
-    int Pages = 0;
-    int Page = 1;
-    int MaxItems;
-    int MaxPages;
-    int StartPage;
-    int EndPage;
+    private int _pages = 0;
+    private int _page = 1;
+    private int _maxItems;
+    private int _maxPages;
+    private int _startPage;
+    private int _endPage;
 
     [Parameter]
     public string Format { get; set; }
@@ -95,7 +95,7 @@
     [Parameter]
     public string Class { get; set; }
 
-    IEnumerable<TableItem> ItemList { get; set; }
+    private IEnumerable<TableItem> ItemList { get; set; }
 
     protected override void OnParametersSet()
     {
@@ -103,6 +103,7 @@
         {
             Format = "Table";
         }
+        
         if (string.IsNullOrEmpty(Class))
         {
             if (Format == "Table")
@@ -114,36 +115,39 @@
                 Class = "container";
             }
         }
+        
         if (string.IsNullOrEmpty(PageSize))
         {
-            MaxItems = 10;
+            _maxItems = 10;
         }
         else
         {
-            MaxItems = int.Parse(PageSize);
+            _maxItems = int.Parse(PageSize);
         }
+        
         if (string.IsNullOrEmpty(DisplayPages))
         {
-            MaxPages = 5;
+            _maxPages = 5;
         }
         else
         {
-            MaxPages = int.Parse(DisplayPages);
+            _maxPages = int.Parse(DisplayPages);
         }
 
         if (Items != null)
         {
-            ItemList = Items.Skip((Page - 1) * MaxItems).Take(MaxItems);
-            Pages = (int)Math.Ceiling(Items.Count() / (decimal)MaxItems);
+            ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
+            _pages = (int)Math.Ceiling(Items.Count() / (decimal)_maxItems);
         }
 
         SetPagerSize("forward");
     }
 
-    public void UpdateList(int CurrentPage)
+    public void UpdateList(int currentPage)
     {
-        ItemList = Items.Skip((CurrentPage - 1) * MaxItems).Take(MaxItems);
-        Page = CurrentPage;
+        ItemList = Items.Skip((currentPage - 1) * _maxItems).Take(_maxItems);
+        _page = currentPage;
+        
         StateHasChanged();
     }
 
@@ -151,29 +155,30 @@
     {
         if (direction == "forward")
         {
-            if (EndPage + 1 < Pages)
+            if (_endPage + 1 < _pages)
             {
-                StartPage = EndPage + 1;
+                _startPage = _endPage + 1;
             }
             else
             {
-                StartPage = 1;
+                _startPage = 1;
             }
 
-            if (EndPage + MaxPages < Pages)
+            if (_endPage + _maxPages < _pages)
             {
-                EndPage = StartPage + MaxPages - 1;
+                _endPage = _startPage + _maxPages - 1;
             }
             else
             {
-                EndPage = Pages;
+                _endPage = _pages;
             }
+            
             StateHasChanged();
         }
         else if (direction == "back")
         {
-            EndPage = StartPage - 1;
-            StartPage = StartPage - MaxPages;
+            _endPage = _startPage - 1;
+            _startPage = _startPage - _maxPages;
         }
     }
 
@@ -181,26 +186,27 @@
     {
         if (direction == "next")
         {
-            if (Page < Pages)
+            if (_page < _pages)
             {
-                if (Page == EndPage)
+                if (_page == _endPage)
                 {
                     SetPagerSize("forward");
                 }
-                Page += 1;
+                _page += 1;
             }
         }
         else if (direction == "previous")
         {
-            if (Page > 1)
+            if (_page > 1)
             {
-                if (Page == StartPage)
+                if (_page == _startPage)
                 {
                     SetPagerSize("back");
                 }
-                Page -= 1;
+                _page -= 1;
             }
         }
-        UpdateList(Page);
+        
+        UpdateList(_page);
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index c57ab192..543403f2 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -3,23 +3,23 @@
 @inject IRoleService RoleService
 @inject IUserService UserService
 
-@if (permissions != null)
+@if (_permissions != null)
 {
     <br />
-    <table class="table">
+    <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <th>Role</th>
-                @foreach (PermissionString permission in permissions)
+                @foreach (PermissionString permission in _permissions)
                 {
-                    <th style="text-align: center;">@permission.PermissionName @EntityName</th>
+                    <th style="text-align: center;">@permission.PermissionName</th>
                 }
             </tr>
-            @foreach (Role role in roles)
+            @foreach (Role role in _roles)
             {
                 <tr>
                     <td>@role.Name</td>
-                    @foreach (PermissionString permission in permissions)
+                    @foreach (PermissionString permission in _permissions)
                     {
                         var p = permission;
                         <td style="text-align: center;">
@@ -30,25 +30,25 @@
             }
         </tbody>
     </table>
-    @if (@users.Count != 0)
+    @if (_users.Count != 0)
     {
-        <table class="table">
+        <table class="table" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
                     <th>User</th>
-                    @foreach (PermissionString permission in permissions)
+                    @foreach (PermissionString permission in _permissions)
                     {
-                        <th style="text-align: center;">@permission.PermissionName @EntityName</th>
+                        <th style="text-align: center;">@permission.PermissionName</th>
                     }
                 </tr>
             </thead>
             <tbody>
-                @foreach (User user in users)
+                @foreach (User user in _users)
                 {
                     string userid = "[" + user.UserId.ToString() + "]";
                     <tr>
                         <td>@user.DisplayName</td>
-                        @foreach (PermissionString permission in permissions)
+                        @foreach (PermissionString permission in _permissions)
                         {
                             var p = permission;
                             <td style="text-align: center;">
@@ -60,20 +60,27 @@
             </tbody>
         </table>
     }
-    <table class="table">
+    <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <td style="text-align: right;"><label for="Username" class="control-label">User: </label></td>
-                <td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@username" /></td>
+                <td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" /></td>
                 <td style="text-align: left;"><button type="button" class="btn btn-primary" @onclick="AddUser">Add</button></td>
             </tr>
         </tbody>
     </table>
     <br />
-    <ModuleMessage Type="MessageType.Error" Message="@message" />
+    <ModuleMessage Type="MessageType.Error" Message="@_message" />
 }
 
 @code {
+    private string _permissionnames = string.Empty;
+    private List<Role> _roles;
+    private List<PermissionString> _permissions;
+    private List<User> _users = new List<User>();
+    private string _username = string.Empty;
+    private string _message = string.Empty;
+
     [Parameter]
     public string EntityName { get; set; }
 
@@ -83,49 +90,48 @@
     [Parameter]
     public string Permissions { get; set; }
 
-    string permissionnames = "";
-    List<Role> roles;
-    List<PermissionString> permissions;
-    List<User> users = new List<User>();
-    string username = "";
-    string message = "";
-
     protected override async Task OnInitializedAsync()
     {
         if (string.IsNullOrEmpty(PermissionNames))
         {
-            permissionnames = "View,Edit";
+            _permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
         }
         else
         {
-            permissionnames = PermissionNames;
+            _permissionnames = PermissionNames;
         }
-        roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
-        roles.Insert(0, new Role { Name = Constants.AllUsersRole });
 
+        _roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
+        _roles.Insert(0, new Role { Name = Constants.AllUsersRole });
+
+        _permissions = new List<PermissionString>();
+        
+        foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+        {
+            // initialize with admin role
+            _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = Constants.AdminRole });
+        }
+        
         if (!string.IsNullOrEmpty(Permissions))
         {
-            permissions = new List<PermissionString>();
-            foreach (string permissionname in permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = "" });
-            }
+            // populate permissions
             foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
             {
-                if (permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
+                if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
                 {
-                    permissions[permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
+                    _permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
                 }
+                
                 if (permissionstring.Permissions.Contains("["))
                 {
                     foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
                     {
                         if (user.Contains("]"))
                         {
-                            int userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-                            if (users.Where(item => item.UserId == userid).FirstOrDefault() == null)
+                            var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
+                            if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
                             {
-                                users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
+                                _users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
                             }
                         }
                     }
@@ -134,15 +140,15 @@
         }
     }
 
-    private bool? GetPermissionValue(string Permissions, string SecurityKey)
+    private bool? GetPermissionValue(string permissions, string securityKey)
     {
-        if ((";" + Permissions + ";").Contains(";" + "!" + SecurityKey + ";"))
+        if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
         {
             return false; // deny permission
         }
         else
         {
-            if ((";" + Permissions + ";").Contains(";" + SecurityKey + ";"))
+            if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
             {
                 return true; // grant permission
             }
@@ -153,81 +159,76 @@
         }
     }
 
-    private bool GetPermissionDisabled(string RoleName)
-    {
-        if (RoleName == Constants.AdminRole)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+    private bool GetPermissionDisabled(string roleName)
+        => roleName == Constants.AdminRole
+            ? true
+            : false;
 
     private async Task AddUser()
     {
-        if (users.Where(item => item.Username == username).FirstOrDefault() == null)
+        if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
         {
             try
             {
-                User user = await UserService.GetUserAsync(username, ModuleState.SiteId);
+                var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
                 if (user != null)
                 {
-                    users.Add(user);
+                    _users.Add(user);
                 }
             }
             catch
             {
-                message = "Username Does Not Exist";
+                _message = "Username Does Not Exist";
             }
         }
-        username = "";
+        
+        _username = string.Empty;
     }
 
-    private void PermissionChanged(bool? Value, string PermissionName, string SecurityId)
+    private void PermissionChanged(bool? value, string permissionName, string securityId)
     {
-        bool? selected = Value;
-        PermissionString permission = permissions.Find(item => item.PermissionName == PermissionName);
+        var selected = value;
+        var permission = _permissions.Find(item => item.PermissionName == permissionName);
         if (permission != null)
         {
-            List<string> ids = permission.Permissions.Split(';').ToList();
+            var ids = permission.Permissions.Split(';').ToList();
 
-            ids.Remove(SecurityId); // remove grant permission
-            ids.Remove("!" + SecurityId); // remove deny permission
+            ids.Remove(securityId); // remove grant permission
+            ids.Remove("!" + securityId); // remove deny permission
 
             switch (selected)
             {
                 case true:
-                    ids.Add(SecurityId); // add grant permission
+                    ids.Add(securityId); // add grant permission
                     break;
                 case false:
-                    ids.Add("!" + SecurityId); // add deny permission
+                    ids.Add("!" + securityId); // add deny permission
                     break;
                 case null:
                     break; // permission not specified
             }
-            permissions[permissions.FindIndex(item => item.PermissionName == PermissionName)].Permissions = string.Join(";", ids.ToArray());
+            
+            _permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
         }
     }
 
     public string GetPermissions()
     {
         ValidatePermissions();
-        return UserSecurity.SetPermissionStrings(permissions);
+        return UserSecurity.SetPermissionStrings(_permissions);
     }
 
     private void ValidatePermissions()
     {
         PermissionString permission;
-        for (int i = 0; i < permissions.Count; i++)
+        for (int i = 0; i < _permissions.Count; i++)
         {
-            permission = permissions[i];
+            permission = _permissions[i];
             List<string> ids = permission.Permissions.Split(';').ToList();
             ids.Remove("!" + Constants.AllUsersRole); // remove deny all users
             ids.Remove("!" + Constants.RegisteredRole); // remove deny registered users
             permission.Permissions = string.Join(";", ids.ToArray());
-            permissions[i] = permission;
+            _permissions[i] = permission;
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index d3d68870..36368c5a 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -1,16 +1,16 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
-@inject IJSRuntime JSRuntime
+@inject IJSRuntime JsRuntime
 
-@if (filemanagervisible)
+@if (_filemanagervisible)
 {
-    <FileManager @ref="filemanager" Filter="@Constants.ImageFiles" />
-    @((MarkupString)@message)
+    <FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
+    @((MarkupString)_message)
     <br />
 }
 <div class="row justify-content-center">
     <button type="button" class="btn btn-success" @onclick="InsertImage">Insert Image</button>
-    @if (filemanagervisible)
+    @if (_filemanagervisible)
     {
         @((MarkupString)"&nbsp;&nbsp;")
         <button type="button" class="btn btn-secondary" @onclick="CloseFileManager">Close</button>
@@ -18,15 +18,21 @@
 </div>
 <div class="row">
     <div class ="col">
-        <div @ref="@ToolBar">
+        <div @ref="@_toolBar">
             @ToolbarContent
         </div>
-        <div @ref="@EditorElement">
+        <div @ref="@_editorElement">
         </div>
     </div>
 </div>
 
 @code {
+    private ElementReference _editorElement;
+    private ElementReference _toolBar;
+    private bool _filemanagervisible = false;
+    private FileManager _fileManager;
+    private string _message = string.Empty;
+
     [Parameter]
     public RenderFragment ToolbarContent { get; set; }
 
@@ -42,20 +48,14 @@
     [Parameter]
     public string DebugLevel { get; set; } = "info";
 
-    private ElementReference EditorElement;
-    private ElementReference ToolBar;
-    bool filemanagervisible = false;
-    FileManager filemanager;
-    string message = "";
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
             await RichTextEditorInterop.CreateEditor(
-                JSRuntime,
-                EditorElement,
-                ToolBar,
+                JsRuntime,
+                _editorElement,
+                _toolBar,
                 ReadOnly,
                 Placeholder,
                 Theme,
@@ -66,68 +66,70 @@
     public async Task<string> GetText()
     {
         return await RichTextEditorInterop.GetText(
-            JSRuntime,
-            EditorElement);
+            JsRuntime,
+            _editorElement);
     }
 
-    public async Task<string> GetHTML()
+    public async Task<string> GetHtml()
     {
-        return await RichTextEditorInterop.GetHTML(
-            JSRuntime,
-            EditorElement);
+        return await RichTextEditorInterop.GetHtml(
+            JsRuntime,
+            _editorElement);
     }
 
     public async Task<string> GetContent()
     {
         return await RichTextEditorInterop.GetContent(
-            JSRuntime,
-            EditorElement);
+            JsRuntime,
+            _editorElement);
     }
 
-    public async Task LoadContent(string Content)
+    public async Task LoadContent(string content)
     {
         await RichTextEditorInterop.LoadEditorContent(
-            JSRuntime,
-            EditorElement, Content);
+            JsRuntime,
+            _editorElement, content);
     }
 
     public async Task EnableEditor(bool mode)
     {
         await RichTextEditorInterop.EnableEditor(
-            JSRuntime,
-            EditorElement, mode);
+            JsRuntime,
+            _editorElement, mode);
     }
 
     public async Task InsertImage()
     {
-        if (filemanagervisible)
+        if (_filemanagervisible)
         {
-            int fileid = filemanager.GetFileId();
+            var fileid = _fileManager.GetFileId();
             if (fileid != -1)
             {
                 await RichTextEditorInterop.InsertImage(
-                    JSRuntime,
-                    EditorElement, ContentUrl(fileid));
-                filemanagervisible = false;
-                message = "";
+                    JsRuntime,
+                    _editorElement, ContentUrl(fileid));
+                _filemanagervisible = false;
+                _message = string.Empty;
             }
             else
             {
-                message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Must Select An Image To Insert</div>";
+                _message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Must Select An Image To Insert</div>";
             }
         }
         else
         {
-            filemanagervisible = true;
-            message = "";
+            _filemanagervisible = true;
+            _message = string.Empty;
         }
+        
         StateHasChanged();
     }
 
     public void CloseFileManager()
     {
-        filemanagervisible = false;
-        message = "";
+        _filemanagervisible = false;
+        _message = string.Empty;
+        
         StateHasChanged();
     }
 
diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor
new file mode 100644
index 00000000..6921f933
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/Section.razor
@@ -0,0 +1,44 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleBase
+
+<div class="d-flex">
+    <div>
+        <a data-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name">
+            <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">
+            <i class="oi oi-chevron-bottom"></i>&nbsp;
+        </a>
+    </div>
+</div>
+<div class="d-flex">
+    <hr class="app-rule" />
+</div>
+<div class="collapse" id="@Name">
+    @ChildContent
+</div>
+
+@code {
+    private string _heading = string.Empty;
+    private string _expanded = string.Empty;
+
+    [Parameter]
+    public RenderFragment ChildContent { get; set; }
+
+    [Parameter]
+    public string Name { get; set; } // required - the name of the section
+
+    [Parameter]
+    public string Heading { get; set; } // optional - will default to Name if not provided
+
+    [Parameter]
+    public string Expanded { get; set; } // optional - will default to false if not provided
+
+    protected override void OnInitialized()
+    {
+        _heading = (!string.IsNullOrEmpty(Heading)) ? Heading : Name;
+        _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded : "false";
+    }
+}
diff --git a/Oqtane.Client/Modules/Controls/TabControl.razor b/Oqtane.Client/Modules/Controls/TabControl.razor
deleted file mode 100644
index e6cda943..00000000
--- a/Oqtane.Client/Modules/Controls/TabControl.razor
+++ /dev/null
@@ -1,43 +0,0 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleBase
-
-<CascadingValue Value="this">
-    <div>
-        @foreach (TabPanel tabPanel in TabPanels)
-        {
-            <button type="button"
-                    class="btn @GetButtonClass(tabPanel)"
-                    @onclick=@( () => ActivateTabPanel(tabPanel) )>
-                @tabPanel.Text
-            </button>
-        }
-    </div>
-    @ChildContent
-</CascadingValue>
-
-@code {
-    // Next line is needed so we are able to add <TabPanel> components inside
-    [Parameter]
-    public RenderFragment ChildContent { get; set; }
-
-    public TabPanel ActiveTabPanel { get; set; }
-    List<TabPanel> TabPanels = new List<TabPanel>();
-
-    internal void AddTabPanel(TabPanel tabPanel)
-    {
-        TabPanels.Add(tabPanel);
-        if (TabPanels.Count == 1)
-            ActiveTabPanel = tabPanel;
-        StateHasChanged();
-    }
-
-    string GetButtonClass(TabPanel tabPanel)
-    {
-        return tabPanel == ActiveTabPanel ? "btn-primary" : "btn-secondary";
-    }
-
-    void ActivateTabPanel(TabPanel tabPanel)
-    {
-        ActiveTabPanel = tabPanel;
-    }
-}
diff --git a/Oqtane.Client/Modules/Controls/TabPanel.razor b/Oqtane.Client/Modules/Controls/TabPanel.razor
index 475d6258..d09ff53f 100644
--- a/Oqtane.Client/Modules/Controls/TabPanel.razor
+++ b/Oqtane.Client/Modules/Controls/TabPanel.razor
@@ -1,27 +1,35 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
-@if (Parent.ActiveTabPanel == (TabPanel)(object)this)
+@if (Name == Parent.ActiveTab)
 {
-    @ChildContent
+    <div id="@Name" class="tab-pane fade show active" role="tabpanel">
+        @ChildContent
+    </div>
+}
+else
+{
+    <div id="@Name" class="tab-pane fade" role="tabpanel">
+        @ChildContent
+    </div>
 }
 
 @code {
     [CascadingParameter]
-    private TabControl Parent { get; set; }
+    private TabStrip Parent { get; set; }
 
     [Parameter]
     public RenderFragment ChildContent { get; set; }
 
     [Parameter]
-    public string Text { get; set; }
+    public string Name { get; set; } // required - name of the TabPanel
+
+    [Parameter]
+    public string Heading { get; set; } // optional - defaults to name if not specified
 
     protected override void OnInitialized()
     {
-        if (Parent == null)
-            throw new ArgumentNullException(nameof(Parent), "TabPanel must exist within a TabControl");
-
         base.OnInitialized();
-        Parent.AddTabPanel((TabPanel)(object)this);
+        Parent.AddTabPanel((TabPanel)this);
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor
new file mode 100644
index 00000000..4f0b872f
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/TabStrip.razor
@@ -0,0 +1,65 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleBase
+
+<CascadingValue Value="this">
+    <div class="container-fluid">
+        <div class="form-group">
+            <ul class="nav nav-tabs" role="tablist">
+                @foreach (TabPanel tabPanel in _tabPanels)
+                {
+                    <li class="nav-item">
+                        @if (tabPanel.Name == ActiveTab)
+                        {
+                            <a class="nav-link active" data-toggle="tab" href="#@tabPanel.Name" role="tab">
+                                @DisplayHeading(tabPanel.Name, tabPanel.Heading)
+                            </a>
+                        }
+                        else
+                        {
+                            <a class="nav-link" data-toggle="tab" href="#@tabPanel.Name" role="tab">
+                                @DisplayHeading(tabPanel.Name, tabPanel.Heading)
+                            </a>
+                        }
+                    </li>
+                }
+            </ul>
+            <div class="tab-content">
+                <br />
+                @ChildContent
+            </div>
+        </div>
+    </div>
+</CascadingValue>
+
+@code {
+    private List<TabPanel> _tabPanels = new List<TabPanel>();
+
+    [Parameter]
+    public RenderFragment ChildContent { get; set; } // contains the TabPanels
+
+    [Parameter]
+    public string ActiveTab { get; set; } // optional - defaults to first TabPanel if not specified. Can also be set using a "tab=" querystring parameter.
+
+    protected override void OnInitialized()
+    {
+        if (PageState.QueryString.ContainsKey("tab"))
+        {
+            ActiveTab = PageState.QueryString["tab"];
+        }
+    }
+
+    internal void AddTabPanel(TabPanel tabPanel)
+    {
+        _tabPanels.Add(tabPanel);
+        if (string.IsNullOrEmpty(ActiveTab))
+        {
+            ActiveTab = tabPanel.Name;
+        }
+        StateHasChanged();
+    }
+
+    private string DisplayHeading(string Name, string Heading)
+    {
+        return (string.IsNullOrEmpty(Heading)) ? Name : Heading;
+    }
+}
diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
index f1ed8776..3c056d87 100644
--- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
+++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
@@ -1,8 +1,12 @@
 @namespace Oqtane.Modules.Controls
 
-<img src="@src" title="@title" @onclick="SetValue" />
+<img src="@_src" title="@_title" @onclick="SetValue" />
 
 @code {
+    private bool? _value = null;
+    private string _title;
+    private string _src = string.Empty;
+
     [Parameter]
     public bool? Value { get; set; }
 
@@ -12,13 +16,9 @@
     [Parameter]
     public Action<bool?> OnChange { get; set; }
 
-    bool? value = null;
-    string title;
-    string src = "";
-
     protected override void OnInitialized()
     {
-        value = Value;
+        _value = Value;
         SetImage();
     }
 
@@ -26,40 +26,42 @@
     {
         if (!Disabled)
         {
-            switch (value)
+            switch (_value)
             {
                 case true:
-                    value = false;
+                    _value = false;
                     break;
                 case false:
-                    value = null;
+                    _value = null;
                     break;
                 case null:
-                    value = true;
+                    _value = true;
                     break;
             }
+            
             SetImage();
-            OnChange(value);
+            OnChange(_value);
         }
     }
 
     private void SetImage()
     {
-        switch (value)
+        switch (_value)
         {
             case true:
-                src = "images/checked.png";
-                title = "Permission Granted";
+                _src = "images/checked.png";
+                _title = "Permission Granted";
                 break;
             case false:
-                src = "images/unchecked.png";
-                title = "Permission Denied";
+                _src = "images/unchecked.png";
+                _title = "Permission Denied";
                 break;
             case null:
-                src = "images/null.png";
-                title = "";
+                _src = "images/null.png";
+                _title = string.Empty;
                 break;
         }
+
         StateHasChanged();
     }
 }
diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
deleted file mode 100644
index b511cfc0..00000000
--- a/Oqtane.Client/Modules/Counter/Index.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-@namespace Oqtane.Modules.Counter
-@inherits ModuleBase
-Current count: @currentCount
-<br />
-<button type="button" class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-<br />
-<br />
-
-@code {
-    int currentCount = 0;
-
-    void IncrementCount()
-    {
-        currentCount++;
-    }
-}
diff --git a/Oqtane.Client/Modules/Counter/Module.cs b/Oqtane.Client/Modules/Counter/Module.cs
deleted file mode 100644
index 5f509ae2..00000000
--- a/Oqtane.Client/Modules/Counter/Module.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace Oqtane.Modules.Counter
-{
-    public class Module : IModule
-    {
-        public Dictionary<string, string> Properties
-        {
-            get
-            {
-                Dictionary<string, string> properties = new Dictionary<string, string>
-                {
-                    { "Name", "Counter" },
-                    { "Description", "Increments a counter" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
-    }
-}
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 0d9601db..ab0f1feb 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -67,16 +67,19 @@
 </div>
 
 @code {
+    private string _visibleText = "d-none";
+    private string _visibleRich;
+    private bool _richTextEditorMode;
+    private RichTextEditor RichTextEditorHtml;
+    private string content;
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel
-    {
-        get { return SecurityAccessLevel.Edit; }
-    }
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    public override string Title
-    {
-        get { return "Edit Html/Text"; }
-    }
+    public override string Title => "Edit Html/Text";
 
     public bool RichTextEditorMode
     {
@@ -88,27 +91,16 @@
             if (_richTextEditorMode)
             {
                 _visibleText = "d-none";
-                _visibleRich = "";
+                _visibleRich = string.Empty;
             }
             else
             {
-                _visibleText = "";
+                _visibleText = string.Empty;
                 _visibleRich = "d-none";
             }
         }
     }
 
-    string _visibleText = "d-none";
-    string _visibleRich;
-    bool _richTextEditorMode;
-
-    RichTextEditor RichTextEditorHtml;
-    string content;
-    string createdby;
-    DateTime createdon;
-    string modifiedby;
-    DateTime modifiedon;
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         try
@@ -131,8 +123,8 @@
 
     private async Task LoadText()
     {
-        HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, NavigationManager);
-        HtmlTextInfo htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
+        var htmltextservice = new HtmlTextService(http, sitestate);
+        var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
         if (htmltext != null)
         {
             content = htmltext.Content;
@@ -158,7 +150,7 @@
 
     private async Task RawHtmlEditor()
     {
-        content = await this.RichTextEditorHtml.GetHTML();
+        content = await this.RichTextEditorHtml.GetHtml();
         RichTextEditorMode = false;
         StateHasChanged();
     }
@@ -167,15 +159,15 @@
     {
         if (RichTextEditorMode)
         {
-            content = await RichTextEditorHtml.GetHTML();
+            content = await RichTextEditorHtml.GetHtml();
         }
 
-        content = content.Replace(((PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path) + Constants.ContentUrl, Constants.ContentUrl);
+        content = content.Replace(((PageState.Alias.Path == string.Empty) ? "/~" : PageState.Alias.Path) + Constants.ContentUrl, Constants.ContentUrl);
 
         try
         {
-            HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, NavigationManager);
-            HtmlTextInfo htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
+            var htmltextservice = new HtmlTextService(http, sitestate);
+            var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
             if (htmltext != null)
             {
                 htmltext.Content = content;
@@ -188,6 +180,7 @@
                 htmltext.Content = content;
                 await htmltextservice.AddHtmlTextAsync(htmltext);
             }
+            
             await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext);
             NavigationManager.NavigateTo(NavigateUrl());
         }
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 6360d882..e04ffbf2 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -8,19 +8,25 @@
 
 @((MarkupString)content)
 
-<br />
+@if (PageState.EditMode)
+{
+    <br />
+}
 <ActionLink Action="Edit" />
-<br /><br />
+@if (PageState.EditMode)
+{
+    <br /><br />
+}
 
 @code {
-    string content = "";
+    private string content = "";
 
     protected override async Task OnParametersSetAsync()
     {
         try
         {
-            HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, NavigationManager);
-            HtmlTextInfo htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
+            var htmltextservice = new HtmlTextService(http, sitestate);
+            var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
             if (htmltext != null)
             {
                 content = htmltext.Content;
diff --git a/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs b/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
index df585a05..4be90a8b 100644
--- a/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
+++ b/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
@@ -1,22 +1,16 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.HtmlText
 {
     public class ModuleInfo : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
-            {
-                Dictionary<string, string> properties = new Dictionary<string, string>
-                {
-                    { "Name", "HtmlText" },
-                    { "Description", "Renders HTML or Text" },
-                    { "Version", "1.0.0" },
-                    { "ServerAssemblyName", "Oqtane.Server" }
-                };
-                return properties;
-            }
-        }
+            Name = "HtmlText",
+            Description = "Renders HTML or Text Content",
+            Version = "1.0.0",
+            ServerManagerType = "Oqtane.Modules.HtmlText.Manager.HtmlTextManager, Oqtane.Server",
+            ReleaseVersions = "1.0.0"
+        };
     }
 }
diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
index 1b3a7834..cb73b9a4 100644
--- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
+++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Services;
 using Oqtane.Shared;
@@ -10,51 +9,35 @@ using Oqtane.Shared;
 namespace Oqtane.Modules.HtmlText.Services
 {
     public class HtmlTextService : ServiceBase, IHtmlTextService
-    {
-        private readonly HttpClient _http;
-        private readonly NavigationManager _navigationManager;
+    {        
         private readonly SiteState _siteState;
 
-        public HtmlTextService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public HtmlTextService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string ApiUrl => CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "HtmlText");
+        private string ApiUrl => CreateApiUrl(_siteState.Alias, "HtmlText");
 
         public async Task<HtmlTextInfo> GetHtmlTextAsync(int moduleId)
         {
-            HtmlTextInfo htmlText;
-            try
-            {
-                //because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
-                //null value is transfered as empty list
-                var htmlTextList = await _http.GetJsonAsync<List<HtmlTextInfo>>(ApiUrl + "/" + moduleId + "?entityid=" + moduleId);
-                htmlText = htmlTextList.FirstOrDefault();
-            }
-            catch
-            {
-                htmlText = null;
-            }
-
-            return htmlText;
+            var htmltext = await GetJsonAsync<List<HtmlTextInfo>>($"{ApiUrl}/{moduleId}?entityid={moduleId}");
+            return htmltext.FirstOrDefault();
         }
 
         public async Task AddHtmlTextAsync(HtmlTextInfo htmlText)
         {
-            await _http.PostJsonAsync(ApiUrl + "?entityid=" + htmlText.ModuleId, htmlText);
+            await PostJsonAsync($"{ApiUrl}?entityid={htmlText.ModuleId}", htmlText);
         }
 
         public async Task UpdateHtmlTextAsync(HtmlTextInfo htmlText)
         {
-            await _http.PutJsonAsync(ApiUrl + "/" + htmlText.HtmlTextId + "?entityid=" + htmlText.ModuleId, htmlText);
+            await PutJsonAsync($"{ApiUrl}/{htmlText.HtmlTextId}?entityid={htmlText.ModuleId}", htmlText);
         }
 
         public async Task DeleteHtmlTextAsync(int moduleId)
         {
-            await _http.DeleteAsync(ApiUrl + "/" + moduleId + "?entityid=" + moduleId);
+            await DeleteAsync($"{ApiUrl}/{moduleId}?entityid={moduleId}");
         }
     }
 }
diff --git a/Oqtane.Client/Modules/IModule.cs b/Oqtane.Client/Modules/IModule.cs
index 675378b8..f0ecfacf 100644
--- a/Oqtane.Client/Modules/IModule.cs
+++ b/Oqtane.Client/Modules/IModule.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules
 {
     public interface IModule
     {
-        Dictionary<string, string> Properties { get; }
+        ModuleDefinition ModuleDefinition { get; }
     }
 }
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index ba0c637b..c81f8d10 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -4,6 +4,7 @@ using Oqtane.Models;
 using System.Threading.Tasks;
 using Oqtane.Services;
 using System;
+using Oqtane.Enums;
 using Oqtane.UI;
 
 namespace Oqtane.Modules
@@ -86,9 +87,7 @@ namespace Oqtane.Modules
 
         public string ContentUrl(int fileid)
         {
-            string url = (PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path;
-            url += Constants.ContentUrl + fileid.ToString();
-            return url;
+            return Utilities.ContentUrl(PageState.Alias, fileid);
         }
 
         // user feedback methods
diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
deleted file mode 100644
index 081469b7..00000000
--- a/Oqtane.Client/Modules/Weather/Index.razor
+++ /dev/null
@@ -1,42 +0,0 @@
-@using Oqtane.Modules.Weather.Services
-@namespace Oqtane.Modules.Weather
-@inherits ModuleBase
-
-@if (forecasts == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Temp. (C)</th>
-                <th>Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-@code {
-    WeatherForecast[] forecasts;
-
-    protected override async Task OnInitializedAsync()
-    {
-        WeatherForecastService forecastservice = new WeatherForecastService();
-        forecasts = await forecastservice.GetForecastAsync(DateTime.UtcNow);
-    }
-}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs b/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs
deleted file mode 100644
index 7e02ea8a..00000000
--- a/Oqtane.Client/Modules/Weather/Models/WeatherForecast.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Oqtane.Modules.Weather
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-        public int TemperatureC { get; set; }
-        public int TemperatureF { get; set; }
-        public string Summary { get; set; }
-    }
-}
diff --git a/Oqtane.Client/Modules/Weather/Module.cs b/Oqtane.Client/Modules/Weather/Module.cs
deleted file mode 100644
index 65d719d8..00000000
--- a/Oqtane.Client/Modules/Weather/Module.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace Oqtane.Modules.Weather
-{
-    public class Module : IModule
-    {
-        public Dictionary<string, string> Properties
-        {
-            get
-            {
-                Dictionary<string, string> properties = new Dictionary<string, string>
-                {
-                    { "Name", "Weather" },
-                    { "Description", "Displays random weather using a service" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
-    }
-}
diff --git a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs
deleted file mode 100644
index 743848fb..00000000
--- a/Oqtane.Client/Modules/Weather/Services/IWeatherForecastService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Oqtane.Modules.Weather.Services
-{
-    public interface IWeatherForecastService
-    {
-        Task<WeatherForecast[]> GetForecastAsync(DateTime startDate);
-    }
-}
diff --git a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs b/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs
deleted file mode 100644
index e6ad13d9..00000000
--- a/Oqtane.Client/Modules/Weather/Services/WeatherForecastService.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Oqtane.Modules;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Oqtane.Modules.Weather.Services
-{
-    public class WeatherForecastService : IWeatherForecastService
-    {
-        private static string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
-        {
-            var rng = new Random();
-            return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = startDate.AddDays(index),
-                TemperatureC = rng.Next(-20, 55),
-                Summary = Summaries[rng.Next(Summaries.Length)]
-            }).ToArray());
-        }
-    }
-}
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index 150eb596..f19dac81 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -3,15 +3,10 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Exe</OutputType>
-    <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
-    <RestoreAdditionalProjectSources>
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
-    <Configurations>Debug;Release;Wasm</Configurations>
-    <Version>0.0.1</Version>
+    <Configurations>Debug;Release</Configurations>
+    <Version>0.9.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -24,15 +19,18 @@
     <RootNamespace>Oqtane</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Wasm|AnyCPU'">
-    <DefineConstants>TRACE;WASM</DefineConstants>
-  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Modules\Admin\ModuleCreator\Templates\**" />
+    <Content Remove="Modules\Admin\ModuleCreator\Templates\**" />
+    <EmbeddedResource Remove="Modules\Admin\ModuleCreator\Templates\**" />
+    <None Remove="Modules\Admin\ModuleCreator\Templates\**" />
+  </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.2" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs
index f7879cf0..74fa8de4 100644
--- a/Oqtane.Client/Program.cs
+++ b/Oqtane.Client/Program.cs
@@ -1,24 +1,84 @@
-using Microsoft.AspNetCore.Blazor.Hosting;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
+using Oqtane.Services;
+using System.Reflection;
+using System;
+using System.Linq;
+using System.Net.Http;
+using Oqtane.Modules;
+using Oqtane.Shared;
+using Oqtane.Providers;
+using Microsoft.AspNetCore.Components.Authorization;
 
 namespace Oqtane.Client
 {
     public class Program
     {
-#if DEBUG || RELEASE
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-        }
-#endif
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+            builder.RootComponents.Add<App>("app");
 
-#if WASM
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+            builder.Services.AddSingleton(
+                new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }
+            );
+            builder.Services.AddOptions();
 
-        public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
-            BlazorWebAssemblyHost.CreateDefaultBuilder()
-                .UseBlazorStartup<Startup>();
-#endif
+            // register auth services
+            builder.Services.AddAuthorizationCore();
+            builder.Services.AddScoped<IdentityAuthenticationStateProvider>();
+            builder.Services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
+
+            // 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>();
+
+            // dynamically register module contexts and repository services
+            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly assembly in assemblies)
+            {
+                Type[] implementationtypes = assembly.GetTypes()
+                    .Where(item => item.GetInterfaces().Contains(typeof(IService)))
+                    .ToArray();
+                foreach (Type implementationtype in implementationtypes)
+                {
+                    Type servicetype = Type.GetType(implementationtype.AssemblyQualifiedName.Replace(implementationtype.Name, "I" + implementationtype.Name));
+                    if (servicetype != null)
+                    {
+                        builder.Services.AddScoped(servicetype, implementationtype); // traditional service interface
+                    }
+                    else
+                    {
+                        builder.Services.AddScoped(implementationtype, implementationtype); // no interface defined for service
+                    }
+                }
+            }
+
+            await builder.Build().RunAsync();
+        }
     }
 }
diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
index 40904341..cbfbaad9 100644
--- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
+++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Net.Http;
+using System.Net.Http.Json;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -28,8 +30,8 @@ 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>();
-            string apiurl = ServiceBase.CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "User") + "/authenticate";
-            User user = await http.GetJsonAsync<User>(apiurl);
+            string apiurl = "/~/api/User/authenticate";
+            User user = await http.GetFromJsonAsync<User>(apiurl);
 
             ClaimsIdentity identity = new ClaimsIdentity();
             if (user.IsAuthenticated)
@@ -37,7 +39,7 @@ namespace Oqtane.Providers
                 identity = new ClaimsIdentity("Identity.Application");
                 identity.AddClaim(new Claim(ClaimTypes.Name, user.Username));
                 identity.AddClaim(new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()));
-                foreach (string role in user.Roles.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                foreach (string role in user.Roles.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
                     identity.AddClaim(new Claim(ClaimTypes.Role, role));
                 }
diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs
index 87ff5e43..1e0f5ac8 100644
--- a/Oqtane.Client/Services/AliasService.cs
+++ b/Oqtane.Client/Services/AliasService.cs
@@ -2,70 +2,49 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
-using Oqtane.Shared;
 using System.Net;
 using System;
 
+
 namespace Oqtane.Services
 {
     public class AliasService : ServiceBase, IAliasService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+        
+        public AliasService(HttpClient http) :base(http) { }
 
-        public AliasService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
-        }
-
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Alias"); }
-        }
+        private string Apiurl => CreateApiUrl("Alias");
 
         public async Task<List<Alias>> GetAliasesAsync()
         {
-            List<Alias> aliases = await _http.GetJsonAsync<List<Alias>>(apiurl);
+            List<Alias> aliases = await GetJsonAsync<List<Alias>>(Apiurl);
             return aliases.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<Alias> GetAliasAsync(int AliasId)
+        public async Task<Alias> GetAliasAsync(int aliasId)
         {
-            return await _http.GetJsonAsync<Alias>(apiurl + "/" + AliasId.ToString());
+            return await GetJsonAsync<Alias>($"{Apiurl}/{aliasId}");
         }
 
-        public async Task<Alias> GetAliasAsync(string Url, DateTime LastSyncDate)
+        public async Task<Alias> GetAliasAsync(string name, DateTime lastSyncDate)
         {
-            Uri uri = new Uri(Url);
-            string name = uri.Authority;
-            if (uri.Segments.Count() > 1)
-            {
-                name += "/" + uri.Segments[1];
-            }
-            if (name.EndsWith("/")) 
-            { 
-                name = name.Substring(0, name.Length - 1); 
-            }
-            return await _http.GetJsonAsync<Alias>(apiurl + "/name/" + WebUtility.UrlEncode(name) + "?lastsyncdate=" + LastSyncDate.ToString("yyyyMMddHHmmssfff"));
+            name = (string.IsNullOrEmpty(name)) ? "~" : name;
+            return await GetJsonAsync<Alias>($"{Apiurl}/name/{WebUtility.UrlEncode(name)}?sync={lastSyncDate.ToString("yyyyMMddHHmmssfff")}");
         }
 
         public async Task<Alias> AddAliasAsync(Alias alias)
         {
-            return await _http.PostJsonAsync<Alias>(apiurl, alias);
+            return await PostJsonAsync<Alias>(Apiurl, alias);
         }
 
         public async Task<Alias> UpdateAliasAsync(Alias alias)
         {
-            return await _http.PutJsonAsync<Alias>(apiurl + "/" + alias.AliasId.ToString(), alias);
+            return await PutJsonAsync<Alias>($"{Apiurl}/{alias.AliasId}", alias);
         }
-        public async Task DeleteAliasAsync(int AliasId)
+        public async Task DeleteAliasAsync(int aliasId)
         {
-            await _http.DeleteAsync(apiurl + "/" + AliasId.ToString());
+            await DeleteAsync($"{Apiurl}/{aliasId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs
index 89dfee81..cbef816a 100644
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Oqtane.Models;
 using Oqtane.Shared;
@@ -14,79 +12,75 @@ namespace Oqtane.Services
 {
     public class FileService : ServiceBase, IFileService
     {
-        private readonly HttpClient _http;
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
         private readonly IJSRuntime _jsRuntime;
 
-        public FileService(HttpClient http, SiteState siteState, NavigationManager navigationManager,
-            IJSRuntime jsRuntime)
+        public FileService(HttpClient http, SiteState siteState, IJSRuntime jsRuntime) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
             _jsRuntime = jsRuntime;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "File");
+
+        public async Task<List<File>> GetFilesAsync(int folderId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "File"); }
+            return await GetFilesAsync(folderId.ToString());
         }
 
-        public async Task<List<File>> GetFilesAsync(int FolderId)
+        public async Task<List<File>> GetFilesAsync(string folder)
         {
-            return await GetFilesAsync(FolderId.ToString());
-        }
-
-        public async Task<List<File>> GetFilesAsync(string Folder)
-        {
-            return await _http.GetJsonAsync<List<File>>(apiurl + "?folder=" + Folder);
+            return await GetJsonAsync<List<File>>($"{Apiurl}?folder={folder}");
         }
 
         public async Task<List<File>> GetFilesAsync(int siteId, string folderPath)
         {
-            if (!folderPath.EndsWith("\\")) folderPath += "\\";
+            if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar)))
+            {
+                folderPath = Utilities.PathCombine(folderPath,"\\");
+            }
+            
             var path = WebUtility.UrlEncode(folderPath);
-            return await _http.GetJsonAsync<List<File>>($"{apiurl}/{siteId}/{path}");
+            
+            return await GetJsonAsync<List<File>>($"{Apiurl}/{siteId}/{path}");
         }
 
-        public async Task<File> GetFileAsync(int FileId)
+        public async Task<File> GetFileAsync(int fileId)
         {
-            return await _http.GetJsonAsync<File>(apiurl + "/" + FileId.ToString());
+            return await GetJsonAsync<File>($"{Apiurl}/{fileId}");
         }
 
-        public async Task<File> AddFileAsync(File File)
+        public async Task<File> AddFileAsync(File file)
         {
-            return await _http.PostJsonAsync<File>(apiurl, File);
+            return await PostJsonAsync<File>(Apiurl, file);
         }
 
-        public async Task<File> UpdateFileAsync(File File)
+        public async Task<File> UpdateFileAsync(File file)
         {
-            return await _http.PutJsonAsync<File>(apiurl + "/" + File.FileId.ToString(), File);
+            return await PutJsonAsync<File>($"{Apiurl}/{file.FileId}", file);
         }
 
-        public async Task DeleteFileAsync(int FileId)
+        public async Task DeleteFileAsync(int fileId)
         {
-            await _http.DeleteAsync(apiurl + "/" + FileId.ToString());
+            await DeleteAsync($"{Apiurl}/{fileId}");
         }
 
-        public async Task<File> UploadFileAsync(string Url, int FolderId)
+        public async Task<File> UploadFileAsync(string url, int folderId)
         {
-            return await _http.GetJsonAsync<File>(apiurl + "/upload?url=" + WebUtility.UrlEncode(Url) + "&folderid=" +
-                                                  FolderId.ToString());
+            return await GetJsonAsync<File>($"{Apiurl}/upload?url={WebUtility.UrlEncode(url)}&folderid={folderId}");
         }
 
-        public async Task<string> UploadFilesAsync(int FolderId, string[] Files, string Id)
+        public async Task<string> UploadFilesAsync(int folderId, string[] files, string id)
         {
-            return await UploadFilesAsync(FolderId.ToString(), Files, Id);
+            return await UploadFilesAsync(folderId.ToString(), files, id);
         }
 
-        public async Task<string> UploadFilesAsync(string Folder, string[] Files, string Id)
+        public async Task<string> UploadFilesAsync(string folder, string[] files, string id)
         {
             string result = "";
 
             var interop = new Interop(_jsRuntime);
-            await interop.UploadFiles(apiurl + "/upload", Folder, Id);
+            await interop.UploadFiles($"{Apiurl}/upload", folder, id);
 
             // uploading files is asynchronous so we need to wait for the upload to complete
             bool success = false;
@@ -96,13 +90,13 @@ namespace Oqtane.Services
                 Thread.Sleep(2000); // wait 2 seconds
                 result = "";
 
-                List<File> files = await GetFilesAsync(Folder);
-                if (files.Count > 0)
+                List<File> fileList = await GetFilesAsync(folder);
+                if (fileList.Count > 0)
                 {
                     success = true;
-                    foreach (string file in Files)
+                    foreach (string file in files)
                     {
-                        if (!files.Exists(item => item.Name == file))
+                        if (!fileList.Exists(item => item.Name == file))
                         {
                             success = false;
                             result += file + ",";
@@ -121,9 +115,9 @@ namespace Oqtane.Services
             return result;
         }
 
-        public async Task<byte[]> DownloadFileAsync(int FileId)
+        public async Task<byte[]> DownloadFileAsync(int fileId)
         {
-            return await _http.GetByteArrayAsync(apiurl + "/download/" + FileId.ToString());
+            return await GetByteArrayAsync($"{Apiurl}/download/{fileId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs
index a457b021..2b58fa17 100644
--- a/Oqtane.Client/Services/FolderService.cs
+++ b/Oqtane.Client/Services/FolderService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Linq;
 using System.Net.Http;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 using System;
@@ -13,92 +12,95 @@ namespace Oqtane.Services
 {
     public class FolderService : ServiceBase, IFolderService
     {
-        private readonly HttpClient _http;
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public FolderService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public FolderService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string ApiUrl => CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Folder");
+        private string ApiUrl => CreateApiUrl(_siteState.Alias, "Folder");
 
-        public async Task<List<Folder>> GetFoldersAsync(int SiteId)
+        public async Task<List<Folder>> GetFoldersAsync(int siteId)
         {
-            List<Folder> folders = await _http.GetJsonAsync<List<Folder>>(ApiUrl + "?siteid=" + SiteId.ToString());
+            List<Folder> folders = await GetJsonAsync<List<Folder>>($"{ApiUrl}?siteid={siteId}");
             folders = GetFoldersHierarchy(folders);
             return folders;
         }
 
-        public async Task<Folder> GetFolderAsync(int FolderId)
+        public async Task<Folder> GetFolderAsync(int folderId)
         {
-            return await _http.GetJsonAsync<Folder>(ApiUrl + "/" + FolderId.ToString());
+            return await GetJsonAsync<Folder>($"{ApiUrl}/{folderId}");
         }
 
         public async Task<Folder> GetFolderAsync(int siteId, [NotNull] string folderPath)
         {
-            if (!folderPath.EndsWith("\\")) folderPath += "\\";
+            if (!(folderPath.EndsWith(System.IO.Path.DirectorySeparatorChar) || folderPath.EndsWith(System.IO.Path.AltDirectorySeparatorChar)))
+            {
+                folderPath = Utilities.PathCombine(folderPath, "\\");
+            }
+            
             var path = WebUtility.UrlEncode(folderPath);
-            return await _http.GetJsonAsync<Folder>($"{ApiUrl}/{siteId}/{path}");
+            
+            return await GetJsonAsync<Folder>($"{ApiUrl}/{siteId}/{path}");
         }
 
-        public async Task<Folder> AddFolderAsync(Folder Folder)
+        public async Task<Folder> AddFolderAsync(Folder folder)
         {
-            return await _http.PostJsonAsync<Folder>(ApiUrl, Folder);
+            return await PostJsonAsync<Folder>(ApiUrl, folder);
         }
 
-        public async Task<Folder> UpdateFolderAsync(Folder Folder)
+        public async Task<Folder> UpdateFolderAsync(Folder folder)
         {
-            return await _http.PutJsonAsync<Folder>(ApiUrl + "/" + Folder.FolderId.ToString(), Folder);
+            return await PutJsonAsync<Folder>($"{ApiUrl}/{folder.FolderId}", folder);
         }
 
-        public async Task UpdateFolderOrderAsync(int SiteId, int FolderId, int? ParentId)
+        public async Task UpdateFolderOrderAsync(int siteId, int folderId, int? parentId)
         {
-            await _http.PutJsonAsync(
-                ApiUrl + "/?siteid=" + SiteId.ToString() + "&folderid=" + FolderId.ToString() + "&parentid=" +
-                ((ParentId == null) ? "" : ParentId.ToString()), null);
+            var parent = parentId == null
+                ? string.Empty
+                : parentId.ToString();
+            await PutAsync($"{ApiUrl}/?siteid={siteId}&folderid={folderId}&parentid={parent}");
         }
 
-        public async Task DeleteFolderAsync(int FolderId)
+        public async Task DeleteFolderAsync(int folderId)
         {
-            await _http.DeleteAsync(ApiUrl + "/" + FolderId.ToString());
+            await DeleteAsync($"{ApiUrl}/{folderId}");
         }
 
-        private static List<Folder> GetFoldersHierarchy(List<Folder> Folders)
+        private static List<Folder> GetFoldersHierarchy(List<Folder> folders)
         {
             List<Folder> hierarchy = new List<Folder>();
-            Action<List<Folder>, Folder> GetPath = null;
-            GetPath = (List<Folder> folders, Folder folder) =>
+            Action<List<Folder>, Folder> getPath = null;
+            var folders1 = folders;
+            getPath = (folderList, folder) =>
             {
                 IEnumerable<Folder> children;
                 int level;
                 if (folder == null)
                 {
                     level = -1;
-                    children = Folders.Where(item => item.ParentId == null);
+                    children = folders1.Where(item => item.ParentId == null);
                 }
                 else
                 {
                     level = folder.Level;
-                    children = Folders.Where(item => item.ParentId == folder.FolderId);
+                    children = folders1.Where(item => item.ParentId == folder.FolderId);
                 }
 
                 foreach (Folder child in children)
                 {
                     child.Level = level + 1;
-                    child.HasChildren = Folders.Any(item => item.ParentId == child.FolderId);
+                    child.HasChildren = folders1.Any(item => item.ParentId == child.FolderId);
                     hierarchy.Add(child);
-                    GetPath(folders, child);
+                    if (getPath != null) getPath(folderList, child);
                 }
             };
-            Folders = Folders.OrderBy(item => item.Order).ToList();
-            GetPath(Folders, null);
+            folders = folders.OrderBy(item => item.Order).ToList();
+            getPath(folders, null);
 
             // add any non-hierarchical items to the end of the list
-            foreach (Folder folder in Folders)
+            foreach (Folder folder in folders)
             {
                 if (hierarchy.Find(item => item.FolderId == folder.FolderId) == null)
                 {
diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs
index e8b66cc4..8515abe2 100644
--- a/Oqtane.Client/Services/InstallationService.cs
+++ b/Oqtane.Client/Services/InstallationService.cs
@@ -1,44 +1,29 @@
 using Oqtane.Models;
 using System.Threading.Tasks;
 using System.Net.Http;
-using System.Linq;
-using Microsoft.AspNetCore.Components;
-using System.Collections.Generic;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class InstallationService : ServiceBase, IInstallationService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+        public InstallationService(HttpClient http):base(http) { }
 
-        public InstallationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        private string ApiUrl => CreateApiUrl("Installation");
+
+        public async Task<Installation> IsInstalled()
         {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
+            return await GetJsonAsync<Installation>($"{ApiUrl}/installed");
         }
 
-        private string apiurl
+        public async Task<Installation> Install(InstallConfig config)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Installation"); }
+            return await PostJsonAsync<InstallConfig,Installation>(ApiUrl, config);
         }
 
-        public async Task<GenericResponse> IsInstalled()
+        public async Task<Installation> Upgrade()
         {
-            return await _http.GetJsonAsync<GenericResponse>(apiurl + "/installed");
-        }
-
-        public async Task<GenericResponse> Install(string connectionstring)
-        {
-            return await _http.PostJsonAsync<GenericResponse>(apiurl, connectionstring);
-        }
-
-        public async Task<GenericResponse> Upgrade()
-        {
-            return await _http.GetJsonAsync<GenericResponse>(apiurl + "/upgrade");
+            return await GetJsonAsync<Installation>($"{ApiUrl}/upgrade");
         }
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IAliasService.cs b/Oqtane.Client/Services/Interfaces/IAliasService.cs
index 1c94d4bd..f15356f1 100644
--- a/Oqtane.Client/Services/Interfaces/IAliasService.cs
+++ b/Oqtane.Client/Services/Interfaces/IAliasService.cs
@@ -9,14 +9,14 @@ namespace Oqtane.Services
     {
         Task<List<Alias>> GetAliasesAsync();
 
-        Task<Alias> GetAliasAsync(int AliasId);
+        Task<Alias> GetAliasAsync(int aliasId);
 
-        Task<Alias> GetAliasAsync(string Url, DateTime LastSyncDate);
+        Task<Alias> GetAliasAsync(string url, DateTime lastSyncDate);
 
-        Task<Alias> AddAliasAsync(Alias Alias);
+        Task<Alias> AddAliasAsync(Alias alias);
 
-        Task<Alias> UpdateAliasAsync(Alias Alias);
+        Task<Alias> UpdateAliasAsync(Alias alias);
 
-        Task DeleteAliasAsync(int AliasId);
+        Task DeleteAliasAsync(int aliasId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IFileService.cs b/Oqtane.Client/Services/Interfaces/IFileService.cs
index c3107e6a..7e10f4fd 100644
--- a/Oqtane.Client/Services/Interfaces/IFileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IFileService.cs
@@ -6,16 +6,16 @@ namespace Oqtane.Services
 {
     public interface IFileService
     {
-        Task<List<File>> GetFilesAsync(int FolderId);
-        Task<List<File>> GetFilesAsync(string Folder);
-        Task<File> GetFileAsync(int FileId);
-        Task<File> AddFileAsync(File File);
-        Task<File> UpdateFileAsync(File File);
-        Task DeleteFileAsync(int FileId);
-        Task<File> UploadFileAsync(string Url, int FolderId);
-        Task<string> UploadFilesAsync(int FolderId, string[] Files, string FileUploadName);
-        Task<string> UploadFilesAsync(string Folder, string[] Files, string FileUploadName);
-        Task<byte[]> DownloadFileAsync(int FileId);
+        Task<List<File>> GetFilesAsync(int folderId);
+        Task<List<File>> GetFilesAsync(string folder);
+        Task<File> GetFileAsync(int fileId);
+        Task<File> AddFileAsync(File file);
+        Task<File> UpdateFileAsync(File file);
+        Task DeleteFileAsync(int fileId);
+        Task<File> UploadFileAsync(string url, int folderId);
+        Task<string> UploadFilesAsync(int folderId, string[] files, string fileUploadName);
+        Task<string> UploadFilesAsync(string folder, string[] files, string fileUploadName);
+        Task<byte[]> DownloadFileAsync(int fileId);
 
         Task<List<File>> GetFilesAsync(int siteId, string folderPath);
     }
diff --git a/Oqtane.Client/Services/Interfaces/IFolderService.cs b/Oqtane.Client/Services/Interfaces/IFolderService.cs
index bbad463c..34edb609 100644
--- a/Oqtane.Client/Services/Interfaces/IFolderService.cs
+++ b/Oqtane.Client/Services/Interfaces/IFolderService.cs
@@ -7,12 +7,12 @@ namespace Oqtane.Services
 {
     public interface IFolderService
     {
-        Task<List<Folder>> GetFoldersAsync(int SiteId);
-        Task<Folder> GetFolderAsync(int FolderId);
-        Task<Folder> AddFolderAsync(Folder Folder);
-        Task<Folder> UpdateFolderAsync(Folder Folder);
-        Task UpdateFolderOrderAsync(int SiteId, int FolderId, int? ParentId);
-        Task DeleteFolderAsync(int FolderId);
+        Task<List<Folder>> GetFoldersAsync(int siteId);
+        Task<Folder> GetFolderAsync(int folderId);
+        Task<Folder> AddFolderAsync(Folder folder);
+        Task<Folder> UpdateFolderAsync(Folder folder);
+        Task UpdateFolderOrderAsync(int siteId, int folderId, int? parentId);
+        Task DeleteFolderAsync(int folderId);
         Task<Folder> GetFolderAsync(int siteId, [NotNull]string folderPath);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IInstallationService.cs b/Oqtane.Client/Services/Interfaces/IInstallationService.cs
index 91a3a11a..c9eeaca8 100644
--- a/Oqtane.Client/Services/Interfaces/IInstallationService.cs
+++ b/Oqtane.Client/Services/Interfaces/IInstallationService.cs
@@ -1,12 +1,13 @@
 using Oqtane.Models;
 using System.Threading.Tasks;
+using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public interface IInstallationService
     {
-        Task<GenericResponse> IsInstalled();
-        Task<GenericResponse> Install(string connectionstring);
-        Task<GenericResponse> Upgrade();
+        Task<Installation> IsInstalled();
+        Task<Installation> Install(InstallConfig config);
+        Task<Installation> Upgrade();
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IJobLogService.cs b/Oqtane.Client/Services/Interfaces/IJobLogService.cs
index 2afc2851..015d83f0 100644
--- a/Oqtane.Client/Services/Interfaces/IJobLogService.cs
+++ b/Oqtane.Client/Services/Interfaces/IJobLogService.cs
@@ -8,12 +8,12 @@ namespace Oqtane.Services
     {
         Task<List<JobLog>> GetJobLogsAsync();
 
-        Task<JobLog> GetJobLogAsync(int JobLogId);
+        Task<JobLog> GetJobLogAsync(int jobLogId);
 
-        Task<JobLog> AddJobLogAsync(JobLog JobLog);
+        Task<JobLog> AddJobLogAsync(JobLog jobLog);
 
-        Task<JobLog> UpdateJobLogAsync(JobLog JobLog);
+        Task<JobLog> UpdateJobLogAsync(JobLog jobLog);
 
-        Task DeleteJobLogAsync(int JobLogId);
+        Task DeleteJobLogAsync(int jobLogId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IJobService.cs b/Oqtane.Client/Services/Interfaces/IJobService.cs
index 15b508f9..d6f0decf 100644
--- a/Oqtane.Client/Services/Interfaces/IJobService.cs
+++ b/Oqtane.Client/Services/Interfaces/IJobService.cs
@@ -8,16 +8,16 @@ namespace Oqtane.Services
     {
         Task<List<Job>> GetJobsAsync();
 
-        Task<Job> GetJobAsync(int JobId);
+        Task<Job> GetJobAsync(int jobId);
 
-        Task<Job> AddJobAsync(Job Job);
+        Task<Job> AddJobAsync(Job job);
 
-        Task<Job> UpdateJobAsync(Job Job);
+        Task<Job> UpdateJobAsync(Job job);
 
-        Task DeleteJobAsync(int JobId);
+        Task DeleteJobAsync(int jobId);
 
-        Task StartJobAsync(int JobId);
+        Task StartJobAsync(int jobId);
 
-        Task StopJobAsync(int JobId);
+        Task StopJobAsync(int jobId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/ILogService.cs b/Oqtane.Client/Services/Interfaces/ILogService.cs
index 171309f6..30867c72 100644
--- a/Oqtane.Client/Services/Interfaces/ILogService.cs
+++ b/Oqtane.Client/Services/Interfaces/ILogService.cs
@@ -3,14 +3,15 @@ using Oqtane.Shared;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Oqtane.Enums;
 
 namespace Oqtane.Services
 {
     public interface ILogService
     {
-        Task<List<Log>> GetLogsAsync(int SiteId, string Level, string Function, int Rows);
-        Task<Log> GetLogAsync(int LogId);
-        Task Log(int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args);
-        Task Log(Alias Alias, int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args);
+        Task<List<Log>> GetLogsAsync(int siteId, string level, string function, int rows);
+        Task<Log> GetLogAsync(int logId);
+        Task Log(int? pageId, int? moduleId, int? userId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args);
+        Task Log(Alias alias, int? pageId, int? moduleId, int? userId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs
index aad9b193..8560c661 100644
--- a/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/Interfaces/IModuleDefinitionService.cs
@@ -1,4 +1,5 @@
 using Oqtane.Models;
+using Oqtane.UI;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -6,11 +7,12 @@ namespace Oqtane.Services
 {
     public interface IModuleDefinitionService
     {
-        Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int SiteId);
-        Task<ModuleDefinition> GetModuleDefinitionAsync(int ModuleDefinitionId, int SiteId);
-        Task UpdateModuleDefinitionAsync(ModuleDefinition ModuleDefinition);
+        Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int siteId);
+        Task<ModuleDefinition> GetModuleDefinitionAsync(int moduleDefinitionId, int siteId);
+        Task UpdateModuleDefinitionAsync(ModuleDefinition moduleDefinition);
         Task InstallModuleDefinitionsAsync();
-        Task DeleteModuleDefinitionAsync(int ModuleDefinitionId, int SiteId);
-        Task LoadModuleDefinitionsAsync(int SiteId);
+        Task DeleteModuleDefinitionAsync(int moduleDefinitionId, int siteId);
+        Task LoadModuleDefinitionsAsync(int siteId, Runtime runtime);
+        Task CreateModuleDefinitionAsync(ModuleDefinition moduleDefinition, int moduleId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IModuleService.cs b/Oqtane.Client/Services/Interfaces/IModuleService.cs
index b51a946b..27f11dff 100644
--- a/Oqtane.Client/Services/Interfaces/IModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IModuleService.cs
@@ -6,12 +6,12 @@ namespace Oqtane.Services
 {
     public interface IModuleService
     {
-        Task<List<Module>> GetModulesAsync(int SiteId);
-        Task<Module> GetModuleAsync(int ModuleId);
-        Task<Module> AddModuleAsync(Module Module);
-        Task<Module> UpdateModuleAsync(Module Module);
-        Task DeleteModuleAsync(int ModuleId);
-        Task<bool> ImportModuleAsync(int ModuleId, string Content);
-        Task<string> ExportModuleAsync(int ModuleId);
+        Task<List<Module>> GetModulesAsync(int siteId);
+        Task<Module> GetModuleAsync(int moduleId);
+        Task<Module> AddModuleAsync(Module module);
+        Task<Module> UpdateModuleAsync(Module module);
+        Task DeleteModuleAsync(int moduleId);
+        Task<bool> ImportModuleAsync(int moduleId, string content);
+        Task<string> ExportModuleAsync(int moduleId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/INotificationService.cs b/Oqtane.Client/Services/Interfaces/INotificationService.cs
index 37072f1a..bd52b7d0 100644
--- a/Oqtane.Client/Services/Interfaces/INotificationService.cs
+++ b/Oqtane.Client/Services/Interfaces/INotificationService.cs
@@ -6,14 +6,14 @@ namespace Oqtane.Services
 {
     public interface INotificationService
     {
-        Task<List<Notification>> GetNotificationsAsync(int SiteId, string Direction, int UserId);
+        Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId);
 
-        Task<Notification> GetNotificationAsync(int NotificationId);
+        Task<Notification> GetNotificationAsync(int notificationId);
 
-        Task<Notification> AddNotificationAsync(Notification Notification);
+        Task<Notification> AddNotificationAsync(Notification notification);
 
-        Task<Notification> UpdateNotificationAsync(Notification Notification);
+        Task<Notification> UpdateNotificationAsync(Notification notification);
 
-        Task DeleteNotificationAsync(int NotificationId);
+        Task DeleteNotificationAsync(int notificationId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IPackageService.cs b/Oqtane.Client/Services/Interfaces/IPackageService.cs
index a40a8697..eeb243c1 100644
--- a/Oqtane.Client/Services/Interfaces/IPackageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPackageService.cs
@@ -6,7 +6,7 @@ namespace Oqtane.Services
 {
     public interface IPackageService
     {
-        Task<List<Package>> GetPackagesAsync(string Tag);
-        Task DownloadPackageAsync(string PackageId, string Version, string Folder);
+        Task<List<Package>> GetPackagesAsync(string tag);
+        Task DownloadPackageAsync(string packageId, string version, string folder);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
index 1879ea35..f51c56a8 100644
--- a/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageModuleService.cs
@@ -1,16 +1,15 @@
 using Oqtane.Models;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
 {
     public interface IPageModuleService
     {
-        Task<PageModule> GetPageModuleAsync(int PageModuleId);
-        Task<PageModule> GetPageModuleAsync(int PageId, int ModuleId);
-        Task<PageModule> AddPageModuleAsync(PageModule PageModule);
-        Task<PageModule> UpdatePageModuleAsync(PageModule PageModule);
-        Task UpdatePageModuleOrderAsync(int PageId, string Pane);
-        Task DeletePageModuleAsync(int PageModuleId);
+        Task<PageModule> GetPageModuleAsync(int pageModuleId);
+        Task<PageModule> GetPageModuleAsync(int pageId, int moduleId);
+        Task<PageModule> AddPageModuleAsync(PageModule pageModule);
+        Task<PageModule> UpdatePageModuleAsync(PageModule pageModule);
+        Task UpdatePageModuleOrderAsync(int pageId, string pane);
+        Task DeletePageModuleAsync(int pageModuleId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IPageService.cs b/Oqtane.Client/Services/Interfaces/IPageService.cs
index 3a2ab862..60f1d86e 100644
--- a/Oqtane.Client/Services/Interfaces/IPageService.cs
+++ b/Oqtane.Client/Services/Interfaces/IPageService.cs
@@ -6,14 +6,14 @@ namespace Oqtane.Services
 {
     public interface IPageService
     {
-        Task<List<Page>> GetPagesAsync(int SiteId);
-        Task<Page> GetPageAsync(int PageId);
-        Task<Page> GetPageAsync(int PageId, int UserId);
-        Task<Page> GetPageAsync(string Path, int SiteId);
-        Task<Page> AddPageAsync(Page Page);
-        Task<Page> AddPageAsync(int PageId, int UserId);
-        Task<Page> UpdatePageAsync(Page Page);
-        Task UpdatePageOrderAsync(int SiteId, int PageId, int? ParentId);
-        Task DeletePageAsync(int PageId);
+        Task<List<Page>> GetPagesAsync(int siteId);
+        Task<Page> GetPageAsync(int pageId);
+        Task<Page> GetPageAsync(int pageId, int userId);
+        Task<Page> GetPageAsync(string path, int siteId);
+        Task<Page> AddPageAsync(Page page);
+        Task<Page> AddPageAsync(int pageId, int userId);
+        Task<Page> UpdatePageAsync(Page page);
+        Task UpdatePageOrderAsync(int siteId, int pageId, int? parentId);
+        Task DeletePageAsync(int pageId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IProfileService.cs b/Oqtane.Client/Services/Interfaces/IProfileService.cs
index f26794a3..cc079f3c 100644
--- a/Oqtane.Client/Services/Interfaces/IProfileService.cs
+++ b/Oqtane.Client/Services/Interfaces/IProfileService.cs
@@ -6,14 +6,14 @@ namespace Oqtane.Services
 {
     public interface IProfileService
     {
-        Task<List<Profile>> GetProfilesAsync(int SiteId);
+        Task<List<Profile>> GetProfilesAsync(int siteId);
 
-        Task<Profile> GetProfileAsync(int ProfileId);
+        Task<Profile> GetProfileAsync(int profileId);
 
-        Task<Profile> AddProfileAsync(Profile Profile);
+        Task<Profile> AddProfileAsync(Profile profile);
 
-        Task<Profile> UpdateProfileAsync(Profile Profile);
+        Task<Profile> UpdateProfileAsync(Profile profile);
 
-        Task DeleteProfileAsync(int ProfileId);
+        Task DeleteProfileAsync(int profileId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs
index 7b54c9d1..23ae0d05 100644
--- a/Oqtane.Client/Services/Interfaces/IRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs
@@ -6,14 +6,14 @@ namespace Oqtane.Services
 {
     public interface IRoleService
     {
-        Task<List<Role>> GetRolesAsync(int SiteId);
+        Task<List<Role>> GetRolesAsync(int siteId);
 
-        Task<Role> GetRoleAsync(int RoleId);
+        Task<Role> GetRoleAsync(int roleId);
 
-        Task<Role> AddRoleAsync(Role Role);
+        Task<Role> AddRoleAsync(Role role);
 
-        Task<Role> UpdateRoleAsync(Role Role);
+        Task<Role> UpdateRoleAsync(Role role);
 
-        Task DeleteRoleAsync(int RoleId);
+        Task DeleteRoleAsync(int roleId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/ISettingService.cs b/Oqtane.Client/Services/Interfaces/ISettingService.cs
index 6f99912e..97c6266d 100644
--- a/Oqtane.Client/Services/Interfaces/ISettingService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISettingService.cs
@@ -6,50 +6,50 @@ namespace Oqtane.Services
 {
     public interface ISettingService
     {
-        Task<Dictionary<string, string>> GetHostSettingsAsync();
+        Task<Dictionary<string, string>> GetTenantSettingsAsync();
 
-        Task UpdateHostSettingsAsync(Dictionary<string, string> HostSettings);
+        Task UpdateTenantSettingsAsync(Dictionary<string, string> tenantSettings);
 
-        Task<Dictionary<string, string>> GetSiteSettingsAsync(int SiteId);
+        Task<Dictionary<string, string>> GetSiteSettingsAsync(int siteId);
 
-        Task UpdateSiteSettingsAsync(Dictionary<string, string> SiteSettings, int SiteId);
+        Task UpdateSiteSettingsAsync(Dictionary<string, string> siteSettings, int siteId);
 
-        Task<Dictionary<string, string>> GetPageSettingsAsync(int PageId);
+        Task<Dictionary<string, string>> GetPageSettingsAsync(int pageId);
 
-        Task UpdatePageSettingsAsync(Dictionary<string, string> PageSettings, int PageId);
+        Task UpdatePageSettingsAsync(Dictionary<string, string> pageSettings, int pageId);
 
-        Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int PageModuleId);
+        Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int pageModuleId);
 
-        Task UpdatePageModuleSettingsAsync(Dictionary<string, string> PageModuleSettings, int PageModuleId);
+        Task UpdatePageModuleSettingsAsync(Dictionary<string, string> pageModuleSettings, int pageModuleId);
 
-        Task<Dictionary<string, string>> GetModuleSettingsAsync(int ModuleId);
+        Task<Dictionary<string, string>> GetModuleSettingsAsync(int moduleId);
 
-        Task UpdateModuleSettingsAsync(Dictionary<string, string> ModuleSettings, int ModuleId);
+        Task UpdateModuleSettingsAsync(Dictionary<string, string> moduleSettings, int moduleId);
 
-        Task<Dictionary<string, string>> GetUserSettingsAsync(int UserId);
+        Task<Dictionary<string, string>> GetUserSettingsAsync(int userId);
 
-        Task UpdateUserSettingsAsync(Dictionary<string, string> UserSettings, int UserId);
+        Task UpdateUserSettingsAsync(Dictionary<string, string> userSettings, int userId);
 
-        Task<Dictionary<string, string>> GetFolderSettingsAsync(int FolderId);
+        Task<Dictionary<string, string>> GetFolderSettingsAsync(int folderId);
 
-        Task UpdateFolderSettingsAsync(Dictionary<string, string> FolderSettings, int FolderId);
+        Task UpdateFolderSettingsAsync(Dictionary<string, string> folderSettings, int folderId);
 
-        Task<Dictionary<string, string>> GetSettingsAsync(string EntityName, int EntityId);
+        Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId);
 
-        Task UpdateSettingsAsync(Dictionary<string, string> Settings, string EntityName, int EntityId);
+        Task UpdateSettingsAsync(Dictionary<string, string> settings, string entityName, int entityId);
 
 
-        Task<Setting> GetSettingAsync(int SettingId);
+        Task<Setting> GetSettingAsync(int settingId);
 
-        Task<Setting> AddSettingAsync(Setting Setting);
+        Task<Setting> AddSettingAsync(Setting setting);
 
-        Task<Setting> UpdateSettingAsync(Setting Setting);
+        Task<Setting> UpdateSettingAsync(Setting setting);
 
-        Task DeleteSettingAsync(int SettingId);
+        Task DeleteSettingAsync(int settingId);
 
 
-        string GetSetting(Dictionary<string, string> Settings, string SettingName, string DefaultValue);
+        string GetSetting(Dictionary<string, string> settings, string settingName, string defaultValue);
 
-        Dictionary<string, string> SetSetting(Dictionary<string, string> Settings, string SettingName, string SettingValue);
+        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue);
      }
 }
diff --git a/Oqtane.Client/Services/Interfaces/ISiteService.cs b/Oqtane.Client/Services/Interfaces/ISiteService.cs
index f3ab0790..a87a26c4 100644
--- a/Oqtane.Client/Services/Interfaces/ISiteService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISiteService.cs
@@ -6,14 +6,16 @@ namespace Oqtane.Services
 {
     public interface ISiteService
     {
-        Task<List<Site>> GetSitesAsync(Alias Alias);
+        void SetAlias(Alias alias);
 
-        Task<Site> GetSiteAsync(int SiteId, Alias Alias);
+        Task<List<Site>> GetSitesAsync();
 
-        Task<Site> AddSiteAsync(Site Site, Alias Alias);
+        Task<Site> GetSiteAsync(int siteId);
 
-        Task<Site> UpdateSiteAsync(Site Site, Alias Alias);
+        Task<Site> AddSiteAsync(Site site);
 
-        Task DeleteSiteAsync(int SiteId, Alias Alias);
+        Task<Site> UpdateSiteAsync(Site site);
+
+        Task DeleteSiteAsync(int siteId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs
new file mode 100644
index 00000000..abb9a6c1
--- /dev/null
+++ b/Oqtane.Client/Services/Interfaces/ISiteTemplateService.cs
@@ -0,0 +1,11 @@
+using Oqtane.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    public interface ISiteTemplateService
+    {
+        Task<List<SiteTemplate>> GetSiteTemplatesAsync();
+    }
+}
diff --git a/Oqtane.Client/Services/Interfaces/ISqlService.cs b/Oqtane.Client/Services/Interfaces/ISqlService.cs
new file mode 100644
index 00000000..f563a795
--- /dev/null
+++ b/Oqtane.Client/Services/Interfaces/ISqlService.cs
@@ -0,0 +1,10 @@
+using Oqtane.Models;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    public interface ISqlService
+    {
+        Task<SqlQuery> ExecuteQueryAsync(SqlQuery sqlquery);
+    }
+}
diff --git a/Oqtane.Client/Services/Interfaces/ISystemService.cs b/Oqtane.Client/Services/Interfaces/ISystemService.cs
new file mode 100644
index 00000000..c450cdc7
--- /dev/null
+++ b/Oqtane.Client/Services/Interfaces/ISystemService.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    public interface ISystemService
+    {
+        Task<Dictionary<string, string>> GetSystemInfoAsync();
+    }
+}
diff --git a/Oqtane.Client/Services/Interfaces/ITenantService.cs b/Oqtane.Client/Services/Interfaces/ITenantService.cs
index b67761db..24bdd79b 100644
--- a/Oqtane.Client/Services/Interfaces/ITenantService.cs
+++ b/Oqtane.Client/Services/Interfaces/ITenantService.cs
@@ -8,12 +8,12 @@ namespace Oqtane.Services
     {
         Task<List<Tenant>> GetTenantsAsync();
 
-        Task<Tenant> GetTenantAsync(int TenantId);
+        Task<Tenant> GetTenantAsync(int tenantId);
 
-        Task<Tenant> AddTenantAsync(Tenant Tenant);
+        Task<Tenant> AddTenantAsync(Tenant tenant);
 
-        Task<Tenant> UpdateTenantAsync(Tenant Tenant);
+        Task<Tenant> UpdateTenantAsync(Tenant tenant);
 
-        Task DeleteTenantAsync(int TenantId);
+        Task DeleteTenantAsync(int tenantId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IThemeService.cs b/Oqtane.Client/Services/Interfaces/IThemeService.cs
index 9e1c9fb5..8756042b 100644
--- a/Oqtane.Client/Services/Interfaces/IThemeService.cs
+++ b/Oqtane.Client/Services/Interfaces/IThemeService.cs
@@ -7,10 +7,10 @@ namespace Oqtane.Services
     public interface IThemeService
     {
         Task<List<Theme>> GetThemesAsync();
-        Dictionary<string, string> GetThemeTypes(List<Theme> Themes);
-        Dictionary<string, string> GetPaneLayoutTypes(List<Theme> Themes, string ThemeName);
-        Dictionary<string, string> GetContainerTypes(List<Theme> Themes);
+        Dictionary<string, string> GetThemeTypes(List<Theme> themes);
+        Dictionary<string, string> GetPaneLayoutTypes(List<Theme> themes, string themeName);
+        Dictionary<string, string> GetContainerTypes(List<Theme> themes);
         Task InstallThemesAsync();
-        Task DeleteThemeAsync(string ThemeName);
+        Task DeleteThemeAsync(string themeName);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
index 6fdfcebc..25cb9ab4 100644
--- a/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserRoleService.cs
@@ -6,10 +6,10 @@ namespace Oqtane.Services
 {
     public interface IUserRoleService
     {
-        Task<List<UserRole>> GetUserRolesAsync(int SiteId);
-        Task<UserRole> GetUserRoleAsync(int UserRoleId);
-        Task<UserRole> AddUserRoleAsync(UserRole UserRole);
-        Task<UserRole> UpdateUserRoleAsync(UserRole UserRole);
-        Task DeleteUserRoleAsync(int UserRoleId);
+        Task<List<UserRole>> GetUserRolesAsync(int siteId);
+        Task<UserRole> GetUserRoleAsync(int userRoleId);
+        Task<UserRole> AddUserRoleAsync(UserRole userRole);
+        Task<UserRole> UpdateUserRoleAsync(UserRole userRole);
+        Task DeleteUserRoleAsync(int userRoleId);
     }
 }
diff --git a/Oqtane.Client/Services/Interfaces/IUserService.cs b/Oqtane.Client/Services/Interfaces/IUserService.cs
index c00fa59c..eca072c5 100644
--- a/Oqtane.Client/Services/Interfaces/IUserService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUserService.cs
@@ -1,31 +1,28 @@
 using Oqtane.Models;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
 {
     public interface IUserService
     {
-        Task<User> GetUserAsync(int UserId, int SiteId);
+        Task<User> GetUserAsync(int userId, int siteId);
 
-        Task<User> GetUserAsync(string Username, int SiteId);
+        Task<User> GetUserAsync(string username, int siteId);
 
-        Task<User> AddUserAsync(User User);
+        Task<User> AddUserAsync(User user);
 
-        Task<User> AddUserAsync(User User, Alias Alias);
+        Task<User> UpdateUserAsync(User user);
 
-        Task<User> UpdateUserAsync(User User);
+        Task DeleteUserAsync(int userId);
 
-        Task DeleteUserAsync(int UserId);
+        Task<User> LoginUserAsync(User user, bool setCookie, bool isPersistent);
 
-        Task<User> LoginUserAsync(User User, bool SetCookie, bool IsPersistent);
+        Task LogoutUserAsync(User user);
 
-        Task LogoutUserAsync(User User);
+        Task<User> VerifyEmailAsync(User user, string token);
 
-        Task<User> VerifyEmailAsync(User User, string Token);
+        Task ForgotPasswordAsync(User user);
 
-        Task ForgotPasswordAsync(User User);
-
-        Task<User> ResetPasswordAsync(User User, string Token);
+        Task<User> ResetPasswordAsync(User user, string token);
     }
 }
diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs
index fde2c158..c15940b5 100644
--- a/Oqtane.Client/Services/JobLogService.cs
+++ b/Oqtane.Client/Services/JobLogService.cs
@@ -2,53 +2,39 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
-using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class JobLogService : ServiceBase, IJobLogService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+        public JobLogService(HttpClient http) :base(http) { }
 
-        public JobLogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
-        }
-
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "JobLog"); }
-        }
+        private string Apiurl => CreateApiUrl("JobLog");
 
         public async Task<List<JobLog>> GetJobLogsAsync()
         {
-            List<JobLog> Joblogs = await _http.GetJsonAsync<List<JobLog>>(apiurl);
-            return Joblogs.OrderBy(item => item.StartDate).ToList();
+            List<JobLog> joblogs = await GetJsonAsync<List<JobLog>>(Apiurl);
+            return joblogs.OrderBy(item => item.StartDate).ToList();
         }
 
-        public async Task<JobLog> GetJobLogAsync(int JobLogId)
+        public async Task<JobLog> GetJobLogAsync(int jobLogId)
         {
-            return await _http.GetJsonAsync<JobLog>(apiurl + "/" + JobLogId.ToString());
+            return await GetJsonAsync<JobLog>($"{Apiurl}/{jobLogId}");
         }
 
-        public async Task<JobLog> AddJobLogAsync(JobLog Joblog)
+        public async Task<JobLog> AddJobLogAsync(JobLog joblog)
         {
-            return await _http.PostJsonAsync<JobLog>(apiurl, Joblog);
+            return await PostJsonAsync<JobLog>(Apiurl, joblog);
         }
 
-        public async Task<JobLog> UpdateJobLogAsync(JobLog Joblog)
+        public async Task<JobLog> UpdateJobLogAsync(JobLog joblog)
         {
-            return await _http.PutJsonAsync<JobLog>(apiurl + "/" + Joblog.JobLogId.ToString(), Joblog);
+            return await PutJsonAsync<JobLog>($"{Apiurl}/{joblog.JobLogId}", joblog);
         }
-        public async Task DeleteJobLogAsync(int JobLogId)
+        public async Task DeleteJobLogAsync(int jobLogId)
         {
-            await _http.DeleteAsync(apiurl + "/" + JobLogId.ToString());
+            await DeleteAsync($"{Apiurl}/{jobLogId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs
index b6b6a003..14cd96ad 100644
--- a/Oqtane.Client/Services/JobService.cs
+++ b/Oqtane.Client/Services/JobService.cs
@@ -2,63 +2,49 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
-using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class JobService : ServiceBase, IJobService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+        public JobService(HttpClient http) : base(http) { }
 
-        public JobService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
-        }
-
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Job"); }
-        }
+        private string Apiurl => CreateApiUrl("Job");
 
         public async Task<List<Job>> GetJobsAsync()
         {
-            List<Job> Jobs = await _http.GetJsonAsync<List<Job>>(apiurl);
-            return Jobs.OrderBy(item => item.Name).ToList();
+            List<Job> jobs = await GetJsonAsync<List<Job>>(Apiurl);
+            return jobs.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<Job> GetJobAsync(int JobId)
+        public async Task<Job> GetJobAsync(int jobId)
         {
-            return await _http.GetJsonAsync<Job>(apiurl + "/" + JobId.ToString());
+            return await GetJsonAsync<Job>($"{Apiurl}/{jobId}");
         }
 
-        public async Task<Job> AddJobAsync(Job Job)
+        public async Task<Job> AddJobAsync(Job job)
         {
-            return await _http.PostJsonAsync<Job>(apiurl, Job);
+            return await PostJsonAsync<Job>(Apiurl, job);
         }
 
-        public async Task<Job> UpdateJobAsync(Job Job)
+        public async Task<Job> UpdateJobAsync(Job job)
         {
-            return await _http.PutJsonAsync<Job>(apiurl + "/" + Job.JobId.ToString(), Job);
+            return await PutJsonAsync<Job>($"{Apiurl}/{job.JobId}", job);
         }
-        public async Task DeleteJobAsync(int JobId)
+        public async Task DeleteJobAsync(int jobId)
         {
-            await _http.DeleteAsync(apiurl + "/" + JobId.ToString());
+            await DeleteAsync($"{Apiurl}/{jobId}");
         }
 
-        public async Task StartJobAsync(int JobId)
+        public async Task StartJobAsync(int jobId)
         {
-            await _http.GetAsync(apiurl + "/start/" + JobId.ToString());
+            await GetAsync($"{Apiurl}/start/{jobId}");
         }
 
-        public async Task StopJobAsync(int JobId)
+        public async Task StopJobAsync(int jobId)
         {
-            await _http.GetAsync(apiurl + "/stop/" + JobId.ToString());
+            await GetAsync($"{Apiurl}/stop/{jobId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs
index 127effb4..f882e530 100644
--- a/Oqtane.Client/Services/LogService.cs
+++ b/Oqtane.Client/Services/LogService.cs
@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 
@@ -11,51 +12,49 @@ namespace Oqtane.Services
 {
     public class LogService : ServiceBase, ILogService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
         private readonly NavigationManager _navigationManager;
 
-        public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public LogService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http)
         {
-            _http = http;
+            
             _siteState = siteState;
             _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Log");
+
+        public async Task<List<Log>> GetLogsAsync(int siteId, string level, string function, int rows)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Log"); }
+            return await GetJsonAsync<List<Log>>($"{Apiurl}?siteid={siteId}&level={level}&function={function}&rows={rows}");
         }
 
-        public async Task<List<Log>> GetLogsAsync(int SiteId, string Level, string Function, int Rows)
+        public async Task<Log> GetLogAsync(int logId)
         {
-            return await _http.GetJsonAsync<List<Log>>(apiurl + "?siteid=" + SiteId.ToString() + "&level=" + Level + "&function=" + Function + "&rows=" + Rows.ToString());
+            return await GetJsonAsync<Log>($"{Apiurl}/{logId}");
         }
 
-        public async Task<Log> GetLogAsync(int LogId)
+        public async Task Log(int? pageId, int? moduleId, int? userId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args)
         {
-            return await _http.GetJsonAsync<Log>(apiurl + "/" + LogId.ToString());
+            await Log(null, pageId, moduleId, userId, category, feature, function, level, exception, message, args);
         }
 
-        public async Task Log(int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args)
-        {
-            await Log(null, PageId, ModuleId, UserId, category, feature, function, level, exception, message, args);
-        }
-
-        public async Task Log(Alias Alias, int? PageId, int? ModuleId, int? UserId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args)
+        public async Task Log(Alias alias, int? pageId, int? moduleId, int? userId, string category, string feature, LogFunction function, LogLevel level, Exception exception, string message, params object[] args)
         {
             Log log = new Log();
-            if (Alias == null)
+            if (alias == null)
             {
                 log.SiteId = _siteState.Alias.SiteId;
             }
             else
             {
-                log.SiteId = Alias.SiteId;
+                base.Alias = alias;
+                log.SiteId = alias.SiteId;
             }
-            log.PageId = PageId;
-            log.ModuleId = ModuleId;
-            log.UserId = UserId;
+            log.PageId = pageId;
+            log.ModuleId = moduleId;
+            log.UserId = userId;
             log.Url = _navigationManager.Uri;
             log.Category = category;
             log.Feature = feature;
@@ -68,7 +67,7 @@ namespace Oqtane.Services
             log.Message = message;
             log.MessageTemplate = "";
             log.Properties = JsonSerializer.Serialize(args);
-            await _http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log);
+            await PostJsonAsync(Apiurl, log);
         }
     }
 }
diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs
index f2ddb714..12d408b4 100644
--- a/Oqtane.Client/Services/ModuleDefinitionService.cs
+++ b/Oqtane.Client/Services/ModuleDefinitionService.cs
@@ -3,11 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using System;
 using System.Reflection;
 using Oqtane.Shared;
-using Oqtane.Providers;
+using Oqtane.UI;
 
 namespace Oqtane.Services
 {
@@ -15,56 +14,48 @@ namespace Oqtane.Services
     {
         private readonly HttpClient _http;
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
-        private readonly IServiceProvider _serviceProvider;
 
-        public ModuleDefinitionService(HttpClient http, SiteState siteState, NavigationManager navigationManager, IServiceProvider serviceProvider)
+        public ModuleDefinitionService(HttpClient http, SiteState siteState) : base(http)
         {
             _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
-            _serviceProvider = serviceProvider;
         }
 
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "ModuleDefinition"); }
-        }
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "ModuleDefinition");
 
-        public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int SiteId)
+        public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int siteId)
         {
-            List<ModuleDefinition> moduledefinitions = await _http.GetJsonAsync<List<ModuleDefinition>>(apiurl + "?siteid=" + SiteId.ToString());
+            List<ModuleDefinition> moduledefinitions = await GetJsonAsync<List<ModuleDefinition>>($"{Apiurl}?siteid={siteId}");
             return moduledefinitions.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<ModuleDefinition> GetModuleDefinitionAsync(int ModuleDefinitionId, int SiteId)
+        public async Task<ModuleDefinition> GetModuleDefinitionAsync(int moduleDefinitionId, int siteId)
         {
-            return await _http.GetJsonAsync<ModuleDefinition>(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
+            return await GetJsonAsync<ModuleDefinition>($"{Apiurl}/{moduleDefinitionId}?siteid={siteId}");
         }
 
-        public async Task UpdateModuleDefinitionAsync(ModuleDefinition ModuleDefinition)
+        public async Task UpdateModuleDefinitionAsync(ModuleDefinition moduleDefinition)
         {
-            await _http.PutJsonAsync(apiurl + "/" + ModuleDefinition.ModuleDefinitionId.ToString(), ModuleDefinition);
+            await PutJsonAsync($"{Apiurl}/{moduleDefinition.ModuleDefinitionId}", moduleDefinition);
         }
 
         public async Task InstallModuleDefinitionsAsync()
         {
-            await _http.GetJsonAsync<List<string>>(apiurl + "/install");
+            await GetJsonAsync<List<string>>($"{Apiurl}/install");
         }
 
-        public async Task DeleteModuleDefinitionAsync(int ModuleDefinitionId, int SiteId)
+        public async Task DeleteModuleDefinitionAsync(int moduleDefinitionId, int siteId)
         {
-            await _http.DeleteAsync(apiurl + "/" + ModuleDefinitionId.ToString() + "?siteid=" + SiteId.ToString());
+            await DeleteAsync($"{Apiurl}/{moduleDefinitionId}?siteid={siteId}");
         }
 
-        public async Task LoadModuleDefinitionsAsync(int SiteId)
+        public async Task LoadModuleDefinitionsAsync(int siteId, Runtime runtime)
         {
             // get list of modules from the server
-            List<ModuleDefinition> moduledefinitions = await GetModuleDefinitionsAsync(SiteId);
+            List<ModuleDefinition> moduledefinitions = await GetModuleDefinitionsAsync(siteId);
 
             // download assemblies to browser when running client-side Blazor
-            var authstateprovider = (IdentityAuthenticationStateProvider)_serviceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-            if (authstateprovider != null)
+            if (runtime == Runtime.WebAssembly)
             {
                 // get list of loaded assemblies on the client ( in the client-side hosting module the browser client has its own app domain )
                 Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
@@ -80,7 +71,7 @@ namespace Oqtane.Services
                             if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null)
                             {
                                 // download assembly from server and load
-                                var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll");
+                                var bytes = await _http.GetByteArrayAsync($"{Apiurl}/load/{assemblyname}.dll");
                                 Assembly.Load(bytes);
                             }
                         }
@@ -89,11 +80,15 @@ namespace Oqtane.Services
                     if (assemblies.Where(item => item.FullName.StartsWith(moduledefinition.AssemblyName + ",")).FirstOrDefault() == null)
                     {
                         // download assembly from server and load
-                        var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + moduledefinition.AssemblyName + ".dll");
+                        var bytes = await _http.GetByteArrayAsync($"{Apiurl}/load/{moduledefinition.AssemblyName}.dll");
                         Assembly.Load(bytes);
                     }
                 }
             }
         }
+        public async Task CreateModuleDefinitionAsync(ModuleDefinition moduleDefinition, int moduleId)
+        {
+            await PostJsonAsync($"{Apiurl}?moduleid={moduleId.ToString()}", moduleDefinition);
+        }
     }
 }
diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs
index ee49abc5..ce1d9978 100644
--- a/Oqtane.Client/Services/ModuleService.cs
+++ b/Oqtane.Client/Services/ModuleService.cs
@@ -3,66 +3,59 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class ModuleService : ServiceBase, IModuleService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public ModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public ModuleService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Module"); }
-        }
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Module");
 
-        public async Task<List<Module>> GetModulesAsync(int SiteId)
+        public async Task<List<Module>> GetModulesAsync(int siteId)
         {
-            List<Module> modules = await _http.GetJsonAsync<List<Module>>(apiurl + "?siteid=" + SiteId.ToString());
+            List<Module> modules = await GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId}");
             modules = modules
                 .OrderBy(item => item.Order)
                 .ToList();
             return modules;
         }
 
-        public async Task<Module> GetModuleAsync(int ModuleId)
+        public async Task<Module> GetModuleAsync(int moduleId)
         {
-            return await _http.GetJsonAsync<Module>(apiurl + "/" + ModuleId.ToString());
+            return await GetJsonAsync<Module>($"{Apiurl}/{moduleId}");
         }
 
-        public async Task<Module> AddModuleAsync(Module Module)
+        public async Task<Module> AddModuleAsync(Module module)
         {
-            return await _http.PostJsonAsync<Module>(apiurl, Module);
+            return await PostJsonAsync<Module>(Apiurl, module);
         }
 
-        public async Task<Module> UpdateModuleAsync(Module Module)
+        public async Task<Module> UpdateModuleAsync(Module module)
         {
-            return await _http.PutJsonAsync<Module>(apiurl + "/" + Module.ModuleId.ToString(), Module);
+            return await PutJsonAsync<Module>($"{Apiurl}/{module.ModuleId}", module);
         }
 
-        public async Task DeleteModuleAsync(int ModuleId)
+        public async Task DeleteModuleAsync(int moduleId)
         {
-            await _http.DeleteAsync(apiurl + "/" + ModuleId.ToString());
+            await DeleteAsync($"{Apiurl}/{moduleId.ToString()}");
         }
 
-        public async Task<bool> ImportModuleAsync(int ModuleId, string Content)
+        public async Task<bool> ImportModuleAsync(int moduleId, string content)
         {
-            return await _http.PostJsonAsync<bool>(apiurl + "/import?moduleid=" + ModuleId, Content);
+            return await PostJsonAsync<string,bool>($"{Apiurl}/import?moduleid={moduleId}", content);
         }
 
-        public async Task<string> ExportModuleAsync(int ModuleId)
+        public async Task<string> ExportModuleAsync(int moduleId)
         {
-            return await _http.GetStringAsync(apiurl + "/export?moduleid=" + ModuleId.ToString());
+            return await GetStringAsync($"{Apiurl}/export?moduleid={moduleId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs
index 22e4f7d3..dbce9f8f 100644
--- a/Oqtane.Client/Services/NotificationService.cs
+++ b/Oqtane.Client/Services/NotificationService.cs
@@ -1,7 +1,6 @@
 using Oqtane.Models;
 using System.Threading.Tasks;
 using System.Net.Http;
-using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,46 +9,40 @@ namespace Oqtane.Services
 {
     public class NotificationService : ServiceBase, INotificationService
     {
-        private readonly HttpClient _http;
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public NotificationService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public NotificationService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Notification");
+
+        public async Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Notification"); }
+            var notifications = await GetJsonAsync<List<Notification>>($"{Apiurl}?siteid={siteId}&direction={direction.ToLower()}&userid={userId}");
+
+            return notifications.OrderByDescending(item => item.CreatedOn).ToList();
         }
 
-        public async Task<List<Notification>> GetNotificationsAsync(int SiteId, string Direction, int UserId)
+        public async Task<Notification> GetNotificationAsync(int notificationId)
         {
-            string querystring = "?siteid=" + SiteId.ToString() + "&direction=" + Direction.ToLower() + "&userid=" + UserId.ToString();
-            List<Notification> Notifications = await _http.GetJsonAsync<List<Notification>>(apiurl + querystring);
-            return Notifications.OrderByDescending(item => item.CreatedOn).ToList();
+            return await GetJsonAsync<Notification>($"{Apiurl}/{notificationId}");
         }
 
-        public async Task<Notification> GetNotificationAsync(int NotificationId)
+        public async Task<Notification> AddNotificationAsync(Notification notification)
         {
-            return await _http.GetJsonAsync<Notification>(apiurl + "/" + NotificationId.ToString());
+            return await PostJsonAsync<Notification>(Apiurl, notification);
         }
 
-        public async Task<Notification> AddNotificationAsync(Notification Notification)
+        public async Task<Notification> UpdateNotificationAsync(Notification notification)
         {
-            return await _http.PostJsonAsync<Notification>(apiurl, Notification);
+            return await PutJsonAsync<Notification>($"{Apiurl}/{notification.NotificationId}", notification);
         }
 
-        public async Task<Notification> UpdateNotificationAsync(Notification Notification)
+        public async Task DeleteNotificationAsync(int notificationId)
         {
-            return await _http.PutJsonAsync<Notification>(apiurl + "/" + Notification.NotificationId.ToString(), Notification);
-        }
-        public async Task DeleteNotificationAsync(int NotificationId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + NotificationId.ToString());
+            await DeleteAsync($"{Apiurl}/{notificationId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs
index 018b5f50..0fa6123b 100644
--- a/Oqtane.Client/Services/PackageService.cs
+++ b/Oqtane.Client/Services/PackageService.cs
@@ -2,39 +2,25 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
 using System.Linq;
 
 namespace Oqtane.Services
 {
     public class PackageService : ServiceBase, IPackageService
-    {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+    {        
+        public PackageService(HttpClient http) : base(http) { }
 
-        public PackageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
-        }
+        private string Apiurl => CreateApiUrl("Package");
 
-        private string apiurl
+        public async Task<List<Package>> GetPackagesAsync(string tag)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Package"); }
-        }
-
-        public async Task<List<Package>> GetPackagesAsync(string Tag)
-        {
-            List<Package> packages = await _http.GetJsonAsync<List<Package>>(apiurl + "?tag=" + Tag);
+            List<Package> packages = await GetJsonAsync<List<Package>>($"{Apiurl}?tag={tag}");
             return packages.OrderByDescending(item => item.Downloads).ToList();
         }
 
-        public async Task DownloadPackageAsync(string PackageId, string Version, string Folder)
+        public async Task DownloadPackageAsync(string packageId, string version, string folder)
         {
-            await _http.PostJsonAsync(apiurl + "?packageid=" + PackageId + "&version=" + Version + "&folder=" + Folder, null);
+            await PostAsync($"{Apiurl}?packageid={packageId}&version={version}&folder={folder}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs
index 28924e85..588a4a6b 100644
--- a/Oqtane.Client/Services/PageModuleService.cs
+++ b/Oqtane.Client/Services/PageModuleService.cs
@@ -1,59 +1,50 @@
 using Oqtane.Models;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class PageModuleService : ServiceBase, IPageModuleService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public PageModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
+        public PageModuleService(HttpClient http, SiteState siteState) : base(http)
+        {            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "PageModule");
+
+        public async Task<PageModule> GetPageModuleAsync(int pageModuleId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "PageModule"); }
+            return await GetJsonAsync<PageModule>($"{Apiurl}/{pageModuleId}");
         }
 
-        public async Task<PageModule> GetPageModuleAsync(int PageModuleId)
+        public async Task<PageModule> GetPageModuleAsync(int pageId, int moduleId)
         {
-            return await _http.GetJsonAsync<PageModule>(apiurl + "/" + PageModuleId.ToString());
+            return await GetJsonAsync<PageModule>($"{Apiurl}/{pageId}/{moduleId}");
         }
 
-        public async Task<PageModule> GetPageModuleAsync(int PageId, int ModuleId)
+        public async Task<PageModule> AddPageModuleAsync(PageModule pageModule)
         {
-            return await _http.GetJsonAsync<PageModule>(apiurl + "/" + PageId.ToString() + "/" + ModuleId.ToString());
+            return await PostJsonAsync<PageModule>(Apiurl, pageModule);
         }
 
-        public async Task<PageModule> AddPageModuleAsync(PageModule PageModule)
+        public async Task<PageModule> UpdatePageModuleAsync(PageModule pageModule)
         {
-            return await _http.PostJsonAsync<PageModule>(apiurl, PageModule);
+            return await PutJsonAsync<PageModule>($"{Apiurl}/{pageModule.PageModuleId}", pageModule);
         }
 
-        public async Task<PageModule> UpdatePageModuleAsync(PageModule PageModule)
+        public async Task UpdatePageModuleOrderAsync(int pageId, string pane)
         {
-            return await _http.PutJsonAsync<PageModule>(apiurl + "/" + PageModule.PageModuleId.ToString(), PageModule);
+            await PutAsync($"{Apiurl}/?pageid={pageId}&pane={pane}");
         }
 
-        public async Task UpdatePageModuleOrderAsync(int PageId, string Pane)
+        public async Task DeletePageModuleAsync(int pageModuleId)
         {
-            await _http.PutJsonAsync(apiurl + "/?pageid=" + PageId.ToString() + "&pane=" + Pane, null);
-        }
-
-        public async Task DeletePageModuleAsync(int PageModuleId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + PageModuleId.ToString());
+            await DeleteAsync($"{Apiurl}/{pageModuleId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs
index 4b757600..c22e4985 100644
--- a/Oqtane.Client/Services/PageService.cs
+++ b/Oqtane.Client/Services/PageService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Linq;
 using System.Net.Http;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 using System;
@@ -12,44 +11,39 @@ namespace Oqtane.Services
 {
     public class PageService : ServiceBase, IPageService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public PageService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public PageService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
+            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Page"); }
-        }
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Page");
 
-        public async Task<List<Page>> GetPagesAsync(int SiteId)
+        public async Task<List<Page>> GetPagesAsync(int siteId)
         {
-            List<Page> pages = await _http.GetJsonAsync<List<Page>>(apiurl + "?siteid=" + SiteId.ToString());
+            List<Page> pages = await GetJsonAsync<List<Page>>($"{Apiurl}?siteid={siteId}");
             pages = GetPagesHierarchy(pages);
             return pages;
         }
 
-        public async Task<Page> GetPageAsync(int PageId)
+        public async Task<Page> GetPageAsync(int pageId)
         {
-            return await _http.GetJsonAsync<Page>(apiurl + "/" + PageId.ToString());
+            return await GetJsonAsync<Page>($"{Apiurl}/{pageId}");
         }
 
-        public async Task<Page> GetPageAsync(int PageId, int UserId)
+        public async Task<Page> GetPageAsync(int pageId, int userId)
         {
-            return await _http.GetJsonAsync<Page>(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString());
+            return await GetJsonAsync<Page>($"{Apiurl}/{pageId}?userid={userId}");
         }
 
-        public async Task<Page> GetPageAsync(string Path, int SiteId)
+        public async Task<Page> GetPageAsync(string path, int siteId)
         {
             try
             {
-                return await _http.GetJsonAsync<Page>(apiurl + "/path/" + SiteId.ToString() + "?path=" + WebUtility.UrlEncode(Path));
+                return await GetJsonAsync<Page>($"{Apiurl}/path/{siteId}?path={WebUtility.UrlEncode(path)}");
             }
             catch
             {
@@ -57,62 +51,65 @@ namespace Oqtane.Services
             }
         }
 
-        public async Task<Page> AddPageAsync(Page Page)
+        public async Task<Page> AddPageAsync(Page page)
         {
-            return await _http.PostJsonAsync<Page>(apiurl, Page);
+            return await PostJsonAsync<Page>(Apiurl, page);
         }
 
-        public async Task<Page> AddPageAsync(int PageId, int UserId)
+        public async Task<Page> AddPageAsync(int pageId, int userId)
         {
-            return await _http.PostJsonAsync<Page>(apiurl + "/" + PageId.ToString() + "?userid=" + UserId.ToString(), null);
+            return await PostJsonAsync<Page>($"{Apiurl}/{pageId}?userid={userId}", null);
         }
 
-        public async Task<Page> UpdatePageAsync(Page Page)
+        public async Task<Page> UpdatePageAsync(Page page)
         {
-            return await _http.PutJsonAsync<Page>(apiurl + "/" + Page.PageId.ToString(), Page);
+            return await PutJsonAsync<Page>($"{Apiurl}/{page.PageId}", page);
         }
 
-        public async Task UpdatePageOrderAsync(int SiteId, int PageId, int? ParentId)
+        public async Task UpdatePageOrderAsync(int siteId, int pageId, int? parentId)
         {
-            await _http.PutJsonAsync(apiurl + "/?siteid=" + SiteId.ToString() + "&pageid=" + PageId.ToString() + "&parentid=" + ((ParentId == null) ? "" : ParentId.ToString()), null);
+            var parent = parentId == null
+                ? string.Empty
+                : parentId.ToString();
+            await PutAsync($"{Apiurl}/?siteid={siteId}&pageid={pageId}&parentid={parent}");
         }
 
-        public async Task DeletePageAsync(int PageId)
+        public async Task DeletePageAsync(int pageId)
         {
-            await _http.DeleteAsync(apiurl + "/" + PageId.ToString());
+            await DeleteAsync($"{Apiurl}/{pageId}");
         }
 
-        private static List<Page> GetPagesHierarchy(List<Page> Pages)
+        private static List<Page> GetPagesHierarchy(List<Page> pages)
         {
             List<Page> hierarchy = new List<Page>();
-            Action<List<Page>, Page> GetPath = null;
-            GetPath = (List<Page> pages, Page page) =>
+            Action<List<Page>, Page> getPath = null;
+            getPath = (pageList, page) =>
             {
                 IEnumerable<Page> children;
                 int level;
                 if (page == null)
                 {
                     level = -1;
-                    children = Pages.Where(item => item.ParentId == null);
+                    children = pages.Where(item => item.ParentId == null);
                 }
                 else
                 {
                     level = page.Level;
-                    children = Pages.Where(item => item.ParentId == page.PageId);
+                    children = pages.Where(item => item.ParentId == page.PageId);
                 }
                 foreach (Page child in children)
                 {
                     child.Level = level + 1;
-                    child.HasChildren = Pages.Where(item => item.ParentId == child.PageId).Any();
+                    child.HasChildren = pages.Any(item => item.ParentId == child.PageId);
                     hierarchy.Add(child);
-                    GetPath(pages, child);
+                    getPath(pageList, child);
                 }
             };
-            Pages = Pages.OrderBy(item => item.Order).ToList();
-            GetPath(Pages, null);
+            pages = pages.OrderBy(item => item.Order).ToList();
+            getPath(pages, null);
 
             // add any non-hierarchical items to the end of the list
-            foreach (Page page in Pages)
+            foreach (Page page in pages)
             {
                 if (hierarchy.Find(item => item.PageId == page.PageId) == null)
                 {
diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs
index c456423b..100d1870 100644
--- a/Oqtane.Client/Services/ProfileService.cs
+++ b/Oqtane.Client/Services/ProfileService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 
@@ -10,45 +9,39 @@ namespace Oqtane.Services
 {
     public class ProfileService : ServiceBase, IProfileService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public ProfileService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
+        public ProfileService(HttpClient http, SiteState siteState) : base(http)
+        {            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Profile");
+
+        public async Task<List<Profile>> GetProfilesAsync(int siteId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Profile"); }
+            List<Profile> profiles = await GetJsonAsync<List<Profile>>($"{Apiurl}?siteid={siteId}");
+            return profiles.OrderBy(item => item.ViewOrder).ToList();
         }
 
-        public async Task<List<Profile>> GetProfilesAsync(int SiteId)
+        public async Task<Profile> GetProfileAsync(int profileId)
         {
-            List<Profile> Profiles = await _http.GetJsonAsync<List<Profile>>(apiurl + "?siteid=" + SiteId.ToString());
-            return Profiles.OrderBy(item => item.ViewOrder).ToList();
+            return await GetJsonAsync<Profile>($"{Apiurl}/{profileId}");
         }
 
-        public async Task<Profile> GetProfileAsync(int ProfileId)
+        public async Task<Profile> AddProfileAsync(Profile profile)
         {
-            return await _http.GetJsonAsync<Profile>(apiurl + "/" + ProfileId.ToString());
+            return await PostJsonAsync<Profile>(Apiurl, profile);
         }
 
-        public async Task<Profile> AddProfileAsync(Profile Profile)
+        public async Task<Profile> UpdateProfileAsync(Profile profile)
         {
-            return await _http.PostJsonAsync<Profile>(apiurl, Profile);
+            return await PutJsonAsync<Profile>($"{Apiurl}/{profile.SiteId}", profile);
         }
-
-        public async Task<Profile> UpdateProfileAsync(Profile Profile)
+        public async Task DeleteProfileAsync(int profileId)
         {
-            return await _http.PutJsonAsync<Profile>(apiurl + "/" + Profile.SiteId.ToString(), Profile);
-        }
-        public async Task DeleteProfileAsync(int ProfileId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + ProfileId.ToString());
+            await DeleteAsync($"{Apiurl}/{profileId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs
index 302d3271..d304edf3 100644
--- a/Oqtane.Client/Services/RoleService.cs
+++ b/Oqtane.Client/Services/RoleService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 
@@ -10,45 +9,40 @@ namespace Oqtane.Services
 {
     public class RoleService : ServiceBase, IRoleService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public RoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public RoleService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
+            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Role");
+
+        public async Task<List<Role>> GetRolesAsync(int siteId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Role"); }
+            List<Role> roles = await GetJsonAsync<List<Role>>($"{Apiurl}?siteid={siteId}");
+            return roles.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<List<Role>> GetRolesAsync(int SiteId)
+        public async Task<Role> GetRoleAsync(int roleId)
         {
-            List<Role> Roles = await _http.GetJsonAsync<List<Role>>(apiurl + "?siteid=" + SiteId.ToString());
-            return Roles.OrderBy(item => item.Name).ToList();
+            return await GetJsonAsync<Role>($"{Apiurl}/{roleId}");
         }
 
-        public async Task<Role> GetRoleAsync(int RoleId)
+        public async Task<Role> AddRoleAsync(Role role)
         {
-            return await _http.GetJsonAsync<Role>(apiurl + "/" + RoleId.ToString());
+            return await PostJsonAsync<Role>(Apiurl, role);
         }
 
-        public async Task<Role> AddRoleAsync(Role Role)
+        public async Task<Role> UpdateRoleAsync(Role role)
         {
-            return await _http.PostJsonAsync<Role>(apiurl, Role);
+            return await PutJsonAsync<Role>($"{Apiurl}/{role.RoleId}", role);
         }
-
-        public async Task<Role> UpdateRoleAsync(Role Role)
+        public async Task DeleteRoleAsync(int roleId)
         {
-            return await _http.PutJsonAsync<Role>(apiurl + "/" + Role.RoleId.ToString(), Role);
-        }
-        public async Task DeleteRoleAsync(int RoleId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + RoleId.ToString());
+            await DeleteAsync($"{Apiurl}/{roleId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs
index f8a6e767..742bd3fa 100644
--- a/Oqtane.Client/Services/ServiceBase.cs
+++ b/Oqtane.Client/Services/ServiceBase.cs
@@ -1,42 +1,179 @@
 using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Threading;
+using System.Threading.Tasks;
 using Oqtane.Models;
 
 namespace Oqtane.Services
 {
     public class ServiceBase
     {
+        private readonly HttpClient _http;
 
-        public static string CreateApiUrl(Alias alias, string absoluteUri, string serviceName)
+        protected ServiceBase(HttpClient client)
         {
-            Uri uri = new Uri(absoluteUri);
+            _http = client;
+        }
+
+        protected async Task GetAsync(string uri)
+        {
+            var response = await _http.GetAsync(uri);
+            CheckResponse(response);
+        }
+
+        protected async Task<string> GetStringAsync(string uri)
+        {
+            try
+            {
+                return await _http.GetStringAsync(uri);
+            }
+            catch (Exception e)
+            {
+                //TODO replace with logging
+                Console.WriteLine(e);
+            }
+
+            return default;
+        }
+
+        protected async Task<byte[]> GetByteArrayAsync(string uri)
+        {
+            try
+            {
+                return await _http.GetByteArrayAsync(uri);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+
+            return default;
+        }
+
+        protected async Task<T> GetJsonAsync<T>(string uri)
+        {
+            var response = await _http.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                return await response.Content.ReadFromJsonAsync<T>();
+            }
+
+            return default;
+        }
+
+        protected async Task PutAsync(string uri)
+        {
+            var response = await _http.PutAsync(uri, null);
+            CheckResponse(response);
+        }
+
+        protected async Task<T> PutJsonAsync<T>(string uri, T value)
+        {
+            return await PutJsonAsync<T, T>(uri, value);
+        }
+
+        protected async Task<TResult> PutJsonAsync<TValue, TResult>(string uri, TValue value)
+        {
+            var response = await _http.PutAsJsonAsync(uri, value);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                var result = await response.Content.ReadFromJsonAsync<TResult>();
+                return result;
+            }
+
+            return default;
+        }
+
+        protected async Task PostAsync(string uri)
+        {
+            var response = await _http.PostAsync(uri, null);
+            CheckResponse(response);
+        }
+
+        protected async Task<T> PostJsonAsync<T>(string uri, T value)
+        {
+            return await PostJsonAsync<T, T>(uri, value);
+        }
+
+        protected async Task<TResult> PostJsonAsync<TValue, TResult>(string uri, TValue value)
+        {
+            var response = await _http.PostAsJsonAsync(uri, value);
+            if (CheckResponse(response) && ValidateJsonContent(response.Content))
+            {
+                var result = await response.Content.ReadFromJsonAsync<TResult>();
+                return result;
+            }
+
+            return default;
+        }
+
+        protected async Task DeleteAsync(string uri)
+        {
+            var response = await _http.DeleteAsync(uri);
+            CheckResponse(response);
+        }
+
+        private bool CheckResponse(HttpResponseMessage response)
+        {
+            if (response.IsSuccessStatusCode) return true;
+            if (response.StatusCode != HttpStatusCode.NoContent && response.StatusCode != HttpStatusCode.NotFound)
+            {
+                //TODO: Log errors here
+                Console.WriteLine($"Response status: {response.StatusCode} {response.ReasonPhrase}");
+            }
+
+            return false;
+        }
+
+        private static bool ValidateJsonContent(HttpContent content)
+        {
+            var mediaType = content?.Headers.ContentType?.MediaType;
+            return mediaType != null && mediaType.Equals("application/json", StringComparison.OrdinalIgnoreCase);
+            //TODO Missing content JSON validation 
+        }
+
+        // create an API Url which is tenant agnostic ( for use with entities in the MasterDB )
+        public string CreateApiUrl(string serviceName)
+        {
+            return CreateApiUrl(null, serviceName);
+        }
+
+        // create an API Url which is tenant aware ( for use with entities in the TenantDB )
+        public string CreateApiUrl(Alias alias, string serviceName)
+        {
+            string apiurl = "/";
+
+            if (Alias != null)
+            {
+                alias = Alias; // override the default alias ( for cross-tenant service calls )
+            }
 
-            string apiurl;
             if (alias != null)
             {
-                // build a url which passes the alias that may include a subfolder for multi-tenancy
-                apiurl = uri.Scheme + "://" + alias.Name + "/";
-                if (alias.Path == "")
-                {
-                    apiurl += "~/";
-                }
+                // include the alias for multi-tenant context
+                apiurl += $"{alias.AliasId}/";
             }
             else
             {
-                // build a url which ignores any subfolder for multi-tenancy
-                apiurl = uri.Scheme + "://" + uri.Authority + "/~/";
+                // tenant agnostic
+                apiurl += "~/";
             }
-            apiurl += "api/" + serviceName;
+
+            apiurl += $"api/{serviceName}";
+
             return apiurl;
         }
 
-        public static string CreateCrossTenantUrl(string url, Alias alias)
+        // can be used to override the default alias
+        public Alias Alias { get; set; }
+
+        [Obsolete("This method is obsolete. Use CreateApiUrl(Alias alias, string serviceName) instead.", false)]
+        public string CreateApiUrl(Alias alias, string absoluteUri, string serviceName)
         {
-            if (alias != null)
-            {
-                url += (url.Contains("?")) ? "&" : "?";
-                url += "aliasid=" + alias.AliasId.ToString();
-            }
-            return url;
+            // only retained for short term backward compatibility
+            return CreateApiUrl(alias, serviceName);
         }
     }
 }
diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index cc308f5d..c5cf45c4 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 
@@ -10,114 +9,109 @@ namespace Oqtane.Services
 {
     public class SettingService : ServiceBase, ISettingService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public SettingService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
+        public SettingService(HttpClient http, SiteState siteState) : base(http)
+        {            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Setting");
+        public async Task<Dictionary<string, string>> GetTenantSettingsAsync()
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Setting"); }
+            return await GetSettingsAsync(EntityNames.Tenant, -1);
         }
 
-        public async Task<Dictionary<string, string>> GetHostSettingsAsync()
+        public async Task UpdateTenantSettingsAsync(Dictionary<string, string> tenantSettings)
         {
-            return await GetSettingsAsync("Host", -1);
+            await UpdateSettingsAsync(tenantSettings, EntityNames.Tenant, -1);
         }
 
-        public async Task UpdateHostSettingsAsync(Dictionary<string, string> HostSettings)
+        public async Task<Dictionary<string, string>> GetSiteSettingsAsync(int siteId)
         {
-            await UpdateSettingsAsync(HostSettings, "Host", -1); 
+            return await GetSettingsAsync(EntityNames.Site, siteId);
         }
 
-        public async Task<Dictionary<string, string>> GetSiteSettingsAsync(int SiteId)
+        public async Task UpdateSiteSettingsAsync(Dictionary<string, string> siteSettings, int siteId)
         {
-            return await GetSettingsAsync("Site", SiteId);
+            await UpdateSettingsAsync(siteSettings, EntityNames.Site, siteId);
         }
 
-        public async Task UpdateSiteSettingsAsync(Dictionary<string, string> SiteSettings, int SiteId)
+        public async Task<Dictionary<string, string>> GetPageSettingsAsync(int pageId)
         {
-            await UpdateSettingsAsync(SiteSettings, "Site", SiteId);
+            return await GetSettingsAsync(EntityNames.Page, pageId);
         }
 
-        public async Task<Dictionary<string, string>> GetPageSettingsAsync(int PageId)
+        public async Task UpdatePageSettingsAsync(Dictionary<string, string> pageSettings, int pageId)
         {
-            return await GetSettingsAsync("Page", PageId);
+            await UpdateSettingsAsync(pageSettings, EntityNames.Page, pageId);
         }
 
-        public async Task UpdatePageSettingsAsync(Dictionary<string, string> PageSettings, int PageId)
+        public async Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int pageModuleId)
         {
-            await UpdateSettingsAsync(PageSettings, "Page", PageId);
+            return await GetSettingsAsync(EntityNames.PageModule, pageModuleId);
         }
 
-        public async Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int PageModuleId)
+        public async Task UpdatePageModuleSettingsAsync(Dictionary<string, string> pageModuleSettings, int pageModuleId)
         {
-            return await GetSettingsAsync("PageModule", PageModuleId);
+            await UpdateSettingsAsync(pageModuleSettings, EntityNames.PageModule, pageModuleId);
         }
 
-        public async Task UpdatePageModuleSettingsAsync(Dictionary<string, string> PageModuleSettings, int PageModuleId)
+        public async Task<Dictionary<string, string>> GetModuleSettingsAsync(int moduleId)
         {
-            await UpdateSettingsAsync(PageModuleSettings, "PageModule", PageModuleId);
+            return await GetSettingsAsync(EntityNames.Module, moduleId);
         }
 
-        public async Task<Dictionary<string, string>> GetModuleSettingsAsync(int ModuleId)
+        public async Task UpdateModuleSettingsAsync(Dictionary<string, string> moduleSettings, int moduleId)
         {
-            return await GetSettingsAsync("Module", ModuleId);
+            await UpdateSettingsAsync(moduleSettings, EntityNames.Module, moduleId);
         }
 
-        public async Task UpdateModuleSettingsAsync(Dictionary<string, string> ModuleSettings, int ModuleId)
+        public async Task<Dictionary<string, string>> GetUserSettingsAsync(int userId)
         {
-            await UpdateSettingsAsync(ModuleSettings, "Module", ModuleId);
+            return await GetSettingsAsync(EntityNames.User, userId);
         }
 
-        public async Task<Dictionary<string, string>> GetUserSettingsAsync(int UserId)
+        public async Task UpdateUserSettingsAsync(Dictionary<string, string> userSettings, int userId)
         {
-            return await GetSettingsAsync("User", UserId);
+            await UpdateSettingsAsync(userSettings, EntityNames.User, userId);
         }
 
-        public async Task UpdateUserSettingsAsync(Dictionary<string, string> UserSettings, int UserId)
+        public async Task<Dictionary<string, string>> GetFolderSettingsAsync(int folderId)
         {
-            await UpdateSettingsAsync(UserSettings, "User", UserId);
+            return await GetSettingsAsync( EntityNames.Folder, folderId);
         }
 
-        public async Task<Dictionary<string, string>> GetFolderSettingsAsync(int FolderId)
+        public async Task UpdateFolderSettingsAsync(Dictionary<string, string> folderSettings, int folderId)
         {
-            return await GetSettingsAsync("Folder", FolderId);
+            await UpdateSettingsAsync(folderSettings, EntityNames.Folder, folderId);
         }
 
-        public async Task UpdateFolderSettingsAsync(Dictionary<string, string> FolderSettings, int FolderId)
+        public async Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId)
         {
-            await UpdateSettingsAsync(FolderSettings, "Folder", FolderId);
-        }
-
-        public async Task<Dictionary<string, string>> GetSettingsAsync(string EntityName, int EntityId)
-        {
-            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-            List<Setting> Settings = await _http.GetJsonAsync<List<Setting>>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
-            foreach(Setting setting in Settings.OrderBy(item => item.SettingName).ToList())
+            var dictionary = new Dictionary<string, string>();
+            var settings = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId}");
+            
+            foreach(Setting setting in settings.OrderBy(item => item.SettingName).ToList())
             {
                 dictionary.Add(setting.SettingName, setting.SettingValue);
             }
             return dictionary;
         }
 
-        public async Task UpdateSettingsAsync(Dictionary<string, string> Settings, string EntityName, int EntityId)
+        public async Task UpdateSettingsAsync(Dictionary<string, string> settings, string entityName, int entityId)
         {
-            List<Setting> settings = await _http.GetJsonAsync<List<Setting>>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
-            foreach (KeyValuePair<string, string> kvp in Settings)
+            var settingsList = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId}");
+            
+            foreach (KeyValuePair<string, string> kvp in settings)
             {
-                Setting setting = settings.Where(item => item.SettingName == kvp.Key).FirstOrDefault();
+                Setting setting = settingsList.FirstOrDefault(item => item.SettingName == kvp.Key);
                 if (setting == null)
                 {
                     setting = new Setting();
-                    setting.EntityName = EntityName;
-                    setting.EntityId = EntityId;
+                    setting.EntityName = entityName;
+                    setting.EntityId = entityId;
                     setting.SettingName = kvp.Key;
                     setting.SettingValue = kvp.Value;
                     setting = await AddSettingAsync(setting);
@@ -134,48 +128,48 @@ namespace Oqtane.Services
         }
 
 
-        public async Task<Setting> GetSettingAsync(int SettingId)
+        public async Task<Setting> GetSettingAsync(int settingId)
         {
-            return await _http.GetJsonAsync<Setting>(apiurl + "/" + SettingId.ToString());
+            return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}");
         }
 
-        public async Task<Setting> AddSettingAsync(Setting Setting)
+        public async Task<Setting> AddSettingAsync(Setting setting)
         {
-            return await _http.PostJsonAsync<Setting>(apiurl, Setting);
+            return await PostJsonAsync<Setting>(Apiurl, setting);
         }
 
-        public async Task<Setting> UpdateSettingAsync(Setting Setting)
+        public async Task<Setting> UpdateSettingAsync(Setting setting)
         {
-            return await _http.PutJsonAsync<Setting>(apiurl + "/" + Setting.SettingId.ToString(), Setting);
+            return await PutJsonAsync<Setting>($"{Apiurl}/{setting.SettingId}", setting);
         }
 
-        public async Task DeleteSettingAsync(int SettingId)
+        public async Task DeleteSettingAsync(int settingId)
         {
-            await _http.DeleteAsync(apiurl + "/" + SettingId.ToString());
+            await DeleteAsync($"{Apiurl}/{settingId}");
         }
 
 
-        public string GetSetting(Dictionary<string, string> Settings, string SettingName, string DefaultValue)
+        public string GetSetting(Dictionary<string, string> settings, string settingName, string defaultValue)
         {
-            string value = DefaultValue;
-            if (Settings.ContainsKey(SettingName))
+            string value = defaultValue;
+            if (settings.ContainsKey(settingName))
             {
-                value = Settings[SettingName];
+                value = settings[settingName];
             }
             return value;
         }
 
-        public Dictionary<string, string> SetSetting(Dictionary<string, string> Settings, string SettingName, string SettingValue)
+        public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue)
         {
-            if (Settings.ContainsKey(SettingName))
+            if (settings.ContainsKey(settingName))
             { 
-                Settings[SettingName] = SettingValue;
+                settings[settingName] = settingValue;
             }
             else
             {
-                Settings.Add(SettingName, SettingValue);
+                settings.Add(settingName, settingValue);
             }
-            return Settings;
+            return settings;
         }
     }
 }
diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs
index 6a5daff8..29e43e73 100644
--- a/Oqtane.Client/Services/SiteService.cs
+++ b/Oqtane.Client/Services/SiteService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Net.Http;
 using System.Linq;
-using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using Oqtane.Shared;
 
@@ -10,46 +9,46 @@ namespace Oqtane.Services
 {
     public class SiteService : ServiceBase, ISiteService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public SiteService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public SiteService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
+            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "Site");
+
+        public void SetAlias(Alias alias)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Site"); }
+            base.Alias = alias;
         }
 
-        public async Task<List<Site>> GetSitesAsync(Alias Alias)
+        public async Task<List<Site>> GetSitesAsync()
         {
-            List<Site> sites = await _http.GetJsonAsync<List<Site>>(CreateCrossTenantUrl(apiurl, Alias));
+            List<Site> sites = await GetJsonAsync<List<Site>>(Apiurl);
             return sites.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<Site> GetSiteAsync(int SiteId, Alias Alias)
+        public async Task<Site> GetSiteAsync(int siteId)
         {
-            return await _http.GetJsonAsync<Site>(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
+            return await GetJsonAsync<Site>($"{Apiurl}/{siteId}");
         }
 
-        public async Task<Site> AddSiteAsync(Site Site, Alias Alias)
+        public async Task<Site> AddSiteAsync(Site site)
         {
-            return await _http.PostJsonAsync<Site>(CreateCrossTenantUrl(apiurl, Alias), Site);
+            return await PostJsonAsync<Site>(Apiurl, site);
         }
 
-        public async Task<Site> UpdateSiteAsync(Site Site, Alias Alias)
+        public async Task<Site> UpdateSiteAsync(Site site)
         {
-            return await _http.PutJsonAsync<Site>(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site);
+            return await PutJsonAsync<Site>($"{Apiurl}/{site.SiteId}", site);
         }
 
-        public async Task DeleteSiteAsync(int SiteId, Alias Alias)
+        public async Task DeleteSiteAsync(int siteId)
         {
-            await _http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
+            await DeleteAsync($"{Apiurl}/{siteId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/SiteTemplateService.cs b/Oqtane.Client/Services/SiteTemplateService.cs
new file mode 100644
index 00000000..8697108b
--- /dev/null
+++ b/Oqtane.Client/Services/SiteTemplateService.cs
@@ -0,0 +1,21 @@
+using Oqtane.Models;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    public class SiteTemplateService : ServiceBase, ISiteTemplateService
+    {
+        public SiteTemplateService(HttpClient http) : base(http) { }
+
+        private string Apiurl => CreateApiUrl("SiteTemplate");
+
+        public async Task<List<SiteTemplate>> GetSiteTemplatesAsync()
+        {
+            List<SiteTemplate> siteTemplates = await GetJsonAsync<List<SiteTemplate>>(Apiurl);
+            return siteTemplates.OrderBy(item => item.Name).ToList();
+        }
+    }
+}
diff --git a/Oqtane.Client/Services/SqlService.cs b/Oqtane.Client/Services/SqlService.cs
new file mode 100644
index 00000000..a99fbd23
--- /dev/null
+++ b/Oqtane.Client/Services/SqlService.cs
@@ -0,0 +1,18 @@
+using Oqtane.Models;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    public class SqlService : ServiceBase, ISqlService
+    {
+        public SqlService(HttpClient http) : base(http) { }
+
+        private string Apiurl => CreateApiUrl("Sql");
+
+        public async Task<SqlQuery> ExecuteQueryAsync(SqlQuery sqlquery)
+        {
+            return await PostJsonAsync<SqlQuery>(Apiurl, sqlquery);
+        }
+    }
+}
diff --git a/Oqtane.Client/Services/SystemService.cs b/Oqtane.Client/Services/SystemService.cs
new file mode 100644
index 00000000..c8b1388b
--- /dev/null
+++ b/Oqtane.Client/Services/SystemService.cs
@@ -0,0 +1,18 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+namespace Oqtane.Services
+{
+    public class SystemService : ServiceBase, ISystemService
+    {
+        public SystemService(HttpClient http) : base(http) { }
+
+        private string Apiurl => CreateApiUrl("System");
+
+        public async Task<Dictionary<string, string>> GetSystemInfoAsync()
+        {
+            return await GetJsonAsync<Dictionary<string, string>>(Apiurl);
+        }
+    }
+}
diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs
index e1778bc4..d8e9be02 100644
--- a/Oqtane.Client/Services/TenantService.cs
+++ b/Oqtane.Client/Services/TenantService.cs
@@ -1,8 +1,6 @@
 using Oqtane.Models;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -10,46 +8,34 @@ namespace Oqtane.Services
 {
     public class TenantService : ServiceBase, ITenantService
     {
-        private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
+        public TenantService(HttpClient http) : base(http) { }
 
-        public TenantService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
-        }
-
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Tenant"); }
-        }
+        private string Apiurl => CreateApiUrl("Tenant");
 
         public async Task<List<Tenant>> GetTenantsAsync()
         {
-            List<Tenant> tenants = await _http.GetJsonAsync<List<Tenant>>(apiurl);
+            List<Tenant> tenants = await GetJsonAsync<List<Tenant>>(Apiurl);
             return tenants.OrderBy(item => item.Name).ToList();
         }
 
-        public async Task<Tenant> GetTenantAsync(int TenantId)
+        public async Task<Tenant> GetTenantAsync(int tenantId)
         {
-            return await _http.GetJsonAsync<Tenant>(apiurl + "/" + TenantId.ToString());
+            return await GetJsonAsync<Tenant>($"{Apiurl}/{tenantId}");
         }
 
-        public async Task<Tenant> AddTenantAsync(Tenant Tenant)
+        public async Task<Tenant> AddTenantAsync(Tenant tenant)
         {
-            return await _http.PostJsonAsync<Tenant>(apiurl, Tenant);
+            return await PostJsonAsync<Tenant>(Apiurl, tenant);
         }
 
-        public async Task<Tenant> UpdateTenantAsync(Tenant Tenant)
+        public async Task<Tenant> UpdateTenantAsync(Tenant tenant)
         {
-            return await _http.PutJsonAsync<Tenant>(apiurl + "/" + Tenant.TenantId.ToString(), Tenant);
+            return await PutJsonAsync<Tenant>($"{Apiurl}/{tenant.TenantId}", tenant);
         }
 
-        public async Task DeleteTenantAsync(int TenantId)
+        public async Task DeleteTenantAsync(int tenantId)
         {
-            await _http.DeleteAsync(apiurl + "/" + TenantId.ToString());
+            await DeleteAsync($"{Apiurl}/{tenantId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs
index a32dc5a8..e40e83dc 100644
--- a/Oqtane.Client/Services/ThemeService.cs
+++ b/Oqtane.Client/Services/ThemeService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using System.Reflection;
 using System;
 using Oqtane.Shared;
@@ -13,24 +12,17 @@ namespace Oqtane.Services
     public class ThemeService : ServiceBase, IThemeService
     {
         private readonly HttpClient _http;
-        private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public ThemeService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public ThemeService(HttpClient http) : base(http)
         {
             _http = http;
-            _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
-        {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Theme"); }
-        }
+        private string Apiurl => CreateApiUrl("Theme");
 
         public async Task<List<Theme>> GetThemesAsync()
         {
-            List<Theme> themes = await _http.GetJsonAsync<List<Theme>>(apiurl);
+            List<Theme> themes = await GetJsonAsync<List<Theme>>(Apiurl);
 
             // get list of loaded assemblies
             Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
@@ -45,7 +37,7 @@ namespace Oqtane.Services
                         if (assemblies.Where(item => item.FullName.StartsWith(assemblyname + ",")).FirstOrDefault() == null)
                         {
                             // download assembly from server and load
-                            var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + assemblyname + ".dll");
+                            var bytes = await _http.GetByteArrayAsync($"{Apiurl}/load/{assemblyname}.dll");
                             Assembly.Load(bytes);
                         }
                     }
@@ -53,7 +45,7 @@ namespace Oqtane.Services
                 if (assemblies.Where(item => item.FullName.StartsWith(theme.AssemblyName + ",")).FirstOrDefault() == null)
                 {
                     // download assembly from server and load
-                    var bytes = await _http.GetByteArrayAsync(apiurl + "/load/" + theme.AssemblyName + ".dll");
+                    var bytes = await _http.GetByteArrayAsync($"{Apiurl}/load/{theme.AssemblyName}.dll");
                     Assembly.Load(bytes);
                 }
             }
@@ -61,10 +53,10 @@ namespace Oqtane.Services
             return themes.OrderBy(item => item.Name).ToList();
         }
 
-        public Dictionary<string, string> GetThemeTypes(List<Theme> Themes)
+        public Dictionary<string, string> GetThemeTypes(List<Theme> themes)
         {
             var selectableThemes = new Dictionary<string, string>();
-            foreach (Theme theme in Themes)
+            foreach (Theme theme in themes)
             {
                 foreach (string themecontrol in theme.ThemeControls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
@@ -74,12 +66,12 @@ namespace Oqtane.Services
             return selectableThemes;
         }
 
-        public Dictionary<string, string> GetPaneLayoutTypes(List<Theme> Themes, string ThemeName)
+        public Dictionary<string, string> GetPaneLayoutTypes(List<Theme> themes, string themeName)
         {
             var selectablePaneLayouts = new Dictionary<string, string>();
-            foreach (Theme theme in Themes)
+            foreach (Theme theme in themes)
             { 
-                if (ThemeName.StartsWith(theme.ThemeName))
+                if (themeName.StartsWith(theme.ThemeName))
                 {
                     foreach (string panelayout in theme.PaneLayouts.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                     {
@@ -90,10 +82,10 @@ namespace Oqtane.Services
             return selectablePaneLayouts;
         }
 
-        public Dictionary<string, string> GetContainerTypes(List<Theme> Themes)
+        public Dictionary<string, string> GetContainerTypes(List<Theme> themes)
         {
             var selectableContainers = new Dictionary<string, string>();
-            foreach (Theme theme in Themes)
+            foreach (Theme theme in themes)
             {
                 foreach (string container in theme.ContainerControls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
@@ -105,12 +97,12 @@ namespace Oqtane.Services
 
         public async Task InstallThemesAsync()
         {
-            await _http.GetJsonAsync<List<string>>(apiurl + "/install");
+            await GetJsonAsync<List<string>>($"{Apiurl}/install");
         }
 
-        public async Task DeleteThemeAsync(string ThemeName)
+        public async Task DeleteThemeAsync(string themeName)
         {
-            await _http.DeleteAsync(apiurl + "/" + ThemeName);
+            await DeleteAsync($"{Apiurl}/{themeName}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs
index 1927de33..e1666df0 100644
--- a/Oqtane.Client/Services/UserRoleService.cs
+++ b/Oqtane.Client/Services/UserRoleService.cs
@@ -1,54 +1,46 @@
 using Oqtane.Models;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
 using Oqtane.Shared;
 
 namespace Oqtane.Services
 {
     public class UserRoleService : ServiceBase, IUserRoleService
     {
-        private readonly HttpClient _http;
+        
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public UserRoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
-        {
-            _http = http;
+        public UserRoleService(HttpClient http, SiteState siteState) : base(http)
+        {            
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "UserRole");
+
+        public async Task<List<UserRole>> GetUserRolesAsync(int siteId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "UserRole"); }
+            return await GetJsonAsync<List<UserRole>>($"{Apiurl}?siteid={siteId}");
         }
 
-        public async Task<List<UserRole>> GetUserRolesAsync(int SiteId)
+        public async Task<UserRole> GetUserRoleAsync(int userRoleId)
         {
-            return await _http.GetJsonAsync<List<UserRole>>(apiurl + "?siteid=" + SiteId.ToString());
+            return await GetJsonAsync<UserRole>($"{Apiurl}/{userRoleId}");
         }
 
-        public async Task<UserRole> GetUserRoleAsync(int UserRoleId)
+        public async Task<UserRole> AddUserRoleAsync(UserRole userRole)
         {
-            return await _http.GetJsonAsync<UserRole>(apiurl + "/" + UserRoleId.ToString());
+            return await PostJsonAsync<UserRole>(Apiurl, userRole);
         }
 
-        public async Task<UserRole> AddUserRoleAsync(UserRole UserRole)
+        public async Task<UserRole> UpdateUserRoleAsync(UserRole userRole)
         {
-            return await _http.PostJsonAsync<UserRole>(apiurl, UserRole);
+            return await PutJsonAsync<UserRole>($"{Apiurl}/{userRole.UserRoleId}", userRole);
         }
 
-        public async Task<UserRole> UpdateUserRoleAsync(UserRole UserRole)
+        public async Task DeleteUserRoleAsync(int userRoleId)
         {
-            return await _http.PutJsonAsync<UserRole>(apiurl + "/" + UserRole.UserRoleId.ToString(), UserRole);
-        }
-
-        public async Task DeleteUserRoleAsync(int UserRoleId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + UserRoleId.ToString());
+            await DeleteAsync($"{Apiurl}/{userRoleId}");
         }
     }
 }
diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs
index 4e38b488..34aaaebb 100644
--- a/Oqtane.Client/Services/UserService.cs
+++ b/Oqtane.Client/Services/UserService.cs
@@ -1,97 +1,70 @@
 using Oqtane.Shared;
 using Oqtane.Models;
 using System.Net.Http;
-using Microsoft.AspNetCore.Components;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
 {
     public class UserService : ServiceBase, IUserService
     {
-        private readonly HttpClient _http;
         private readonly SiteState _siteState;
-        private readonly NavigationManager _navigationManager;
 
-        public UserService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
+        public UserService(HttpClient http, SiteState siteState) : base(http)
         {
-            _http = http;
             _siteState = siteState;
-            _navigationManager = navigationManager;
         }
 
-        private string apiurl
+        private string Apiurl => CreateApiUrl(_siteState.Alias, "User");
+
+        public async Task<User> GetUserAsync(int userId, int siteId)
         {
-            get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "User"); }
+            return await GetJsonAsync<User>($"{Apiurl}/{userId}?siteid={siteId}");
         }
 
-        public async Task<User> GetUserAsync(int UserId, int SiteId)
+        public async Task<User> GetUserAsync(string username, int siteId)
         {
-            return await _http.GetJsonAsync<User>(apiurl + "/" + UserId.ToString() + "?siteid=" + SiteId.ToString());
+            return await GetJsonAsync<User>($"{Apiurl}/name/{username}?siteid={siteId}");
         }
 
-        public async Task<User> GetUserAsync(string Username, int SiteId)
+        public async Task<User> AddUserAsync(User user)
         {
-            return await _http.GetJsonAsync<User>(apiurl + "/name/" + Username + "?siteid=" + SiteId.ToString());
+            return await PostJsonAsync<User>(Apiurl, user);
         }
 
-        public async Task<User> AddUserAsync(User User)
+        public async Task<User> UpdateUserAsync(User user)
         {
-            try
-            {
-                return await _http.PostJsonAsync<User>(apiurl, User);
-            }
-            catch
-            {
-                return null;
-            }
+            return await PutJsonAsync<User>($"{Apiurl}/{user.UserId}", user);
         }
 
-        public async Task<User> AddUserAsync(User User, Alias Alias)
+        public async Task DeleteUserAsync(int userId)
         {
-            try
-            {
-                return await _http.PostJsonAsync<User>(CreateCrossTenantUrl(apiurl, Alias), User);
-            }
-            catch
-            {
-                return null;
-            }
+            await DeleteAsync($"{Apiurl}/{userId}");
         }
 
-        public async Task<User> UpdateUserAsync(User User)
+        public async Task<User> LoginUserAsync(User user, bool setCookie, bool isPersistent)
         {
-            return await _http.PutJsonAsync<User>(apiurl + "/" + User.UserId.ToString(), User);
-        }
-        public async Task DeleteUserAsync(int UserId)
-        {
-            await _http.DeleteAsync(apiurl + "/" + UserId.ToString());
+            return await PostJsonAsync<User>($"{Apiurl}/login?setcookie={setCookie}&persistent={isPersistent}", user);
         }
 
-        public async Task<User> LoginUserAsync(User User, bool SetCookie, bool IsPersistent)
-        {
-            return await _http.PostJsonAsync<User>(apiurl + "/login?setcookie=" + SetCookie.ToString() + "&persistent=" + IsPersistent.ToString(), User);
-        }
-
-        public async Task LogoutUserAsync(User User)
+        public async Task LogoutUserAsync(User user)
         {
             // best practices recommend post is preferrable to get for logout
-            await _http.PostJsonAsync(apiurl + "/logout", User); 
+            await PostJsonAsync($"{Apiurl}/logout", user);
         }
 
-        public async Task<User> VerifyEmailAsync(User User, string Token)
+        public async Task<User> VerifyEmailAsync(User user, string token)
         {
-            return await _http.PostJsonAsync<User>(apiurl + "/verify?token=" + Token, User);
+            return await PostJsonAsync<User>($"{Apiurl}/verify?token={token}", user);
         }
 
-        public async Task ForgotPasswordAsync(User User)
+        public async Task ForgotPasswordAsync(User user)
         {
-            await _http.PostJsonAsync(apiurl + "/forgot", User);
+            await PostJsonAsync($"{Apiurl}/forgot", user);
         }
 
-        public async Task<User> ResetPasswordAsync(User User, string Token)
+        public async Task<User> ResetPasswordAsync(User user, string token)
         {
-            return await _http.PostJsonAsync<User>(apiurl + "/reset?token=" + Token, User);
+            return await PostJsonAsync<User>($"{Apiurl}/reset?token={token}", user);
         }
-
     }
 }
diff --git a/Oqtane.Client/Startup.cs b/Oqtane.Client/Startup.cs
deleted file mode 100644
index 817e36fa..00000000
--- a/Oqtane.Client/Startup.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Microsoft.AspNetCore.Components.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Oqtane.Services;
-using System.Linq;
-using System.Net.Http;
-using Microsoft.AspNetCore.Components;
-using System.Reflection;
-using Oqtane.Modules;
-using Oqtane.Shared;
-using Oqtane.Providers;
-using Microsoft.AspNetCore.Blazor.Http;
-using Microsoft.AspNetCore.Components.Authorization;
-
-namespace Oqtane.Client
-{
-    public class Startup
-    {
-#if DEBUG || RELEASE
-        public void ConfigureServices(IServiceCollection services)
-        {
-
-        }
-
-        public void Configure(IComponentsApplicationBuilder app)
-        {
-
-        }
-#endif
-#if WASM
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // register auth services
-            services.AddAuthorizationCore();
-            services.AddScoped<IdentityAuthenticationStateProvider>();
-            services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
-
-            // register scoped core 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>();
-
-            // dynamically register module contexts and repository services
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            foreach (Assembly assembly in assemblies)
-            {
-                Type[] implementationtypes = assembly.GetTypes()
-                    .Where(item => item.GetInterfaces().Contains(typeof(IService)))
-                    .ToArray();
-                foreach (Type implementationtype in implementationtypes)
-                {
-                    Type servicetype = Type.GetType(implementationtype.AssemblyQualifiedName.Replace(implementationtype.Name, "I" + implementationtype.Name));
-                    if (servicetype != null)
-                    {
-                        services.AddScoped(servicetype, implementationtype); // traditional service interface
-                    }
-                    else
-                    {
-                        services.AddScoped(implementationtype, implementationtype); // no interface defined for service
-                    }
-                }
-            }
-        }
-
-        public void Configure(IComponentsApplicationBuilder app)
-        {
-            app.AddComponent<App>("app");
-        }
-#endif
-    }
-}
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index aaef1a67..7d9301e2 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -1,14 +1,27 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ThemeBase
 
+<div class="breadcrumbs">
+    <Breadcrumbs />
+</div>
+
 <div class="sidebar">
-    <div align="center"><Logo /></div>
-    <Menu Orientation="Vertical" />
+    <nav class="navbar">
+        <Logo />
+        <button class="navbar-toggler" aria-expanded="false" aria-controls="navbarSupportedContent"
+                aria-label="Toggle navigation" type="button" data-toggle="collapse"
+                data-target="#navbarSupportedContent">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <Menu Orientation="Vertical" />
+        </div>
+    </nav>
 </div>
 
 <div class="main">
     <div class="top-row px-4">
-        <Breadcrumbs /> <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+        <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
     <div class="container">
         <div class="row px-4">
@@ -21,7 +34,7 @@
 </div>
 
 @code {
-    public override string Panes { get { return "Content"; } }
+    public override string Panes => "Content";
 
     protected override async Task OnParametersSetAsync()
     {
diff --git a/Oqtane.Client/Themes/BlazorTheme/Theme.cs b/Oqtane.Client/Themes/BlazorTheme/Theme.cs
deleted file mode 100644
index 4f95db85..00000000
--- a/Oqtane.Client/Themes/BlazorTheme/Theme.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-
-namespace Oqtane.Themes.BlazorTheme
-{
-    public class Theme : ITheme
-    {
-        public Dictionary<string, string> Properties
-        {
-            get
-            {
-                Dictionary<string, string> properties = new Dictionary<string, string>
-                {
-                    { "Name", "Blazor Theme" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
-    }
-}
diff --git a/Oqtane.Client/Themes/BlazorTheme/ThemeInfo.cs b/Oqtane.Client/Themes/BlazorTheme/ThemeInfo.cs
new file mode 100644
index 00000000..7c52e766
--- /dev/null
+++ b/Oqtane.Client/Themes/BlazorTheme/ThemeInfo.cs
@@ -0,0 +1,14 @@
+using Oqtane.Models;
+
+namespace Oqtane.Themes.BlazorTheme
+{
+    public class ThemeInfo : ITheme
+    {
+        public Theme Theme => new Theme
+        {
+            Name = "Blazor Theme",
+            Version = "1.0.0"
+        };
+
+    }
+}
diff --git a/Oqtane.Client/Themes/Controls/Breadcrumbs.razor b/Oqtane.Client/Themes/Controls/Breadcrumbs.razor
index 45f98830..7175f85d 100644
--- a/Oqtane.Client/Themes/Controls/Breadcrumbs.razor
+++ b/Oqtane.Client/Themes/Controls/Breadcrumbs.razor
@@ -1,31 +1,34 @@
 @namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 
-@if (breadcrumbs != "")
+@if (BreadCrumbPages.Any())
 {
-    @((MarkupString)breadcrumbs)
+    <ol class="breadcrumb">
+        @foreach (var p in BreadCrumbPages)
+        {
+            <li class="breadcrumb-item @ActiveClass(p)">
+                <a href="@NavigateUrl(p.Path)">@p.Name</a>
+            </li>
+        }
+    </ol>
 }
 
 @code {
-    string breadcrumbs = "";
 
-    protected override void OnParametersSet()
+    protected IEnumerable<Page> BreadCrumbPages => GetBreadCrumbPages().Reverse().ToList();
+
+    protected string ActiveClass(Page page)
     {
-        breadcrumbs = "";
-        int? pageid = PageState.Page.PageId;
-        for (int i = PageState.Pages.Count - 1; i >= 0; i--)
+        return (page.PageId == PageState.Page.PageId) ? " active" : string.Empty;
+    }
+ 
+    private IEnumerable<Page> GetBreadCrumbPages()
+    {
+        var page = PageState.Page;
+        do
         {
-            Page p = PageState.Pages[i];
-            if (p.PageId == pageid)
-            {
-                breadcrumbs = "<li class=\"breadcrumb-item" + ((p.PageId == PageState.Page.PageId) ? " active" : "") +
-                    "\"><a href=\"" + NavigateUrl(p.Path) + "\">" + p.Name + "</a></li>" + breadcrumbs;
-                pageid = p.ParentId;
-            }
-        }
-        if (breadcrumbs != "")
-        {
-            breadcrumbs = "<ol class=\"breadcrumb\">" + breadcrumbs + "</ol>";
-        }
+            yield return page;
+            page = PageState.Pages.FirstOrDefault(p => page != null && p.PageId == page.ParentId);
+        } while (page != null);
     }
 }
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 685a11ef..fe9e5486 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -1,4 +1,5 @@
 @namespace Oqtane.Themes.Controls
+@using Oqtane.Enums
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -9,7 +10,7 @@
 @inject IPageModuleService PageModuleService
 @inject ILogService logger
 
-@if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, PageState.Page.Permissions))
+@if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, PageState.Page.Permissions))
 {
     <div class="app-controlpanel" style="@_display">
 
@@ -86,22 +87,36 @@
                             @if (_moduleDefinitions != null)
                             {
                                 <select class="form-control" @onchange="(e => CategoryChanged(e))">
-                                    <option value="-">&lt;Common Modules&gt;</option>
                                     @foreach (var category in _categories)
                                     {
-                                        <option value="@category">@category</option>
+                                        if (category == _category)
+                                        {
+                                            <option value="@category" selected>@category Modules</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="@category">@category Modules</option>
+                                        }
                                     }
                                 </select>
-                                <select class="form-control" @bind="@_moduleDefinitionName">
-                                    <option value="-">&lt;Select Module&gt;</option>
+                                <select class="form-control" @onchange="(e => ModuleChanged(e))">
+                                    @if (_moduleDefinitionName == "-")
+                                    {
+                                        <option value="-" selected>&lt;Select Module&gt;</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="-">&lt;Select Module&gt;</option>
+                                    }
                                     @foreach (var moduledefinition in _moduleDefinitions)
                                     {
-                                        if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.Utilize, moduledefinition.Permissions))
+                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
                                         {
                                             <option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
                                         }
                                     }
                                 </select>
+                                @((MarkupString)@_description)                                
                             }
                         }
                         else
@@ -190,11 +205,29 @@
 @if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, PageState.Page.Permissions))
 {
     <button type="button" class="btn @ButtonClass" @onclick="ShowControlPanel">
-        <span class="oi oi-menu"></span>
+        <span class="oi oi-cog"></span>
     </button>
 }
 
 @code {
+    private bool _deleteConfirmation = false;
+    private string _moduleType = "new";
+    private List<string> _categories = new List<string>();
+    private List<ModuleDefinition> _allModuleDefinitions;
+    private List<ModuleDefinition> _moduleDefinitions;
+    private List<Page> _pages = new List<Page>();
+    private string _pageId = "-";
+    private string _moduleId = "-";
+    private List<Module> _modules = new List<Module>();
+    private Dictionary<string, string> _containers = new Dictionary<string, string>();
+    private string _moduleDefinitionName = "-";
+    private string _category = "Common";
+    private string _description = "";
+    private string _pane = "";
+    private string _title = "";
+    private string _containerType = "";
+    private string _display = "display: none;";
+    private string _message = "";
 
     [Parameter]
     public string ButtonClass { get; set; }
@@ -208,37 +241,23 @@
     [Parameter]
     public string BodyClass { get; set; }
 
-    bool _deleteConfirmation = false;
-    string _moduleType = "new";
-    List<string> _categories = new List<string>();
-    List<ModuleDefinition> _allModuleDefinitions;
-    List<ModuleDefinition> _moduleDefinitions;
-    List<Page> _pages = new List<Page>();
-    string _pageId = "-";
-    string _moduleId = "-";
-    List<Module> _modules = new List<Module>();
-    Dictionary<string, string> _containers = new Dictionary<string, string>();
-    string _moduleDefinitionName = "-";
-    string _pane = "";
-    string _title = "";
-    string _containerType = "";
-    string _display = "display: none;";
-    string _message = "";
-
     protected override async Task OnParametersSetAsync()
     {
         if (string.IsNullOrEmpty(ButtonClass))
         {
             ButtonClass = "btn-outline-primary";
         }
+
         if (string.IsNullOrEmpty(CardClass))
         {
             CardClass = "card bg-secondary mb-3";
         }
+
         if (string.IsNullOrEmpty(HeaderClass))
         {
             HeaderClass = "card-header text-white";
         }
+
         if (string.IsNullOrEmpty(BodyClass))
         {
             BodyClass = "card-body";
@@ -248,7 +267,23 @@
         {
             _pages?.Clear();
 
+            foreach (Page p in PageState.Pages)
+            {
+                if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, p.Permissions))
+                {
+                    _pages.Add(p);
+                }
+            }
+
+            var panes = PageState.Page.Panes.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+            _pane = panes.Count() == 1 ? panes.SingleOrDefault() : "";
+            var themes = await ThemeService.GetThemesAsync();
+            _containers = ThemeService.GetContainerTypes(themes);
+            _containerType = PageState.Site.DefaultContainerType;
+
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+
+            _categories = new List<string>();
             foreach (ModuleDefinition moduledefinition in _allModuleDefinitions)
             {
                 if (moduledefinition.Categories != "")
@@ -262,34 +297,35 @@
                     }
                 }
             }
-            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories == "").ToList();
-            foreach (Page p in PageState.Pages)
-            {
-                if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, p.Permissions))
-                {
-                    _pages.Add(p);
-                }
-            }
-            var panes = PageState.Page.Panes.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
-            _pane = panes.Count() == 1 ? panes.SingleOrDefault() : "";
-            List<Theme> themes = await ThemeService.GetThemesAsync();
-            _containers = ThemeService.GetContainerTypes(themes);
-            _containerType = PageState.Site.DefaultContainerType;
+
+            _category = "Common";
+            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
+            _moduleDefinitionName = "-";
+            _description = "";
         }
     }
 
     private void CategoryChanged(ChangeEventArgs e)
     {
-        string category = (string) e.Value;
-        if (category == "-")
+        _category = (string) e.Value;
+        _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
+        _moduleDefinitionName = "-";
+        _description = "";
+        StateHasChanged();
+    }
+
+    private void ModuleChanged(ChangeEventArgs e)
+    {
+        _moduleDefinitionName = (string)e.Value;
+        if (_moduleDefinitionName != "-")
         {
-            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories == "").ToList();
+            var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == _moduleDefinitionName);
+            _description = "<br /><div class=\"alert alert-info\" role=\"alert\">" + moduleDefinition.Description + "</div>";
         }
         else
         {
-            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(category)).ToList();
+            _description = "";
         }
-        _moduleDefinitionName = "-";
         StateHasChanged();
     }
 
@@ -297,6 +333,7 @@
     {
         _pageId = (string) e.Value;
         _modules?.Clear();
+
         if (_pageId != "-")
         {
             foreach (Module module in PageState.Modules.Where(item => item.PageId == int.Parse(_pageId) && !item.IsDeleted))
@@ -307,6 +344,7 @@
                 }
             }
         }
+
         _moduleId = "-";
         StateHasChanged();
     }
@@ -345,6 +383,7 @@
                         pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(_moduleId))?.Title;
                     }
                 }
+
                 pageModule.Pane = _pane;
                 pageModule.Order = int.MaxValue;
                 pageModule.ContainerType = _containerType;
@@ -360,6 +399,7 @@
                 _message = "<br /><div class=\"alert alert-success\" role=\"alert\">Module Added To Page</div>";
 
                 _moduleDefinitionName = "-";
+                _description = "";
                 _pane = "";
                 _title = "";
                 _containerType = "";
@@ -407,7 +447,7 @@
     private void ShowControlPanel()
     {
         _message = "";
-        _display = "width: 25%; minwidth:300px";
+        _display = "width: 25%; min-width: 375px;";
         StateHasChanged();
     }
 
@@ -425,18 +465,21 @@
         switch (location)
         {
             case "Admin":
-    // get admin dashboard moduleid
+                // get admin dashboard moduleid
                 module = PageState.Modules.FirstOrDefault(item => item.ModuleDefinitionName == Constants.AdminDashboardModule);
+
                 if (module != null)
                 {
                     NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, module.ModuleId, "Index", ""));
                 }
+
                 break;
             case "Add":
             case "Edit":
                 string url = "";
-    // get page management moduleid
+                // get page management moduleid
                 module = PageState.Modules.FirstOrDefault(item => item.ModuleDefinitionName == Constants.PageManagementModule);
+
                 if (module != null)
                 {
                     switch (location)
@@ -449,10 +492,12 @@
                             break;
                     }
                 }
+
                 if (url != "")
                 {
                     NavigationManager.NavigateTo(url);
                 }
+
                 break;
         }
     }
@@ -466,7 +511,8 @@
     private async Task DeletePage()
     {
         ConfirmDelete();
-        Page page = PageState.Page;
+
+        var page = PageState.Page;
         try
         {
             if (page.UserId == null)
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index f8dbddd3..55d975aa 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -1,9 +1,5 @@
 @namespace Oqtane.Themes.Controls
-@inherits ThemeControlBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
-@inject IJSRuntime jsRuntime
-@inject IServiceProvider ServiceProvider
+@inherits LoginBase
 
 <AuthorizeView>
     <Authorizing>
@@ -16,37 +12,3 @@
         <button type="button" class="btn btn-primary" @onclick="LoginUser">Login</button>
     </NotAuthorized>
 </AuthorizeView>
-
-
-@code {
-    private void LoginUser()
-    {
-        string returnurl = PageState.Alias.Path;
-        if (PageState.Page.Path != "/")
-        {
-            returnurl += "/" + PageState.Page.Path;
-        }
-        NavigationManager.NavigateTo(NavigateUrl("login", "returnurl=" + returnurl));
-    }
-
-    private async Task LogoutUser()
-    {
-        await UserService.LogoutUserAsync(PageState.User);
-
-        var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-        if (authstateprovider == null)
-        {
-            // server-side Blazor
-            var interop = new Interop(jsRuntime);
-            string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-            var fields = new { __RequestVerificationToken = antiforgerytoken, returnurl = (PageState.Alias.Path + "/" + PageState.Page.Path) };
-            await interop.SubmitForm("/pages/logout/", fields);
-        }
-        else
-        {
-            // client-side Blazor
-            authstateprovider.NotifyAuthenticationChanged();
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
-        }
-    }
-}
diff --git a/Oqtane.Client/Themes/Controls/LoginBase.cs b/Oqtane.Client/Themes/Controls/LoginBase.cs
new file mode 100644
index 00000000..60bbb781
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/LoginBase.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using Oqtane.Providers;
+using Oqtane.Services;
+using Oqtane.UI;
+
+namespace Oqtane.Themes.Controls
+{
+    public class LoginBase : ThemeControlBase
+    {
+        [Inject] public NavigationManager NavigationManager {get;set;}
+        [Inject]public IUserService UserService {get;set;}
+        [Inject]public IJSRuntime jsRuntime {get;set;}
+        [Inject]public IServiceProvider ServiceProvider {get;set;}
+
+        protected void LoginUser()
+        {
+            var returnurl = PageState.Alias.Path;
+            if (PageState.Page.Path != "/")
+            {
+                returnurl += "/" + PageState.Page.Path;
+            }
+            NavigationManager.NavigateTo(NavigateUrl("login", "returnurl=" + returnurl));
+        }
+
+        protected async Task LogoutUser()
+        {
+            await UserService.LogoutUserAsync(PageState.User);
+
+            if (PageState.Runtime == Runtime.Server)
+            {
+                // server-side Blazor
+                var interop = new Interop(jsRuntime);
+                string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
+                var fields = new { __RequestVerificationToken = antiforgerytoken, returnurl = (PageState.Alias.Path + "/" + PageState.Page.Path) };
+                await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/logout/", fields);
+            }
+            else
+            {
+                // client-side Blazor
+                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                authstateprovider.NotifyAuthenticationChanged();
+                NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "reload"));
+            }
+        }
+    }
+}
diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor
index afe78f5e..fe9929f4 100644
--- a/Oqtane.Client/Themes/Controls/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Logo.razor
@@ -2,17 +2,20 @@
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 
-@((MarkupString)logo)
+@if (PageState.Site.LogoFileId != null)
+{
+    <a href="@Href">
+        <img class="img-fluid" src="@ContentUrl(PageState.Site.LogoFileId.Value)" alt="@PageState.Site.Name"/>
+    </a>
+}
 
 @code {
-    string logo = "";
-
-    protected override void OnParametersSet()
+    string Href
     {
-        if (PageState.Site.LogoFileId != null)
+        get
         {
-            Uri uri = new Uri(NavigationManager.Uri);
-            logo = "<a href=\"" + uri.Scheme + "://" + uri.Authority + "\"><img src=\"" + ContentUrl(PageState.Site.LogoFileId.Value) + "\" alt=\"" + PageState.Site.Name + "\"/></a>";
+            var uri = new Uri(NavigationManager.Uri);
+            return $"{uri.Scheme}://{uri.Authority}";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor
index 07e09d34..0f2610cc 100644
--- a/Oqtane.Client/Themes/Controls/Menu.razor
+++ b/Oqtane.Client/Themes/Controls/Menu.razor
@@ -1,98 +1,20 @@
 @namespace Oqtane.Themes.Controls
-@inherits ThemeControlBase
 
-@if (menu != "")
+@switch (Orientation)
 {
-    <div class="app-menu">
-        @((MarkupString)menu)
-    </div>
+    case "Horizontal":
+        <MenuHorizontal/>
+        break;
+    default: // Vertical
+    {
+        <MenuVertical/>
+        break;
+    }
 }
 
-@code {
+@code{
+
     [Parameter]
     public string Orientation { get; set; }
 
-    string menu = "";
-
-    protected override void OnParametersSet()
-    {
-        switch (Orientation)
-        {
-            case "Horizontal":
-                CreateHorizontalMenu();
-                break;
-            default: // Vertical
-                CreateVerticalMenu();
-                break;
-        }
-    }
-
-    private void CreateVerticalMenu()
-    {
-        int level = -1;
-        int securitylevel = int.MaxValue;
-
-        menu = "<ul class=\"nav flex-column\">\n";
-
-        foreach (Page p in PageState.Pages.Where(item => item.IsNavigation && !item.IsDeleted))
-        {
-            if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, p.Permissions) && p.Level <= securitylevel)
-            {
-                securitylevel = int.MaxValue;
-
-                menu += "<li class=\"nav-item px-3\">";
-                menu += "<a href=\"" + NavigateUrl(p.Path) + "\" class=\"nav-link\" style=\"padding-left: " + ((p.Level + 1) * 15).ToString() + "px !important;\">";
-                if (p.HasChildren)
-                {
-                    menu += "<i class=\"oi oi-chevron-right\"></i>";
-                }
-                if (p.Icon != "")
-                {
-                    menu += "<span class=\"oi oi-" + p.Icon + "\" aria-hidden=\"true\"></span>";
-                }
-                menu += p.Name;
-                menu += "</a>\n";
-                menu += "</li>\n";
-
-                level = p.Level;
-            }
-            else
-            {
-                if (securitylevel == int.MaxValue)
-                {
-                    securitylevel = p.Level;
-                }
-            }
-        }
-        menu += "</ul>";
-    }
-
-    private void CreateHorizontalMenu()
-    {
-        menu = "<button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#Menu\" aria-controls=\"Menu\" aria-expanded=\"false\" aria-label=\"Toggle navigation\"><span class=\"navbar-toggler-icon\"></span></button>";
-        menu += "<div class=\"collapse navbar-collapse\" id=\"Menu\">";
-        menu += "<ul class=\"navbar-nav mr-auto\">";
-        foreach (Page p in PageState.Pages.Where(item => item.IsNavigation && !item.IsDeleted))
-        {
-            if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, p.Permissions) && p.ParentId == PageState.Page.ParentId && p.Level == PageState.Page.Level)
-            {
-                if (p.PageId == PageState.Page.PageId)
-                {
-                    menu += "<li class=\"nav-item active\">" +
-                        "<a class=\"nav-link\" href=\"" + NavigateUrl(p.Path) + "\">" +
-                        ((p.Icon != "") ? "<span class=\"oi oi-" + p.Icon + "\" aria-hidden=\"true\"></span> " : "") + 
-                        p.Name + " <span class=\"sr-only\">(current)</span></a></li>";
-                }
-                else
-                {
-                    menu += "<li class=\"nav-item\">" +
-                        "<a class=\"nav-link\" href=\"" + NavigateUrl(p.Path) + "\">" +
-                        ((p.Icon != "") ? "<span class=\"oi oi-" + p.Icon + "\" aria-hidden=\"true\"></span> " : "") + 
-                        p.Name + "</a></li>";
-                }
-            }
-        }
-        menu += "</ul>";
-        menu += "</div>";
-    }
 }
diff --git a/Oqtane.Client/Themes/Controls/MenuBase.cs b/Oqtane.Client/Themes/Controls/MenuBase.cs
new file mode 100644
index 00000000..c63f0dc8
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/MenuBase.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Linq;
+using Oqtane.Models;
+using Oqtane.Security;
+using Oqtane.Shared;
+
+namespace Oqtane.Themes.Controls
+{
+    public class MenuBase : ThemeControlBase
+    {
+        protected IEnumerable<Page> MenuPages => GetMenuPages().ToList();
+
+        protected string GetTarget(Page page)
+        {
+            return page.Url != null && page.Url.StartsWith("http") ? "_new" : string.Empty;
+        }
+
+        protected string GetUrl(Page page)
+        {
+            return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+        }
+
+        private IEnumerable<Page> GetMenuPages()
+        {
+            var securityLevel = int.MaxValue;
+            foreach (Page p in PageState.Pages.Where(item => item.IsNavigation && !item.IsDeleted))
+            {
+                if (p.Level <= securityLevel && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                {
+                    securityLevel = int.MaxValue;
+                    yield return p;
+                }
+                else
+                {
+                    if (securityLevel == int.MaxValue)
+                    {
+                        securityLevel = p.Level;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor b/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor
new file mode 100644
index 00000000..708a3059
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor
@@ -0,0 +1,42 @@
+@namespace Oqtane.Themes.Controls
+@inherits MenuBase
+@if (MenuPages.Any())
+{
+    <div class="app-menu">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="Menu">
+            <ul class="navbar-nav mr-auto">
+                @foreach (var p in MenuPages)
+                {
+                    if (p.PageId == PageState.Page.PageId)
+                    {
+                        <li class="nav-item active">
+                            <a class="nav-link" href="@NavigateUrl(p.Path)">
+                                @if (p.Icon != string.Empty)
+                                {
+                                    <span class="oi oi-@p.Icon" aria-hidden="true"></span>
+                                }
+                                @p.Name<span class="sr-only">(current)</span>
+                            </a>
+                        </li>
+                    }
+                    else
+                    {
+                        <li class="nav-item">
+                            <a class="nav-link" href="@NavigateUrl(p.Path)">
+                                @if (p.Icon != string.Empty)
+                                {
+                                    <span class="oi oi-@p.Icon" aria-hidden="true"></span>
+                                }
+                                @p.Name
+                            </a>
+                        </li>
+                    }
+                }
+            </ul>
+        </div>
+    </div>
+}
diff --git a/Oqtane.Client/Themes/Controls/MenuVertical.razor b/Oqtane.Client/Themes/Controls/MenuVertical.razor
new file mode 100644
index 00000000..8991b277
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/MenuVertical.razor
@@ -0,0 +1,27 @@
+@namespace Oqtane.Themes.Controls
+@inherits MenuBase
+@if (MenuPages.Any())
+{
+    <div class="app-menu">
+        <ul class="nav flex-column">
+            @foreach (var p in MenuPages)
+            {
+                <li class="nav-item px-3">
+                    <a href="@GetUrl(p)" class="nav-link" style="padding-left:@((p.Level + 1) * 15)px !important;" target="@GetTarget(p)">
+
+                        @if (p.HasChildren)
+                        {
+                            <i class="oi oi-chevron-right"></i>
+                        }
+                        @if (p.Icon != string.Empty)
+                        {
+                            <span class="oi oi-@p.Icon" aria-hidden="true"></span>
+                        }
+                        @p.Name
+
+                    </a>
+                </li>
+            }
+        </ul>
+    </div>
+}
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index c0be940a..6ca55f1a 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -1,128 +1,20 @@
 @namespace Oqtane.Themes.Controls
-@inherits ContainerBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
-@inject IPageModuleService PageModuleService
+@inherits ModuleActionsBase
 
 @if (PageState.EditMode && !PageState.Page.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions))
 {
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>
     <div 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)
+    @foreach (var action in Actions)
     {
-        if (action.Action != "")
+        if (string.IsNullOrEmpty(action.Name))
         {
-            <a class="dropdown-item" @onclick="(async () => await ModuleAction(action.Action))">@action.Name</a>
+            <div class="dropdown-divider"></div>
         }
         else
         {
-            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" @onclick="(async () => await ModuleAction(action))">@action.Name</a>
         }
     }
     </div>
 }
-
-@code {
-    List<ActionViewModel> actions;
-
-    protected override void OnParametersSet()
-    {
-        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions))
-        {
-            actions = new List<ActionViewModel>();
-            actions.Add(new ActionViewModel { Action = "settings", Name = "Manage Settings" });
-            if (ModuleState.ModuleDefinition != null && ModuleState.ModuleDefinition.ServerAssemblyName != "")
-            {
-                actions.Add(new ActionViewModel { Action = "import", Name = "Import Content" });
-                actions.Add(new ActionViewModel { Action = "export", Name = "Export Content" });
-            }
-            actions.Add(new ActionViewModel { Action = "delete", Name = "Delete Module" });
-            actions.Add(new ActionViewModel { Action = "", Name = "" });
-            if (ModuleState.PaneModuleIndex > 0)
-            {
-                actions.Add(new ActionViewModel { Action = "<<", Name = "Move To Top" });
-            }
-            if (ModuleState.PaneModuleIndex > 0)
-            {
-                actions.Add(new ActionViewModel { Action = "<", Name = "Move Up" });
-            }
-            if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1))
-            {
-                actions.Add(new ActionViewModel { Action = ">", Name = "Move Down" });
-            }
-            if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1))
-            {
-                actions.Add(new ActionViewModel { Action = ">>", Name = "Move To Bottom" });
-            }
-            foreach (string pane in PageState.Page.Panes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                if (pane != ModuleState.Pane)
-                {
-                    actions.Add(new ActionViewModel { Action = pane, Name = "Move To " + pane + " Pane" });
-                }
-            }
-        }
-    }
-
-    protected async Task ModuleAction(string action)
-    {
-        if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions))
-        {
-            PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-
-            string url = NavigateUrl();
-            switch (action)
-            {
-                case "<<":
-                    pagemodule.Order = 0;
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    break;
-                case "<":
-                    pagemodule.Order -= 3;
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    break;
-                case ">":
-                    pagemodule.Order += 3;
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    break;
-                case ">>":
-                    pagemodule.Order = int.MaxValue;
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    break;
-                case "settings":
-                    url = EditUrl(pagemodule.ModuleId, "Settings");
-                    break;
-                case "import":
-                    url = EditUrl(pagemodule.ModuleId, "Import");
-                    break;
-                case "export":
-                    url = EditUrl(pagemodule.ModuleId, "Export");
-                    break;
-                case "delete":
-                    pagemodule.IsDeleted = true;
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    break;
-                default: // move to pane
-                    string pane = pagemodule.Pane;
-                    pagemodule.Pane = action;
-                    pagemodule.Order = int.MaxValue; // add to bottom of pane
-                    await PageModuleService.UpdatePageModuleAsync(pagemodule);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-                    await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pane);
-                    break;
-            }
-            NavigationManager.NavigateTo(url);
-        }
-    }
-
-    public class ActionViewModel
-    {
-        public string Action { set; get; }
-        public string Name { set; get; }
-    }
-}
diff --git a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
new file mode 100644
index 00000000..c5254428
--- /dev/null
+++ b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Oqtane.Models;
+using Oqtane.Security;
+using Oqtane.Services;
+using Oqtane.Shared;
+
+// ReSharper disable UnassignedGetOnlyAutoProperty
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace Oqtane.Themes.Controls
+{
+    public class ModuleActionsBase : ContainerBase
+    {
+        [Inject] public NavigationManager NavigationManager { get; set; }
+        [Inject] public IPageModuleService PageModuleService { get; set; }
+
+        protected List<ActionViewModel> Actions;
+
+        protected override void OnParametersSet()
+        {
+            Actions = GetActions();
+        }
+
+        protected virtual List<ActionViewModel> GetActions()
+        {
+            var actionList = new List<ActionViewModel>();
+            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions))
+            {
+                actionList.Add(new ActionViewModel {Name = "Manage Settings", Action = async (u, m) => await Settings(u, m)});
+
+                if (ModuleState.ModuleDefinition != null && ModuleState.ModuleDefinition.ServerManagerType != "")
+                {
+                    actionList.Add(new ActionViewModel {Name = "Import Content", Action = async (u, m) => await EditUrlAsync(u, m.ModuleId, "Import")});
+                    actionList.Add(new ActionViewModel {Name = "Export Content", Action = async (u, m) => await EditUrlAsync(u, m.ModuleId, "Export")});
+                }
+
+                actionList.Add(new ActionViewModel {Name = "Delete Module", Action = async (u, m) => await DeleteModule(u, m)});
+                actionList.Add(new ActionViewModel {Name = ""});
+
+                if (ModuleState.PaneModuleIndex > 0)
+                {
+                    actionList.Add(new ActionViewModel {Name = "Move To Top", Action = async (s, m) => await MoveTop(s, m)});
+                }
+
+                if (ModuleState.PaneModuleIndex > 0)
+                {
+                    actionList.Add(new ActionViewModel {Name = "Move Up", Action = async (s, m) => await MoveUp(s, m)});
+                }
+
+                if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1))
+                {
+                    actionList.Add(new ActionViewModel {Name = "Move Down", Action = async (s, m) => await MoveDown(s, m)});
+                }
+
+                if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1))
+                {
+                    actionList.Add(new ActionViewModel {Name = "Move To Bottom", Action = async (s, m) => await MoveBottom(s, m)});
+                }
+
+                foreach (string pane in PageState.Page.Panes.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    if (pane != ModuleState.Pane)
+                    {
+                        actionList.Add(new ActionViewModel {Name = "Move To " + pane + " Pane", Action = async (s, m) => await MoveToPane(s, pane, m)});
+                    }
+                }
+            }
+
+            return actionList;
+        }
+
+        private async Task<string> EditUrlAsync(string url, int moduleId, string import)
+        {
+            await Task.Yield();
+            return EditUrl(moduleId, import);
+        }
+
+        protected async Task ModuleAction(ActionViewModel action)
+        {
+            if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions))
+            {
+                PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+
+                string url = NavigateUrl();
+
+                if (action.Action != null)
+                {
+                    url = await action.Action(url, pagemodule);
+                }
+
+                NavigationManager.NavigateTo(url);
+            }
+        }
+
+        private async Task<string> MoveToPane(string url, string newPane, PageModule pagemodule)
+        {
+            string oldPane = pagemodule.Pane;
+            pagemodule.Pane = newPane;
+            pagemodule.Order = int.MaxValue; // add to bottom of pane
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, oldPane);
+            return url;
+        }
+
+        private async Task<string> DeleteModule(string url, PageModule pagemodule)
+        {
+            pagemodule.IsDeleted = true;
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            return url;
+        }
+
+        private async Task<string> Settings(string url, PageModule pagemodule)
+        {
+            await Task.Yield();
+            url = EditUrl(pagemodule.ModuleId, "Settings");
+            return url;
+        }
+
+        private async Task<string> MoveTop(string s, PageModule pagemodule)
+        {
+            pagemodule.Order = 0;
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            return s;
+        }
+
+        private async Task<string> MoveBottom(string s, PageModule pagemodule)
+        {
+            pagemodule.Order = int.MaxValue;
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            return s;
+        }
+
+        private async Task<string> MoveUp(string s, PageModule pagemodule)
+        {
+            pagemodule.Order -= 3;
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            return s;
+        }
+
+        private async Task<string> MoveDown(string s, PageModule pagemodule)
+        {
+            pagemodule.Order += 3;
+            await PageModuleService.UpdatePageModuleAsync(pagemodule);
+            await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+            return s;
+        }
+
+        public class ActionViewModel
+        {
+            public string Name { set; get; }
+
+            public Func<string, PageModule, Task<string>> Action { set; get; }
+        }
+    }
+}
diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index eec5bc28..bb8d6f62 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -4,7 +4,7 @@
 @((MarkupString)title)
 
 @code {
-    string title = "";
+    private string title = "";
 
     protected override Task OnParametersSetAsync()
     {
diff --git a/Oqtane.Client/Themes/Controls/UserProfile.razor b/Oqtane.Client/Themes/Controls/UserProfile.razor
index f43f3747..1f101caf 100644
--- a/Oqtane.Client/Themes/Controls/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/UserProfile.razor
@@ -10,7 +10,10 @@
         <button type="button" class="btn btn-primary" @onclick="UpdateProfile">@context.User.Identity.Name</button>
     </Authorized>
     <NotAuthorized>
-        <button type="button" class="btn btn-primary" @onclick="RegisterUser">Register</button>
+        @if (PageState.Site.AllowRegistration)
+        {
+            <button type="button" class="btn btn-primary" @onclick="RegisterUser">Register</button>
+        }
     </NotAuthorized>
 </AuthorizeView>
 
diff --git a/Oqtane.Client/Themes/ITheme.cs b/Oqtane.Client/Themes/ITheme.cs
index 134ec3a2..16d77bf4 100644
--- a/Oqtane.Client/Themes/ITheme.cs
+++ b/Oqtane.Client/Themes/ITheme.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Themes
 {
     public interface ITheme
     {
-        Dictionary<string, string> Properties { get; }
+        Theme Theme { get; }
     }
 }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index 420355b8..89623e29 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -14,7 +14,7 @@
 </main>
 
 @code {
-    public override string Panes { get { return ""; } }
+    public override string Panes => string.Empty;
 
     protected override async Task OnParametersSetAsync()
     {
diff --git a/Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor b/Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor
index c6ab6bb3..24ba1146 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor
@@ -14,5 +14,5 @@
 </div>
 
 @code {
-    public override string Panes { get { return "Top;Left;Content;Right;Bottom"; } }
+    public override string Panes => "Top;Left;Content;Right;Bottom";
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor b/Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor
index 69a00363..c89c6318 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor
@@ -6,5 +6,5 @@
 </div>
 
 @code {
-    public override string Panes { get { return "Content"; } }
+    public override string Panes => "Content";
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Theme.cs b/Oqtane.Client/Themes/OqtaneTheme/Theme.cs
deleted file mode 100644
index 4a9ab697..00000000
--- a/Oqtane.Client/Themes/OqtaneTheme/Theme.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-
-namespace Oqtane.Themes.OqtaneTheme
-{
-    public class Theme : ITheme
-    {
-        public Dictionary<string, string> Properties
-        {
-            get
-            {
-                Dictionary<string, string> properties = new Dictionary<string, string>
-                {
-                    { "Name", "Oqtane Theme" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
-    }
-}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs b/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs
new file mode 100644
index 00000000..39784cf3
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs
@@ -0,0 +1,13 @@
+using Oqtane.Models;
+
+namespace Oqtane.Themes.OqtaneTheme
+{
+    public class ThemeInfo : ITheme
+    {
+        public Theme Theme => new Theme
+        {
+            Name = "Oqtane Theme",
+            Version = "1.0.0"
+        };
+    }
+}
diff --git a/Oqtane.Client/Themes/ThemeControlBase.cs b/Oqtane.Client/Themes/ThemeControlBase.cs
index 13cc1923..b3a2314a 100644
--- a/Oqtane.Client/Themes/ThemeControlBase.cs
+++ b/Oqtane.Client/Themes/ThemeControlBase.cs
@@ -41,9 +41,7 @@ namespace Oqtane.Themes
 
         public string ContentUrl(int fileid)
         {
-            string url = (PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path;
-            url += Constants.ContentUrl + fileid.ToString();
-            return url;
+            return Utilities.ContentUrl(PageState.Alias, fileid);
         }
     }
 }
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 01dee688..488b48c4 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,10 +1,12 @@
 @namespace Oqtane.UI
 
-<CascadingValue Value="@ModuleState">
+<CascadingValue Value="@_moduleState">
     @DynamicComponent
 </CascadingValue>
 
 @code {
+    private Module _moduleState;
+
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
@@ -13,13 +15,11 @@
 
     RenderFragment DynamicComponent { get; set; }
 
-    Module ModuleState;
-
     protected override void OnParametersSet()
     {
-        ModuleState = Module; // passed in from Pane component
-        string container = ModuleState.ContainerType;
-        if (PageState.ModuleId != -1 && PageState.Action != "" && ModuleState.UseAdminContainer)
+        _moduleState = Module; // passed in from Pane component
+        string container = _moduleState.ContainerType;
+        if (PageState.ModuleId != -1 && PageState.Action != "" && _moduleState.UseAdminContainer)
         {
             container = Constants.DefaultAdminContainer;
         }
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index d36edf35..c3afd00d 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -18,10 +18,10 @@
                 <tbody>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Database Type: </label>
+                            <label class="control-label" style="font-weight: bold">Database Type: </label>
                         </td>
                         <td>
-                            <select class="custom-select" @bind="@DatabaseType">
+                            <select class="custom-select" @bind="@_databaseType">
                                 <option value="LocalDB">Local Database</option>
                                 <option value="SQLServer">SQL Server</option>
                             </select>
@@ -29,23 +29,23 @@
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Server: </label>
+                            <label class="control-label" style="font-weight: bold">Server: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" @bind="@ServerName" />
+                            <input type="text" class="form-control" @bind="@_serverName" />
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Database: </label>
+                            <label class="control-label" style="font-weight: bold">Database: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" @bind="@DatabaseName" />
+                            <input type="text" class="form-control" @bind="@_databaseName" />
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Integrated Security: </label>
+                            <label class="control-label" style="font-weight: bold">Integrated Security: </label>
                         </td>
                         <td>
                             <select class="custom-select" @onchange="SetIntegratedSecurity">
@@ -54,20 +54,20 @@
                             </select>
                         </td>
                     </tr>
-                    <tr style="@IntegratedSecurityDisplay">
+                    <tr style="@_integratedSecurityDisplay">
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
+                            <label class="control-label" style="font-weight: bold">Username: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" @bind="@Username" />
+                            <input type="text" class="form-control" @bind="@_username" />
                         </td>
                     </tr>
-                    <tr style="@IntegratedSecurityDisplay">
+                    <tr style="@_integratedSecurityDisplay">
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
+                            <label class="control-label" style="font-weight: bold">Password: </label>
                         </td>
                         <td>
-                            <input type="password" class="form-control" @bind="@Password" />
+                            <input type="password" class="form-control" @bind="@_password" />
                         </td>
                     </tr>
                 </tbody>
@@ -79,34 +79,34 @@
                 <tbody>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
+                            <label class="control-label" style="font-weight: bold">Username: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" @bind="@HostUsername" readonly />
+                            <input type="text" class="form-control" @bind="@_hostUsername" readonly />
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
+                            <label class="control-label" style="font-weight: bold">Password: </label>
                         </td>
                         <td>
-                            <input type="password" class="form-control" @bind="@HostPassword" />
+                            <input type="password" class="form-control" @bind="@_hostPassword" />
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Confirm: </label>
+                            <label class="control-label" style="font-weight: bold">Confirm: </label>
                         </td>
                         <td>
-                            <input type="password" class="form-control" @bind="@ConfirmPassword" />
+                            <input type="password" class="form-control" @bind="@_confirmPassword" />
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Email: </label>
+                            <label class="control-label" style="font-weight: bold">Email: </label>
                         </td>
                         <td>
-                            <input type="text" class="form-control" @bind="@HostEmail" />
+                            <input type="text" class="form-control" @bind="@_hostEmail" />
                         </td>
                     </tr>
                 </tbody>
@@ -117,95 +117,87 @@
     <div class="row">
         <div class="mx-auto text-center">
             <button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
-            @((MarkupString)@Message)
+            @((MarkupString) _message)
         </div>
-        <div class="app-progress-indicator" style="@LoadingDisplay"></div>
+        <div class="app-progress-indicator" style="@_loadingDisplay"></div>
     </div>
 </div>
 
 @code {
-    private string DatabaseType = "LocalDB";
-    private string ServerName = "(LocalDb)\\MSSQLLocalDB";
-    private string DatabaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
-    private string Username = "";
-    private string Password = "";
-    private string HostUsername = Constants.HostUser;
-    private string HostPassword = "";
-    private string ConfirmPassword = "";
-    private string HostEmail = "";
-    private string Message = "";
-
-    private string IntegratedSecurityDisplay = "display: none;";
-    private string LoadingDisplay = "display: none;";
+    private string _databaseType = "LocalDB";
+    private string _serverName = "(LocalDb)\\MSSQLLocalDB";
+    private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _username = "";
+    private string _password = "";
+    private string _hostUsername = Constants.HostUser;
+    private string _hostPassword = "";
+    private string _confirmPassword = "";
+    private string _hostEmail = "";
+    private string _message = "";
+    private string _integratedSecurityDisplay = "display: none;";
+    private string _loadingDisplay = "display: none;";
 
     private void SetIntegratedSecurity(ChangeEventArgs e)
     {
-        if (Convert.ToBoolean((string)e.Value))
-        {
-            IntegratedSecurityDisplay = "display: none;";
-        }
-        else
-        {
-            IntegratedSecurityDisplay = "";
-        }
+        _integratedSecurityDisplay = Convert.ToBoolean((string)e.Value)
+            ? "display: none;"
+            : string.Empty;
     }
 
     private async Task Install()
     {
-        if (HostUsername != "" && HostPassword.Length >= 6 && HostPassword == ConfirmPassword && HostEmail != "")
+        if (_serverName != "" && _databaseName != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "")
         {
-            LoadingDisplay = "";
+            _loadingDisplay = "";
             StateHasChanged();
 
-            string connectionstring = "";
-            if (DatabaseType == "LocalDB")
+            var connectionstring = "";
+            if (_databaseType == "LocalDB")
             {
-                connectionstring = "Data Source=" + ServerName + ";AttachDbFilename=|DataDirectory|\\" + DatabaseName + ".mdf;Initial Catalog=" + DatabaseName + ";Integrated Security=SSPI;";
+                connectionstring = "Data Source=" + _serverName + ";AttachDbFilename=|DataDirectory|\\" + _databaseName + ".mdf;Initial Catalog=" + _databaseName + ";Integrated Security=SSPI;";
             }
             else
             {
-                connectionstring = "Data Source=" + ServerName + ";Initial Catalog=" + DatabaseName + ";";
-                if (IntegratedSecurityDisplay == "display: none;")
+                connectionstring = "Data Source=" + _serverName + ";Initial Catalog=" + _databaseName + ";";
+                if (_integratedSecurityDisplay == "display: none;")
                 {
                     connectionstring += "Integrated Security=SSPI;";
                 }
                 else
                 {
-                    connectionstring += "User ID=" + Username + ";Password=" + Password;
-
+                    connectionstring += "User ID=" + _username + ";Password=" + _password;
                 }
             }
-            GenericResponse response = await InstallationService.Install(connectionstring);
-            if (response.Success)
+
+            Uri uri = new Uri(NavigationManager.Uri);
+
+            var config = new InstallConfig
             {
-                Site site = new Site();
-                site.TenantId = -1; // will be populated on server
-                site.Name = "Default Site";
-                site.LogoFileId = null;
-                site.DefaultThemeType = Constants.DefaultTheme;
-                site.DefaultLayoutType = Constants.DefaultLayout;
-                site.DefaultContainerType = Constants.DefaultContainer;
-                site = await SiteService.AddSiteAsync(site, null);
+                ConnectionString = connectionstring,
+                Aliases = uri.Authority,
+                HostEmail = _hostEmail,
+                HostPassword = _hostPassword,
+                HostName = Constants.HostUser,
+                TenantName = Constants.MasterTenant,
+                IsNewTenant = true,
+                SiteName = Constants.DefaultSite
+            };
 
-                User user = new User();
-                user.SiteId = site.SiteId;
-                user.Username = HostUsername;
-                user.Password = HostPassword;
-                user.Email = HostEmail;
-                user.DisplayName = HostUsername;
-                user = await UserService.AddUserAsync(user);
-
-                NavigationManager.NavigateTo("", true);
+            var installation = await InstallationService.Install(config);
+            if (installation.Success)
+            {
+                NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
             }
             else
             {
-                Message = "<div class=\"alert alert-danger\" role=\"alert\">" + response.Message + "</div>";
-                LoadingDisplay = "display: none;";
+                _message = "<div class=\"alert alert-danger\" role=\"alert\">" + installation.Message + "</div>";
+                _loadingDisplay = "display: none;";
             }
         }
         else
         {
-            Message = "<div class=\"alert alert-danger\" role=\"alert\">Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length</div>";
+            _message = "<div class=\"alert alert-danger\" role=\"alert\">Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length</div>";
         }
     }
+
 }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 2ab8673e..73aaf029 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -43,13 +43,73 @@ namespace Oqtane.UI
             }
         }
 
+        public Task UpdateTitle(string title)
+        {
+            try
+            {
+                _jsRuntime.InvokeAsync<string>(
+                    "interop.updateTitle",
+                    title);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+        public Task IncludeMeta(string id, string attribute, string name, string content)
+        {
+            try
+            {
+                _jsRuntime.InvokeAsync<string>(
+                    "interop.includeMeta",
+                    id, attribute, name, content);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+        public Task IncludeLink(string id, string rel, string url, string type, string integrity, string crossorigin)
+        {
+            try
+            {
+                _jsRuntime.InvokeAsync<string>(
+                    "interop.includeLink",
+                    id, rel, url, type, integrity, crossorigin);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+        public Task IncludeScript(string id, string src, string content, string location, string integrity, string crossorigin)
+        {
+            try
+            {
+                _jsRuntime.InvokeAsync<string>(
+                    "interop.includeScript",
+                    id, src, content, location, integrity, crossorigin);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
         public Task IncludeCSS(string id, string url)
         {
             try
             {
                 _jsRuntime.InvokeAsync<string>(
-                    "interop.includeCSS",
-                    id, url);
+                    "interop.includeLink",
+                    id, "stylesheet", url, "text/css");
                 return Task.CompletedTask;
             }
             catch
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 7487d2de..8dfe2e03 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -1,28 +1,28 @@
 @namespace Oqtane.UI
 
-<ModuleMessage Message="@message" Type="MessageType.Error" />
+<ModuleMessage Message="@_message" Type="MessageType.Error" />
 <CascadingValue Value="this">
-    <ModuleMessage @ref="modulemessage" />
+    <ModuleMessage @ref="ModuleMessage" />
     @DynamicComponent
 </CascadingValue>
-@if (progressindicator)
+@if (_progressindicator)
 {
     <div class="app-progress-indicator"></div>
 }
 
 @code {
+    private string _message;
+    private bool _progressindicator = false;
+
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
     [CascadingParameter]
     private Module ModuleState { get; set; }
 
-    private ModuleMessage modulemessage { get; set; }
-    string message;
+    private ModuleMessage ModuleMessage { get; set; }
 
-    RenderFragment DynamicComponent { get; set; }
-
-    bool progressindicator = false;
+    private RenderFragment DynamicComponent { get; set; }
 
     protected override void OnParametersSet()
     {
@@ -48,12 +48,12 @@
                 else
                 {
                     // module does not exist with typename specified
-                    message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
+                    _message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
                 }
             }
             else
             {
-                message = "Something is wrong with moduletype";
+                _message = "Something is wrong with moduletype";
             }
 
         };
@@ -61,20 +61,20 @@
 
     public void AddModuleMessage(string message, MessageType type)
     {
-        progressindicator = false;
+        _progressindicator = false;
         StateHasChanged();
-        modulemessage.SetModuleMessage(message, type);
+        ModuleMessage.SetModuleMessage(message, type);
     }
 
     public void ShowProgressIndicator()
     {
-        progressindicator = true;
+        _progressindicator = true;
         StateHasChanged();
     }
 
     public void HideProgressIndicator()
     {
-        progressindicator = false;
+        _progressindicator = false;
         StateHasChanged();
     }
 }
diff --git a/Oqtane.Client/UI/PageState.cs b/Oqtane.Client/UI/PageState.cs
index e801ad73..a2678802 100644
--- a/Oqtane.Client/UI/PageState.cs
+++ b/Oqtane.Client/UI/PageState.cs
@@ -18,5 +18,6 @@ namespace Oqtane.UI
         public string Action { get; set; }
         public bool EditMode { get; set; }
         public DateTime LastSyncDate { get; set; }
+        public Runtime Runtime { get; set; }
     }
 }
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index d2be8b2b..9d0c7dd4 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -3,15 +3,18 @@
 @inject IModuleService ModuleService
 @inject IModuleDefinitionService ModuleDefinitionService
 
-<div class="@paneadminborder">
-    @if (panetitle != "")
+<div class="@_paneadminborder">
+    @if (_panetitle != "")
     {
-        @((MarkupString)panetitle)
+        @((MarkupString)_panetitle)
     }
     @DynamicComponent
 </div>
 
 @code {
+    private string _paneadminborder = "";
+    private string _panetitle = "";
+
     [CascadingParameter]
     protected PageState PageState { get; set; }
 
@@ -20,20 +23,17 @@
 
     RenderFragment DynamicComponent { get; set; }
 
-    string paneadminborder = "";
-    string panetitle = "";
-
     protected override void OnParametersSet()
     {
         if (PageState.EditMode && !PageState.Page.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, PageState.Page.Permissions) && Name != Constants.AdminPane)
         {
-            paneadminborder = "app-pane-admin-border";
-            panetitle = "<div class=\"app-pane-admin-title\">" + Name + " Pane</div>";
+            _paneadminborder = "app-pane-admin-border";
+            _panetitle = "<div class=\"app-pane-admin-title\">" + Name + " Pane</div>";
         }
         else
         {
-            paneadminborder = "";
-            panetitle = "";
+            _paneadminborder = "";
+            _panetitle = "";
         }
 
         DynamicComponent = builder =>
@@ -42,36 +42,36 @@
             {
                 if (Name.ToLower() == Constants.AdminPane.ToLower())
                 {
-                    Module module = PageState.Modules.Where(item => item.ModuleId == PageState.ModuleId).FirstOrDefault();
+                    Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
                     if (module != null)
                     {
-                        string typename = module.ModuleType;
+                        var typename = module.ModuleType;
                         // check for core module actions component
-                        if (Constants.DefaultModuleActions.Contains(PageState.Action)) 
+                        if (Constants.DefaultModuleActions.Contains(PageState.Action))
                         {
                             typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, PageState.Action);
                         }
-                        Type moduleType = Type.GetType(typename);
+                        
+                        var moduleType = Type.GetType(typename);
                         if (moduleType != null)
                         {
                             bool authorized = false;
                             if (Constants.DefaultModuleActions.Contains(PageState.Action))
                             {
-                                authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, PageState.Page.Permissions);
+                                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions);
                             }
                             else
                             {
-                            // verify security access level for this module control
-                            switch (module.SecurityAccessLevel)
+                                switch (module.SecurityAccessLevel)
                                 {
                                     case SecurityAccessLevel.Anonymous:
                                         authorized = true;
                                         break;
                                     case SecurityAccessLevel.View:
-                                        authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, module.Permissions);
+                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions);
                                         break;
                                     case SecurityAccessLevel.Edit:
-                                        authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, module.Permissions);
+                                        authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions);
                                         break;
                                     case SecurityAccessLevel.Admin:
                                         authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole);
@@ -81,12 +81,14 @@
                                         break;
                                 }
                             }
+
                             if (authorized)
                             {
                                 if (!Constants.DefaultModuleActions.Contains(PageState.Action) && module.ControlTitle != "")
                                 {
                                     module.Title = module.ControlTitle;
                                 }
+                                
                                 builder.OpenComponent(0, Type.GetType(Constants.ContainerComponent));
                                 builder.AddAttribute(1, "Module", module);
                                 builder.CloseComponent();
@@ -103,11 +105,11 @@
             {
                 if (PageState.ModuleId != -1)
                 {
-                    Module module = PageState.Modules.Where(item => item.ModuleId == PageState.ModuleId).FirstOrDefault();
+                    Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
                     if (module != null && module.Pane.ToLower() == Name.ToLower())
                     {
                         // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, module.Permissions))
+                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
                         {
                             builder.OpenComponent(0, Type.GetType(Constants.ContainerComponent));
                             builder.AddAttribute(1, "Module", module);
@@ -120,7 +122,7 @@
                     foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId && item.Pane.ToLower() == Name.ToLower() && !item.IsDeleted).OrderBy(x => x.Order).ToArray())
                     {
                         // check if user is authorized to view module
-                        if (UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, module.Permissions))
+                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
                         {
                             builder.OpenComponent(0, Type.GetType(Constants.ContainerComponent));
                             builder.AddAttribute(1, "Module", module);
@@ -129,7 +131,7 @@
                         }
                     }
                 }
-            };
+            }
         };
     }
 }
diff --git a/Oqtane.Client/UI/PaneLayout.razor b/Oqtane.Client/UI/PaneLayout.razor
index add8cc94..2226c8c0 100644
--- a/Oqtane.Client/UI/PaneLayout.razor
+++ b/Oqtane.Client/UI/PaneLayout.razor
@@ -12,7 +12,7 @@
     {
         DynamicComponent = builder =>
         {
-            Type layoutType = Type.GetType(PageState.Page.LayoutType);
+            var layoutType = Type.GetType(PageState.Page.LayoutType);
             if (layoutType != null)
             {
                 builder.OpenComponent(0, layoutType);
diff --git a/Oqtane.Client/UI/RichTextEditorInterop.cs b/Oqtane.Client/UI/RichTextEditorInterop.cs
index 50a46e48..54536005 100644
--- a/Oqtane.Client/UI/RichTextEditorInterop.cs
+++ b/Oqtane.Client/UI/RichTextEditorInterop.cs
@@ -30,7 +30,7 @@ namespace Oqtane.UI
                 quillElement);
         }
 
-        internal static ValueTask<string> GetHTML(
+        internal static ValueTask<string> GetHtml(
             IJSRuntime jsRuntime,
             ElementReference quillElement)
         {
@@ -51,11 +51,11 @@ namespace Oqtane.UI
         internal static ValueTask<object> LoadEditorContent(
             IJSRuntime jsRuntime,
             ElementReference quillElement,
-            string Content)
+            string content)
         {
             return jsRuntime.InvokeAsync<object>(
                 "interop.loadQuillContent",
-                quillElement, Content);
+                quillElement, content);
         }
 
         internal static ValueTask<object> EnableEditor(
@@ -70,11 +70,11 @@ namespace Oqtane.UI
         internal static ValueTask<object> InsertImage(
             IJSRuntime jsRuntime,
             ElementReference quillElement,
-            string ImageURL)
+            string imageUrl)
         {
             return jsRuntime.InvokeAsync<object>(
                 "interop.insertQuillImage",
-                quillElement, ImageURL);
+                quillElement, imageUrl);
         }
     }
 }
diff --git a/Oqtane.Client/UI/Runtime.cs b/Oqtane.Client/UI/Runtime.cs
new file mode 100644
index 00000000..dcc886b1
--- /dev/null
+++ b/Oqtane.Client/UI/Runtime.cs
@@ -0,0 +1,8 @@
+namespace Oqtane.UI
+{
+    public enum Runtime
+    {
+        Server,
+        WebAssembly
+    }
+}
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index e8e0c675..a384fc58 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -12,23 +12,25 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject ILogService LogService
 @using System.Diagnostics.CodeAnalysis
+@using Oqtane.Enums
+@using System.Runtime.InteropServices 
 @implements IHandleAfterRender
 
 @DynamicComponent
 
 @code {
 
+    private string _absoluteUri;
+    private bool _navigationInterceptionEnabled;
+    private PageState _pagestate;
+
     [CascadingParameter]
     PageState PageState { get; set; }
 
     [Parameter]
     public Action<PageState> OnStateChange { get; set; }
 
-    PageState pagestate;
-    RenderFragment DynamicComponent { get; set; }
-
-    string _absoluteUri;
-    bool _navigationInterceptionEnabled;
+    private RenderFragment DynamicComponent { get; set; }
 
     protected override void OnInitialized()
     {
@@ -75,26 +77,20 @@
         Page page;
         User user = null;
         List<Module> modules;
-        int moduleid = -1;
-        string action = "";
-        bool editmode = false;
-        Reload reload = Reload.None;
-        DateTime lastsyncdate = DateTime.UtcNow;
+        var moduleid = -1;
+        var action = "";
+        var editmode = false;
+        var reload = Reload.None;
+        var lastsyncdate = DateTime.UtcNow;
+        var runtime = GetRuntime();
 
-        // get Url path and querystring ( and remove anchors )
-        string path = new Uri(_absoluteUri).PathAndQuery.Substring(1);
-        if (path.IndexOf("#") != -1)
-        {
-            path = path.Substring(0, path.IndexOf("#"));
-        }
+        Uri uri = new Uri(_absoluteUri);
 
-        // parse querystring and remove
-        Dictionary<string, string> querystring = new Dictionary<string, string>();
-        if (path.IndexOf("?") != -1)
-        {
-            querystring = ParseQueryString(path);
-            path = path.Substring(0, path.IndexOf("?"));
-        }
+        // get path
+        var path = uri.LocalPath.Substring(1);
+
+        // parse querystring 
+        var querystring = ParseQueryString(uri.Query);
 
         // the reload parameter is used during user login/logout
         if (querystring.ContainsKey("reload"))
@@ -108,18 +104,18 @@
             lastsyncdate = PageState.LastSyncDate;
         }
 
-        alias = await AliasService.GetAliasAsync(_absoluteUri, lastsyncdate);
+        alias = await AliasService.GetAliasAsync(path, lastsyncdate);
         SiteState.Alias = alias; // set state for services
         lastsyncdate = alias.SyncDate;
 
         // process any sync events for site or page
         if (reload != Reload.Site && alias.SyncEvents.Any())
         {
-            if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == "Page" && item.EntityId == PageState.Page.PageId))
+            if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == EntityNames.Page && item.EntityId == PageState.Page.PageId))
             {
                 reload = Reload.Page;
             }
-            if (alias.SyncEvents.Exists(item => item.EntityName == "Site" && item.EntityId == alias.SiteId))
+            if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == alias.SiteId))
             {
                 reload = Reload.Site;
             }
@@ -127,13 +123,14 @@
 
         if (reload == Reload.Site || PageState == null || alias.SiteId != PageState.Alias.SiteId)
         {
-            site = await SiteService.GetSiteAsync(alias.SiteId, alias);
+            site = await SiteService.GetSiteAsync(alias.SiteId);
             reload = Reload.Site;
         }
         else
         {
             site = PageState.Site;
         }
+
         if (site != null)
         {
             if (PageState == null || reload == Reload.Site)
@@ -153,7 +150,7 @@
             // process any sync events for user
             if (reload != Reload.Site && user != null && alias.SyncEvents.Any())
             {
-                if (alias.SyncEvents.Exists(item => item.EntityName == "User" && item.EntityId == user.UserId))
+                if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
                 {
                     reload = Reload.Site;
                 }
@@ -161,7 +158,7 @@
 
             if (PageState == null || reload >= Reload.Site)
             {
-                await ModuleDefinitionService.LoadModuleDefinitionsAsync(site.SiteId);
+                await ModuleDefinitionService.LoadModuleDefinitionsAsync(site.SiteId, runtime);
                 pages = await PageService.GetPagesAsync(site.SiteId);
             }
             else
@@ -171,14 +168,19 @@
 
             // format path and remove alias
             path = path.Replace("//", "/");
-            if (!path.EndsWith("/")) { path += "/"; }
+
+            if (!path.EndsWith("/"))
+            {
+                path += "/";
+            }
+
             if (alias.Path != "")
             {
                 path = path.Replace(alias.Path + "/", "");
             }
 
             // extract admin route elements from path
-            string[] segments = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            var segments = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
             int result;
             // check if path has moduleid and control specification ie. page/moduleid/control/
             if (segments.Length >= 2 && int.TryParse(segments[segments.Length - 2], out result))
@@ -196,6 +198,7 @@
                     path = path.Replace(moduleid.ToString() + "/", "");
                 }
             }
+
             // remove trailing slash so it can be used as a key for Pages
             if (path.EndsWith("/")) path = path.Substring(0, path.Length - 1);
 
@@ -207,6 +210,7 @@
             {
                 page = PageState.Page;
             }
+
             // failsafe in case router cannot locate the home page for the site
             if (page == null && path == "")
             {
@@ -237,18 +241,21 @@
                 {
                     page = await ProcessPage(page, site, user);
 
-                    pagestate = new PageState();
-                    pagestate.Alias = alias;
-                    pagestate.Site = site;
-                    pagestate.Pages = pages;
-                    pagestate.Page = page;
-                    pagestate.User = user;
-                    pagestate.Uri = new Uri(_absoluteUri, UriKind.Absolute);
-                    pagestate.QueryString = querystring;
-                    pagestate.ModuleId = moduleid;
-                    pagestate.Action = action;
+                    _pagestate = new PageState
+                    {
+                        Alias = alias,
+                        Site = site,
+                        Pages = pages,
+                        Page = page,
+                        User = user,
+                        Uri = new Uri(_absoluteUri, UriKind.Absolute),
+                        QueryString = querystring,
+                        ModuleId = moduleid,
+                        Action = action,
+                        Runtime = runtime
+                    };
 
-                    if (PageState != null && (PageState.ModuleId != pagestate.ModuleId || PageState.Action != pagestate.Action))
+                    if (PageState != null && (PageState.ModuleId != _pagestate.ModuleId || PageState.Action != _pagestate.Action))
                     {
                         reload = Reload.Page;
                     }
@@ -256,17 +263,17 @@
                     if (PageState == null || reload >= Reload.Page)
                     {
                         modules = await ModuleService.GetModulesAsync(site.SiteId);
-                        modules = ProcessModules(modules, page.PageId, pagestate.ModuleId, pagestate.Action, page.Panes, site.DefaultContainerType);
+                        modules = ProcessModules(modules, page.PageId, _pagestate.ModuleId, _pagestate.Action, page.Panes, site.DefaultContainerType);
                     }
                     else
                     {
                         modules = PageState.Modules;
                     }
-                    pagestate.Modules = modules;
-                    pagestate.EditMode = editmode;
-                    pagestate.LastSyncDate = lastsyncdate;
+                    _pagestate.Modules = modules;
+                    _pagestate.EditMode = editmode;
+                    _pagestate.LastSyncDate = lastsyncdate;
 
-                    OnStateChange?.Invoke(pagestate);
+                    OnStateChange?.Invoke(_pagestate);
                 }
             }
             else
@@ -307,15 +314,17 @@
             _navigationInterceptionEnabled = true;
             return NavigationInterception.EnableNavigationInterceptionAsync();
         }
+
         return Task.CompletedTask;
     }
 
-    private Dictionary<string, string> ParseQueryString(string path)
+    private Dictionary<string, string> ParseQueryString(string query)
     {
         Dictionary<string, string> querystring = new Dictionary<string, string>();
-        if (path.IndexOf("?") != -1)
+        if (!string.IsNullOrEmpty(query))
         {
-            foreach (string kvp in path.Substring(path.IndexOf("?") + 1).Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
+            query = query.Substring(1); // ignore "?"
+            foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
             {
                 if (kvp != "")
                 {
@@ -326,7 +335,7 @@
                     }
                     else
                     {
-                        querystring.Add(kvp, "true"); // default querystring when no value is provided
+                        querystring.Add(kvp, "true"); // default parameter when no value is provided
                     }
                 }
             }
@@ -350,6 +359,7 @@
                 page.LayoutType = site.DefaultLayoutType;
             }
             Type type;
+
             if (!string.IsNullOrEmpty(page.LayoutType))
             {
                 type = Type.GetType(page.LayoutType);
@@ -358,24 +368,26 @@
             {
                 type = Type.GetType(page.ThemeType);
             }
-            System.Reflection.PropertyInfo property = type.GetProperty("Panes");
+
+            var property = type.GetProperty("Panes");
             page.Panes = (string)property.GetValue(Activator.CreateInstance(type), null);
         }
         catch
         {
             // error loading theme or layout
         }
+
         return page;
     }
 
     private List<Module> ProcessModules(List<Module> modules, int pageid, int moduleid, string control, string panes, string defaultcontainertype)
     {
-        Dictionary<string, int> paneindex = new Dictionary<string, int>();
+        var paneindex = new Dictionary<string, int>();
         foreach (Module module in modules)
         {
             if (module.PageId == pageid || module.ModuleId == moduleid)
             {
-                string typename = "";
+                var typename = string.Empty;
                 if (module.ModuleDefinition != null)
                 {
                     typename = module.ModuleDefinition.ControlTypeTemplate;
@@ -384,6 +396,7 @@
                 {
                     typename = Constants.ErrorModule;
                 }
+
                 if (module.ModuleId == moduleid && control != "")
                 {
                     // check if the module defines custom routes
@@ -439,6 +452,7 @@
                 {
                     paneindex.Add(module.Pane, 0);
                 }
+
                 module.PaneModuleIndex = paneindex[module.Pane];
 
                 if (string.IsNullOrEmpty(module.ContainerType))
@@ -452,7 +466,12 @@
         {
             module.PaneModuleCount = paneindex[module.Pane] + 1;
         }
+
         return modules;
     }
 
+    private Runtime GetRuntime()
+        => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
+                ? Runtime.WebAssembly
+                : Runtime.Server;
 }
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 2be44081..e2cf9e4a 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.UI
 @inject IJSRuntime JsRuntime
+@inject NavigationManager NavigationManager
 
 @DynamicComponent
 
@@ -8,11 +9,29 @@
 
     RenderFragment DynamicComponent { get; set; }
 
-    protected override void OnParametersSet()
+    protected override async Task OnParametersSetAsync()
     {
+        var interop = new Interop(JsRuntime);
+        if (!string.IsNullOrEmpty(PageState.Page.Title))
+        {
+            await interop.UpdateTitle(PageState.Page.Title);
+        }
+        else
+        {
+            await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
+        }
+        if (PageState.Site.FaviconFileId != null)
+        {
+            await interop.IncludeLink("fav-icon", "shortcut icon", Utilities.ContentUrl(PageState.Alias, PageState.Site.FaviconFileId.Value), "image/x-icon", "", "");
+        }
+        if (PageState.Site.PwaIsEnabled)
+        {
+            await InitializePwa(interop);
+        }
+
         DynamicComponent = builder =>
         {
-            Type themeType = Type.GetType(PageState.Page.ThemeType);
+            var themeType = Type.GetType(PageState.Page.ThemeType);
             if (themeType != null)
             {
                 builder.OpenComponent(0, themeType);
@@ -27,4 +46,44 @@
             }
         };
     }
+
+    private async Task InitializePwa(Interop interop)
+    {
+        // dynamically create manifest.json and add to page
+        string manifest = "setTimeout(() => { " +
+            "var manifest = { " +
+            "\"name\": \"" + PageState.Site.Name + "\", " +
+            "\"short_name\": \"" + PageState.Site.Name + "\", " +
+            "\"start_url\": \"/\", " +
+            "\"display\": \"standalone\", " +
+            "\"background_color\": \"#fff\", " +
+            "\"description\": \"" + PageState.Site.Name + "\", " +
+            "\"icons\": [{ " +
+                "\"src\": \"" + Utilities.ContentUrl(PageState.Alias, PageState.Site.PwaAppIconFileId.Value) + "\", " +
+                "\"sizes\": \"192x192\", " +
+                "\"type\": \"image/png\" " +
+                "}, { " +
+                "\"src\": \"" + Utilities.ContentUrl(PageState.Alias, PageState.Site.PwaSplashIconFileId.Value) + "\", " +
+                "\"sizes\": \"512x512\", " +
+                "\"type\": \"image/png\" " +
+            "}] " +
+            "} " +
+            "const serialized = JSON.stringify(manifest); " +
+            "const blob = new Blob([serialized], {type: 'application/javascript'}); " +
+            "const url = URL.createObjectURL(blob); " +
+            "document.getElementById('pwa-manifest').setAttribute('href', url); " +
+            "} " +
+            ", 1000);";
+        await interop.IncludeScript("pwa-manifestscript", "", manifest, "body", "", "");
+
+        // service worker must be in root of site
+        string serviceworker = "if ('serviceWorker' in navigator) { " +
+            "navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " +
+                "console.log('ServiceWorker Registration Successful'); " +
+            "}).catch (function(err) { " +
+                "console.log('ServiceWorker Registration Failed ', err); " +
+            "}); " +
+            "}";
+        await interop.IncludeScript("pwa-serviceworker", "", serviceworker, "body", "", "");
+    }
 }
diff --git a/Oqtane.Client/wwwroot/css/app.css b/Oqtane.Client/wwwroot/css/app.css
deleted file mode 100644
index ed6583dd..00000000
--- a/Oqtane.Client/wwwroot/css/app.css
+++ /dev/null
@@ -1,112 +0,0 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
-
-html, body {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-}
-
-app {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-/* Control Panel */
-.app-controlpanel {
-    height: 100%;
-    width: 0%;
-    position: fixed; /* Stay in place */
-    z-index: 9999; /* Sit on top */
-    right: 0;
-    top: 0;
-    overflow-x: hidden; /* Disable horizontal scroll */
-    transition: 0.5s; /* 0.5 second transition effect to slide in or slide down the overlay (height or width, depending on reveal) */
-}
-
-    /* Position the content inside the overlay */
-    .app-controlpanel .card-body {
-        position: relative;
-        width: 100%; /* 100% width */
-    }
-
-    /* Pad the navigation links */
-    .app-controlpanel .nav-item {
-        font-size: 0.9rem;
-        padding-bottom: 0.5rem;
-    }
-
-    .app-controlpanel .card-body .control-label {
-        color: white;
-    }
-
-/* Admin Modal */
-.app-admin-modal .modal {
-    position: fixed; /* Stay in place */
-    z-index: 9999; /* Sit on top */
-    left: 0;
-    top: 0;
-    display: block;
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    overflow: auto; /* Enable scroll if needed */
-    background: rgba(0,0,0,0.3); /* Dim background */
-}
-
-.app-admin-modal .modal-dialog {
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    max-width: none; /* Override default of 500px */
-}
-
-.app-admin-modal .modal-content {
-    margin: 5% auto; /* 5% from the top and centered */
-    padding: 20px;
-    width: 80%; /* Could be more or less, depending on screen size */
-}
-
-.app-pane-admin-border {
-    width: 100%;
-    border-width: 1px;
-    border-style: dashed;
-    border-color: gray;
-}
-
-.app-pane-admin-title {
-    width: 100%;
-    text-align: center;
-    color: gray;
-}
-
-.app-progress-indicator {
-    background: rgba(0,0,0,0.2) url('../loading.gif') no-repeat 50% 50%;
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 9999; /* Sit on top */
-}
-
-.app-rule {
-    width: 100%;
-    color: gray;
-    height: 1px;
-    background-color: gray;
-}
-
-.app-link-unstyled, .app-link-unstyled:visited, .app-link-unstyled:hover, .app-link-unstyled:active, .app-link-unstyled:focus, .app-link-unstyled:active:hover {
-    font-style: inherit;
-    color: inherit;
-    background-color: transparent;
-    font-size: inherit;
-    text-decoration: none;
-    font-variant: inherit;
-    font-weight: inherit;
-    line-height: inherit;
-    font-family: inherit;
-    border-radius: inherit;
-    border: inherit;
-    outline: inherit;
-    box-shadow: inherit;
-    padding: inherit;
-    vertical-align: inherit;
-}
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/FONT-LICENSE b/Oqtane.Client/wwwroot/css/open-iconic/FONT-LICENSE
deleted file mode 100644
index a1dc03f3..00000000
--- a/Oqtane.Client/wwwroot/css/open-iconic/FONT-LICENSE
+++ /dev/null
@@ -1,86 +0,0 @@
-SIL OPEN FONT LICENSE Version 1.1
-
-Copyright (c) 2014 Waybury
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/ICON-LICENSE b/Oqtane.Client/wwwroot/css/open-iconic/ICON-LICENSE
deleted file mode 100644
index 2199f4a6..00000000
--- a/Oqtane.Client/wwwroot/css/open-iconic/ICON-LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Waybury
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/README.md b/Oqtane.Client/wwwroot/css/open-iconic/README.md
deleted file mode 100644
index 6b810e47..00000000
--- a/Oqtane.Client/wwwroot/css/open-iconic/README.md
+++ /dev/null
@@ -1,114 +0,0 @@
-[Open Iconic v1.1.1](http://useiconic.com/open)
-===========
-
-### Open Iconic is the open source sibling of [Iconic](http://useiconic.com). It is a hyper-legible collection of 223 icons with a tiny footprint&mdash;ready to use with Bootstrap and Foundation. [View the collection](http://useiconic.com/open#icons)
-
-
-
-## What's in Open Iconic?
-
-* 223 icons designed to be legible down to 8 pixels
-* Super-light SVG files - 61.8 for the entire set 
-* SVG sprite&mdash;the modern replacement for icon fonts
-* Webfont (EOT, OTF, SVG, TTF, WOFF), PNG and WebP formats
-* Webfont stylesheets (including versions for Bootstrap and Foundation) in CSS, LESS, SCSS and Stylus formats
-* PNG and WebP raster images in 8px, 16px, 24px, 32px, 48px and 64px.
-
-
-## Getting Started
-
-#### For code samples and everything else you need to get started with Open Iconic, check out our [Icons](http://useiconic.com/open#icons) and [Reference](http://useiconic.com/open#reference) sections.
-
-### General Usage
-
-#### Using Open Iconic's SVGs
-
-We like SVGs and we think they're the way to display icons on the web. Since Open Iconic are just basic SVGs, we suggest you display them like you would any other image (don't forget the `alt` attribute).
-
-```
-<img src="/open-iconic/svg/icon-name.svg" alt="icon name">
-```
-
-#### Using Open Iconic's SVG Sprite
-
-Open Iconic also comes in a SVG sprite which allows you to display all the icons in the set with a single request. It's like an icon font, without being a hack.
-
-Adding an icon from an SVG sprite is a little different than what you're used to, but it's still a piece of cake. *Tip: To make your icons easily style able, we suggest adding a general class to the* `<svg>` *tag and a unique class name for each different icon in the* `<use>` *tag.*  
-
-```
-<svg class="icon">
-  <use xlink:href="open-iconic.svg#account-login" class="icon-account-login"></use>
-</svg>
-```
-
-Sizing icons only needs basic CSS. All the icons are in a square format, so just set the `<svg>` tag with equal width and height dimensions.
-
-```
-.icon {
-  width: 16px;
-  height: 16px;
-}
-```
-
-Coloring icons is even easier. All you need to do is set the `fill` rule on the `<use>` tag.
-
-```
-.icon-account-login {
-  fill: #f00;
-}
-```
-
-To learn more about SVG Sprites, read [Chris Coyier's guide](http://css-tricks.com/svg-sprites-use-better-icon-fonts/).
-
-#### Using Open Iconic's Icon Font...
-
-
-##### …with Bootstrap
-
-You can find our Bootstrap stylesheets in `font/css/open-iconic-bootstrap.{css, less, scss, styl}`
-
-
-```
-<link href="/open-iconic/font/css/open-iconic-bootstrap.css" rel="stylesheet">
-```
-
-
-```
-<span class="oi oi-icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-##### …with Foundation
-
-You can find our Foundation stylesheets in `font/css/open-iconic-foundation.{css, less, scss, styl}`
-
-```
-<link href="/open-iconic/font/css/open-iconic-foundation.css" rel="stylesheet">
-```
-
-
-```
-<span class="fi-icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-##### …on its own
-
-You can find our default stylesheets in `font/css/open-iconic.{css, less, scss, styl}`
-
-```
-<link href="/open-iconic/font/css/open-iconic.css" rel="stylesheet">
-```
-
-```
-<span class="oi" data-glyph="icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-
-## License
-
-### Icons
-
-All code (including SVG markup) is under the [MIT License](http://opensource.org/licenses/MIT).
-
-### Fonts
-
-All fonts are under the [SIL Licensed](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web).
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/Oqtane.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
deleted file mode 100644
index 4664f2e8..00000000
--- a/Oqtane.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:Icons;src:url(../fonts/open-iconic.eot);src:url(../fonts/open-iconic.eot?#iconic-sm) format('embedded-opentype'),url(../fonts/open-iconic.woff) format('woff'),url(../fonts/open-iconic.ttf) format('truetype'),url(../fonts/open-iconic.otf) format('opentype'),url(../fonts/open-iconic.svg#iconic-sm) format('svg');font-weight:400;font-style:normal}.oi{position:relative;top:1px;display:inline-block;speak:none;font-family:Icons;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.oi:empty:before{width:1em;text-align:center;box-sizing:content-box}.oi.oi-align-center:before{text-align:center}.oi.oi-align-left:before{text-align:left}.oi.oi-align-right:before{text-align:right}.oi.oi-flip-horizontal:before{-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.oi.oi-flip-vertical:before{-webkit-transform:scale(1,-1);-ms-transform:scale(-1,1);transform:scale(1,-1)}.oi.oi-flip-horizontal-vertical:before{-webkit-transform:scale(-1,-1);-ms-transform:scale(-1,1);transform:scale(-1,-1)}.oi-account-login:before{content:'\e000'}.oi-account-logout:before{content:'\e001'}.oi-action-redo:before{content:'\e002'}.oi-action-undo:before{content:'\e003'}.oi-align-center:before{content:'\e004'}.oi-align-left:before{content:'\e005'}.oi-align-right:before{content:'\e006'}.oi-aperture:before{content:'\e007'}.oi-arrow-bottom:before{content:'\e008'}.oi-arrow-circle-bottom:before{content:'\e009'}.oi-arrow-circle-left:before{content:'\e00a'}.oi-arrow-circle-right:before{content:'\e00b'}.oi-arrow-circle-top:before{content:'\e00c'}.oi-arrow-left:before{content:'\e00d'}.oi-arrow-right:before{content:'\e00e'}.oi-arrow-thick-bottom:before{content:'\e00f'}.oi-arrow-thick-left:before{content:'\e010'}.oi-arrow-thick-right:before{content:'\e011'}.oi-arrow-thick-top:before{content:'\e012'}.oi-arrow-top:before{content:'\e013'}.oi-audio-spectrum:before{content:'\e014'}.oi-audio:before{content:'\e015'}.oi-badge:before{content:'\e016'}.oi-ban:before{content:'\e017'}.oi-bar-chart:before{content:'\e018'}.oi-basket:before{content:'\e019'}.oi-battery-empty:before{content:'\e01a'}.oi-battery-full:before{content:'\e01b'}.oi-beaker:before{content:'\e01c'}.oi-bell:before{content:'\e01d'}.oi-bluetooth:before{content:'\e01e'}.oi-bold:before{content:'\e01f'}.oi-bolt:before{content:'\e020'}.oi-book:before{content:'\e021'}.oi-bookmark:before{content:'\e022'}.oi-box:before{content:'\e023'}.oi-briefcase:before{content:'\e024'}.oi-british-pound:before{content:'\e025'}.oi-browser:before{content:'\e026'}.oi-brush:before{content:'\e027'}.oi-bug:before{content:'\e028'}.oi-bullhorn:before{content:'\e029'}.oi-calculator:before{content:'\e02a'}.oi-calendar:before{content:'\e02b'}.oi-camera-slr:before{content:'\e02c'}.oi-caret-bottom:before{content:'\e02d'}.oi-caret-left:before{content:'\e02e'}.oi-caret-right:before{content:'\e02f'}.oi-caret-top:before{content:'\e030'}.oi-cart:before{content:'\e031'}.oi-chat:before{content:'\e032'}.oi-check:before{content:'\e033'}.oi-chevron-bottom:before{content:'\e034'}.oi-chevron-left:before{content:'\e035'}.oi-chevron-right:before{content:'\e036'}.oi-chevron-top:before{content:'\e037'}.oi-circle-check:before{content:'\e038'}.oi-circle-x:before{content:'\e039'}.oi-clipboard:before{content:'\e03a'}.oi-clock:before{content:'\e03b'}.oi-cloud-download:before{content:'\e03c'}.oi-cloud-upload:before{content:'\e03d'}.oi-cloud:before{content:'\e03e'}.oi-cloudy:before{content:'\e03f'}.oi-code:before{content:'\e040'}.oi-cog:before{content:'\e041'}.oi-collapse-down:before{content:'\e042'}.oi-collapse-left:before{content:'\e043'}.oi-collapse-right:before{content:'\e044'}.oi-collapse-up:before{content:'\e045'}.oi-command:before{content:'\e046'}.oi-comment-square:before{content:'\e047'}.oi-compass:before{content:'\e048'}.oi-contrast:before{content:'\e049'}.oi-copywriting:before{content:'\e04a'}.oi-credit-card:before{content:'\e04b'}.oi-crop:before{content:'\e04c'}.oi-dashboard:before{content:'\e04d'}.oi-data-transfer-download:before{content:'\e04e'}.oi-data-transfer-upload:before{content:'\e04f'}.oi-delete:before{content:'\e050'}.oi-dial:before{content:'\e051'}.oi-document:before{content:'\e052'}.oi-dollar:before{content:'\e053'}.oi-double-quote-sans-left:before{content:'\e054'}.oi-double-quote-sans-right:before{content:'\e055'}.oi-double-quote-serif-left:before{content:'\e056'}.oi-double-quote-serif-right:before{content:'\e057'}.oi-droplet:before{content:'\e058'}.oi-eject:before{content:'\e059'}.oi-elevator:before{content:'\e05a'}.oi-ellipses:before{content:'\e05b'}.oi-envelope-closed:before{content:'\e05c'}.oi-envelope-open:before{content:'\e05d'}.oi-euro:before{content:'\e05e'}.oi-excerpt:before{content:'\e05f'}.oi-expand-down:before{content:'\e060'}.oi-expand-left:before{content:'\e061'}.oi-expand-right:before{content:'\e062'}.oi-expand-up:before{content:'\e063'}.oi-external-link:before{content:'\e064'}.oi-eye:before{content:'\e065'}.oi-eyedropper:before{content:'\e066'}.oi-file:before{content:'\e067'}.oi-fire:before{content:'\e068'}.oi-flag:before{content:'\e069'}.oi-flash:before{content:'\e06a'}.oi-folder:before{content:'\e06b'}.oi-fork:before{content:'\e06c'}.oi-fullscreen-enter:before{content:'\e06d'}.oi-fullscreen-exit:before{content:'\e06e'}.oi-globe:before{content:'\e06f'}.oi-graph:before{content:'\e070'}.oi-grid-four-up:before{content:'\e071'}.oi-grid-three-up:before{content:'\e072'}.oi-grid-two-up:before{content:'\e073'}.oi-hard-drive:before{content:'\e074'}.oi-header:before{content:'\e075'}.oi-headphones:before{content:'\e076'}.oi-heart:before{content:'\e077'}.oi-home:before{content:'\e078'}.oi-image:before{content:'\e079'}.oi-inbox:before{content:'\e07a'}.oi-infinity:before{content:'\e07b'}.oi-info:before{content:'\e07c'}.oi-italic:before{content:'\e07d'}.oi-justify-center:before{content:'\e07e'}.oi-justify-left:before{content:'\e07f'}.oi-justify-right:before{content:'\e080'}.oi-key:before{content:'\e081'}.oi-laptop:before{content:'\e082'}.oi-layers:before{content:'\e083'}.oi-lightbulb:before{content:'\e084'}.oi-link-broken:before{content:'\e085'}.oi-link-intact:before{content:'\e086'}.oi-list-rich:before{content:'\e087'}.oi-list:before{content:'\e088'}.oi-location:before{content:'\e089'}.oi-lock-locked:before{content:'\e08a'}.oi-lock-unlocked:before{content:'\e08b'}.oi-loop-circular:before{content:'\e08c'}.oi-loop-square:before{content:'\e08d'}.oi-loop:before{content:'\e08e'}.oi-magnifying-glass:before{content:'\e08f'}.oi-map-marker:before{content:'\e090'}.oi-map:before{content:'\e091'}.oi-media-pause:before{content:'\e092'}.oi-media-play:before{content:'\e093'}.oi-media-record:before{content:'\e094'}.oi-media-skip-backward:before{content:'\e095'}.oi-media-skip-forward:before{content:'\e096'}.oi-media-step-backward:before{content:'\e097'}.oi-media-step-forward:before{content:'\e098'}.oi-media-stop:before{content:'\e099'}.oi-medical-cross:before{content:'\e09a'}.oi-menu:before{content:'\e09b'}.oi-microphone:before{content:'\e09c'}.oi-minus:before{content:'\e09d'}.oi-monitor:before{content:'\e09e'}.oi-moon:before{content:'\e09f'}.oi-move:before{content:'\e0a0'}.oi-musical-note:before{content:'\e0a1'}.oi-paperclip:before{content:'\e0a2'}.oi-pencil:before{content:'\e0a3'}.oi-people:before{content:'\e0a4'}.oi-person:before{content:'\e0a5'}.oi-phone:before{content:'\e0a6'}.oi-pie-chart:before{content:'\e0a7'}.oi-pin:before{content:'\e0a8'}.oi-play-circle:before{content:'\e0a9'}.oi-plus:before{content:'\e0aa'}.oi-power-standby:before{content:'\e0ab'}.oi-print:before{content:'\e0ac'}.oi-project:before{content:'\e0ad'}.oi-pulse:before{content:'\e0ae'}.oi-puzzle-piece:before{content:'\e0af'}.oi-question-mark:before{content:'\e0b0'}.oi-rain:before{content:'\e0b1'}.oi-random:before{content:'\e0b2'}.oi-reload:before{content:'\e0b3'}.oi-resize-both:before{content:'\e0b4'}.oi-resize-height:before{content:'\e0b5'}.oi-resize-width:before{content:'\e0b6'}.oi-rss-alt:before{content:'\e0b7'}.oi-rss:before{content:'\e0b8'}.oi-script:before{content:'\e0b9'}.oi-share-boxed:before{content:'\e0ba'}.oi-share:before{content:'\e0bb'}.oi-shield:before{content:'\e0bc'}.oi-signal:before{content:'\e0bd'}.oi-signpost:before{content:'\e0be'}.oi-sort-ascending:before{content:'\e0bf'}.oi-sort-descending:before{content:'\e0c0'}.oi-spreadsheet:before{content:'\e0c1'}.oi-star:before{content:'\e0c2'}.oi-sun:before{content:'\e0c3'}.oi-tablet:before{content:'\e0c4'}.oi-tag:before{content:'\e0c5'}.oi-tags:before{content:'\e0c6'}.oi-target:before{content:'\e0c7'}.oi-task:before{content:'\e0c8'}.oi-terminal:before{content:'\e0c9'}.oi-text:before{content:'\e0ca'}.oi-thumb-down:before{content:'\e0cb'}.oi-thumb-up:before{content:'\e0cc'}.oi-timer:before{content:'\e0cd'}.oi-transfer:before{content:'\e0ce'}.oi-trash:before{content:'\e0cf'}.oi-underline:before{content:'\e0d0'}.oi-vertical-align-bottom:before{content:'\e0d1'}.oi-vertical-align-center:before{content:'\e0d2'}.oi-vertical-align-top:before{content:'\e0d3'}.oi-video:before{content:'\e0d4'}.oi-volume-high:before{content:'\e0d5'}.oi-volume-low:before{content:'\e0d6'}.oi-volume-off:before{content:'\e0d7'}.oi-warning:before{content:'\e0d8'}.oi-wifi:before{content:'\e0d9'}.oi-wrench:before{content:'\e0da'}.oi-x:before{content:'\e0db'}.oi-yen:before{content:'\e0dc'}.oi-zoom-in:before{content:'\e0dd'}.oi-zoom-out:before{content:'\e0de'}
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
deleted file mode 100644
index f98177db..00000000
Binary files a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
deleted file mode 100644
index f6bd6846..00000000
Binary files a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
deleted file mode 100644
index 32b2c4e9..00000000
--- a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2014-7-1: Created.
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-Created by FontForge 20120731 at Tue Jul  1 20:39:22 2014
- By P.J. Onori
-Created by P.J. Onori with FontForge 2.0 (http://fontforge.sf.net)
-</metadata>
-<defs>
-<font id="open-iconic" horiz-adv-x="800" >
-  <font-face 
-    font-family="Icons"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="800"
-    panose-1="2 0 5 3 0 0 0 0 0 0"
-    ascent="800"
-    descent="0"
-    bbox="-0.5 -101 802 800.126"
-    underline-thickness="50"
-    underline-position="-100"
-    unicode-range="U+E000-E0DE"
-  />
-    <missing-glyph />
-    <glyph glyph-name="" unicode="&#xe000;" 
-d="M300 700h500v-700h-500v100h400v500h-400v100zM400 500l200 -150l-200 -150v100h-400v100h400v100z" />
-    <glyph glyph-name="1" unicode="&#xe001;" 
-d="M300 700h500v-700h-500v100h400v500h-400v100zM200 500v-100h400v-100h-400v-100l-200 150z" />
-    <glyph glyph-name="2" unicode="&#xe002;" 
-d="M350 700c193 0 350 -157 350 -350v-50h100l-200 -200l-200 200h100v50c0 138 -112 250 -250 250s-250 -112 -250 -250c0 193 157 350 350 350z" />
-    <glyph glyph-name="3" unicode="&#xe003;" 
-d="M450 700c193 0 350 -157 350 -350c0 138 -112 250 -250 250s-250 -112 -250 -250v-50h100l-200 -200l-200 200h100v50c0 193 157 350 350 350z" />
-    <glyph glyph-name="4" unicode="&#xe004;" 
-d="M0 700h800v-100h-800v100zM100 500h600v-100h-600v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
-    <glyph glyph-name="5" unicode="&#xe005;" 
-d="M0 700h800v-100h-800v100zM0 500h600v-100h-600v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
-    <glyph glyph-name="6" unicode="&#xe006;" 
-d="M0 700h800v-100h-800v100zM200 500h600v-100h-600v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="7" unicode="&#xe007;" 
-d="M400 700c75 0 146 -23 206 -59l-75 -225l-322 234c57 31 122 50 191 50zM125 588l191 -138l-310 -222c-4 24 -6 47 -6 72c0 114 49 215 125 288zM688 575c69 -72 112 -168 112 -275c0 -35 -8 -68 -16 -100h-218zM216 253l112 -347c-128 23 -232 109 -287 222zM372 100
-h372c-64 -109 -177 -185 -310 -197z" />
-    <glyph glyph-name="8" unicode="&#xe008;" horiz-adv-x="600" 
-d="M200 800h100v-500h200l-247 -300l-253 300h200v500z" />
-    <glyph glyph-name="9" unicode="&#xe009;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 700v-300h-200l300 -300l300 300h-200v300h-200z" />
-    <glyph glyph-name="a" unicode="&#xe00a;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300l300 -300v200h300v200h-300v200z" />
-    <glyph glyph-name="b" unicode="&#xe00b;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700v-200h-300v-200h300v-200l300 300z" />
-    <glyph glyph-name="c" unicode="&#xe00c;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300h200v-300h200v300h200z" />
-    <glyph glyph-name="d" unicode="&#xe00d;" 
-d="M300 600v-200h500v-100h-500v-200l-300 247z" />
-    <glyph glyph-name="e" unicode="&#xe00e;" 
-d="M500 600l300 -247l-300 -253v200h-500v100h500v200z" />
-    <glyph glyph-name="f" unicode="&#xe00f;" horiz-adv-x="600" 
-d="M200 800h200v-500h200l-297 -300l-303 300h200v500z" />
-    <glyph glyph-name="10" unicode="&#xe010;" 
-d="M300 700v-200h500v-200h-500v-200l-300 297z" />
-    <glyph glyph-name="11" unicode="&#xe011;" 
-d="M500 700l300 -297l-300 -303v200h-500v200h500v200z" />
-    <glyph glyph-name="12" unicode="&#xe012;" horiz-adv-x="600" 
-d="M297 800l303 -300h-200v-500h-200v500h-200z" />
-    <glyph glyph-name="13" unicode="&#xe013;" horiz-adv-x="600" 
-d="M247 800l253 -300h-200v-500h-100v500h-200z" />
-    <glyph glyph-name="14" unicode="&#xe014;" 
-d="M400 800h100v-800h-100v800zM200 700h100v-600h-100v600zM600 600h100v-400h-100v400zM0 500h100v-200h-100v200z" />
-    <glyph glyph-name="15" unicode="&#xe015;" 
-d="M116 600l72 -72c-54 -54 -88 -126 -88 -209s34 -159 88 -213l-72 -72c-72 72 -116 175 -116 285s44 209 116 281zM684 600c72 -72 116 -171 116 -281s-44 -213 -116 -285l-72 72c54 54 88 130 88 213s-34 155 -88 209zM259 460l69 -72c-18 -18 -28 -41 -28 -69
-s10 -54 28 -72l-69 -72c-36 36 -59 89 -59 144s23 105 59 141zM541 459c36 -36 59 -85 59 -140s-23 -108 -59 -144l-69 72c18 18 28 44 28 72s-10 51 -28 69z" />
-    <glyph glyph-name="16" unicode="&#xe016;" horiz-adv-x="400" 
-d="M200 800c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM100 319c31 -11 65 -19 100 -19s68 8 100 19v-319l-100 100l-100 -100v319z" />
-    <glyph glyph-name="17" unicode="&#xe017;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300c0 -66 21 -126 56 -175l419 419c-49 35 -109 56 -175 56zM644 575l-419 -419c49 -35 109 -56 175 -56c166 0 300 134 300 300
-c0 66 -21 126 -56 175z" />
-    <glyph glyph-name="18" unicode="&#xe018;" 
-d="M0 700h100v-600h700v-100h-800v700zM500 700h200v-500h-200v500zM200 500h200v-300h-200v300z" />
-    <glyph glyph-name="19" unicode="&#xe019;" 
-d="M397 800c13 1 23 -4 34 -13c2 -2 214 -254 241 -287h128v-100h-100v-366c0 -18 -16 -34 -34 -34h-532c-18 0 -34 16 -34 34v366h-100v100h128l234 281c9 11 22 18 35 19zM400 672l-144 -172h288zM250 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50
-v100c0 28 -22 50 -50 50zM550 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50v100c0 28 -22 50 -50 50z" />
-    <glyph glyph-name="1a" unicode="&#xe01a;" 
-d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9zM100 600v-400h500v400h-500z" />
-    <glyph glyph-name="1b" unicode="&#xe01b;" 
-d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9z" />
-    <glyph glyph-name="1c" unicode="&#xe01c;" 
-d="M92 650c0 23 19 50 45 50h3h5h5h500c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-141c9 -17 120 -231 166 -309c16 -26 34 -61 34 -106c0 -39 -15 -77 -41 -103h-3c-26 -25 -62 -41 -100 -41h-512c-39 0 -77 15 -103 41s-41 64 -41 103c0 46 18 80 34 106
-c46 78 157 292 166 309v141h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51zM500 600h-200v-162l-6 -10s-63 -123 -119 -228h450c-56 105 -119 228 -119 228l-6 10v162z" />
-    <glyph glyph-name="1d" unicode="&#xe01d;" 
-d="M400 800c110 0 200 -90 200 -200c0 -104 52 -198 134 -266c41 -34 66 -82 66 -134h-800c0 52 25 100 66 134c82 68 134 162 134 266c0 110 90 200 200 200zM300 100h200c0 -55 -45 -100 -100 -100s-100 45 -100 100z" />
-    <glyph glyph-name="1e" unicode="&#xe01e;" horiz-adv-x="600" 
-d="M150 800h50l350 -250l-225 -147l225 -153l-350 -250h-50v250l-75 -75l-75 75l150 150l-150 150l75 75l75 -75v250zM250 650v-200l150 100zM250 350v-200l150 100z" />
-    <glyph glyph-name="1f" unicode="&#xe01f;" 
-d="M0 800h500c110 0 200 -90 200 -200c0 -47 -17 -91 -44 -125c85 -40 144 -125 144 -225c0 -138 -112 -250 -250 -250h-550v100c55 0 100 45 100 100v400c0 55 -45 100 -100 100v100zM300 700v-200h100c55 0 100 45 100 100s-45 100 -100 100h-100zM300 400v-300h150
-c83 0 150 67 150 150s-67 150 -150 150h-150z" />
-    <glyph glyph-name="20" unicode="&#xe020;" horiz-adv-x="600" 
-d="M300 800v-300h200l-300 -500v300h-200z" />
-    <glyph glyph-name="21" unicode="&#xe021;" 
-d="M100 800h300v-300l100 100l100 -100v300h50c28 0 50 -22 50 -50v-550h-550c-28 0 -50 -22 -50 -50s22 -50 50 -50h550v-100h-550c-83 0 -150 67 -150 150v550l3 19c8 39 39 70 78 78z" />
-    <glyph glyph-name="22" unicode="&#xe022;" horiz-adv-x="400" 
-d="M0 800h400v-800l-200 200l-200 -200v800z" />
-    <glyph glyph-name="23" unicode="&#xe023;" 
-d="M0 800h800v-100h-800v100zM0 600h300v-103h203v103h297v-591c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v591z" />
-    <glyph glyph-name="24" unicode="&#xe024;" 
-d="M300 800h200c55 0 100 -45 100 -100v-100h191c6 0 9 -3 9 -9v-241c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v241c0 6 3 9 9 9h191v100c0 55 45 100 100 100zM300 700v-100h200v100h-200zM0 209c16 -6 32 -9 50 -9h700c18 0 34 3 50 9v-200c0 -6 -3 -9 -9 -9h-782
-c-6 0 -9 3 -9 9v200z" />
-    <glyph glyph-name="25" unicode="&#xe025;" horiz-adv-x="600" 
-d="M300 800c58 0 110 -16 147 -53s53 -89 53 -147h-100c0 39 -11 61 -25 75s-36 25 -75 25c-35 0 -55 -10 -72 -31s-28 -55 -28 -94c0 -51 20 -107 28 -175h172v-100h-178c-14 -60 -49 -127 -113 -200h491v-100h-600v122l16 12c69 69 95 121 106 166h-122v100h125
-c-8 50 -25 106 -25 175c0 58 16 114 50 156c34 43 88 69 150 69z" />
-    <glyph glyph-name="26" unicode="&#xe026;" 
-d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-700c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v700v2c0 20 15 42 34 48zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50zM350 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h300c28 0 50 22 50 50
-s-22 50 -50 50h-300zM100 400v-400h600v400h-600z" />
-    <glyph glyph-name="27" unicode="&#xe027;" 
-d="M744 797l6 -3l44 -44c4 -4 3 -8 0 -12l-266 -375l-15 -13l-25 -12c-23 72 -78 127 -150 150l12 25l13 15l375 266zM266 400c74 0 134 -60 134 -134c0 -147 -119 -266 -266 -266c-48 0 -95 12 -134 34c80 46 134 133 134 232c0 74 58 134 132 134z" />
-    <glyph glyph-name="28" unicode="&#xe028;" 
-d="M9 451c0 23 19 50 46 50c8 0 19 -3 26 -7l131 -66l29 22c-79 81 -1 250 118 250s197 -167 119 -250l28 -22l131 66c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-115 -56c9 -16 19 -33 25 -50h68c28 0 50 -22 50 -50s-22 -50 -50 -50h-50
-c0 -23 -2 -45 -6 -66l78 -40c21 -5 37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11l-65 35c-24 -46 -62 -86 -103 -110c-35 19 -60 45 -60 72v135v4v5v6v5v5v87c0 28 -22 50 -50 50c-24 0 -45 -17 -50 -40c1 -3 1 -8 1 -11s0 -8 -1 -11v-82v-4v-5v-144
-c0 -28 -24 -53 -59 -72c-41 25 -79 64 -103 110l-66 -35c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49l78 40c-4 21 -6 43 -6 66h-50h-5c-28 0 -50 22 -50 50c0 26 22 50 50 50h5h69c6 17 16 34 25 50l-116 56c-16 7 -28 27 -28 45z" />
-    <glyph glyph-name="29" unicode="&#xe029;" 
-d="M600 700h91c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-91v600zM210 503l290 147v-500l-250 125v-3c-15 0 -25 -8 -28 -22l75 -178c11 -25 0 -58 -25 -69s-58 0 -69 25l-103 272h-91c-6 0 -9 3 -9 9v182c0 6 3 9 9 9h182z" />
-    <glyph glyph-name="2a" unicode="&#xe02a;" 
-d="M9 800h682c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM100 700v-200h500v200h-500zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-300h100v300h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="2b" unicode="&#xe02b;" 
-d="M0 800h700v-200h-700v200zM0 500h700v-491c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v491zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="2c" unicode="&#xe02c;" 
-d="M409 800h182c6 0 10 -4 12 -9l94 -182c2 -5 6 -9 12 -9h82c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v441c0 83 67 150 150 150h141c6 0 10 4 12 9l94 182c2 5 6 9 12 9zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z
-M500 500c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM500 400c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="2d" unicode="&#xe02d;" 
-d="M0 600h800l-400 -400z" />
-    <glyph glyph-name="2e" unicode="&#xe02e;" horiz-adv-x="400" 
-d="M400 800v-800l-400 400z" />
-    <glyph glyph-name="2f" unicode="&#xe02f;" horiz-adv-x="400" 
-d="M0 800l400 -400l-400 -400v800z" />
-    <glyph glyph-name="30" unicode="&#xe030;" 
-d="M400 600l400 -400h-800z" />
-    <glyph glyph-name="31" unicode="&#xe031;" 
-d="M0 550c0 23 20 50 46 50h3h5h4h200c17 0 37 -13 44 -28l38 -72h444c14 0 19 -12 15 -25l-81 -250c-4 -13 -21 -25 -35 -25h-350c-14 0 -30 12 -34 25c-27 83 -54 167 -81 250l-10 25h-150c-2 0 -5 -1 -7 -1c-28 0 -51 23 -51 51zM358 100c28 0 50 -22 50 -50
-s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM658 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="32" unicode="&#xe032;" 
-d="M0 700h500v-100h-300v-300h-100l-100 -100v500zM300 500h500v-500l-100 100h-400v400z" />
-    <glyph glyph-name="33" unicode="&#xe033;" 
-d="M641 700l143 -141l-493 -493c-71 76 -146 148 -219 222l-72 71l141 141c50 -51 101 -101 153 -150c116 117 234 231 347 350z" />
-    <glyph glyph-name="34" unicode="&#xe034;" 
-d="M150 600l250 -250l250 250l150 -150l-400 -400l-400 400z" />
-    <glyph glyph-name="35" unicode="&#xe035;" horiz-adv-x="600" 
-d="M400 800l150 -150l-250 -250l250 -250l-150 -150l-400 400z" />
-    <glyph glyph-name="36" unicode="&#xe036;" horiz-adv-x="600" 
-d="M150 800l400 -400l-400 -400l-150 150l250 250l-250 250z" />
-    <glyph glyph-name="37" unicode="&#xe037;" 
-d="M400 600l400 -400l-150 -150l-250 250l-250 -250l-150 150z" />
-    <glyph glyph-name="38" unicode="&#xe038;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM600 622l-250 -250l-100 100l-72 -72l172 -172l322 322z" />
-    <glyph glyph-name="39" unicode="&#xe039;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM250 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
-    <glyph glyph-name="3a" unicode="&#xe03a;" 
-d="M350 800c28 0 50 -22 50 -50v-50h75c14 0 25 -11 25 -25v-75h-300v75c0 14 11 25 25 25h75v50c0 28 22 50 50 50zM25 700h75v-200h500v200h75c14 0 25 -11 25 -25v-650c0 -14 -11 -25 -25 -25h-650c-14 0 -25 11 -25 25v650c0 14 11 25 25 25z" />
-    <glyph glyph-name="3b" unicode="&#xe03b;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM350 600h100v-181c23 -24 47 -47 72 -69l-72 -72c-27 30 -55 59 -84 88l-16 12
-v222z" />
-    <glyph glyph-name="3c" unicode="&#xe03c;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-191v50c0 83 -67 150 -150 150s-150 -67 -150 -150v-50h-272c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM434 400h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1
-v-150h150l-200 -200l-200 200h150v150v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="3d" unicode="&#xe03d;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-141l-200 200l-200 -200h-222c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM450 350l250 -250h-200v-50c0 -28 -22 -50 -50 -50s-50 22 -50 50v50h-200z" />
-    <glyph glyph-name="3e" unicode="&#xe03e;" 
-d="M450 700c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200s90 200 200 200c23 114 129 200 250 200z" />
-    <glyph glyph-name="3f" unicode="&#xe03f;" 
-d="M250 800c82 0 154 -40 200 -100c-143 0 -270 -85 -325 -209c-36 -10 -70 -25 -100 -47c-16 33 -25 67 -25 106c0 138 112 250 250 250zM450 600c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200
-s90 200 200 200c23 114 129 200 250 200z" />
-    <glyph glyph-name="40" unicode="&#xe040;" 
-d="M500 700h100l-300 -600h-100zM100 600h100l-100 -200l100 -200h-100l-100 200zM600 600h100l100 -200l-100 -200h-100l100 200z" />
-    <glyph glyph-name="41" unicode="&#xe041;" 
-d="M350 800h100l50 -119l28 -12l119 50l72 -72l-50 -119l12 -28l119 -50v-100l-119 -50l-12 -28l50 -119l-72 -72l-119 50l-28 -12l-50 -119h-100l-50 119l-28 12l-119 -50l-72 72l50 119l-12 28l-119 50v100l119 50l12 28l-50 119l72 72l119 -50l28 12zM400 550
-c-83 0 -150 -67 -150 -150s67 -150 150 -150s150 67 150 150s-67 150 -150 150z" />
-    <glyph glyph-name="42" unicode="&#xe042;" 
-d="M0 800h800v-200h-800v200zM200 500h400l-200 -200zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="43" unicode="&#xe043;" 
-d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM500 600v-400l-200 200z" />
-    <glyph glyph-name="44" unicode="&#xe044;" 
-d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM300 600l200 -200l-200 -200v400z" />
-    <glyph glyph-name="45" unicode="&#xe045;" 
-d="M0 800h800v-100h-800v100zM400 500l200 -200h-400zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="46" unicode="&#xe046;" 
-d="M150 700c83 0 150 -67 150 -150v-50h100v50c0 83 67 150 150 150s150 -67 150 -150s-67 -150 -150 -150h-50v-100h50c83 0 150 -67 150 -150s-67 -150 -150 -150s-150 67 -150 150v50h-100v-50c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150h50v100h-50
-c-83 0 -150 67 -150 150s67 150 150 150zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h50v50c0 28 -22 50 -50 50zM550 600c-28 0 -50 -22 -50 -50v-50h50c28 0 50 22 50 50s-22 50 -50 50zM300 400v-100h100v100h-100zM150 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
-s50 22 50 50v50h-50zM500 200v-50c0 -28 22 -50 50 -50s50 22 50 50s-22 50 -50 50h-50z" />
-    <glyph glyph-name="47" unicode="&#xe047;" 
-d="M0 791c0 5 4 9 9 9h782c6 0 9 -4 9 -10v-790l-200 200h-591c-6 0 -9 3 -9 9v582z" />
-    <glyph glyph-name="48" unicode="&#xe048;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM600 600l-100 -300l-300 -100l100 300zM400 450c-28 0 -50 -22 -50 -50
-s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="49" unicode="&#xe049;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700v-600c166 0 300 134 300 300s-134 300 -300 300z" />
-    <glyph glyph-name="4a" unicode="&#xe04a;" 
-d="M0 800h800v-100h-800v100zM0 600h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100zM750 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="4b" unicode="&#xe04b;" 
-d="M25 700h750c14 0 25 -11 25 -25v-75h-800v75c0 14 11 25 25 25zM0 500h800v-375c0 -14 -11 -25 -25 -25h-750c-14 0 -25 11 -25 25v375zM100 300v-100h100v100h-100zM300 300v-100h100v100h-100z" />
-    <glyph glyph-name="4c" unicode="&#xe04c;" 
-d="M100 800h100v-100h450l100 100l50 -50l-100 -100v-450h100v-100h-100v-100h-100v100h-500v500h-100v100h100v100zM200 600v-350l350 350h-350zM600 550l-350 -350h350v350z" />
-    <glyph glyph-name="4d" unicode="&#xe04d;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z
-M200 452c0 20 15 42 34 48h3h3h8c12 0 28 -7 36 -16l91 -90l25 6c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100l6 25l-90 91c-9 8 -16 24 -16 36zM550 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="4e" unicode="&#xe04e;" 
-d="M300 800h200v-300h200l-300 -300l-300 300h200v300zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="4f" unicode="&#xe04f;" 
-d="M0 800h800v-100h-800v100zM400 600l300 -300h-200v-300h-200v300h-200z" />
-    <glyph glyph-name="50" unicode="&#xe050;" 
-d="M200 700h600v-600h-600l-200 300zM350 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
-    <glyph glyph-name="51" unicode="&#xe051;" 
-d="M400 700c220 0 400 -180 400 -400h-100c0 166 -134 300 -300 300s-300 -134 -300 -300h-100c0 220 180 400 400 400zM341 491l59 -88l59 88c81 -25 141 -101 141 -191c0 -110 -90 -200 -200 -200s-200 90 -200 200c0 90 60 166 141 191z" />
-    <glyph glyph-name="52" unicode="&#xe052;" 
-d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300zM100 600v-100h100v100h-100zM100 400v-100h100v100h-100zM100 200v-100h400v100h-400z" />
-    <glyph glyph-name="53" unicode="&#xe053;" horiz-adv-x="600" 
-d="M200 700h100v-100h75c30 0 58 -6 81 -22s44 -44 44 -78v-100h-100v94c-4 3 -13 6 -25 6h-250c-14 0 -25 -11 -25 -25v-50c0 -15 20 -40 34 -44l257 -65c66 -16 109 -73 109 -141v-50c0 -68 -57 -125 -125 -125h-75v-100h-100v100h-75c-30 0 -58 6 -81 22s-44 44 -44 78
-v100h100v-94c4 -3 13 -6 25 -6h250c14 0 25 11 25 25v50c0 15 -20 40 -34 44l-257 65c-66 16 -109 73 -109 141v50c0 68 57 125 125 125h75v100z" />
-    <glyph glyph-name="54" unicode="&#xe054;" 
-d="M0 700h300v-300l-300 -300v600zM500 700h300v-300l-300 -300v600z" />
-    <glyph glyph-name="55" unicode="&#xe055;" 
-d="M300 700v-600h-300v300zM800 700v-600h-300v300z" />
-    <glyph glyph-name="56" unicode="&#xe056;" 
-d="M300 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300zM800 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300z" />
-    <glyph glyph-name="57" unicode="&#xe057;" 
-d="M0 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300zM500 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300z" />
-    <glyph glyph-name="58" unicode="&#xe058;" horiz-adv-x="600" 
-d="M300 800l34 -34c11 -11 266 -270 266 -488c0 -165 -135 -300 -300 -300s-300 135 -300 300c0 218 255 477 266 488zM150 328c-28 0 -50 -22 -50 -50c0 -110 90 -200 200 -200c28 0 50 22 50 50s-22 50 -50 50c-55 0 -100 45 -100 100c0 28 -22 50 -50 50z" />
-    <glyph glyph-name="59" unicode="&#xe059;" 
-d="M400 800l400 -500h-800zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="5a" unicode="&#xe05a;" horiz-adv-x="600" 
-d="M300 800l300 -300h-600zM0 300h600l-300 -300z" />
-    <glyph glyph-name="5b" unicode="&#xe05b;" 
-d="M0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200z" />
-    <glyph glyph-name="5c" unicode="&#xe05c;" 
-d="M0 700h800v-100l-400 -200l-400 200v100zM0 500l400 -200l400 200v-400h-800v400z" />
-    <glyph glyph-name="5d" unicode="&#xe05d;" 
-d="M400 800l400 -200v-600h-800v600zM400 688l-300 -150v-188l300 -150l300 150v188zM200 500h400v-100l-200 -100l-200 100v100z" />
-    <glyph glyph-name="5e" unicode="&#xe05e;" 
-d="M600 700c69 0 134 -19 191 -50l-16 -106c-49 35 -109 56 -175 56c-131 0 -240 -84 -281 -200h331l-16 -100h-334c0 -36 8 -68 19 -100h297l-16 -100h-222c55 -61 133 -100 222 -100c78 0 147 30 200 78v-122c-59 -35 -127 -56 -200 -56c-147 0 -274 82 -344 200h-256
-l19 100h197c-8 32 -16 66 -16 100h-200l25 100h191c45 172 198 300 384 300z" />
-    <glyph glyph-name="5f" unicode="&#xe05f;" 
-d="M0 700h700v-100h-700v100zM0 500h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100z" />
-    <glyph glyph-name="60" unicode="&#xe060;" 
-d="M0 800h800v-100h-800v100zM200 600h400l-200 -200zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="61" unicode="&#xe061;" 
-d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM200 600l200 -200l-200 -200v400z" />
-    <glyph glyph-name="62" unicode="&#xe062;" 
-d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM600 600v-400l-200 200z" />
-    <glyph glyph-name="63" unicode="&#xe063;" 
-d="M0 800h800v-200h-800v200zM400 400l200 -200h-400zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="64" unicode="&#xe064;" 
-d="M0 800h200v-100h-100v-600h600v100h100v-200h-800v800zM400 800h400v-400l-150 150l-250 -250l-100 100l250 250z" />
-    <glyph glyph-name="65" unicode="&#xe065;" 
-d="M403 700c247 0 397 -300 397 -300s-150 -300 -397 -300c-253 0 -403 300 -403 300s150 300 403 300zM400 600c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM400 500c10 0 19 -3 28 -6c-16 -8 -28 -24 -28 -44c0 -28 22 -50 50 -50
-c20 0 36 12 44 28c3 -9 6 -18 6 -28c0 -55 -45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="66" unicode="&#xe066;" horiz-adv-x="900" 
-d="M331 700h3h3c3 1 7 1 10 1c12 0 29 -8 37 -17l94 -93l66 65c57 57 155 57 212 0c58 -58 58 -154 0 -212l-65 -66l93 -94c10 -8 18 -25 18 -38c0 -28 -22 -50 -50 -50c-13 0 -32 9 -40 20l-62 65l-381 -381h-269v272l375 381l-63 63c-9 8 -16 24 -16 36c0 20 16 42 35 48z
-M447 481l-313 -315l128 -132l316 316z" />
-    <glyph glyph-name="67" unicode="&#xe067;" 
-d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300z" />
-    <glyph glyph-name="68" unicode="&#xe068;" 
-d="M200 800c0 0 200 -100 200 -300s-298 -302 -200 -500c0 0 -200 100 -200 300s300 300 200 500zM500 500c0 0 200 -100 200 -300c0 -150 -60 -200 -100 -200h-300c0 200 300 300 200 500z" />
-    <glyph glyph-name="69" unicode="&#xe069;" 
-d="M0 800h100v-800h-100v800zM200 800h300v-100h300l-200 -203l200 -197h-400v100h-200v400z" />
-    <glyph glyph-name="6a" unicode="&#xe06a;" horiz-adv-x="400" 
-d="M150 800h150l-100 -200h200l-150 -300h150l-300 -300l-100 300h134l66 200h-200z" />
-    <glyph glyph-name="6b" unicode="&#xe06b;" 
-d="M0 800h300v-100h500v-100h-800v200zM0 500h800v-450c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v450z" />
-    <glyph glyph-name="6c" unicode="&#xe06c;" 
-d="M150 800c83 0 150 -67 150 -150c0 -66 -41 -121 -100 -141v-118c15 5 33 9 50 9h200c28 0 50 22 50 50v59c-59 20 -100 75 -100 141c0 83 67 150 150 150s150 -67 150 -150c0 -66 -41 -121 -100 -141v-59c0 -82 -68 -150 -150 -150h-200c-14 0 -25 -7 -34 -16
-c50 -24 84 -74 84 -134c0 -83 -67 -150 -150 -150s-150 67 -150 150c0 66 41 121 100 141v218c-59 20 -100 75 -100 141c0 83 67 150 150 150z" />
-    <glyph glyph-name="6d" unicode="&#xe06d;" 
-d="M0 800h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400zM500 400l150 -150l150 150v-400h-400l150 150l-150 150z" />
-    <glyph glyph-name="6e" unicode="&#xe06e;" 
-d="M100 800l150 -150l150 150v-400h-400l150 150l-150 150zM400 400h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400z" />
-    <glyph glyph-name="6f" unicode="&#xe06f;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700c-56 0 -108 -17 -153 -44l22 -19c33 -18 13 -48 -13 -59c-30 -13 -77 10 -65 -41c13 -55 -27 -3 -47 -15c-42 -26 49 -152 31 -156l-59 34c-8 0 -13 -5 -16 -10
-c1 -30 10 -57 19 -84c28 -11 77 -2 100 -25c47 -28 97 -115 75 -159c34 -13 68 -22 106 -22c101 0 193 48 247 125c3 24 -8 44 -50 44c-69 0 -156 13 -153 97c2 46 101 108 66 143c-30 30 12 39 12 66c0 37 -65 32 -69 50s20 36 41 56c-30 10 -60 19 -94 19zM631 591
-c-38 -11 -94 -35 -87 -53c6 -15 52 -1 65 -13c11 -10 16 -59 44 -31l22 22v3c-11 26 -26 50 -44 72z" />
-    <glyph glyph-name="70" unicode="&#xe070;" 
-d="M703 800l97 -100l-400 -400l-100 100l-200 -203l-100 100l300 303l100 -100zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="71" unicode="&#xe071;" 
-d="M0 700h100v-100h-100v100zM200 700h100v-100h-100v100zM400 700h100v-100h-100v100zM600 700h100v-100h-100v100zM0 500h100v-100h-100v100zM200 500h100v-100h-100v100zM400 500h100v-100h-100v100zM600 500h100v-100h-100v100zM0 300h100v-100h-100v100zM200 300h100
-v-100h-100v100zM400 300h100v-100h-100v100zM600 300h100v-100h-100v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100zM600 100h100v-100h-100v100z" />
-    <glyph glyph-name="72" unicode="&#xe072;" 
-d="M0 800h200v-200h-200v200zM300 800h200v-200h-200v200zM600 800h200v-200h-200v200zM0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200zM0 200h200v-200h-200v200zM300 200h200v-200h-200v200zM600 200h200v-200h-200v200z" />
-    <glyph glyph-name="73" unicode="&#xe073;" 
-d="M0 800h300v-300h-300v300zM500 800h300v-300h-300v300zM0 300h300v-300h-300v300zM500 300h300v-300h-300v300z" />
-    <glyph glyph-name="74" unicode="&#xe074;" 
-d="M19 800h662c11 0 19 -8 19 -19v-331c0 -28 -22 -50 -50 -50h-600c-28 0 -50 22 -50 50v331c0 11 8 19 19 19zM0 309c16 -6 32 -9 50 -9h600c18 0 34 3 50 9v-290c0 -11 -8 -19 -19 -19h-662c-11 0 -19 8 -19 19v290zM550 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
-s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="75" unicode="&#xe075;" 
-d="M0 700h300v-100h-50c-28 0 -50 -22 -50 -50v-150h300v150c0 28 -22 50 -50 50h-50v100h300v-100h-50c-28 0 -50 -22 -50 -50v-400c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50v150h-300v-150c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50
-v400c0 28 -22 50 -50 50h-50v100z" />
-    <glyph glyph-name="76" unicode="&#xe076;" 
-d="M400 700c165 0 300 -135 300 -300v-100h50c28 0 50 -22 50 -50v-200c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v350c0 111 -89 200 -200 200s-200 -89 -200 -200v-350c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v200c0 28 22 50 50 50h50v100
-c0 165 135 300 300 300z" />
-    <glyph glyph-name="77" unicode="&#xe077;" 
-d="M0 500c0 109 91 200 200 200s200 -91 200 -200c0 109 91 200 200 200s200 -91 200 -200c0 -55 -23 -105 -59 -141l-341 -340l-341 340c-36 36 -59 86 -59 141z" />
-    <glyph glyph-name="78" unicode="&#xe078;" 
-d="M400 700l400 -300l-100 3v-403h-200v200h-200v-200h-200v400h-100z" />
-    <glyph glyph-name="79" unicode="&#xe079;" 
-d="M0 800h800v-800h-800v800zM100 700v-300l100 100l400 -400h100v100l-200 200l100 100l100 -100v300h-600z" />
-    <glyph glyph-name="7a" unicode="&#xe07a;" 
-d="M19 800h762c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-762c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 600v-300h100l100 -100h200l100 100h100v300h-600z" />
-    <glyph glyph-name="7b" unicode="&#xe07b;" 
-d="M200 600c80 0 142 -56 200 -122c58 66 119 122 200 122c131 0 200 -101 200 -200s-69 -200 -200 -200c-81 0 -142 56 -200 122c-58 -66 -121 -122 -200 -122c-131 0 -200 101 -200 200s69 200 200 200zM200 500c-74 0 -100 -54 -100 -100s26 -100 100 -100
-c42 0 88 47 134 100c-46 53 -92 100 -134 100zM600 500c-43 0 -88 -47 -134 -100c46 -53 91 -100 134 -100c74 0 100 54 100 100s-26 100 -100 100z" />
-    <glyph glyph-name="7c" unicode="&#xe07c;" horiz-adv-x="400" 
-d="M300 800c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100zM150 550c83 0 150 -69 150 -150c0 -66 -100 -214 -100 -250c0 -28 22 -50 50 -50s50 22 50 50h100c0 -83 -67 -150 -150 -150s-150 64 -150 150s100 222 100 250s-22 50 -50 50
-s-50 -22 -50 -50h-100c0 83 67 150 150 150z" />
-    <glyph glyph-name="7d" unicode="&#xe07d;" 
-d="M200 800h500v-100h-122c-77 -197 -156 -392 -234 -588l-6 -12h162v-100h-500v100h122c77 197 156 392 234 588l7 12h-163v100z" />
-    <glyph glyph-name="7e" unicode="&#xe07e;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
-    <glyph glyph-name="7f" unicode="&#xe07f;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
-    <glyph glyph-name="80" unicode="&#xe080;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="81" unicode="&#xe081;" 
-d="M550 800c138 0 250 -112 250 -250s-112 -250 -250 -250c-16 0 -32 0 -47 3l-3 -3v-100h-200v-200h-300v200l303 303c-3 15 -3 31 -3 47c0 138 112 250 250 250zM600 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
-    <glyph glyph-name="82" unicode="&#xe082;" 
-d="M134 600h3h4h4h5h500c28 0 50 -22 50 -50v-350h100v-150c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v150h100v350v2c0 20 15 42 34 48zM200 500v-300h100v-100h200v100h100v300h-400z" />
-    <glyph glyph-name="83" unicode="&#xe083;" 
-d="M0 800h400v-400h-400v400zM500 600h100v-400h-400v100h300v300zM700 400h100v-400h-400v100h300v300z" />
-    <glyph glyph-name="84" unicode="&#xe084;" horiz-adv-x="600" 
-d="M337 694c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-300 -150c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49zM437 544c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-400 -200c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50
-c0 21 16 44 37 49zM437 344c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-106 -56c24 -4 43 -26 43 -50c0 -28 -23 -51 -51 -51c-2 0 -6 1 -8 1h-200c-26 1 -48 24 -48 50c0 16 12 36 26 44zM151 -50c0 23 20 50 46 50h3h4h5h100c28 0 50 -22 50 -50
-s-22 -50 -50 -50h-100c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
-    <glyph glyph-name="85" unicode="&#xe085;" 
-d="M199 800h100v-200h-200v100h100v100zM586 797h1c18 1 38 1 56 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0l-44 -44
-c-8 -13 -27 -24 -42 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l43 44c32 33 72 53 128 56zM208 490c4 5 14 16 22 16h3c2 0 6 1 8 1c28 0 50 -22 50 -50c0 -11 -6 -27 -14 -35l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0l44 44c8 13 27 24 42 24
-c28 0 50 -22 50 -50c0 -15 -11 -35 -24 -43l-43 -44c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281zM499 200h200v-100h-100v-100h-100v200z" />
-    <glyph glyph-name="86" unicode="&#xe086;" 
-d="M586 797c18 1 39 1 57 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-62 -62 -132 -81 -182 -78s-69 17 -84 25s-26 27 -26 44c0 28 22 51 50 51c8 0 19 -3 26 -7c0 0 15 -11 41 -13s62 3 106 47l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0
-c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43c32 33 72 53 128 56zM386 566c50 -2 64 -17 85 -22s37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11c0 0 -19 9 -47 10s-63 -4 -103 -44l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0
-c8 13 27 24 42 24c28 0 50 -22 50 -50c0 -15 -10 -35 -23 -43c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281l150 150c60 60 128 78 178 76z" />
-    <glyph glyph-name="87" unicode="&#xe087;" 
-d="M0 700h300v-300h-300v300zM400 700h400v-100h-400v100zM400 500h300v-100h-300v100zM0 300h300v-300h-300v300zM400 300h400v-100h-400v100zM400 100h300v-100h-300v100z" />
-    <glyph glyph-name="88" unicode="&#xe088;" 
-d="M50 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 700h600v-100h-600v100zM50 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 500h600v-100h-600v100zM50 300c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
-s22 50 50 50zM200 300h600v-100h-600v100zM50 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="89" unicode="&#xe089;" 
-d="M800 800l-400 -800l-100 300l-300 100z" />
-    <glyph glyph-name="8a" unicode="&#xe08a;" horiz-adv-x="600" 
-d="M300 700c110 0 200 -90 200 -200v-100h100v-400h-600v400h100v100c0 110 90 200 200 200zM300 600c-56 0 -100 -44 -100 -100v-100h200v100c0 56 -44 100 -100 100z" />
-    <glyph glyph-name="8b" unicode="&#xe08b;" horiz-adv-x="600" 
-d="M300 800c110 0 200 -90 200 -200v-200h100v-400h-600v400h400v200c0 56 -44 100 -100 100s-100 -44 -100 -100h-100c0 110 90 200 200 200z" />
-    <glyph glyph-name="8c" unicode="&#xe08c;" 
-d="M400 700v-100c-111 0 -200 -89 -200 -200h100l-150 -200l-150 200h100c0 165 135 300 300 300zM650 600l150 -200h-100c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-100z" />
-    <glyph glyph-name="8d" unicode="&#xe08d;" 
-d="M100 800h600v-300h100l-150 -250l-150 250h100v200h-400v-100h-100v200zM150 550l150 -250h-100v-200h400v100h100v-200h-600v300h-100z" />
-    <glyph glyph-name="8e" unicode="&#xe08e;" 
-d="M600 700l200 -150l-200 -150v100h-500v-100h-100v100c0 55 45 100 100 100h500v100zM200 300v-100h500v100h100v-100c0 -55 -45 -100 -100 -100h-500v-100l-200 150z" />
-    <glyph glyph-name="8f" unicode="&#xe08f;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -60 -17 -117 -44 -166c5 -3 12 -8 16 -12l100 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 100c-4 3 -9 9 -12 13c-49 -26 -107 -41 -166 -41c-193 0 -350 157 -350 350s157 350 350 350zM350 200
-c142 0 250 108 250 250c0 139 -111 250 -250 250s-250 -111 -250 -250s111 -250 250 -250z" />
-    <glyph glyph-name="90" unicode="&#xe090;" horiz-adv-x="600" 
-d="M300 800c166 0 300 -134 300 -300c0 -200 -300 -500 -300 -500s-300 300 -300 500c0 166 134 300 300 300zM300 700c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200z" />
-    <glyph glyph-name="91" unicode="&#xe091;" horiz-adv-x="900" 
-d="M0 800h800v-541c1 -3 1 -8 1 -11s0 -7 -1 -10v-238h-800v800zM495 250c0 26 22 50 50 50h5h150v400h-600v-600h600v100h-150h-5c-28 0 -50 22 -50 50zM350 600c83 0 150 -67 150 -150c0 -100 -150 -250 -150 -250s-150 150 -150 250c0 83 67 150 150 150zM350 500
-c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="92" unicode="&#xe092;" horiz-adv-x="600" 
-d="M0 700h200v-600h-200v600zM400 700h200v-600h-200v600z" />
-    <glyph glyph-name="93" unicode="&#xe093;" horiz-adv-x="600" 
-d="M0 700l600 -300l-600 -300v600z" />
-    <glyph glyph-name="94" unicode="&#xe094;" horiz-adv-x="600" 
-d="M300 700c166 0 300 -134 300 -300s-134 -300 -300 -300s-300 134 -300 300s134 300 300 300z" />
-    <glyph glyph-name="95" unicode="&#xe095;" 
-d="M400 700v-600l-400 300zM400 400l400 300v-600z" />
-    <glyph glyph-name="96" unicode="&#xe096;" 
-d="M0 700l400 -300l-400 -300v600zM400 100v600l400 -300z" />
-    <glyph glyph-name="97" unicode="&#xe097;" 
-d="M0 700h200v-600h-200v600zM200 400l500 300v-600z" />
-    <glyph glyph-name="98" unicode="&#xe098;" 
-d="M0 700l500 -300l-500 -300v600zM500 100v600h200v-600h-200z" />
-    <glyph glyph-name="99" unicode="&#xe099;" horiz-adv-x="600" 
-d="M0 700h600v-600h-600v600z" />
-    <glyph glyph-name="9a" unicode="&#xe09a;" 
-d="M200 800h400v-200h200v-400h-200v-200h-400v200h-200v400h200v200z" />
-    <glyph glyph-name="9b" unicode="&#xe09b;" 
-d="M0 700h800v-100h-800v100zM0 403h800v-100h-800v100zM0 103h800v-100h-800v100z" />
-    <glyph glyph-name="9c" unicode="&#xe09c;" horiz-adv-x="600" 
-d="M278 700c7 2 13 4 22 4c55 0 100 -45 100 -100v-4v-200c0 -55 -45 -100 -100 -100s-100 45 -100 100v200v2c0 44 35 88 78 98zM34 500h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-50c0 -111 89 -200 200 -200s200 89 200 200v50c0 28 22 50 50 50s50 -22 50 -50v-50
-c0 -148 -109 -270 -250 -294v-106h50c55 0 100 -45 100 -100h-400c0 55 45 100 100 100h50v106c-141 24 -250 146 -250 294v50v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="9d" unicode="&#xe09d;" 
-d="M0 500h800v-200h-800v200z" />
-    <glyph glyph-name="9e" unicode="&#xe09e;" 
-d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-500c0 -28 -22 -50 -50 -50h-250v-100h100c55 0 100 -45 100 -100h-600c0 55 45 100 100 100h100v100h-250c-28 0 -50 22 -50 50v500v2c0 20 15 42 34 48zM100 600v-400h600v400h-600z" />
-    <glyph glyph-name="9f" unicode="&#xe09f;" 
-d="M272 700c-14 -40 -22 -83 -22 -128c0 -221 179 -400 400 -400c45 0 88 8 128 22c-53 -158 -202 -272 -378 -272c-221 0 -400 179 -400 400c0 176 114 325 272 378z" />
-    <glyph glyph-name="a0" unicode="&#xe0a0;" 
-d="M350 700l150 -150h-100v-150h150v100l150 -150l-150 -150v100h-150v-150h100l-150 -150l-150 150h100v150h-150v-100l-150 150l150 150v-100h150v150h-100z" />
-    <glyph glyph-name="a1" unicode="&#xe0a1;" 
-d="M800 800v-550c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v206c-201 -6 -327 -27 -400 -50v-397c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v409s100 100 600 100z" />
-    <glyph glyph-name="a2" unicode="&#xe0a2;" horiz-adv-x="700" 
-d="M499 700c51 0 102 -20 141 -59c78 -78 78 -203 0 -281l-250 -244c-48 -48 -127 -48 -175 0s-48 127 0 175l96 97l69 -69l-90 -94l-7 -3c-10 -10 -10 -28 0 -38s28 -10 38 0l250 247c37 40 39 102 0 141s-104 40 -144 0l-278 -275c-66 -69 -68 -179 0 -247
-c69 -69 181 -69 250 0l9 12l116 113l69 -69l-125 -125c-107 -107 -281 -107 -388 0s-107 281 0 388l278 272c39 39 90 59 141 59z" />
-    <glyph glyph-name="a3" unicode="&#xe0a3;" 
-d="M600 800l200 -200l-100 -100l-200 200zM400 600l200 -200l-400 -400h-200v200z" />
-    <glyph glyph-name="a4" unicode="&#xe0a4;" 
-d="M550 800c83 0 150 -90 150 -200s-67 -200 -150 -200c-22 0 -40 8 -59 19c6 26 9 52 9 81c0 84 -27 158 -72 212c27 52 71 88 122 88zM250 700c83 0 150 -90 150 -200s-67 -200 -150 -200s-150 90 -150 200s67 200 150 200zM725 384c44 -22 75 -66 75 -118v-166h-200v66
-c0 50 -17 96 -44 134c66 2 126 33 169 84zM75 284c45 -53 106 -84 175 -84s130 31 175 84c44 -22 75 -66 75 -118v-166h-500v166c0 52 31 96 75 118z" />
-    <glyph glyph-name="a5" unicode="&#xe0a5;" 
-d="M400 800c110 0 200 -112 200 -250s-90 -250 -200 -250s-200 112 -200 250s90 250 200 250zM191 300c54 -61 128 -100 209 -100s155 39 209 100c106 -5 191 -92 191 -200v-100h-800v100c0 108 85 195 191 200z" />
-    <glyph glyph-name="a6" unicode="&#xe0a6;" horiz-adv-x="600" 
-d="M19 800h462c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-462c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 700v-500h300v500h-300zM250 150c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="a7" unicode="&#xe0a7;" 
-d="M350 800c17 0 34 -1 50 -3v-397l-297 297c63 64 150 103 247 103zM500 694c169 -25 300 -168 300 -344c0 -193 -157 -350 -350 -350c-85 0 -161 31 -222 81l272 272v341zM91 562l237 -234l-212 -212c-70 55 -116 138 -116 234c0 84 35 158 91 212z" />
-    <glyph glyph-name="a8" unicode="&#xe0a8;" 
-d="M92 650c0 23 20 50 46 50h3h4h5h400c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-200h100c55 0 100 -45 100 -100h-300v-300l-56 -100l-44 100v300h-300c0 55 45 100 100 100h100v200h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
-    <glyph glyph-name="a9" unicode="&#xe0a9;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 600v-400l300 200z" />
-    <glyph glyph-name="aa" unicode="&#xe0aa;" 
-d="M300 800h200v-300h300v-200h-300v-300h-200v300h-300v200h300v300z" />
-    <glyph glyph-name="ab" unicode="&#xe0ab;" 
-d="M300 800h100v-400h-100v400zM172 656l62 -78l-40 -31c-58 -46 -94 -117 -94 -197c0 -139 111 -250 250 -250s250 111 250 250c0 80 -39 151 -97 197l-37 31l62 78l38 -31c82 -64 134 -164 134 -275c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 111 53 211 134 275z
-" />
-    <glyph glyph-name="ac" unicode="&#xe0ac;" 
-d="M200 800h400v-200h-400v200zM9 500h782c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-91v200h-600v-200h-91c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM200 300h400v-300h-400v300z" />
-    <glyph glyph-name="ad" unicode="&#xe0ad;" 
-d="M0 700h100v-700h-100v700zM700 700h100v-700h-100v700zM200 600h200v-100h-200v100zM300 400h200v-100h-200v100zM400 200h200v-100h-200v100z" />
-    <glyph glyph-name="ae" unicode="&#xe0ae;" 
-d="M325 700c42 -141 87 -280 131 -419c29 74 59 148 88 222c30 -57 58 -114 87 -172h169v-100h-231l-13 28c-37 -92 -74 -184 -112 -275c-38 129 -79 257 -119 385c-42 -133 -83 -267 -125 -400c-28 88 -56 175 -84 262h-116v100h188l9 -34l3 -6c42 137 83 273 125 409z" />
-    <glyph glyph-name="af" unicode="&#xe0af;" 
-d="M200 600c0 57 43 100 100 100s100 -43 100 -100c0 -28 -18 -48 -28 -72c-3 -6 -3 -16 -3 -28h231v-231c12 0 22 0 28 3c24 10 44 28 72 28c57 0 100 -43 100 -100s-43 -100 -100 -100c-28 0 -48 18 -72 28c-6 3 -16 3 -28 3v-231h-231c0 12 0 22 3 28c10 24 28 44 28 72
-c0 57 -43 100 -100 100s-100 -43 -100 -100c0 -28 18 -48 28 -72c3 -6 3 -16 3 -28h-231v600h231c0 12 0 22 -3 28c-10 24 -28 44 -28 72z" />
-    <glyph glyph-name="b0" unicode="&#xe0b0;" horiz-adv-x="500" 
-d="M247 700c84 0 148 -20 191 -59s59 -93 59 -141c0 -117 -69 -181 -119 -225s-81 -67 -81 -150v-25h-100v25c0 117 65 181 115 225s85 67 85 150c0 25 -8 48 -28 66s-56 34 -122 34s-97 -18 -116 -37s-27 -43 -31 -69l-100 12c5 38 19 88 59 128s103 66 188 66zM197 0h100
-v-100h-100v100z" />
-    <glyph glyph-name="b1" unicode="&#xe0b1;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -69 -48 -127 -112 -144c-22 55 -75 94 -138 94c-20 0 -39 -5 -56 -12c-17 64 -75 112 -144 112s-127 -48 -144 -112c-17 7 -36 12 -56 12c-37 0 -71 -12 -97 -34c-33 36 -53 82 -53 134
-c0 110 90 200 200 200c23 114 129 200 250 200zM334 300h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-200c0 -28 -22 -50 -50 -50s-50 22 -50 50v200v2c0 20 15 42 34 48zM134 200h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2
-c0 20 15 42 34 48zM534 200h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="b2" unicode="&#xe0b2;" 
-d="M600 800l200 -150l-200 -150v100h-50l-153 -191l175 -206l6 -3h22v100l200 -150l-200 -150v100h-25c-35 0 -56 12 -78 38l-166 190l-153 -190c-22 -27 -43 -38 -78 -38h-100v100h100l166 206l-163 191l-3 3h-100v100h100c34 0 56 -12 78 -38l153 -178l141 178
-c22 27 43 38 78 38h50v100z" />
-    <glyph glyph-name="b3" unicode="&#xe0b3;" 
-d="M400 800c110 0 209 -47 281 -119l119 119v-300h-300l109 109c-54 55 -126 91 -209 91c-166 0 -300 -134 -300 -300s134 -300 300 -300c83 0 158 34 212 88l72 -72c-72 -72 -174 -116 -284 -116c-220 0 -400 180 -400 400s180 400 400 400z" />
-    <glyph glyph-name="b4" unicode="&#xe0b4;" 
-d="M400 800h400v-400l-166 166l-400 -400l166 -166h-400v400l166 -166l400 400z" />
-    <glyph glyph-name="b5" unicode="&#xe0b5;" horiz-adv-x="600" 
-d="M250 800l250 -300h-200v-200h200l-250 -300l-250 300h200v200h-200z" />
-    <glyph glyph-name="b6" unicode="&#xe0b6;" 
-d="M300 600v-200h200v200l300 -250l-300 -250v200h-200v-200l-300 250z" />
-    <glyph glyph-name="b7" unicode="&#xe0b7;" 
-d="M0 800c441 0 800 -359 800 -800h-200c0 333 -267 600 -600 600v200zM0 500c275 0 500 -225 500 -500h-200c0 167 -133 300 -300 300v200zM0 200c110 0 200 -90 200 -200h-200v200z" />
-    <glyph glyph-name="b8" unicode="&#xe0b8;" 
-d="M100 800c386 0 700 -314 700 -700h-100c0 332 -268 600 -600 600v100zM100 600c276 0 500 -224 500 -500h-100c0 222 -178 400 -400 400v100zM100 400c165 0 300 -135 300 -300h-100c0 111 -89 200 -200 200v100zM100 200c55 0 100 -45 100 -100s-45 -100 -100 -100
-s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="b9" unicode="&#xe0b9;" 
-d="M300 800h400c55 0 100 -45 100 -100v-200h-400v150c0 28 -22 50 -50 50s-50 -22 -50 -50v-250h400v-300c0 -55 -45 -100 -100 -100h-500c-55 0 -100 45 -100 100v200h100v-150c0 -28 22 -50 50 -50s50 22 50 50v550c0 55 45 100 100 100z" />
-    <glyph glyph-name="ba" unicode="&#xe0ba;" 
-d="M75 700h225v-100h-200v-500h400v100h100v-125c0 -41 -34 -75 -75 -75h-450c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM600 700l200 -200l-200 -200v100h-200c-94 0 -173 -65 -194 -153c23 199 189 353 394 353v100z" />
-    <glyph glyph-name="bb" unicode="&#xe0bb;" 
-d="M500 700l300 -284l-300 -316v200h-100c-200 0 -348 -102 -400 -300c0 295 100 500 500 500v200z" />
-    <glyph glyph-name="bc" unicode="&#xe0bc;" 
-d="M381 791l19 9l19 -9c127 -53 253 -108 381 -160v-31c0 -166 -67 -313 -147 -419c-40 -53 -83 -97 -125 -128s-82 -53 -128 -53s-86 22 -128 53s-85 75 -125 128c-80 107 -147 253 -147 419v31c128 52 254 107 381 160zM400 100v591l-294 -122c8 -126 58 -243 122 -328
-c35 -46 73 -86 106 -110s62 -31 66 -31z" />
-    <glyph glyph-name="bd" unicode="&#xe0bd;" 
-d="M600 800h100v-800h-100v800zM400 700h100v-700h-100v700zM200 500h100v-500h-100v500zM0 300h100v-300h-100v300z" />
-    <glyph glyph-name="be" unicode="&#xe0be;" 
-d="M300 800h100v-200h200l100 -100l-100 -100h-200v-400h-100v500h-200l-100 100l100 100h200v100z" />
-    <glyph glyph-name="bf" unicode="&#xe0bf;" 
-d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h200v-100h-200v100zM400 600h300v-100h-300v100zM400 400h400v-100h-400v100z" />
-    <glyph glyph-name="c0" unicode="&#xe0c0;" 
-d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h400v-100h-400v100zM400 600h300v-100h-300v100zM400 400h200v-100h-200v100z" />
-    <glyph glyph-name="c1" unicode="&#xe0c1;" 
-d="M75 700h650c41 0 75 -34 75 -75v-550c0 -41 -34 -75 -75 -75h-650c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM100 600v-100h100v100h-100zM300 600v-100h400v100h-400zM100 400v-100h100v100h-100zM300 400v-100h400v100h-400zM100 200v-100h100v100h-100zM300 200
-v-100h400v100h-400z" />
-    <glyph glyph-name="c2" unicode="&#xe0c2;" 
-d="M400 800l100 -300h300l-250 -200l100 -300l-250 200l-250 -200l100 300l-250 200h300z" />
-    <glyph glyph-name="c3" unicode="&#xe0c3;" 
-d="M400 800c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM650 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 600c110 0 200 -90 200 -200
-s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM50 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM750 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
-s22 50 50 50zM650 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="c4" unicode="&#xe0c4;" 
-d="M34 800h632c18 0 34 -16 34 -34v-732c0 -18 -16 -34 -34 -34h-632c-18 0 -34 16 -34 34v732c0 18 16 34 34 34zM100 700v-500h500v500h-500zM350 150c-38 0 -63 -42 -44 -75s69 -33 88 0s-6 75 -44 75z" />
-    <glyph glyph-name="c5" unicode="&#xe0c5;" 
-d="M0 800h300l500 -500l-300 -300l-500 500v300zM200 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
-    <glyph glyph-name="c6" unicode="&#xe0c6;" 
-d="M0 600h200l300 -300l-200 -200l-300 300v200zM340 600h160l300 -300l-200 -200l-78 78l119 122zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="c7" unicode="&#xe0c7;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200
-s90 200 200 200zM400 500c-56 0 -100 -44 -100 -100s44 -100 100 -100s100 44 100 100s-44 100 -100 100z" />
-    <glyph glyph-name="c8" unicode="&#xe0c8;" 
-d="M0 700h559l-100 -100h-359v-500h500v159l100 100v-359h-700v700zM700 700l100 -100l-400 -400l-200 200l100 100l100 -100z" />
-    <glyph glyph-name="c9" unicode="&#xe0c9;" 
-d="M9 800h782c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM150 722l-72 -72l100 -100l-100 -100l72 -72l172 172zM400 500v-100h300v100h-300z" />
-    <glyph glyph-name="ca" unicode="&#xe0ca;" 
-d="M0 800h800v-200h-50c0 55 -45 100 -100 100h-150v-550c0 -28 22 -50 50 -50h50v-100h-400v100h50c28 0 50 22 50 50v550h-150c-55 0 -100 -45 -100 -100h-50v200z" />
-    <glyph glyph-name="cb" unicode="&#xe0cb;" 
-d="M0 700h100v-400h-100v400zM200 700h350c21 0 39 -13 47 -31c0 0 103 -291 103 -319s-22 -50 -50 -50h-150c-28 0 -50 -25 -50 -50s39 -158 47 -184s-5 -55 -31 -63s-52 5 -66 31s-109 219 -128 238s-44 28 -72 28v400z" />
-    <glyph glyph-name="cc" unicode="&#xe0cc;" 
-d="M400 666c10 19 28 32 47 34l19 -3c26 -8 39 -37 31 -63s-47 -159 -47 -184s22 -50 50 -50h150c28 0 50 -22 50 -50s-103 -319 -103 -319c-8 -18 -26 -31 -47 -31h-350v400c28 0 53 9 72 28s114 212 128 238zM0 400h100v-400h-100v400z" />
-    <glyph glyph-name="cd" unicode="&#xe0cd;" 
-d="M200 700h300v-100h-100v-6c25 -4 50 -8 72 -16l-34 -94c-28 11 -58 16 -88 16c-139 0 -250 -111 -250 -250s111 -250 250 -250s250 111 250 250c0 31 -5 60 -16 88l91 37c14 -38 25 -81 25 -125c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 176 130 323 300 347v3
-h-100v100zM700 584c0 0 -296 -348 -316 -368s-48 -20 -68 0s-20 48 0 68s384 300 384 300z" />
-    <glyph glyph-name="ce" unicode="&#xe0ce;" 
-d="M600 700l200 -150l-200 -150v100h-600v100h600v100zM200 300v-100h600v-100h-600v-100l-200 150z" />
-    <glyph glyph-name="cf" unicode="&#xe0cf;" 
-d="M300 800h100c55 0 100 -45 100 -100h100c55 0 100 -45 100 -100h-700c0 55 45 100 100 100h100c0 55 45 100 100 100zM100 500h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-481c0 -11 -8 -19 -19 -19h-462
-c-11 0 -19 8 -19 19v481z" />
-    <glyph glyph-name="d0" unicode="&#xe0d0;" 
-d="M100 800h200v-400c0 -55 45 -100 100 -100s100 45 100 100v400h100v-400c0 -110 -90 -200 -200 -200h-50c-138 0 -250 90 -250 200v400zM0 100h700v-100h-700v100z" />
-    <glyph glyph-name="d1" unicode="&#xe0d1;" 
-d="M9 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM609 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282
-c0 6 3 9 9 9zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="d2" unicode="&#xe0d2;" 
-d="M10 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 4 9 10 9zM610 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 5 9 10 9zM310 600h181c6 0 9 -3 9 -9v-91h-200v91c0 6 4 9 10 9zM0 400h800v-100h-800v100zM0 200h200v-191c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v191zM300 200
-h200v-91c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v91zM600 200h200v-191c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v191z" />
-    <glyph glyph-name="d3" unicode="&#xe0d3;" 
-d="M0 700h800v-100h-800v100zM9 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM609 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182
-c-6 0 -9 3 -9 9v482c0 6 3 9 9 9z" />
-    <glyph glyph-name="d4" unicode="&#xe0d4;" 
-d="M50 600h500c28 0 50 -22 50 -50v-150l100 100h100v-300h-100l-100 100v-150c0 -28 -22 -50 -50 -50h-500c-28 0 -50 22 -50 50v400c0 28 22 50 50 50z" />
-    <glyph glyph-name="d5" unicode="&#xe0d5;" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 600v100c26 0 52 -4 75 -10c130 -33 225 -150 225 -290s-95 -258 -225 -291h-3c-23 -6 -47 -9 -72 -9v100c17 0 34 2 50 6c86 22 150 100 150 194s-64 172 -150 194c-16 4 -33 6 -50 6zM500 500l25 -3
-c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
-    <glyph glyph-name="d6" unicode="&#xe0d6;" horiz-adv-x="600" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 500l25 -3c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
-    <glyph glyph-name="d7" unicode="&#xe0d7;" horiz-adv-x="400" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200z" />
-    <glyph glyph-name="d8" unicode="&#xe0d8;" 
-d="M309 800h82c6 0 10 -4 12 -9l294 -682l3 -19v-81c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v81l3 19l294 682c2 5 6 9 12 9zM300 500v-200h100v200h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="d9" unicode="&#xe0d9;" 
-d="M375 800c138 0 269 -39 378 -109l-53 -82c-93 60 -205 91 -325 91c-119 0 -229 -32 -322 -91l-53 82c109 70 237 109 375 109zM375 500c78 0 154 -23 216 -62l-53 -85c-46 30 -104 47 -163 47c-60 0 -112 -17 -159 -47l-54 85c62 40 134 62 213 62zM375 200
-c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="da" unicode="&#xe0da;" horiz-adv-x="900" 
-d="M551 800c16 0 32 0 47 -3l-97 -97v-200h200l97 97c3 -15 3 -31 3 -47c0 -138 -112 -250 -250 -250c-32 0 -62 8 -90 19l-288 -291c-20 -20 -46 -28 -72 -28s-52 8 -72 28c-39 39 -39 105 0 144l291 287c-11 28 -19 59 -19 91c0 138 112 250 250 250zM101 150
-c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="db" unicode="&#xe0db;" 
-d="M141 700c84 -84 169 -167 253 -250c82 83 167 165 247 250l143 -141l-253 -253c84 -82 167 -166 253 -247l-143 -143c-81 86 -165 169 -247 253l-253 -253l-141 143c85 80 167 164 250 247c-83 84 -166 169 -250 253z" />
-    <glyph glyph-name="dc" unicode="&#xe0dc;" 
-d="M0 800h100l231 -300h38l231 300h100l-225 -300h225v-100h-300v-100h300v-100h-300v-200h-100v200h-300v100h300v100h-300v100h225z" />
-    <glyph glyph-name="dd" unicode="&#xe0dd;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
-c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM300 600h100v-100h100v-100h-100v-100h-100v100h-100v100h100v100z" />
-    <glyph glyph-name="de" unicode="&#xe0de;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
-c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM200 500h300v-100h-300v100z" />
-  </font>
-</defs></svg>
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
deleted file mode 100644
index fab60486..00000000
Binary files a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
deleted file mode 100644
index f9309988..00000000
Binary files a/Oqtane.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/css/quill/quill1.3.6.bubble.css b/Oqtane.Client/wwwroot/css/quill/quill1.3.6.bubble.css
deleted file mode 100644
index 4336aa88..00000000
--- a/Oqtane.Client/wwwroot/css/quill/quill1.3.6.bubble.css
+++ /dev/null
@@ -1,952 +0,0 @@
-/*!
- * Quill Editor v1.3.6
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */
-.ql-container {
-  box-sizing: border-box;
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  height: 100%;
-  margin: 0px;
-  position: relative;
-}
-.ql-container.ql-disabled .ql-tooltip {
-  visibility: hidden;
-}
-.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {
-  pointer-events: none;
-}
-.ql-clipboard {
-  left: -100000px;
-  height: 1px;
-  overflow-y: hidden;
-  position: absolute;
-  top: 50%;
-}
-.ql-clipboard p {
-  margin: 0;
-  padding: 0;
-}
-.ql-editor {
-  box-sizing: border-box;
-  line-height: 1.42;
-  height: 100%;
-  outline: none;
-  overflow-y: auto;
-  padding: 12px 15px;
-  tab-size: 4;
-  -moz-tab-size: 4;
-  text-align: left;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-.ql-editor > * {
-  cursor: text;
-}
-.ql-editor p,
-.ql-editor ol,
-.ql-editor ul,
-.ql-editor pre,
-.ql-editor blockquote,
-.ql-editor h1,
-.ql-editor h2,
-.ql-editor h3,
-.ql-editor h4,
-.ql-editor h5,
-.ql-editor h6 {
-  margin: 0;
-  padding: 0;
-  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol,
-.ql-editor ul {
-  padding-left: 1.5em;
-}
-.ql-editor ol > li,
-.ql-editor ul > li {
-  list-style-type: none;
-}
-.ql-editor ul > li::before {
-  content: '\2022';
-}
-.ql-editor ul[data-checked=true],
-.ql-editor ul[data-checked=false] {
-  pointer-events: none;
-}
-.ql-editor ul[data-checked=true] > li *,
-.ql-editor ul[data-checked=false] > li * {
-  pointer-events: all;
-}
-.ql-editor ul[data-checked=true] > li::before,
-.ql-editor ul[data-checked=false] > li::before {
-  color: #777;
-  cursor: pointer;
-  pointer-events: all;
-}
-.ql-editor ul[data-checked=true] > li::before {
-  content: '\2611';
-}
-.ql-editor ul[data-checked=false] > li::before {
-  content: '\2610';
-}
-.ql-editor li::before {
-  display: inline-block;
-  white-space: nowrap;
-  width: 1.2em;
-}
-.ql-editor li:not(.ql-direction-rtl)::before {
-  margin-left: -1.5em;
-  margin-right: 0.3em;
-  text-align: right;
-}
-.ql-editor li.ql-direction-rtl::before {
-  margin-left: 0.3em;
-  margin-right: -1.5em;
-}
-.ql-editor ol li:not(.ql-direction-rtl),
-.ql-editor ul li:not(.ql-direction-rtl) {
-  padding-left: 1.5em;
-}
-.ql-editor ol li.ql-direction-rtl,
-.ql-editor ul li.ql-direction-rtl {
-  padding-right: 1.5em;
-}
-.ql-editor ol li {
-  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-  counter-increment: list-0;
-}
-.ql-editor ol li:before {
-  content: counter(list-0, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-  counter-increment: list-1;
-}
-.ql-editor ol li.ql-indent-1:before {
-  content: counter(list-1, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-  counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-2 {
-  counter-increment: list-2;
-}
-.ql-editor ol li.ql-indent-2:before {
-  content: counter(list-2, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-2 {
-  counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-3 {
-  counter-increment: list-3;
-}
-.ql-editor ol li.ql-indent-3:before {
-  content: counter(list-3, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-3 {
-  counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-4 {
-  counter-increment: list-4;
-}
-.ql-editor ol li.ql-indent-4:before {
-  content: counter(list-4, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-4 {
-  counter-reset: list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-5 {
-  counter-increment: list-5;
-}
-.ql-editor ol li.ql-indent-5:before {
-  content: counter(list-5, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-5 {
-  counter-reset: list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-6 {
-  counter-increment: list-6;
-}
-.ql-editor ol li.ql-indent-6:before {
-  content: counter(list-6, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-6 {
-  counter-reset: list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-7 {
-  counter-increment: list-7;
-}
-.ql-editor ol li.ql-indent-7:before {
-  content: counter(list-7, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-7 {
-  counter-reset: list-8 list-9;
-}
-.ql-editor ol li.ql-indent-8 {
-  counter-increment: list-8;
-}
-.ql-editor ol li.ql-indent-8:before {
-  content: counter(list-8, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-8 {
-  counter-reset: list-9;
-}
-.ql-editor ol li.ql-indent-9 {
-  counter-increment: list-9;
-}
-.ql-editor ol li.ql-indent-9:before {
-  content: counter(list-9, decimal) '. ';
-}
-.ql-editor .ql-indent-1:not(.ql-direction-rtl) {
-  padding-left: 3em;
-}
-.ql-editor li.ql-indent-1:not(.ql-direction-rtl) {
-  padding-left: 4.5em;
-}
-.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right {
-  padding-right: 3em;
-}
-.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right {
-  padding-right: 4.5em;
-}
-.ql-editor .ql-indent-2:not(.ql-direction-rtl) {
-  padding-left: 6em;
-}
-.ql-editor li.ql-indent-2:not(.ql-direction-rtl) {
-  padding-left: 7.5em;
-}
-.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right {
-  padding-right: 6em;
-}
-.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right {
-  padding-right: 7.5em;
-}
-.ql-editor .ql-indent-3:not(.ql-direction-rtl) {
-  padding-left: 9em;
-}
-.ql-editor li.ql-indent-3:not(.ql-direction-rtl) {
-  padding-left: 10.5em;
-}
-.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right {
-  padding-right: 9em;
-}
-.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right {
-  padding-right: 10.5em;
-}
-.ql-editor .ql-indent-4:not(.ql-direction-rtl) {
-  padding-left: 12em;
-}
-.ql-editor li.ql-indent-4:not(.ql-direction-rtl) {
-  padding-left: 13.5em;
-}
-.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right {
-  padding-right: 12em;
-}
-.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right {
-  padding-right: 13.5em;
-}
-.ql-editor .ql-indent-5:not(.ql-direction-rtl) {
-  padding-left: 15em;
-}
-.ql-editor li.ql-indent-5:not(.ql-direction-rtl) {
-  padding-left: 16.5em;
-}
-.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right {
-  padding-right: 15em;
-}
-.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right {
-  padding-right: 16.5em;
-}
-.ql-editor .ql-indent-6:not(.ql-direction-rtl) {
-  padding-left: 18em;
-}
-.ql-editor li.ql-indent-6:not(.ql-direction-rtl) {
-  padding-left: 19.5em;
-}
-.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right {
-  padding-right: 18em;
-}
-.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right {
-  padding-right: 19.5em;
-}
-.ql-editor .ql-indent-7:not(.ql-direction-rtl) {
-  padding-left: 21em;
-}
-.ql-editor li.ql-indent-7:not(.ql-direction-rtl) {
-  padding-left: 22.5em;
-}
-.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right {
-  padding-right: 21em;
-}
-.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right {
-  padding-right: 22.5em;
-}
-.ql-editor .ql-indent-8:not(.ql-direction-rtl) {
-  padding-left: 24em;
-}
-.ql-editor li.ql-indent-8:not(.ql-direction-rtl) {
-  padding-left: 25.5em;
-}
-.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right {
-  padding-right: 24em;
-}
-.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right {
-  padding-right: 25.5em;
-}
-.ql-editor .ql-indent-9:not(.ql-direction-rtl) {
-  padding-left: 27em;
-}
-.ql-editor li.ql-indent-9:not(.ql-direction-rtl) {
-  padding-left: 28.5em;
-}
-.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right {
-  padding-right: 27em;
-}
-.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right {
-  padding-right: 28.5em;
-}
-.ql-editor .ql-video {
-  display: block;
-  max-width: 100%;
-}
-.ql-editor .ql-video.ql-align-center {
-  margin: 0 auto;
-}
-.ql-editor .ql-video.ql-align-right {
-  margin: 0 0 0 auto;
-}
-.ql-editor .ql-bg-black {
-  background-color: #000;
-}
-.ql-editor .ql-bg-red {
-  background-color: #e60000;
-}
-.ql-editor .ql-bg-orange {
-  background-color: #f90;
-}
-.ql-editor .ql-bg-yellow {
-  background-color: #ff0;
-}
-.ql-editor .ql-bg-green {
-  background-color: #008a00;
-}
-.ql-editor .ql-bg-blue {
-  background-color: #06c;
-}
-.ql-editor .ql-bg-purple {
-  background-color: #93f;
-}
-.ql-editor .ql-color-white {
-  color: #fff;
-}
-.ql-editor .ql-color-red {
-  color: #e60000;
-}
-.ql-editor .ql-color-orange {
-  color: #f90;
-}
-.ql-editor .ql-color-yellow {
-  color: #ff0;
-}
-.ql-editor .ql-color-green {
-  color: #008a00;
-}
-.ql-editor .ql-color-blue {
-  color: #06c;
-}
-.ql-editor .ql-color-purple {
-  color: #93f;
-}
-.ql-editor .ql-font-serif {
-  font-family: Georgia, Times New Roman, serif;
-}
-.ql-editor .ql-font-monospace {
-  font-family: Monaco, Courier New, monospace;
-}
-.ql-editor .ql-size-small {
-  font-size: 0.75em;
-}
-.ql-editor .ql-size-large {
-  font-size: 1.5em;
-}
-.ql-editor .ql-size-huge {
-  font-size: 2.5em;
-}
-.ql-editor .ql-direction-rtl {
-  direction: rtl;
-  text-align: inherit;
-}
-.ql-editor .ql-align-center {
-  text-align: center;
-}
-.ql-editor .ql-align-justify {
-  text-align: justify;
-}
-.ql-editor .ql-align-right {
-  text-align: right;
-}
-.ql-editor.ql-blank::before {
-  color: rgba(0,0,0,0.6);
-  content: attr(data-placeholder);
-  font-style: italic;
-  left: 15px;
-  pointer-events: none;
-  position: absolute;
-  right: 15px;
-}
-.ql-bubble.ql-toolbar:after,
-.ql-bubble .ql-toolbar:after {
-  clear: both;
-  content: '';
-  display: table;
-}
-.ql-bubble.ql-toolbar button,
-.ql-bubble .ql-toolbar button {
-  background: none;
-  border: none;
-  cursor: pointer;
-  display: inline-block;
-  float: left;
-  height: 24px;
-  padding: 3px 5px;
-  width: 28px;
-}
-.ql-bubble.ql-toolbar button svg,
-.ql-bubble .ql-toolbar button svg {
-  float: left;
-  height: 100%;
-}
-.ql-bubble.ql-toolbar button:active:hover,
-.ql-bubble .ql-toolbar button:active:hover {
-  outline: none;
-}
-.ql-bubble.ql-toolbar input.ql-image[type=file],
-.ql-bubble .ql-toolbar input.ql-image[type=file] {
-  display: none;
-}
-.ql-bubble.ql-toolbar button:hover,
-.ql-bubble .ql-toolbar button:hover,
-.ql-bubble.ql-toolbar button:focus,
-.ql-bubble .ql-toolbar button:focus,
-.ql-bubble.ql-toolbar button.ql-active,
-.ql-bubble .ql-toolbar button.ql-active,
-.ql-bubble.ql-toolbar .ql-picker-label:hover,
-.ql-bubble .ql-toolbar .ql-picker-label:hover,
-.ql-bubble.ql-toolbar .ql-picker-label.ql-active,
-.ql-bubble .ql-toolbar .ql-picker-label.ql-active,
-.ql-bubble.ql-toolbar .ql-picker-item:hover,
-.ql-bubble .ql-toolbar .ql-picker-item:hover,
-.ql-bubble.ql-toolbar .ql-picker-item.ql-selected,
-.ql-bubble .ql-toolbar .ql-picker-item.ql-selected {
-  color: #fff;
-}
-.ql-bubble.ql-toolbar button:hover .ql-fill,
-.ql-bubble .ql-toolbar button:hover .ql-fill,
-.ql-bubble.ql-toolbar button:focus .ql-fill,
-.ql-bubble .ql-toolbar button:focus .ql-fill,
-.ql-bubble.ql-toolbar button.ql-active .ql-fill,
-.ql-bubble .ql-toolbar button.ql-active .ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-bubble.ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,
-.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill {
-  fill: #fff;
-}
-.ql-bubble.ql-toolbar button:hover .ql-stroke,
-.ql-bubble .ql-toolbar button:hover .ql-stroke,
-.ql-bubble.ql-toolbar button:focus .ql-stroke,
-.ql-bubble .ql-toolbar button:focus .ql-stroke,
-.ql-bubble.ql-toolbar button.ql-active .ql-stroke,
-.ql-bubble .ql-toolbar button.ql-active .ql-stroke,
-.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-bubble.ql-toolbar button:hover .ql-stroke-miter,
-.ql-bubble .ql-toolbar button:hover .ql-stroke-miter,
-.ql-bubble.ql-toolbar button:focus .ql-stroke-miter,
-.ql-bubble .ql-toolbar button:focus .ql-stroke-miter,
-.ql-bubble.ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-bubble .ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,
-.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter {
-  stroke: #fff;
-}
-@media (pointer: coarse) {
-  .ql-bubble.ql-toolbar button:hover:not(.ql-active),
-  .ql-bubble .ql-toolbar button:hover:not(.ql-active) {
-    color: #ccc;
-  }
-  .ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-fill,
-  .ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-fill,
-  .ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,
-  .ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill {
-    fill: #ccc;
-  }
-  .ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-  .ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-  .ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,
-  .ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter {
-    stroke: #ccc;
-  }
-}
-.ql-bubble {
-  box-sizing: border-box;
-}
-.ql-bubble * {
-  box-sizing: border-box;
-}
-.ql-bubble .ql-hidden {
-  display: none;
-}
-.ql-bubble .ql-out-bottom,
-.ql-bubble .ql-out-top {
-  visibility: hidden;
-}
-.ql-bubble .ql-tooltip {
-  position: absolute;
-  transform: translateY(10px);
-}
-.ql-bubble .ql-tooltip a {
-  cursor: pointer;
-  text-decoration: none;
-}
-.ql-bubble .ql-tooltip.ql-flip {
-  transform: translateY(-10px);
-}
-.ql-bubble .ql-formats {
-  display: inline-block;
-  vertical-align: middle;
-}
-.ql-bubble .ql-formats:after {
-  clear: both;
-  content: '';
-  display: table;
-}
-.ql-bubble .ql-stroke {
-  fill: none;
-  stroke: #ccc;
-  stroke-linecap: round;
-  stroke-linejoin: round;
-  stroke-width: 2;
-}
-.ql-bubble .ql-stroke-miter {
-  fill: none;
-  stroke: #ccc;
-  stroke-miterlimit: 10;
-  stroke-width: 2;
-}
-.ql-bubble .ql-fill,
-.ql-bubble .ql-stroke.ql-fill {
-  fill: #ccc;
-}
-.ql-bubble .ql-empty {
-  fill: none;
-}
-.ql-bubble .ql-even {
-  fill-rule: evenodd;
-}
-.ql-bubble .ql-thin,
-.ql-bubble .ql-stroke.ql-thin {
-  stroke-width: 1;
-}
-.ql-bubble .ql-transparent {
-  opacity: 0.4;
-}
-.ql-bubble .ql-direction svg:last-child {
-  display: none;
-}
-.ql-bubble .ql-direction.ql-active svg:last-child {
-  display: inline;
-}
-.ql-bubble .ql-direction.ql-active svg:first-child {
-  display: none;
-}
-.ql-bubble .ql-editor h1 {
-  font-size: 2em;
-}
-.ql-bubble .ql-editor h2 {
-  font-size: 1.5em;
-}
-.ql-bubble .ql-editor h3 {
-  font-size: 1.17em;
-}
-.ql-bubble .ql-editor h4 {
-  font-size: 1em;
-}
-.ql-bubble .ql-editor h5 {
-  font-size: 0.83em;
-}
-.ql-bubble .ql-editor h6 {
-  font-size: 0.67em;
-}
-.ql-bubble .ql-editor a {
-  text-decoration: underline;
-}
-.ql-bubble .ql-editor blockquote {
-  border-left: 4px solid #ccc;
-  margin-bottom: 5px;
-  margin-top: 5px;
-  padding-left: 16px;
-}
-.ql-bubble .ql-editor code,
-.ql-bubble .ql-editor pre {
-  background-color: #f0f0f0;
-  border-radius: 3px;
-}
-.ql-bubble .ql-editor pre {
-  white-space: pre-wrap;
-  margin-bottom: 5px;
-  margin-top: 5px;
-  padding: 5px 10px;
-}
-.ql-bubble .ql-editor code {
-  font-size: 85%;
-  padding: 2px 4px;
-}
-.ql-bubble .ql-editor pre.ql-syntax {
-  background-color: #23241f;
-  color: #f8f8f2;
-  overflow: visible;
-}
-.ql-bubble .ql-editor img {
-  max-width: 100%;
-}
-.ql-bubble .ql-picker {
-  color: #ccc;
-  display: inline-block;
-  float: left;
-  font-size: 14px;
-  font-weight: 500;
-  height: 24px;
-  position: relative;
-  vertical-align: middle;
-}
-.ql-bubble .ql-picker-label {
-  cursor: pointer;
-  display: inline-block;
-  height: 100%;
-  padding-left: 8px;
-  padding-right: 2px;
-  position: relative;
-  width: 100%;
-}
-.ql-bubble .ql-picker-label::before {
-  display: inline-block;
-  line-height: 22px;
-}
-.ql-bubble .ql-picker-options {
-  background-color: #444;
-  display: none;
-  min-width: 100%;
-  padding: 4px 8px;
-  position: absolute;
-  white-space: nowrap;
-}
-.ql-bubble .ql-picker-options .ql-picker-item {
-  cursor: pointer;
-  display: block;
-  padding-bottom: 5px;
-  padding-top: 5px;
-}
-.ql-bubble .ql-picker.ql-expanded .ql-picker-label {
-  color: #777;
-  z-index: 2;
-}
-.ql-bubble .ql-picker.ql-expanded .ql-picker-label .ql-fill {
-  fill: #777;
-}
-.ql-bubble .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
-  stroke: #777;
-}
-.ql-bubble .ql-picker.ql-expanded .ql-picker-options {
-  display: block;
-  margin-top: -1px;
-  top: 100%;
-  z-index: 1;
-}
-.ql-bubble .ql-color-picker,
-.ql-bubble .ql-icon-picker {
-  width: 28px;
-}
-.ql-bubble .ql-color-picker .ql-picker-label,
-.ql-bubble .ql-icon-picker .ql-picker-label {
-  padding: 2px 4px;
-}
-.ql-bubble .ql-color-picker .ql-picker-label svg,
-.ql-bubble .ql-icon-picker .ql-picker-label svg {
-  right: 4px;
-}
-.ql-bubble .ql-icon-picker .ql-picker-options {
-  padding: 4px 0px;
-}
-.ql-bubble .ql-icon-picker .ql-picker-item {
-  height: 24px;
-  width: 24px;
-  padding: 2px 4px;
-}
-.ql-bubble .ql-color-picker .ql-picker-options {
-  padding: 3px 5px;
-  width: 152px;
-}
-.ql-bubble .ql-color-picker .ql-picker-item {
-  border: 1px solid transparent;
-  float: left;
-  height: 16px;
-  margin: 2px;
-  padding: 0px;
-  width: 16px;
-}
-.ql-bubble .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
-  position: absolute;
-  margin-top: -9px;
-  right: 0;
-  top: 50%;
-  width: 18px;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-bubble .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-bubble .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=''])::before {
-  content: attr(data-label);
-}
-.ql-bubble .ql-picker.ql-header {
-  width: 98px;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item::before {
-  content: 'Normal';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: 'Heading 1';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: 'Heading 2';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: 'Heading 3';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: 'Heading 4';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: 'Heading 5';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: 'Heading 6';
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  font-size: 2em;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  font-size: 1.5em;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  font-size: 1.17em;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  font-size: 1em;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  font-size: 0.83em;
-}
-.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  font-size: 0.67em;
-}
-.ql-bubble .ql-picker.ql-font {
-  width: 108px;
-}
-.ql-bubble .ql-picker.ql-font .ql-picker-label::before,
-.ql-bubble .ql-picker.ql-font .ql-picker-item::before {
-  content: 'Sans Serif';
-}
-.ql-bubble .ql-picker.ql-font .ql-picker-label[data-value=serif]::before,
-.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
-  content: 'Serif';
-}
-.ql-bubble .ql-picker.ql-font .ql-picker-label[data-value=monospace]::before,
-.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
-  content: 'Monospace';
-}
-.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
-  font-family: Georgia, Times New Roman, serif;
-}
-.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
-  font-family: Monaco, Courier New, monospace;
-}
-.ql-bubble .ql-picker.ql-size {
-  width: 98px;
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-label::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-item::before {
-  content: 'Normal';
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=small]::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
-  content: 'Small';
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=large]::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
-  content: 'Large';
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=huge]::before,
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
-  content: 'Huge';
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
-  font-size: 10px;
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
-  font-size: 18px;
-}
-.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
-  font-size: 32px;
-}
-.ql-bubble .ql-color-picker.ql-background .ql-picker-item {
-  background-color: #fff;
-}
-.ql-bubble .ql-color-picker.ql-color .ql-picker-item {
-  background-color: #000;
-}
-.ql-bubble .ql-toolbar .ql-formats {
-  margin: 8px 12px 8px 0px;
-}
-.ql-bubble .ql-toolbar .ql-formats:first-child {
-  margin-left: 12px;
-}
-.ql-bubble .ql-color-picker svg {
-  margin: 1px;
-}
-.ql-bubble .ql-color-picker .ql-picker-item.ql-selected,
-.ql-bubble .ql-color-picker .ql-picker-item:hover {
-  border-color: #fff;
-}
-.ql-bubble .ql-tooltip {
-  background-color: #444;
-  border-radius: 25px;
-  color: #fff;
-}
-.ql-bubble .ql-tooltip-arrow {
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  content: " ";
-  display: block;
-  left: 50%;
-  margin-left: -6px;
-  position: absolute;
-}
-.ql-bubble .ql-tooltip:not(.ql-flip) .ql-tooltip-arrow {
-  border-bottom: 6px solid #444;
-  top: -6px;
-}
-.ql-bubble .ql-tooltip.ql-flip .ql-tooltip-arrow {
-  border-top: 6px solid #444;
-  bottom: -6px;
-}
-.ql-bubble .ql-tooltip.ql-editing .ql-tooltip-editor {
-  display: block;
-}
-.ql-bubble .ql-tooltip.ql-editing .ql-formats {
-  visibility: hidden;
-}
-.ql-bubble .ql-tooltip-editor {
-  display: none;
-}
-.ql-bubble .ql-tooltip-editor input[type=text] {
-  background: transparent;
-  border: none;
-  color: #fff;
-  font-size: 13px;
-  height: 100%;
-  outline: none;
-  padding: 10px 20px;
-  position: absolute;
-  width: 100%;
-}
-.ql-bubble .ql-tooltip-editor a {
-  top: 10px;
-  position: absolute;
-  right: 20px;
-}
-.ql-bubble .ql-tooltip-editor a:before {
-  color: #ccc;
-  content: "\D7";
-  font-size: 16px;
-  font-weight: bold;
-}
-.ql-container.ql-bubble:not(.ql-disabled) a {
-  position: relative;
-  white-space: nowrap;
-}
-.ql-container.ql-bubble:not(.ql-disabled) a::before {
-  background-color: #444;
-  border-radius: 15px;
-  top: -5px;
-  font-size: 12px;
-  color: #fff;
-  content: attr(href);
-  font-weight: normal;
-  overflow: hidden;
-  padding: 5px 15px;
-  text-decoration: none;
-  z-index: 1;
-}
-.ql-container.ql-bubble:not(.ql-disabled) a::after {
-  border-top: 6px solid #444;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  top: 0;
-  content: " ";
-  height: 0;
-  width: 0;
-}
-.ql-container.ql-bubble:not(.ql-disabled) a::before,
-.ql-container.ql-bubble:not(.ql-disabled) a::after {
-  left: 0;
-  margin-left: 50%;
-  position: absolute;
-  transform: translate(-50%, -100%);
-  transition: visibility 0s ease 200ms;
-  visibility: hidden;
-}
-.ql-container.ql-bubble:not(.ql-disabled) a:hover::before,
-.ql-container.ql-bubble:not(.ql-disabled) a:hover::after {
-  visibility: visible;
-}
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/css/quill/quill1.3.6.snow.css b/Oqtane.Client/wwwroot/css/quill/quill1.3.6.snow.css
deleted file mode 100644
index 8094fc96..00000000
--- a/Oqtane.Client/wwwroot/css/quill/quill1.3.6.snow.css
+++ /dev/null
@@ -1,945 +0,0 @@
-/*!
- * Quill Editor v1.3.6
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */
-.ql-container {
-  box-sizing: border-box;
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  height: 100%;
-  margin: 0px;
-  position: relative;
-}
-.ql-container.ql-disabled .ql-tooltip {
-  visibility: hidden;
-}
-.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {
-  pointer-events: none;
-}
-.ql-clipboard {
-  left: -100000px;
-  height: 1px;
-  overflow-y: hidden;
-  position: absolute;
-  top: 50%;
-}
-.ql-clipboard p {
-  margin: 0;
-  padding: 0;
-}
-.ql-editor {
-  box-sizing: border-box;
-  line-height: 1.42;
-  height: 100%;
-  outline: none;
-  overflow-y: auto;
-  padding: 12px 15px;
-  tab-size: 4;
-  -moz-tab-size: 4;
-  text-align: left;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-.ql-editor > * {
-  cursor: text;
-}
-.ql-editor p,
-.ql-editor ol,
-.ql-editor ul,
-.ql-editor pre,
-.ql-editor blockquote,
-.ql-editor h1,
-.ql-editor h2,
-.ql-editor h3,
-.ql-editor h4,
-.ql-editor h5,
-.ql-editor h6 {
-  margin: 0;
-  padding: 0;
-  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol,
-.ql-editor ul {
-  padding-left: 1.5em;
-}
-.ql-editor ol > li,
-.ql-editor ul > li {
-  list-style-type: none;
-}
-.ql-editor ul > li::before {
-  content: '\2022';
-}
-.ql-editor ul[data-checked=true],
-.ql-editor ul[data-checked=false] {
-  pointer-events: none;
-}
-.ql-editor ul[data-checked=true] > li *,
-.ql-editor ul[data-checked=false] > li * {
-  pointer-events: all;
-}
-.ql-editor ul[data-checked=true] > li::before,
-.ql-editor ul[data-checked=false] > li::before {
-  color: #777;
-  cursor: pointer;
-  pointer-events: all;
-}
-.ql-editor ul[data-checked=true] > li::before {
-  content: '\2611';
-}
-.ql-editor ul[data-checked=false] > li::before {
-  content: '\2610';
-}
-.ql-editor li::before {
-  display: inline-block;
-  white-space: nowrap;
-  width: 1.2em;
-}
-.ql-editor li:not(.ql-direction-rtl)::before {
-  margin-left: -1.5em;
-  margin-right: 0.3em;
-  text-align: right;
-}
-.ql-editor li.ql-direction-rtl::before {
-  margin-left: 0.3em;
-  margin-right: -1.5em;
-}
-.ql-editor ol li:not(.ql-direction-rtl),
-.ql-editor ul li:not(.ql-direction-rtl) {
-  padding-left: 1.5em;
-}
-.ql-editor ol li.ql-direction-rtl,
-.ql-editor ul li.ql-direction-rtl {
-  padding-right: 1.5em;
-}
-.ql-editor ol li {
-  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-  counter-increment: list-0;
-}
-.ql-editor ol li:before {
-  content: counter(list-0, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-  counter-increment: list-1;
-}
-.ql-editor ol li.ql-indent-1:before {
-  content: counter(list-1, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-  counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-2 {
-  counter-increment: list-2;
-}
-.ql-editor ol li.ql-indent-2:before {
-  content: counter(list-2, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-2 {
-  counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-3 {
-  counter-increment: list-3;
-}
-.ql-editor ol li.ql-indent-3:before {
-  content: counter(list-3, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-3 {
-  counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-4 {
-  counter-increment: list-4;
-}
-.ql-editor ol li.ql-indent-4:before {
-  content: counter(list-4, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-4 {
-  counter-reset: list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-5 {
-  counter-increment: list-5;
-}
-.ql-editor ol li.ql-indent-5:before {
-  content: counter(list-5, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-5 {
-  counter-reset: list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-6 {
-  counter-increment: list-6;
-}
-.ql-editor ol li.ql-indent-6:before {
-  content: counter(list-6, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-6 {
-  counter-reset: list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-7 {
-  counter-increment: list-7;
-}
-.ql-editor ol li.ql-indent-7:before {
-  content: counter(list-7, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-7 {
-  counter-reset: list-8 list-9;
-}
-.ql-editor ol li.ql-indent-8 {
-  counter-increment: list-8;
-}
-.ql-editor ol li.ql-indent-8:before {
-  content: counter(list-8, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-8 {
-  counter-reset: list-9;
-}
-.ql-editor ol li.ql-indent-9 {
-  counter-increment: list-9;
-}
-.ql-editor ol li.ql-indent-9:before {
-  content: counter(list-9, decimal) '. ';
-}
-.ql-editor .ql-indent-1:not(.ql-direction-rtl) {
-  padding-left: 3em;
-}
-.ql-editor li.ql-indent-1:not(.ql-direction-rtl) {
-  padding-left: 4.5em;
-}
-.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right {
-  padding-right: 3em;
-}
-.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right {
-  padding-right: 4.5em;
-}
-.ql-editor .ql-indent-2:not(.ql-direction-rtl) {
-  padding-left: 6em;
-}
-.ql-editor li.ql-indent-2:not(.ql-direction-rtl) {
-  padding-left: 7.5em;
-}
-.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right {
-  padding-right: 6em;
-}
-.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right {
-  padding-right: 7.5em;
-}
-.ql-editor .ql-indent-3:not(.ql-direction-rtl) {
-  padding-left: 9em;
-}
-.ql-editor li.ql-indent-3:not(.ql-direction-rtl) {
-  padding-left: 10.5em;
-}
-.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right {
-  padding-right: 9em;
-}
-.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right {
-  padding-right: 10.5em;
-}
-.ql-editor .ql-indent-4:not(.ql-direction-rtl) {
-  padding-left: 12em;
-}
-.ql-editor li.ql-indent-4:not(.ql-direction-rtl) {
-  padding-left: 13.5em;
-}
-.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right {
-  padding-right: 12em;
-}
-.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right {
-  padding-right: 13.5em;
-}
-.ql-editor .ql-indent-5:not(.ql-direction-rtl) {
-  padding-left: 15em;
-}
-.ql-editor li.ql-indent-5:not(.ql-direction-rtl) {
-  padding-left: 16.5em;
-}
-.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right {
-  padding-right: 15em;
-}
-.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right {
-  padding-right: 16.5em;
-}
-.ql-editor .ql-indent-6:not(.ql-direction-rtl) {
-  padding-left: 18em;
-}
-.ql-editor li.ql-indent-6:not(.ql-direction-rtl) {
-  padding-left: 19.5em;
-}
-.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right {
-  padding-right: 18em;
-}
-.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right {
-  padding-right: 19.5em;
-}
-.ql-editor .ql-indent-7:not(.ql-direction-rtl) {
-  padding-left: 21em;
-}
-.ql-editor li.ql-indent-7:not(.ql-direction-rtl) {
-  padding-left: 22.5em;
-}
-.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right {
-  padding-right: 21em;
-}
-.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right {
-  padding-right: 22.5em;
-}
-.ql-editor .ql-indent-8:not(.ql-direction-rtl) {
-  padding-left: 24em;
-}
-.ql-editor li.ql-indent-8:not(.ql-direction-rtl) {
-  padding-left: 25.5em;
-}
-.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right {
-  padding-right: 24em;
-}
-.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right {
-  padding-right: 25.5em;
-}
-.ql-editor .ql-indent-9:not(.ql-direction-rtl) {
-  padding-left: 27em;
-}
-.ql-editor li.ql-indent-9:not(.ql-direction-rtl) {
-  padding-left: 28.5em;
-}
-.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right {
-  padding-right: 27em;
-}
-.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right {
-  padding-right: 28.5em;
-}
-.ql-editor .ql-video {
-  display: block;
-  max-width: 100%;
-}
-.ql-editor .ql-video.ql-align-center {
-  margin: 0 auto;
-}
-.ql-editor .ql-video.ql-align-right {
-  margin: 0 0 0 auto;
-}
-.ql-editor .ql-bg-black {
-  background-color: #000;
-}
-.ql-editor .ql-bg-red {
-  background-color: #e60000;
-}
-.ql-editor .ql-bg-orange {
-  background-color: #f90;
-}
-.ql-editor .ql-bg-yellow {
-  background-color: #ff0;
-}
-.ql-editor .ql-bg-green {
-  background-color: #008a00;
-}
-.ql-editor .ql-bg-blue {
-  background-color: #06c;
-}
-.ql-editor .ql-bg-purple {
-  background-color: #93f;
-}
-.ql-editor .ql-color-white {
-  color: #fff;
-}
-.ql-editor .ql-color-red {
-  color: #e60000;
-}
-.ql-editor .ql-color-orange {
-  color: #f90;
-}
-.ql-editor .ql-color-yellow {
-  color: #ff0;
-}
-.ql-editor .ql-color-green {
-  color: #008a00;
-}
-.ql-editor .ql-color-blue {
-  color: #06c;
-}
-.ql-editor .ql-color-purple {
-  color: #93f;
-}
-.ql-editor .ql-font-serif {
-  font-family: Georgia, Times New Roman, serif;
-}
-.ql-editor .ql-font-monospace {
-  font-family: Monaco, Courier New, monospace;
-}
-.ql-editor .ql-size-small {
-  font-size: 0.75em;
-}
-.ql-editor .ql-size-large {
-  font-size: 1.5em;
-}
-.ql-editor .ql-size-huge {
-  font-size: 2.5em;
-}
-.ql-editor .ql-direction-rtl {
-  direction: rtl;
-  text-align: inherit;
-}
-.ql-editor .ql-align-center {
-  text-align: center;
-}
-.ql-editor .ql-align-justify {
-  text-align: justify;
-}
-.ql-editor .ql-align-right {
-  text-align: right;
-}
-.ql-editor.ql-blank::before {
-  color: rgba(0,0,0,0.6);
-  content: attr(data-placeholder);
-  font-style: italic;
-  left: 15px;
-  pointer-events: none;
-  position: absolute;
-  right: 15px;
-}
-.ql-snow.ql-toolbar:after,
-.ql-snow .ql-toolbar:after {
-  clear: both;
-  content: '';
-  display: table;
-}
-.ql-snow.ql-toolbar button,
-.ql-snow .ql-toolbar button {
-  background: none;
-  border: none;
-  cursor: pointer;
-  display: inline-block;
-  float: left;
-  height: 24px;
-  padding: 3px 5px;
-  width: 28px;
-}
-.ql-snow.ql-toolbar button svg,
-.ql-snow .ql-toolbar button svg {
-  float: left;
-  height: 100%;
-}
-.ql-snow.ql-toolbar button:active:hover,
-.ql-snow .ql-toolbar button:active:hover {
-  outline: none;
-}
-.ql-snow.ql-toolbar input.ql-image[type=file],
-.ql-snow .ql-toolbar input.ql-image[type=file] {
-  display: none;
-}
-.ql-snow.ql-toolbar button:hover,
-.ql-snow .ql-toolbar button:hover,
-.ql-snow.ql-toolbar button:focus,
-.ql-snow .ql-toolbar button:focus,
-.ql-snow.ql-toolbar button.ql-active,
-.ql-snow .ql-toolbar button.ql-active,
-.ql-snow.ql-toolbar .ql-picker-label:hover,
-.ql-snow .ql-toolbar .ql-picker-label:hover,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active,
-.ql-snow.ql-toolbar .ql-picker-item:hover,
-.ql-snow .ql-toolbar .ql-picker-item:hover,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected {
-  color: #06c;
-}
-.ql-snow.ql-toolbar button:hover .ql-fill,
-.ql-snow .ql-toolbar button:hover .ql-fill,
-.ql-snow.ql-toolbar button:focus .ql-fill,
-.ql-snow .ql-toolbar button:focus .ql-fill,
-.ql-snow.ql-toolbar button.ql-active .ql-fill,
-.ql-snow .ql-toolbar button.ql-active .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-snow.ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill {
-  fill: #06c;
-}
-.ql-snow.ql-toolbar button:hover .ql-stroke,
-.ql-snow .ql-toolbar button:hover .ql-stroke,
-.ql-snow.ql-toolbar button:focus .ql-stroke,
-.ql-snow .ql-toolbar button:focus .ql-stroke,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke,
-.ql-snow .ql-toolbar button.ql-active .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-snow.ql-toolbar button:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar button:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar button:focus .ql-stroke-miter,
-.ql-snow .ql-toolbar button:focus .ql-stroke-miter,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-snow .ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter {
-  stroke: #06c;
-}
-@media (pointer: coarse) {
-  .ql-snow.ql-toolbar button:hover:not(.ql-active),
-  .ql-snow .ql-toolbar button:hover:not(.ql-active) {
-    color: #444;
-  }
-  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-fill,
-  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-fill,
-  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,
-  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill {
-    fill: #444;
-  }
-  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,
-  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter {
-    stroke: #444;
-  }
-}
-.ql-snow {
-  box-sizing: border-box;
-}
-.ql-snow * {
-  box-sizing: border-box;
-}
-.ql-snow .ql-hidden {
-  display: none;
-}
-.ql-snow .ql-out-bottom,
-.ql-snow .ql-out-top {
-  visibility: hidden;
-}
-.ql-snow .ql-tooltip {
-  position: absolute;
-  transform: translateY(10px);
-}
-.ql-snow .ql-tooltip a {
-  cursor: pointer;
-  text-decoration: none;
-}
-.ql-snow .ql-tooltip.ql-flip {
-  transform: translateY(-10px);
-}
-.ql-snow .ql-formats {
-  display: inline-block;
-  vertical-align: middle;
-}
-.ql-snow .ql-formats:after {
-  clear: both;
-  content: '';
-  display: table;
-}
-.ql-snow .ql-stroke {
-  fill: none;
-  stroke: #444;
-  stroke-linecap: round;
-  stroke-linejoin: round;
-  stroke-width: 2;
-}
-.ql-snow .ql-stroke-miter {
-  fill: none;
-  stroke: #444;
-  stroke-miterlimit: 10;
-  stroke-width: 2;
-}
-.ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-  fill: #444;
-}
-.ql-snow .ql-empty {
-  fill: none;
-}
-.ql-snow .ql-even {
-  fill-rule: evenodd;
-}
-.ql-snow .ql-thin,
-.ql-snow .ql-stroke.ql-thin {
-  stroke-width: 1;
-}
-.ql-snow .ql-transparent {
-  opacity: 0.4;
-}
-.ql-snow .ql-direction svg:last-child {
-  display: none;
-}
-.ql-snow .ql-direction.ql-active svg:last-child {
-  display: inline;
-}
-.ql-snow .ql-direction.ql-active svg:first-child {
-  display: none;
-}
-.ql-snow .ql-editor h1 {
-  font-size: 2em;
-}
-.ql-snow .ql-editor h2 {
-  font-size: 1.5em;
-}
-.ql-snow .ql-editor h3 {
-  font-size: 1.17em;
-}
-.ql-snow .ql-editor h4 {
-  font-size: 1em;
-}
-.ql-snow .ql-editor h5 {
-  font-size: 0.83em;
-}
-.ql-snow .ql-editor h6 {
-  font-size: 0.67em;
-}
-.ql-snow .ql-editor a {
-  text-decoration: underline;
-}
-.ql-snow .ql-editor blockquote {
-  border-left: 4px solid #ccc;
-  margin-bottom: 5px;
-  margin-top: 5px;
-  padding-left: 16px;
-}
-.ql-snow .ql-editor code,
-.ql-snow .ql-editor pre {
-  background-color: #f0f0f0;
-  border-radius: 3px;
-}
-.ql-snow .ql-editor pre {
-  white-space: pre-wrap;
-  margin-bottom: 5px;
-  margin-top: 5px;
-  padding: 5px 10px;
-}
-.ql-snow .ql-editor code {
-  font-size: 85%;
-  padding: 2px 4px;
-}
-.ql-snow .ql-editor pre.ql-syntax {
-  background-color: #23241f;
-  color: #f8f8f2;
-  overflow: visible;
-}
-.ql-snow .ql-editor img {
-  max-width: 100%;
-}
-.ql-snow .ql-picker {
-  color: #444;
-  display: inline-block;
-  float: left;
-  font-size: 14px;
-  font-weight: 500;
-  height: 24px;
-  position: relative;
-  vertical-align: middle;
-}
-.ql-snow .ql-picker-label {
-  cursor: pointer;
-  display: inline-block;
-  height: 100%;
-  padding-left: 8px;
-  padding-right: 2px;
-  position: relative;
-  width: 100%;
-}
-.ql-snow .ql-picker-label::before {
-  display: inline-block;
-  line-height: 22px;
-}
-.ql-snow .ql-picker-options {
-  background-color: #fff;
-  display: none;
-  min-width: 100%;
-  padding: 4px 8px;
-  position: absolute;
-  white-space: nowrap;
-}
-.ql-snow .ql-picker-options .ql-picker-item {
-  cursor: pointer;
-  display: block;
-  padding-bottom: 5px;
-  padding-top: 5px;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label {
-  color: #ccc;
-  z-index: 2;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill {
-  fill: #ccc;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
-  stroke: #ccc;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-options {
-  display: block;
-  margin-top: -1px;
-  top: 100%;
-  z-index: 1;
-}
-.ql-snow .ql-color-picker,
-.ql-snow .ql-icon-picker {
-  width: 28px;
-}
-.ql-snow .ql-color-picker .ql-picker-label,
-.ql-snow .ql-icon-picker .ql-picker-label {
-  padding: 2px 4px;
-}
-.ql-snow .ql-color-picker .ql-picker-label svg,
-.ql-snow .ql-icon-picker .ql-picker-label svg {
-  right: 4px;
-}
-.ql-snow .ql-icon-picker .ql-picker-options {
-  padding: 4px 0px;
-}
-.ql-snow .ql-icon-picker .ql-picker-item {
-  height: 24px;
-  width: 24px;
-  padding: 2px 4px;
-}
-.ql-snow .ql-color-picker .ql-picker-options {
-  padding: 3px 5px;
-  width: 152px;
-}
-.ql-snow .ql-color-picker .ql-picker-item {
-  border: 1px solid transparent;
-  float: left;
-  height: 16px;
-  margin: 2px;
-  padding: 0px;
-  width: 16px;
-}
-.ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
-  position: absolute;
-  margin-top: -9px;
-  right: 0;
-  top: 50%;
-  width: 18px;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=''])::before {
-  content: attr(data-label);
-}
-.ql-snow .ql-picker.ql-header {
-  width: 98px;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: 'Normal';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: 'Heading 1';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: 'Heading 2';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: 'Heading 3';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: 'Heading 4';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: 'Heading 5';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: 'Heading 6';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  font-size: 2em;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  font-size: 1.5em;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  font-size: 1.17em;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  font-size: 1em;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  font-size: 0.83em;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  font-size: 0.67em;
-}
-.ql-snow .ql-picker.ql-font {
-  width: 108px;
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: 'Sans Serif';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=serif]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
-  content: 'Serif';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=monospace]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
-  content: 'Monospace';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
-  font-family: Georgia, Times New Roman, serif;
-}
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
-  font-family: Monaco, Courier New, monospace;
-}
-.ql-snow .ql-picker.ql-size {
-  width: 98px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: 'Normal';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=small]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
-  content: 'Small';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=large]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
-  content: 'Large';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=huge]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
-  content: 'Huge';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
-  font-size: 10px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
-  font-size: 18px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
-  font-size: 32px;
-}
-.ql-snow .ql-color-picker.ql-background .ql-picker-item {
-  background-color: #fff;
-}
-.ql-snow .ql-color-picker.ql-color .ql-picker-item {
-  background-color: #000;
-}
-.ql-toolbar.ql-snow {
-  border: 1px solid #ccc;
-  box-sizing: border-box;
-  font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-  padding: 8px;
-}
-.ql-toolbar.ql-snow .ql-formats {
-  margin-right: 15px;
-}
-.ql-toolbar.ql-snow .ql-picker-label {
-  border: 1px solid transparent;
-}
-.ql-toolbar.ql-snow .ql-picker-options {
-  border: 1px solid transparent;
-  box-shadow: rgba(0,0,0,0.2) 0 2px 8px;
-}
-.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label {
-  border-color: #ccc;
-}
-.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
-  border-color: #ccc;
-}
-.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item.ql-selected,
-.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item:hover {
-  border-color: #000;
-}
-.ql-toolbar.ql-snow + .ql-container.ql-snow {
-  border-top: 0px;
-}
-.ql-snow .ql-tooltip {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  box-shadow: 0px 0px 5px #ddd;
-  color: #444;
-  padding: 5px 12px;
-  white-space: nowrap;
-}
-.ql-snow .ql-tooltip::before {
-  content: "Visit URL:";
-  line-height: 26px;
-  margin-right: 8px;
-}
-.ql-snow .ql-tooltip input[type=text] {
-  display: none;
-  border: 1px solid #ccc;
-  font-size: 13px;
-  height: 26px;
-  margin: 0px;
-  padding: 3px 5px;
-  width: 170px;
-}
-.ql-snow .ql-tooltip a.ql-preview {
-  display: inline-block;
-  max-width: 200px;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  vertical-align: top;
-}
-.ql-snow .ql-tooltip a.ql-action::after {
-  border-right: 1px solid #ccc;
-  content: 'Edit';
-  margin-left: 16px;
-  padding-right: 8px;
-}
-.ql-snow .ql-tooltip a.ql-remove::before {
-  content: 'Remove';
-  margin-left: 8px;
-}
-.ql-snow .ql-tooltip a {
-  line-height: 26px;
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-preview,
-.ql-snow .ql-tooltip.ql-editing a.ql-remove {
-  display: none;
-}
-.ql-snow .ql-tooltip.ql-editing input[type=text] {
-  display: inline-block;
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0px;
-  content: 'Save';
-  padding-right: 0px;
-}
-.ql-snow .ql-tooltip[data-mode=link]::before {
-  content: "Enter link:";
-}
-.ql-snow .ql-tooltip[data-mode=formula]::before {
-  content: "Enter formula:";
-}
-.ql-snow .ql-tooltip[data-mode=video]::before {
-  content: "Enter video:";
-}
-.ql-snow a {
-  color: #06c;
-}
-.ql-container.ql-snow {
-  border: 1px solid #ccc;
-}
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/favicon.ico b/Oqtane.Client/wwwroot/favicon.ico
deleted file mode 100644
index 0e569015..00000000
Binary files a/Oqtane.Client/wwwroot/favicon.ico and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/images/checked.png b/Oqtane.Client/wwwroot/images/checked.png
deleted file mode 100644
index a4100c70..00000000
Binary files a/Oqtane.Client/wwwroot/images/checked.png and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/images/null.png b/Oqtane.Client/wwwroot/images/null.png
deleted file mode 100644
index d0f50939..00000000
Binary files a/Oqtane.Client/wwwroot/images/null.png and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/images/unchecked.png b/Oqtane.Client/wwwroot/images/unchecked.png
deleted file mode 100644
index 566e60a8..00000000
Binary files a/Oqtane.Client/wwwroot/images/unchecked.png and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/index.html b/Oqtane.Client/wwwroot/index.html
deleted file mode 100644
index 16cb5285..00000000
--- a/Oqtane.Client/wwwroot/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width">
-    <title>Oqtane</title>
-    <base href="/" />
-    <link href="css/quill/quill1.3.6.bubble.css" rel="stylesheet" />
-    <link href="css/quill/quill1.3.6.snow.css" rel="stylesheet" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <link href="css/app.css" rel="stylesheet" />
-</head>
-<body>
-    <app>
-        <div>
-            <img src="oqtane.png" style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%);" />
-        </div>
-    </app>
-
-    <script src="js/site.js"></script>
-    <script src="js/interop.js"></script>
-    <script src="js/quill1.3.6.min.js"></script>
-    <script src="js/quill-blot-formatter.min.js"></script>
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
-    <script src="_framework/blazor.webassembly.js"></script>
-</body>
-</html>
-
-
-
diff --git a/Oqtane.Client/wwwroot/js/interop.js b/Oqtane.Client/wwwroot/js/interop.js
deleted file mode 100644
index f2a2421f..00000000
--- a/Oqtane.Client/wwwroot/js/interop.js
+++ /dev/null
@@ -1,179 +0,0 @@
-window.interop = {
-    setCookie: function (name, value, days) {
-        var d = new Date();
-        d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000));
-        var expires = "expires=" + d.toUTCString();
-        document.cookie = name + "=" + value + ";" + expires + ";path=/";
-    },
-    getCookie: function (name) {
-        name = name + "=";
-        var decodedCookie = decodeURIComponent(document.cookie);
-        var ca = decodedCookie.split(';');
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-            while (c.charAt(0) === ' ') {
-                c = c.substring(1);
-            }
-            if (c.indexOf(name) === 0) {
-                return c.substring(name.length, c.length);
-            }
-        }
-        return "";
-    },
-    getElementByName: function (name) {
-        var elements = document.getElementsByName(name);
-        if (elements.length) {
-            return elements[0].value;
-        } else {
-            return "";
-        }
-    },
-    includeCSS: function (id, url) {
-        var link = document.getElementById(id);
-        if (link === null) {
-            link = document.createElement("link");
-            link.id = id;
-            link.type = "text/css";
-            link.rel = "stylesheet";
-            link.href = url;
-            document.head.appendChild(link);
-        }
-        else {
-            if (link.href !== url) {
-                link.setAttribute('href', url);
-            }
-        }
-    },
-    submitForm: function (path, fields) {
-        const form = document.createElement('form');
-        form.method = 'post';
-        form.action = path;
-
-        for (const key in fields) {
-            if (fields.hasOwnProperty(key)) {
-                const hiddenField = document.createElement('input');
-                hiddenField.type = 'hidden';
-                hiddenField.name = key;
-                hiddenField.value = fields[key];
-                form.appendChild(hiddenField);
-            }
-        }
-
-        document.body.appendChild(form);
-        form.submit();
-    },
-    getFiles: function (id) {
-        var files = [];
-        var fileinput = document.getElementById(id);
-        if (fileinput !== null) {
-            for (var i = 0; i < fileinput.files.length; i++) {
-                files.push(fileinput.files[i].name);
-            }
-        }
-        return files;
-    },
-    uploadFiles: function (posturl, folder, id) {
-        var files = document.getElementById(id + 'FileInput').files;
-        var progressinfo = document.getElementById(id + 'ProgressInfo');
-        var progressbar = document.getElementById(id + 'ProgressBar');
-        var filename = '';
-
-        for (var i = 0; i < files.length; i++) {
-            var FileChunk = [];
-            var file = files[i];
-            var MaxFileSizeMB = 1;
-            var BufferChunkSize = MaxFileSizeMB * (1024 * 1024);
-            var FileStreamPos = 0;
-            var EndPos = BufferChunkSize;
-            var Size = file.size;
-
-            progressbar.setAttribute("style", "visibility: visible;");
-
-            if (files.length > 1) {
-                filename = file.name;
-            }
-
-            while (FileStreamPos < Size) {
-                FileChunk.push(file.slice(FileStreamPos, EndPos));
-                FileStreamPos = EndPos;
-                EndPos = FileStreamPos + BufferChunkSize;
-            }
-
-            var TotalParts = FileChunk.length;
-            var PartCount = 0;
-
-            while (Chunk = FileChunk.shift()) {
-                PartCount++;
-                var FileName = file.name + ".part_" + PartCount + "_" + TotalParts;
-
-                var data = new FormData();
-                data.append('folder', folder);
-                data.append('file', Chunk, FileName);
-                var request = new XMLHttpRequest();
-                request.open('POST', posturl, true);
-                request.upload.onloadstart = function (e) {
-                    progressbar.value = 0;
-                    progressinfo.innerHTML = filename + ' 0%';
-                };
-                request.upload.onprogress = function (e) {
-                    var percent = Math.ceil((e.loaded / e.total) * 100);
-                    progressbar.value = (percent / 100);
-                    progressinfo.innerHTML = filename + '[' + PartCount + '] ' + percent + '%';
-                };
-                request.upload.onloadend = function (e) {
-                    progressbar.value = 1;
-                    progressinfo.innerHTML = filename + ' 100%';
-                };
-                request.send(data);
-            }
-        }
-    },
-    createQuill: function (
-        quillElement, toolBar, readOnly,
-        placeholder, theme, debugLevel) {
-
-        Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
-
-        var options = {
-            debug: debugLevel,
-            modules: {
-                toolbar: toolBar,
-                blotFormatter: {}
-            },
-            placeholder: placeholder,
-            readOnly: readOnly,
-            theme: theme
-        };
-
-        new Quill(quillElement, options);
-    },
-    getQuillContent: function (editorElement) {
-        return JSON.stringify(editorElement.__quill.getContents());
-    },
-    getQuillText: function (editorElement) {
-        return editorElement.__quill.getText();
-    },
-    getQuillHTML: function (editorElement) {
-        return editorElement.__quill.root.innerHTML;
-    },
-    loadQuillContent: function (editorElement, editorContent) {
-        return editorElement.__quill.root.innerHTML = editorContent;
-    },
-    enableQuillEditor: function (editorElement, mode) {
-        editorElement.__quill.enable(mode);
-    },
-    insertQuillImage: function (quillElement, imageURL) {
-        var Delta = Quill.import('delta');
-        editorIndex = 0;
-
-        if (quillElement.__quill.getSelection() !== null) {
-            editorIndex = quillElement.__quill.getSelection().index;
-        }
-
-        return quillElement.__quill.updateContents(
-            new Delta()
-                .retain(editorIndex)
-                .insert({ image: imageURL },
-                    { alt: imageURL }));
-    }
-};
diff --git a/Oqtane.Client/wwwroot/js/quill-blot-formatter.min.js b/Oqtane.Client/wwwroot/js/quill-blot-formatter.min.js
deleted file mode 100644
index ba11f7a7..00000000
--- a/Oqtane.Client/wwwroot/js/quill-blot-formatter.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function (e, t) { "object" == typeof exports && "object" == typeof module ? module.exports = t(require("Quill")) : "function" == typeof define && define.amd ? define(["Quill"], t) : "object" == typeof exports ? exports.QuillBlotFormatter = t(require("Quill")) : e.QuillBlotFormatter = t(e.Quill) }(this, function (e) { return function (e) { function t(r) { if (n[r]) return n[r].exports; var o = n[r] = { i: r, l: !1, exports: {} }; return e[r].call(o.exports, o, o.exports, t), o.l = !0, o.exports } var n = {}; return t.m = e, t.c = n, t.d = function (e, n, r) { t.o(e, n) || Object.defineProperty(e, n, { configurable: !1, enumerable: !0, get: r }) }, t.n = function (e) { var n = e && e.__esModule ? function () { return e.default } : function () { return e }; return t.d(n, "a", n), n }, t.o = function (e, t) { return Object.prototype.hasOwnProperty.call(e, t) }, t.p = "", t(t.s = 14) }([function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } Object.defineProperty(t, "__esModule", { value: !0 }); var i = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), a = n(15), l = r(a), u = n(4), s = r(u), c = n(1), f = (r(c), n(2)), p = (r(f), function (e, t) { return t }), d = function () { function e(t) { var n = this, r = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {}; o(this, e), this.onClick = function () { n.hide() }, this.quill = t, this.options = (0, l.default)(s.default, r, { arrayMerge: p }), this.currentSpec = null, this.actions = [], this.overlay = document.createElement("div"), this.overlay.classList.add(this.options.overlay.className), this.options.overlay.style && Object.assign(this.overlay.style, this.options.overlay.style), document.execCommand("enableObjectResizing", !1, "false"), this.quill.root.parentNode.style.position = this.quill.root.parentNode.style.position || "relative", this.quill.root.addEventListener("click", this.onClick), this.specs = this.options.specs.map(function (e) { return new e(n) }), this.specs.forEach(function (e) { return e.init() }) } return i(e, [{ key: "show", value: function (e) { this.currentSpec = e, this.currentSpec.setSelection(), this.setUserSelect("none"), this.quill.root.parentNode.appendChild(this.overlay), this.repositionOverlay(), this.createActions(e) } }, { key: "hide", value: function () { this.currentSpec && (this.currentSpec.onHide(), this.currentSpec = null, this.quill.root.parentNode.removeChild(this.overlay), this.overlay.style.setProperty("display", "none"), this.setUserSelect(""), this.destroyActions()) } }, { key: "update", value: function () { this.repositionOverlay(), this.actions.forEach(function (e) { return e.onUpdate() }) } }, { key: "createActions", value: function (e) { var t = this; this.actions = e.getActions().map(function (e) { var n = new e(t); return n.onCreate(), n }) } }, { key: "destroyActions", value: function () { this.actions.forEach(function (e) { return e.onDestroy() }), this.actions = [] } }, { key: "repositionOverlay", value: function () { if (this.currentSpec) { var e = this.currentSpec.getOverlayElement(); if (e) { var t = this.quill.root.parentNode, n = e.getBoundingClientRect(), r = t.getBoundingClientRect(); Object.assign(this.overlay.style, { display: "block", left: n.left - r.left - 1 + t.scrollLeft + "px", top: n.top - r.top + t.scrollTop + "px", width: n.width + "px", height: n.height + "px" }) } } } }, { key: "setUserSelect", value: function (e) { var t = this;["userSelect", "mozUserSelect", "webkitUserSelect", "msUserSelect"].forEach(function (n) { t.quill.root.style.setProperty(n, e), document.documentElement && document.documentElement.style.setProperty(n, e) }) } }]), e }(); t.default = d }, function (e, t, n) { "use strict"; function r(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } Object.defineProperty(t, "__esModule", { value: !0 }); var o = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), i = n(0), a = (function (e) { e && e.__esModule }(i), function () { function e(t) { r(this, e), this.formatter = t } return o(e, [{ key: "onCreate", value: function () { } }, { key: "onDestroy", value: function () { } }, { key: "onUpdate", value: function () { } }]), e }()); t.default = a }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } Object.defineProperty(t, "__esModule", { value: !0 }); var i = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), a = n(0), l = (r(a), n(1)), u = (r(l), n(5)), s = r(u), c = n(9), f = r(c), p = n(10), d = r(p), y = function () { function e(t) { o(this, e), this.formatter = t } return i(e, [{ key: "init", value: function () { } }, { key: "getActions", value: function () { return [s.default, f.default, d.default] } }, { key: "getTargetElement", value: function () { return null } }, { key: "getOverlayElement", value: function () { return this.getTargetElement() } }, { key: "setSelection", value: function () { this.formatter.quill.setSelection(null) } }, { key: "onHide", value: function () { } }]), e }(); t.default = y }, function (e, t, n) { "use strict" }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } Object.defineProperty(t, "__esModule", { value: !0 }); var o = n(2), i = (r(o), n(11)), a = r(i), l = n(12), u = r(l), s = { specs: [a.default, u.default], overlay: { className: "blot-formatter__overlay", style: { position: "absolute", boxSizing: "border-box", border: "1px dashed #444" } }, align: { attribute: "data-align", aligner: { applyStyle: !0 }, icons: { left: '\n        <svg viewbox="0 0 18 18">\n          <line class="ql-stroke" x1="3" x2="15" y1="9" y2="9"></line>\n          <line class="ql-stroke" x1="3" x2="13" y1="14" y2="14"></line>\n          <line class="ql-stroke" x1="3" x2="9" y1="4" y2="4"></line>\n        </svg>\n      ', center: '\n        <svg viewbox="0 0 18 18">\n           <line class="ql-stroke" x1="15" x2="3" y1="9" y2="9"></line>\n          <line class="ql-stroke" x1="14" x2="4" y1="14" y2="14"></line>\n          <line class="ql-stroke" x1="12" x2="6" y1="4" y2="4"></line>\n        </svg>\n      ', right: '\n        <svg viewbox="0 0 18 18">\n          <line class="ql-stroke" x1="15" x2="3" y1="9" y2="9"></line>\n          <line class="ql-stroke" x1="15" x2="5" y1="14" y2="14"></line>\n          <line class="ql-stroke" x1="15" x2="9" y1="4" y2="4"></line>\n        </svg>\n      ' }, toolbar: { allowDeselect: !0, mainClassName: "blot-formatter__toolbar", mainStyle: { position: "absolute", top: "-12px", right: "0", left: "0", height: "0", minWidth: "100px", font: "12px/1.0 Arial, Helvetica, sans-serif", textAlign: "center", color: "#333", boxSizing: "border-box", cursor: "default", zIndex: "1" }, buttonClassName: "blot-formatter__toolbar-button", addButtonSelectStyle: !0, buttonStyle: { display: "inline-block", width: "24px", height: "24px", background: "white", border: "1px solid #999", verticalAlign: "middle" }, svgStyle: { display: "inline-block", width: "24px", height: "24px", background: "white", border: "1px solid #999", verticalAlign: "middle" } } }, resize: { handleClassName: "blot-formatter__resize-handle", handleStyle: { position: "absolute", height: "12px", width: "12px", backgroundColor: "white", border: "1px solid #777", boxSizing: "border-box", opacity: "0.80" } } }; t.default = s }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), u = n(1), s = r(u), c = n(0), f = (r(c), n(6)), p = r(f), d = (n(3), n(7), n(8)), y = r(d), h = function (e) { function t(e) { o(this, t); var n = i(this, (t.__proto__ || Object.getPrototypeOf(t)).call(this, e)); return n.aligner = new p.default(e.options.align), n.toolbar = new y.default, n } return a(t, e), l(t, [{ key: "onCreate", value: function () { var e = this.toolbar.create(this.formatter, this.aligner); this.formatter.overlay.appendChild(e) } }, { key: "onDestroy", value: function () { var e = this.toolbar.getElement(); e && (this.formatter.overlay.removeChild(e), this.toolbar.destroy()) } }]), t }(s.default); t.default = h }, function (e, t, n) { "use strict"; function r(e, t, n) { return t in e ? Object.defineProperty(e, t, { value: n, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = n, e } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } Object.defineProperty(t, "__esModule", { value: !0 }); var i = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), a = (n(3), "left"), l = "center", u = "right", s = function () { function e(t) { var n, i = this; o(this, e), this.applyStyle = t.aligner.applyStyle, this.alignAttribute = t.attribute, this.alignments = (n = {}, r(n, a, { name: a, icon: t.icons.left, apply: function (e) { i.setAlignment(e, a), i.setStyle(e, "inline", "left", "0 1em 1em 0") } }), r(n, l, { name: l, icon: t.icons.center, apply: function (e) { i.setAlignment(e, l), i.setStyle(e, "block", null, "auto") } }), r(n, u, { name: u, icon: t.icons.right, apply: function (e) { i.setAlignment(e, u), i.setStyle(e, "inline", "right", "0 0 1em 1em") } }), n) } return i(e, [{ key: "getAlignments", value: function () { var e = this; return Object.keys(this.alignments).map(function (t) { return e.alignments[t] }) } }, { key: "clear", value: function (e) { e.removeAttribute(this.alignAttribute), this.setStyle(e, null, null, null) } }, { key: "isAligned", value: function (e, t) { return e.getAttribute(this.alignAttribute) === t.name } }, { key: "setAlignment", value: function (e, t) { e.setAttribute(this.alignAttribute, t) } }, { key: "setStyle", value: function (e, t, n, r) { this.applyStyle && (e.style.setProperty("display", t), e.style.setProperty("float", n), e.style.setProperty("margin", r)) } }]), e }(); t.default = s }, function (e, t, n) { "use strict"; var r = (n(3), n(0)); !function (e) { e && e.__esModule }(r) }, function (e, t, n) { "use strict"; function r(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } Object.defineProperty(t, "__esModule", { value: !0 }); var o = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), i = (n(7), n(3), n(0)), a = (function (e) { e && e.__esModule }(i), function () { function e() { r(this, e), this.toolbar = null, this.buttons = [] } return o(e, [{ key: "create", value: function (e, t) { var n = document.createElement("div"); return n.classList.add(e.options.align.toolbar.mainClassName), this.addToolbarStyle(e, n), this.addButtons(e, n, t), this.toolbar = n, this.toolbar } }, { key: "destroy", value: function () { this.toolbar = null, this.buttons = [] } }, { key: "getElement", value: function () { return this.toolbar } }, { key: "addToolbarStyle", value: function (e, t) { e.options.align.toolbar.mainStyle && Object.assign(t.style, e.options.align.toolbar.mainStyle) } }, { key: "addButtonStyle", value: function (e, t, n) { n.options.align.toolbar.buttonStyle && (Object.assign(e.style, n.options.align.toolbar.buttonStyle), t > 0 && (e.style.borderLeftWidth = "0")), n.options.align.toolbar.svgStyle && Object.assign(e.children[0].style, n.options.align.toolbar.svgStyle) } }, { key: "addButtons", value: function (e, t, n) { var r = this; n.getAlignments().forEach(function (o, i) { var a = document.createElement("span"); a.classList.add(e.options.align.toolbar.buttonClassName), a.innerHTML = o.icon, a.addEventListener("click", function () { r.onButtonClick(a, e, o, n) }), r.preselectButton(a, o, e, n), r.addButtonStyle(a, i, e), r.buttons.push(a), t.appendChild(a) }) } }, { key: "preselectButton", value: function (e, t, n, r) { if (n.currentSpec) { var o = n.currentSpec.getTargetElement(); o && r.isAligned(o, t) && this.selectButton(n, e) } } }, { key: "onButtonClick", value: function (e, t, n, r) { if (t.currentSpec) { var o = t.currentSpec.getTargetElement(); o && this.clickButton(e, o, t, n, r) } } }, { key: "clickButton", value: function (e, t, n, r, o) { var i = this; this.buttons.forEach(function (e) { i.deselectButton(n, e) }), o.isAligned(t, r) ? n.options.align.toolbar.allowDeselect ? o.clear(t) : this.selectButton(n, e) : (this.selectButton(n, e), r.apply(t)), n.update() } }, { key: "selectButton", value: function (e, t) { t.classList.add("is-selected"), e.options.align.toolbar.addButtonSelectStyle && t.style.setProperty("filter", "invert(20%)") } }, { key: "deselectButton", value: function (e, t) { t.classList.remove("is-selected"), e.options.align.toolbar.addButtonSelectStyle && t.style.removeProperty("filter") } }]), e }()); t.default = a }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), u = n(1), s = r(u), c = n(0), f = (r(c), function (e) { function t(e) { o(this, t); var n = i(this, (t.__proto__ || Object.getPrototypeOf(t)).call(this, e)); return n.onMouseDown = function (e) { if (e.target instanceof HTMLElement && (n.dragHandle = e.target, n.setCursor(n.dragHandle.style.cursor), n.formatter.currentSpec)) { var t = n.formatter.currentSpec.getTargetElement(); if (t) { var r = t.getBoundingClientRect(); n.dragStartX = e.clientX, n.preDragWidth = r.width, n.targetRatio = r.height / r.width, document.addEventListener("mousemove", n.onDrag), document.addEventListener("mouseup", n.onMouseUp) } } }, n.onDrag = function (e) { if (n.formatter.currentSpec) { var t = n.formatter.currentSpec.getTargetElement(); if (t) { var r = e.clientX - n.dragStartX, o = 0; o = n.dragHandle === n.topLeftHandle || n.dragHandle === n.bottomLeftHandle ? Math.round(n.preDragWidth - r) : Math.round(n.preDragWidth + r); var i = n.targetRatio * o; t.setAttribute("width", "" + o), t.setAttribute("height", "" + i), n.formatter.update() } } }, n.onMouseUp = function () { n.setCursor(""), document.removeEventListener("mousemove", n.onDrag), document.removeEventListener("mouseup", n.onMouseUp) }, n.topLeftHandle = n.createHandle("top-left", "nwse-resize"), n.topRightHandle = n.createHandle("top-right", "nesw-resize"), n.bottomRightHandle = n.createHandle("bottom-right", "nwse-resize"), n.bottomLeftHandle = n.createHandle("bottom-left", "nesw-resize"), n.dragHandle = null, n.dragStartX = 0, n.preDragWidth = 0, n.targetRatio = 0, n } return a(t, e), l(t, [{ key: "onCreate", value: function () { this.formatter.overlay.appendChild(this.topLeftHandle), this.formatter.overlay.appendChild(this.topRightHandle), this.formatter.overlay.appendChild(this.bottomRightHandle), this.formatter.overlay.appendChild(this.bottomLeftHandle), this.repositionHandles(this.formatter.options.resize.handleStyle) } }, { key: "onDestroy", value: function () { this.setCursor(""), this.formatter.overlay.removeChild(this.topLeftHandle), this.formatter.overlay.removeChild(this.topRightHandle), this.formatter.overlay.removeChild(this.bottomRightHandle), this.formatter.overlay.removeChild(this.bottomLeftHandle) } }, { key: "createHandle", value: function (e, t) { var n = document.createElement("div"); return n.classList.add(this.formatter.options.resize.handleClassName), n.setAttribute("data-position", e), n.style.cursor = t, this.formatter.options.resize.handleStyle && Object.assign(n.style, this.formatter.options.resize.handleStyle), n.addEventListener("mousedown", this.onMouseDown), n } }, { key: "repositionHandles", value: function (e) { var t = "0px", n = "0px"; e && (e.width && (t = -parseFloat(e.width) / 2 + "px"), e.height && (n = -parseFloat(e.height) / 2 + "px")), Object.assign(this.topLeftHandle.style, { left: t, top: n }), Object.assign(this.topRightHandle.style, { right: t, top: n }), Object.assign(this.bottomRightHandle.style, { right: t, bottom: n }), Object.assign(this.bottomLeftHandle.style, { left: t, bottom: n }) } }, { key: "setCursor", value: function (e) { if (document.body && (document.body.style.cursor = e), this.formatter.currentSpec) { var t = this.formatter.currentSpec.getOverlayElement(); t && (t.style.cursor = e) } } }]), t }(s.default)); t.default = f }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), u = n(16), s = r(u), c = n(1), f = r(c), p = function (e) { function t() { var e, n, r, a; o(this, t); for (var l = arguments.length, u = Array(l), c = 0; c < l; c++)u[c] = arguments[c]; return n = r = i(this, (e = t.__proto__ || Object.getPrototypeOf(t)).call.apply(e, [this].concat(u))), r.onKeyUp = function (e) { if (r.formatter.currentSpec && (46 === e.keyCode || 8 === e.keyCode)) { var t = s.default.find(r.formatter.currentSpec.getTargetElement()); t && t.deleteAt(0), r.formatter.hide() } }, a = n, i(r, a) } return a(t, e), l(t, [{ key: "onCreate", value: function () { document.addEventListener("keyup", this.onKeyUp, !0), this.formatter.quill.root.addEventListener("input", this.onKeyUp, !0) } }, { key: "onDestroy", value: function () { document.removeEventListener("keyup", this.onKeyUp), this.formatter.quill.root.removeEventListener("input", this.onKeyUp) } }]), t }(f.default); t.default = p }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), u = n(2), s = r(u), c = n(0), f = (r(c), function (e) { function t(e) { o(this, t); var n = i(this, (t.__proto__ || Object.getPrototypeOf(t)).call(this, e)); return n.onClick = function (e) { var t = e.target; t instanceof HTMLElement && "IMG" === t.tagName && (n.img = t, n.formatter.show(n)) }, n.img = null, n } return a(t, e), l(t, [{ key: "init", value: function () { this.formatter.quill.root.addEventListener("click", this.onClick) } }, { key: "getTargetElement", value: function () { return this.img } }, { key: "onHide", value: function () { this.img = null } }]), t }(s.default)); t.default = f }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = n(13), u = r(l), s = n(0), c = (r(s), function (e) { function t(e) { return o(this, t), i(this, (t.__proto__ || Object.getPrototypeOf(t)).call(this, e, "iframe.ql-video")) } return a(t, e), t }(u.default)); t.default = c }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } function o(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function i(e, t) { if (!e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return !t || "object" != typeof t && "function" != typeof t ? e : t } function a(e, t) { if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function, not " + typeof t); e.prototype = Object.create(t && t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }), t && (Object.setPrototypeOf ? Object.setPrototypeOf(e, t) : e.__proto__ = t) } Object.defineProperty(t, "__esModule", { value: !0 }); var l = function () { function e(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; r.enumerable = r.enumerable || !1, r.configurable = !0, "value" in r && (r.writable = !0), Object.defineProperty(e, r.key, r) } } return function (t, n, r) { return n && e(t.prototype, n), r && e(t, r), t } }(), u = n(2), s = r(u), c = n(0), f = (r(c), "data-blot-formatter-unclickable-bound"), p = function (e) { function t(e, n) { o(this, t); var r = i(this, (t.__proto__ || Object.getPrototypeOf(t)).call(this, e)); return r.onTextChange = function () { Array.from(document.querySelectorAll(r.selector + ":not([" + f + "])")).forEach(function (e) { e.setAttribute(f, "true"), e.addEventListener("mouseenter", r.onMouseEnter) }) }, r.onMouseEnter = function (e) { var t = e.target; t instanceof HTMLElement && (r.nextUnclickable = t, r.repositionProxyImage(r.nextUnclickable)) }, r.onProxyImageClick = function () { r.unclickable = r.nextUnclickable, r.nextUnclickable = null, r.formatter.show(r), r.hideProxyImage() }, r.selector = n, r.unclickable = null, r.nextUnclickable = null, r } return a(t, e), l(t, [{ key: "init", value: function () { document.body && document.body.appendChild(this.createProxyImage()), this.hideProxyImage(), this.proxyImage.addEventListener("click", this.onProxyImageClick), this.formatter.quill.on("text-change", this.onTextChange) } }, { key: "getTargetElement", value: function () { return this.unclickable } }, { key: "getOverlayElement", value: function () { return this.unclickable } }, { key: "onHide", value: function () { this.hideProxyImage(), this.nextUnclickable = null, this.unclickable = null } }, { key: "createProxyImage", value: function () { var e = document.createElement("canvas"), t = e.getContext("2d"); return t.globalAlpha = 0, t.fillRect(0, 0, 1, 1), this.proxyImage = document.createElement("img"), this.proxyImage.src = e.toDataURL("image/png"), this.proxyImage.classList.add("blot-formatter__proxy-image"), Object.assign(this.proxyImage.style, { position: "absolute", margin: "0" }), this.proxyImage } }, { key: "hideProxyImage", value: function () { Object.assign(this.proxyImage.style, { display: "none" }) } }, { key: "repositionProxyImage", value: function (e) { var t = e.getBoundingClientRect(); Object.assign(this.proxyImage.style, { display: "block", left: t.left + window.pageXOffset + "px", top: t.top + window.pageYOffset + "px", width: t.width + "px", height: t.height + "px" }) } }]), t }(s.default); t.default = p }, function (e, t, n) { "use strict"; function r(e) { return e && e.__esModule ? e : { default: e } } Object.defineProperty(t, "__esModule", { value: !0 }); var o = n(4); Object.defineProperty(t, "DefaultOptions", { enumerable: !0, get: function () { return r(o).default } }); var i = n(0); Object.defineProperty(t, "default", { enumerable: !0, get: function () { return r(i).default } }); var a = n(1); Object.defineProperty(t, "Action", { enumerable: !0, get: function () { return r(a).default } }); var l = n(5); Object.defineProperty(t, "AlignAction", { enumerable: !0, get: function () { return r(l).default } }); var u = n(6); Object.defineProperty(t, "DefaultAligner", { enumerable: !0, get: function () { return r(u).default } }); var s = n(8); Object.defineProperty(t, "DefaultToolbar", { enumerable: !0, get: function () { return r(s).default } }); var c = n(10); Object.defineProperty(t, "DeleteAction", { enumerable: !0, get: function () { return r(c).default } }); var f = n(9); Object.defineProperty(t, "ResizeAction", { enumerable: !0, get: function () { return r(f).default } }); var p = n(2); Object.defineProperty(t, "BlotSpec", { enumerable: !0, get: function () { return r(p).default } }); var d = n(11); Object.defineProperty(t, "ImageSpec", { enumerable: !0, get: function () { return r(d).default } }); var y = n(13); Object.defineProperty(t, "UnclickableBlotSpec", { enumerable: !0, get: function () { return r(y).default } }); var h = n(12); Object.defineProperty(t, "IframeVideoSpec", { enumerable: !0, get: function () { return r(h).default } }) }, function (e, t, n) { "use strict"; function r(e) { return !!e && "object" == typeof e } function o(e) { var t = Object.prototype.toString.call(e); return "[object RegExp]" === t || "[object Date]" === t || i(e) } function i(e) { return e.$$typeof === d } function a(e) { return Array.isArray(e) ? [] : {} } function l(e, t) { return t && !1 === t.clone || !f(e) ? e : c(a(e), e, t) } function u(e, t, n) { return e.concat(t).map(function (e) { return l(e, n) }) } function s(e, t, n) { var r = {}; return f(e) && Object.keys(e).forEach(function (t) { r[t] = l(e[t], n) }), Object.keys(t).forEach(function (o) { f(t[o]) && e[o] ? r[o] = c(e[o], t[o], n) : r[o] = l(t[o], n) }), r } function c(e, t, n) { var r = Array.isArray(t), o = Array.isArray(e), i = n || { arrayMerge: u }; if (r === o) return r ? (i.arrayMerge || u)(e, t, n) : s(e, t, n); return l(t, n) } Object.defineProperty(t, "__esModule", { value: !0 }); var f = function (e) { return r(e) && !o(e) }, p = "function" == typeof Symbol && Symbol.for, d = p ? Symbol.for("react.element") : 60103; c.all = function (e, t) { if (!Array.isArray(e)) throw new Error("first argument should be an array"); return e.reduce(function (e, n) { return c(e, n, t) }, {}) }; var y = c; t.default = y }, function (t, n) { t.exports = e }]) });
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/js/quill1.3.6.min.js b/Oqtane.Client/wwwroot/js/quill1.3.6.min.js
deleted file mode 100644
index ff30fd90..00000000
--- a/Oqtane.Client/wwwroot/js/quill1.3.6.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * Quill Editor v1.3.6
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Quill=e():t.Quill=e()}("undefined"!=typeof self?self:this,function(){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};return e.m=t,e.c=n,e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=45)}([function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(17),o=n(18),i=n(19),l=n(48),a=n(49),s=n(50),u=n(51),c=n(52),f=n(11),h=n(29),p=n(30),d=n(28),y=n(1),v={Scope:y.Scope,create:y.create,find:y.find,query:y.query,register:y.register,Container:r.default,Format:o.default,Leaf:i.default,Embed:u.default,Scroll:l.default,Block:s.default,Inline:a.default,Text:c.default,Attributor:{Attribute:f.default,Class:h.default,Style:p.default,Store:d.default}};e.default=v},function(t,e,n){"use strict";function r(t,e){var n=i(t);if(null==n)throw new s("Unable to create "+t+" blot");var r=n;return new r(t instanceof Node||t.nodeType===Node.TEXT_NODE?t:r.create(e),e)}function o(t,n){return void 0===n&&(n=!1),null==t?null:null!=t[e.DATA_KEY]?t[e.DATA_KEY].blot:n?o(t.parentNode,n):null}function i(t,e){void 0===e&&(e=p.ANY);var n;if("string"==typeof t)n=h[t]||u[t];else if(t instanceof Text||t.nodeType===Node.TEXT_NODE)n=h.text;else if("number"==typeof t)t&p.LEVEL&p.BLOCK?n=h.block:t&p.LEVEL&p.INLINE&&(n=h.inline);else if(t instanceof HTMLElement){var r=(t.getAttribute("class")||"").split(/\s+/);for(var o in r)if(n=c[r[o]])break;n=n||f[t.tagName]}return null==n?null:e&p.LEVEL&n.scope&&e&p.TYPE&n.scope?n:null}function l(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];if(t.length>1)return t.map(function(t){return l(t)});var n=t[0];if("string"!=typeof n.blotName&&"string"!=typeof n.attrName)throw new s("Invalid definition");if("abstract"===n.blotName)throw new s("Cannot register abstract class");if(h[n.blotName||n.attrName]=n,"string"==typeof n.keyName)u[n.keyName]=n;else if(null!=n.className&&(c[n.className]=n),null!=n.tagName){Array.isArray(n.tagName)?n.tagName=n.tagName.map(function(t){return t.toUpperCase()}):n.tagName=n.tagName.toUpperCase();var r=Array.isArray(n.tagName)?n.tagName:[n.tagName];r.forEach(function(t){null!=f[t]&&null!=n.className||(f[t]=n)})}return n}var a=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var s=function(t){function e(e){var n=this;return e="[Parchment] "+e,n=t.call(this,e)||this,n.message=e,n.name=n.constructor.name,n}return a(e,t),e}(Error);e.ParchmentError=s;var u={},c={},f={},h={};e.DATA_KEY="__blot";var p;!function(t){t[t.TYPE=3]="TYPE",t[t.LEVEL=12]="LEVEL",t[t.ATTRIBUTE=13]="ATTRIBUTE",t[t.BLOT=14]="BLOT",t[t.INLINE=7]="INLINE",t[t.BLOCK=11]="BLOCK",t[t.BLOCK_BLOT=10]="BLOCK_BLOT",t[t.INLINE_BLOT=6]="INLINE_BLOT",t[t.BLOCK_ATTRIBUTE=9]="BLOCK_ATTRIBUTE",t[t.INLINE_ATTRIBUTE=5]="INLINE_ATTRIBUTE",t[t.ANY=15]="ANY"}(p=e.Scope||(e.Scope={})),e.create=r,e.find=o,e.query=i,e.register=l},function(t,e){"use strict";var n=Object.prototype.hasOwnProperty,r=Object.prototype.toString,o=function(t){return"function"==typeof Array.isArray?Array.isArray(t):"[object Array]"===r.call(t)},i=function(t){if(!t||"[object Object]"!==r.call(t))return!1;var e=n.call(t,"constructor"),o=t.constructor&&t.constructor.prototype&&n.call(t.constructor.prototype,"isPrototypeOf");if(t.constructor&&!e&&!o)return!1;var i;for(i in t);return void 0===i||n.call(t,i)};t.exports=function t(){var e,n,r,l,a,s,u=arguments[0],c=1,f=arguments.length,h=!1;for("boolean"==typeof u&&(h=u,u=arguments[1]||{},c=2),(null==u||"object"!=typeof u&&"function"!=typeof u)&&(u={});c<f;++c)if(null!=(e=arguments[c]))for(n in e)r=u[n],l=e[n],u!==l&&(h&&l&&(i(l)||(a=o(l)))?(a?(a=!1,s=r&&o(r)?r:[]):s=r&&i(r)?r:{},u[n]=t(h,s,l)):void 0!==l&&(u[n]=l));return u}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return null==t?e:("function"==typeof t.formats&&(e=(0,f.default)(e,t.formats())),null==t.parent||"scroll"==t.parent.blotName||t.parent.statics.scope!==t.statics.scope?e:a(t.parent,e))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BlockEmbed=e.bubbleFormats=void 0;var s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(2),f=r(c),h=n(4),p=r(h),d=n(0),y=r(d),v=n(14),b=r(v),g=n(5),m=r(g),_=n(8),O=r(_),w=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),s(e,[{key:"attach",value:function(){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"attach",this).call(this),this.attributes=new y.default.Attributor.Store(this.domNode)}},{key:"delta",value:function(){return(new p.default).insert(this.value(),(0,f.default)(this.formats(),this.attributes.values()))}},{key:"format",value:function(t,e){var n=y.default.query(t,y.default.Scope.BLOCK_ATTRIBUTE);null!=n&&this.attributes.attribute(n,e)}},{key:"formatAt",value:function(t,e,n,r){this.format(n,r)}},{key:"insertAt",value:function(t,n,r){if("string"==typeof n&&n.endsWith("\n")){var o=y.default.create(x.blotName);this.parent.insertBefore(o,0===t?this:this.next),o.insertAt(0,n.slice(0,-1))}else u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r)}}]),e}(y.default.Embed);w.scope=y.default.Scope.BLOCK_BLOT;var x=function(t){function e(t){o(this,e);var n=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return n.cache={},n}return l(e,t),s(e,[{key:"delta",value:function(){return null==this.cache.delta&&(this.cache.delta=this.descendants(y.default.Leaf).reduce(function(t,e){return 0===e.length()?t:t.insert(e.value(),a(e))},new p.default).insert("\n",a(this))),this.cache.delta}},{key:"deleteAt",value:function(t,n){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"deleteAt",this).call(this,t,n),this.cache={}}},{key:"formatAt",value:function(t,n,r,o){n<=0||(y.default.query(r,y.default.Scope.BLOCK)?t+n===this.length()&&this.format(r,o):u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,Math.min(n,this.length()-t-1),r,o),this.cache={})}},{key:"insertAt",value:function(t,n,r){if(null!=r)return u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r);if(0!==n.length){var o=n.split("\n"),i=o.shift();i.length>0&&(t<this.length()-1||null==this.children.tail?u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,Math.min(t,this.length()-1),i):this.children.tail.insertAt(this.children.tail.length(),i),this.cache={});var l=this;o.reduce(function(t,e){return l=l.split(t,!0),l.insertAt(0,e),e.length},t+i.length)}}},{key:"insertBefore",value:function(t,n){var r=this.children.head;u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n),r instanceof b.default&&r.remove(),this.cache={}}},{key:"length",value:function(){return null==this.cache.length&&(this.cache.length=u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"length",this).call(this)+1),this.cache.length}},{key:"moveChildren",value:function(t,n){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"moveChildren",this).call(this,t,n),this.cache={}}},{key:"optimize",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.cache={}}},{key:"path",value:function(t){return u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"path",this).call(this,t,!0)}},{key:"removeChild",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"removeChild",this).call(this,t),this.cache={}}},{key:"split",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(n&&(0===t||t>=this.length()-1)){var r=this.clone();return 0===t?(this.parent.insertBefore(r,this),this):(this.parent.insertBefore(r,this.next),r)}var o=u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"split",this).call(this,t,n);return this.cache={},o}}]),e}(y.default.Block);x.blotName="block",x.tagName="P",x.defaultChild="break",x.allowedChildren=[m.default,y.default.Embed,O.default],e.bubbleFormats=a,e.BlockEmbed=w,e.default=x},function(t,e,n){var r=n(54),o=n(12),i=n(2),l=n(20),a=String.fromCharCode(0),s=function(t){Array.isArray(t)?this.ops=t:null!=t&&Array.isArray(t.ops)?this.ops=t.ops:this.ops=[]};s.prototype.insert=function(t,e){var n={};return 0===t.length?this:(n.insert=t,null!=e&&"object"==typeof e&&Object.keys(e).length>0&&(n.attributes=e),this.push(n))},s.prototype.delete=function(t){return t<=0?this:this.push({delete:t})},s.prototype.retain=function(t,e){if(t<=0)return this;var n={retain:t};return null!=e&&"object"==typeof e&&Object.keys(e).length>0&&(n.attributes=e),this.push(n)},s.prototype.push=function(t){var e=this.ops.length,n=this.ops[e-1];if(t=i(!0,{},t),"object"==typeof n){if("number"==typeof t.delete&&"number"==typeof n.delete)return this.ops[e-1]={delete:n.delete+t.delete},this;if("number"==typeof n.delete&&null!=t.insert&&(e-=1,"object"!=typeof(n=this.ops[e-1])))return this.ops.unshift(t),this;if(o(t.attributes,n.attributes)){if("string"==typeof t.insert&&"string"==typeof n.insert)return this.ops[e-1]={insert:n.insert+t.insert},"object"==typeof t.attributes&&(this.ops[e-1].attributes=t.attributes),this;if("number"==typeof t.retain&&"number"==typeof n.retain)return this.ops[e-1]={retain:n.retain+t.retain},"object"==typeof t.attributes&&(this.ops[e-1].attributes=t.attributes),this}}return e===this.ops.length?this.ops.push(t):this.ops.splice(e,0,t),this},s.prototype.chop=function(){var t=this.ops[this.ops.length-1];return t&&t.retain&&!t.attributes&&this.ops.pop(),this},s.prototype.filter=function(t){return this.ops.filter(t)},s.prototype.forEach=function(t){this.ops.forEach(t)},s.prototype.map=function(t){return this.ops.map(t)},s.prototype.partition=function(t){var e=[],n=[];return this.forEach(function(r){(t(r)?e:n).push(r)}),[e,n]},s.prototype.reduce=function(t,e){return this.ops.reduce(t,e)},s.prototype.changeLength=function(){return this.reduce(function(t,e){return e.insert?t+l.length(e):e.delete?t-e.delete:t},0)},s.prototype.length=function(){return this.reduce(function(t,e){return t+l.length(e)},0)},s.prototype.slice=function(t,e){t=t||0,"number"!=typeof e&&(e=1/0);for(var n=[],r=l.iterator(this.ops),o=0;o<e&&r.hasNext();){var i;o<t?i=r.next(t-o):(i=r.next(e-o),n.push(i)),o+=l.length(i)}return new s(n)},s.prototype.compose=function(t){for(var e=l.iterator(this.ops),n=l.iterator(t.ops),r=new s;e.hasNext()||n.hasNext();)if("insert"===n.peekType())r.push(n.next());else if("delete"===e.peekType())r.push(e.next());else{var o=Math.min(e.peekLength(),n.peekLength()),i=e.next(o),a=n.next(o);if("number"==typeof a.retain){var u={};"number"==typeof i.retain?u.retain=o:u.insert=i.insert;var c=l.attributes.compose(i.attributes,a.attributes,"number"==typeof i.retain);c&&(u.attributes=c),r.push(u)}else"number"==typeof a.delete&&"number"==typeof i.retain&&r.push(a)}return r.chop()},s.prototype.concat=function(t){var e=new s(this.ops.slice());return t.ops.length>0&&(e.push(t.ops[0]),e.ops=e.ops.concat(t.ops.slice(1))),e},s.prototype.diff=function(t,e){if(this.ops===t.ops)return new s;var n=[this,t].map(function(e){return e.map(function(n){if(null!=n.insert)return"string"==typeof n.insert?n.insert:a;var r=e===t?"on":"with";throw new Error("diff() called "+r+" non-document")}).join("")}),i=new s,u=r(n[0],n[1],e),c=l.iterator(this.ops),f=l.iterator(t.ops);return u.forEach(function(t){for(var e=t[1].length;e>0;){var n=0;switch(t[0]){case r.INSERT:n=Math.min(f.peekLength(),e),i.push(f.next(n));break;case r.DELETE:n=Math.min(e,c.peekLength()),c.next(n),i.delete(n);break;case r.EQUAL:n=Math.min(c.peekLength(),f.peekLength(),e);var a=c.next(n),s=f.next(n);o(a.insert,s.insert)?i.retain(n,l.attributes.diff(a.attributes,s.attributes)):i.push(s).delete(n)}e-=n}}),i.chop()},s.prototype.eachLine=function(t,e){e=e||"\n";for(var n=l.iterator(this.ops),r=new s,o=0;n.hasNext();){if("insert"!==n.peekType())return;var i=n.peek(),a=l.length(i)-n.peekLength(),u="string"==typeof i.insert?i.insert.indexOf(e,a)-a:-1;if(u<0)r.push(n.next());else if(u>0)r.push(n.next(u));else{if(!1===t(r,n.next(1).attributes||{},o))return;o+=1,r=new s}}r.length()>0&&t(r,{},o)},s.prototype.transform=function(t,e){if(e=!!e,"number"==typeof t)return this.transformPosition(t,e);for(var n=l.iterator(this.ops),r=l.iterator(t.ops),o=new s;n.hasNext()||r.hasNext();)if("insert"!==n.peekType()||!e&&"insert"===r.peekType())if("insert"===r.peekType())o.push(r.next());else{var i=Math.min(n.peekLength(),r.peekLength()),a=n.next(i),u=r.next(i);if(a.delete)continue;u.delete?o.push(u):o.retain(i,l.attributes.transform(a.attributes,u.attributes,e))}else o.retain(l.length(n.next()));return o.chop()},s.prototype.transformPosition=function(t,e){e=!!e;for(var n=l.iterator(this.ops),r=0;n.hasNext()&&r<=t;){var o=n.peekLength(),i=n.peekType();n.next(),"delete"!==i?("insert"===i&&(r<t||!e)&&(t+=o),r+=o):t-=Math.min(o,t-r)}return t},t.exports=s},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(8),c=r(u),f=n(0),h=r(f),p=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,[{key:"formatAt",value:function(t,n,r,o){if(e.compare(this.statics.blotName,r)<0&&h.default.query(r,h.default.Scope.BLOT)){var i=this.isolate(t,n);o&&i.wrap(r,o)}else s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,n,r,o)}},{key:"optimize",value:function(t){if(s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.parent instanceof e&&e.compare(this.statics.blotName,this.parent.statics.blotName)>0){var n=this.parent.isolate(this.offset(),this.length());this.moveChildren(n),n.wrap(this)}}}],[{key:"compare",value:function(t,n){var r=e.order.indexOf(t),o=e.order.indexOf(n);return r>=0||o>=0?r-o:t===n?0:t<n?-1:1}}]),e}(h.default.Inline);p.allowedChildren=[p,h.default.Embed,c.default],p.order=["cursor","inline","underline","strike","italic","bold","script","link","code"],e.default=p},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(e=(0,N.default)(!0,{container:t,modules:{clipboard:!0,keyboard:!0,history:!0}},e),e.theme&&e.theme!==S.DEFAULTS.theme){if(e.theme=S.import("themes/"+e.theme),null==e.theme)throw new Error("Invalid theme "+e.theme+". Did you register it?")}else e.theme=T.default;var n=(0,N.default)(!0,{},e.theme.DEFAULTS);[n,e].forEach(function(t){t.modules=t.modules||{},Object.keys(t.modules).forEach(function(e){!0===t.modules[e]&&(t.modules[e]={})})});var r=Object.keys(n.modules).concat(Object.keys(e.modules)),o=r.reduce(function(t,e){var n=S.import("modules/"+e);return null==n?P.error("Cannot load "+e+" module. Are you sure you registered it?"):t[e]=n.DEFAULTS||{},t},{});return null!=e.modules&&e.modules.toolbar&&e.modules.toolbar.constructor!==Object&&(e.modules.toolbar={container:e.modules.toolbar}),e=(0,N.default)(!0,{},S.DEFAULTS,{modules:o},n,e),["bounds","container","scrollingContainer"].forEach(function(t){"string"==typeof e[t]&&(e[t]=document.querySelector(e[t]))}),e.modules=Object.keys(e.modules).reduce(function(t,n){return e.modules[n]&&(t[n]=e.modules[n]),t},{}),e}function a(t,e,n,r){if(this.options.strict&&!this.isEnabled()&&e===g.default.sources.USER)return new d.default;var o=null==n?null:this.getSelection(),i=this.editor.delta,l=t();if(null!=o&&(!0===n&&(n=o.index),null==r?o=u(o,l,e):0!==r&&(o=u(o,n,r,e)),this.setSelection(o,g.default.sources.SILENT)),l.length()>0){var a,s=[g.default.events.TEXT_CHANGE,l,i,e];if((a=this.emitter).emit.apply(a,[g.default.events.EDITOR_CHANGE].concat(s)),e!==g.default.sources.SILENT){var c;(c=this.emitter).emit.apply(c,s)}}return l}function s(t,e,n,r,o){var i={};return"number"==typeof t.index&&"number"==typeof t.length?"number"!=typeof e?(o=r,r=n,n=e,e=t.length,t=t.index):(e=t.length,t=t.index):"number"!=typeof e&&(o=r,r=n,n=e,e=0),"object"===(void 0===n?"undefined":c(n))?(i=n,o=r):"string"==typeof n&&(null!=r?i[n]=r:o=n),o=o||g.default.sources.API,[t,e,i,o]}function u(t,e,n,r){if(null==t)return null;var o=void 0,i=void 0;if(e instanceof d.default){var l=[t.index,t.index+t.length].map(function(t){return e.transformPosition(t,r!==g.default.sources.USER)}),a=f(l,2);o=a[0],i=a[1]}else{var s=[t.index,t.index+t.length].map(function(t){return t<e||t===e&&r===g.default.sources.USER?t:n>=0?t+n:Math.max(e,t+n)}),u=f(s,2);o=u[0],i=u[1]}return new x.Range(o,i-o)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.overload=e.expandConfig=void 0;var c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},f=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),h=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();n(53);var p=n(4),d=r(p),y=n(57),v=r(y),b=n(9),g=r(b),m=n(7),_=r(m),O=n(0),w=r(O),x=n(22),k=r(x),E=n(2),N=r(E),j=n(10),A=r(j),q=n(32),T=r(q),P=(0,A.default)("quill"),S=function(){function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(i(this,t),this.options=l(e,r),this.container=this.options.container,null==this.container)return P.error("Invalid Quill container",e);this.options.debug&&t.debug(this.options.debug);var o=this.container.innerHTML.trim();this.container.classList.add("ql-container"),this.container.innerHTML="",this.container.__quill=this,this.root=this.addContainer("ql-editor"),this.root.classList.add("ql-blank"),this.root.setAttribute("data-gramm",!1),this.scrollingContainer=this.options.scrollingContainer||this.root,this.emitter=new g.default,this.scroll=w.default.create(this.root,{emitter:this.emitter,whitelist:this.options.formats}),this.editor=new v.default(this.scroll),this.selection=new k.default(this.scroll,this.emitter),this.theme=new this.options.theme(this,this.options),this.keyboard=this.theme.addModule("keyboard"),this.clipboard=this.theme.addModule("clipboard"),this.history=this.theme.addModule("history"),this.theme.init(),this.emitter.on(g.default.events.EDITOR_CHANGE,function(t){t===g.default.events.TEXT_CHANGE&&n.root.classList.toggle("ql-blank",n.editor.isBlank())}),this.emitter.on(g.default.events.SCROLL_UPDATE,function(t,e){var r=n.selection.lastRange,o=r&&0===r.length?r.index:void 0;a.call(n,function(){return n.editor.update(null,e,o)},t)});var s=this.clipboard.convert("<div class='ql-editor' style=\"white-space: normal;\">"+o+"<p><br></p></div>");this.setContents(s),this.history.clear(),this.options.placeholder&&this.root.setAttribute("data-placeholder",this.options.placeholder),this.options.readOnly&&this.disable()}return h(t,null,[{key:"debug",value:function(t){!0===t&&(t="log"),A.default.level(t)}},{key:"find",value:function(t){return t.__quill||w.default.find(t)}},{key:"import",value:function(t){return null==this.imports[t]&&P.error("Cannot import "+t+". Are you sure it was registered?"),this.imports[t]}},{key:"register",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]&&arguments[2];if("string"!=typeof t){var o=t.attrName||t.blotName;"string"==typeof o?this.register("formats/"+o,t,e):Object.keys(t).forEach(function(r){n.register(r,t[r],e)})}else null==this.imports[t]||r||P.warn("Overwriting "+t+" with",e),this.imports[t]=e,(t.startsWith("blots/")||t.startsWith("formats/"))&&"abstract"!==e.blotName?w.default.register(e):t.startsWith("modules")&&"function"==typeof e.register&&e.register()}}]),h(t,[{key:"addContainer",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;if("string"==typeof t){var n=t;t=document.createElement("div"),t.classList.add(n)}return this.container.insertBefore(t,e),t}},{key:"blur",value:function(){this.selection.setRange(null)}},{key:"deleteText",value:function(t,e,n){var r=this,o=s(t,e,n),i=f(o,4);return t=i[0],e=i[1],n=i[3],a.call(this,function(){return r.editor.deleteText(t,e)},n,t,-1*e)}},{key:"disable",value:function(){this.enable(!1)}},{key:"enable",value:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.scroll.enable(t),this.container.classList.toggle("ql-disabled",!t)}},{key:"focus",value:function(){var t=this.scrollingContainer.scrollTop;this.selection.focus(),this.scrollingContainer.scrollTop=t,this.scrollIntoView()}},{key:"format",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:g.default.sources.API;return a.call(this,function(){var r=n.getSelection(!0),i=new d.default;if(null==r)return i;if(w.default.query(t,w.default.Scope.BLOCK))i=n.editor.formatLine(r.index,r.length,o({},t,e));else{if(0===r.length)return n.selection.format(t,e),i;i=n.editor.formatText(r.index,r.length,o({},t,e))}return n.setSelection(r,g.default.sources.SILENT),i},r)}},{key:"formatLine",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,e,n,r,o),c=f(u,4);return t=c[0],e=c[1],l=c[2],o=c[3],a.call(this,function(){return i.editor.formatLine(t,e,l)},o,t,0)}},{key:"formatText",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,e,n,r,o),c=f(u,4);return t=c[0],e=c[1],l=c[2],o=c[3],a.call(this,function(){return i.editor.formatText(t,e,l)},o,t,0)}},{key:"getBounds",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=void 0;n="number"==typeof t?this.selection.getBounds(t,e):this.selection.getBounds(t.index,t.length);var r=this.container.getBoundingClientRect();return{bottom:n.bottom-r.top,height:n.height,left:n.left-r.left,right:n.right-r.left,top:n.top-r.top,width:n.width}}},{key:"getContents",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.getLength()-t,n=s(t,e),r=f(n,2);return t=r[0],e=r[1],this.editor.getContents(t,e)}},{key:"getFormat",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.getSelection(!0),e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return"number"==typeof t?this.editor.getFormat(t,e):this.editor.getFormat(t.index,t.length)}},{key:"getIndex",value:function(t){return t.offset(this.scroll)}},{key:"getLength",value:function(){return this.scroll.length()}},{key:"getLeaf",value:function(t){return this.scroll.leaf(t)}},{key:"getLine",value:function(t){return this.scroll.line(t)}},{key:"getLines",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Number.MAX_VALUE;return"number"!=typeof t?this.scroll.lines(t.index,t.length):this.scroll.lines(t,e)}},{key:"getModule",value:function(t){return this.theme.modules[t]}},{key:"getSelection",value:function(){return arguments.length>0&&void 0!==arguments[0]&&arguments[0]&&this.focus(),this.update(),this.selection.getRange()[0]}},{key:"getText",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.getLength()-t,n=s(t,e),r=f(n,2);return t=r[0],e=r[1],this.editor.getText(t,e)}},{key:"hasFocus",value:function(){return this.selection.hasFocus()}},{key:"insertEmbed",value:function(e,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:t.sources.API;return a.call(this,function(){return o.editor.insertEmbed(e,n,r)},i,e)}},{key:"insertText",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,0,n,r,o),c=f(u,4);return t=c[0],l=c[2],o=c[3],a.call(this,function(){return i.editor.insertText(t,e,l)},o,t,e.length)}},{key:"isEnabled",value:function(){return!this.container.classList.contains("ql-disabled")}},{key:"off",value:function(){return this.emitter.off.apply(this.emitter,arguments)}},{key:"on",value:function(){return this.emitter.on.apply(this.emitter,arguments)}},{key:"once",value:function(){return this.emitter.once.apply(this.emitter,arguments)}},{key:"pasteHTML",value:function(t,e,n){this.clipboard.dangerouslyPasteHTML(t,e,n)}},{key:"removeFormat",value:function(t,e,n){var r=this,o=s(t,e,n),i=f(o,4);return t=i[0],e=i[1],n=i[3],a.call(this,function(){return r.editor.removeFormat(t,e)},n,t)}},{key:"scrollIntoView",value:function(){this.selection.scrollIntoView(this.scrollingContainer)}},{key:"setContents",value:function(t){var e=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API;return a.call(this,function(){t=new d.default(t);var n=e.getLength(),r=e.editor.deleteText(0,n),o=e.editor.applyDelta(t),i=o.ops[o.ops.length-1];return null!=i&&"string"==typeof i.insert&&"\n"===i.insert[i.insert.length-1]&&(e.editor.deleteText(e.getLength()-1,1),o.delete(1)),r.compose(o)},n)}},{key:"setSelection",value:function(e,n,r){if(null==e)this.selection.setRange(null,n||t.sources.API);else{var o=s(e,n,r),i=f(o,4);e=i[0],n=i[1],r=i[3],this.selection.setRange(new x.Range(e,n),r),r!==g.default.sources.SILENT&&this.selection.scrollIntoView(this.scrollingContainer)}}},{key:"setText",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API,n=(new d.default).insert(t);return this.setContents(n,e)}},{key:"update",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:g.default.sources.USER,e=this.scroll.update(t);return this.selection.update(t),e}},{key:"updateContents",value:function(t){var e=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API;return a.call(this,function(){return t=new d.default(t),e.editor.applyDelta(t,n)},n,!0)}}]),t}();S.DEFAULTS={bounds:null,formats:null,modules:{},placeholder:"",readOnly:!1,scrollingContainer:null,strict:!0,theme:"default"},S.events=g.default.events,S.sources=g.default.sources,S.version="1.3.6",S.imports={delta:d.default,parchment:w.default,"core/module":_.default,"core/theme":T.default},e.expandConfig=l,e.overload=s,e.default=S},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};r(this,t),this.quill=e,this.options=n};o.DEFAULTS={},e.default=o},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(0),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default.Text);e.default=s},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(58),c=r(u),f=n(10),h=r(f),p=(0,h.default)("quill:events");["selectionchange","mousedown","mouseup","click"].forEach(function(t){document.addEventListener(t,function(){for(var t=arguments.length,e=Array(t),n=0;n<t;n++)e[n]=arguments[n];[].slice.call(document.querySelectorAll(".ql-container")).forEach(function(t){if(t.__quill&&t.__quill.emitter){var n;(n=t.__quill.emitter).handleDOM.apply(n,e)}})})});var d=function(t){function e(){o(this,e);var t=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return t.listeners={},t.on("error",p.error),t}return l(e,t),a(e,[{key:"emit",value:function(){p.log.apply(p,arguments),s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"emit",this).apply(this,arguments)}},{key:"handleDOM",value:function(t){for(var e=arguments.length,n=Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];(this.listeners[t.type]||[]).forEach(function(e){var r=e.node,o=e.handler;(t.target===r||r.contains(t.target))&&o.apply(void 0,[t].concat(n))})}},{key:"listenDOM",value:function(t,e,n){this.listeners[t]||(this.listeners[t]=[]),this.listeners[t].push({node:e,handler:n})}}]),e}(c.default);d.events={EDITOR_CHANGE:"editor-change",SCROLL_BEFORE_UPDATE:"scroll-before-update",SCROLL_OPTIMIZE:"scroll-optimize",SCROLL_UPDATE:"scroll-update",SELECTION_CHANGE:"selection-change",TEXT_CHANGE:"text-change"},d.sources={API:"api",SILENT:"silent",USER:"user"},e.default=d},function(t,e,n){"use strict";function r(t){if(i.indexOf(t)<=i.indexOf(l)){for(var e,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];(e=console)[t].apply(e,r)}}function o(t){return i.reduce(function(e,n){return e[n]=r.bind(console,n,t),e},{})}Object.defineProperty(e,"__esModule",{value:!0});var i=["error","warn","log","info"],l="warn";r.level=o.level=function(t){l=t},e.default=o},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(1),o=function(){function t(t,e,n){void 0===n&&(n={}),this.attrName=t,this.keyName=e;var o=r.Scope.TYPE&r.Scope.ATTRIBUTE;null!=n.scope?this.scope=n.scope&r.Scope.LEVEL|o:this.scope=r.Scope.ATTRIBUTE,null!=n.whitelist&&(this.whitelist=n.whitelist)}return t.keys=function(t){return[].map.call(t.attributes,function(t){return t.name})},t.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(t.setAttribute(this.keyName,e),!0)},t.prototype.canAdd=function(t,e){return null!=r.query(t,r.Scope.BLOT&(this.scope|r.Scope.TYPE))&&(null==this.whitelist||("string"==typeof e?this.whitelist.indexOf(e.replace(/["']/g,""))>-1:this.whitelist.indexOf(e)>-1))},t.prototype.remove=function(t){t.removeAttribute(this.keyName)},t.prototype.value=function(t){var e=t.getAttribute(this.keyName);return this.canAdd(t,e)&&e?e:""},t}();e.default=o},function(t,e,n){function r(t){return null===t||void 0===t}function o(t){return!(!t||"object"!=typeof t||"number"!=typeof t.length)&&("function"==typeof t.copy&&"function"==typeof t.slice&&!(t.length>0&&"number"!=typeof t[0]))}function i(t,e,n){var i,c;if(r(t)||r(e))return!1;if(t.prototype!==e.prototype)return!1;if(s(t))return!!s(e)&&(t=l.call(t),e=l.call(e),u(t,e,n));if(o(t)){if(!o(e))return!1;if(t.length!==e.length)return!1;for(i=0;i<t.length;i++)if(t[i]!==e[i])return!1;return!0}try{var f=a(t),h=a(e)}catch(t){return!1}if(f.length!=h.length)return!1;for(f.sort(),h.sort(),i=f.length-1;i>=0;i--)if(f[i]!=h[i])return!1;for(i=f.length-1;i>=0;i--)if(c=f[i],!u(t[c],e[c],n))return!1;return typeof t==typeof e}var l=Array.prototype.slice,a=n(55),s=n(56),u=t.exports=function(t,e,n){return n||(n={}),t===e||(t instanceof Date&&e instanceof Date?t.getTime()===e.getTime():!t||!e||"object"!=typeof t&&"object"!=typeof e?n.strict?t===e:t==e:i(t,e,n))}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Code=void 0;var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(4),f=r(c),h=n(0),p=r(h),d=n(3),y=r(d),v=n(5),b=r(v),g=n(8),m=r(g),_=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),e}(b.default);_.blotName="code",_.tagName="CODE";var O=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),s(e,[{key:"delta",value:function(){var t=this,e=this.domNode.textContent;return e.endsWith("\n")&&(e=e.slice(0,-1)),e.split("\n").reduce(function(e,n){return e.insert(n).insert("\n",t.formats())},new f.default)}},{key:"format",value:function(t,n){if(t!==this.statics.blotName||!n){var r=this.descendant(m.default,this.length()-1),o=a(r,1),i=o[0];null!=i&&i.deleteAt(i.length()-1,1),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}},{key:"formatAt",value:function(t,n,r,o){if(0!==n&&null!=p.default.query(r,p.default.Scope.BLOCK)&&(r!==this.statics.blotName||o!==this.statics.formats(this.domNode))){var i=this.newlineIndex(t);if(!(i<0||i>=t+n)){var l=this.newlineIndex(t,!0)+1,a=i-l+1,s=this.isolate(l,a),u=s.next;s.format(r,o),u instanceof e&&u.formatAt(0,t-l+n-a,r,o)}}}},{key:"insertAt",value:function(t,e,n){if(null==n){var r=this.descendant(m.default,t),o=a(r,2),i=o[0],l=o[1];i.insertAt(l,e)}}},{key:"length",value:function(){var t=this.domNode.textContent.length;return this.domNode.textContent.endsWith("\n")?t:t+1}},{key:"newlineIndex",value:function(t){if(arguments.length>1&&void 0!==arguments[1]&&arguments[1])return this.domNode.textContent.slice(0,t).lastIndexOf("\n");var e=this.domNode.textContent.slice(t).indexOf("\n");return e>-1?t+e:-1}},{key:"optimize",value:function(t){this.domNode.textContent.endsWith("\n")||this.appendChild(p.default.create("text","\n")),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t);var n=this.next;null!=n&&n.prev===this&&n.statics.blotName===this.statics.blotName&&this.statics.formats(this.domNode)===n.statics.formats(n.domNode)&&(n.optimize(t),n.moveChildren(this),n.remove())}},{key:"replace",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replace",this).call(this,t),[].slice.call(this.domNode.querySelectorAll("*")).forEach(function(t){var e=p.default.find(t);null==e?t.parentNode.removeChild(t):e instanceof p.default.Embed?e.remove():e.unwrap()})}}],[{key:"create",value:function(t){var n=u(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return n.setAttribute("spellcheck",!1),n}},{key:"formats",value:function(){return!0}}]),e}(y.default);O.blotName="code-block",O.tagName="PRE",O.TAB="  ",e.Code=_,e.default=O},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"insertInto",value:function(t,n){0===t.children.length?a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertInto",this).call(this,t,n):this.remove()}},{key:"length",value:function(){return 0}},{key:"value",value:function(){return""}}],[{key:"value",value:function(){}}]),e}(u.default.Embed);c.blotName="break",c.tagName="BR",e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function l(t,e){var n=document.createElement("a");n.href=t;var r=n.href.slice(0,n.href.indexOf(":"));return e.indexOf(r)>-1}Object.defineProperty(e,"__esModule",{value:!0}),e.sanitize=e.default=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(5),c=function(t){return t&&t.__esModule?t:{default:t}}(u),f=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),a(e,[{key:"format",value:function(t,n){if(t!==this.statics.blotName||!n)return s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n);n=this.constructor.sanitize(n),this.domNode.setAttribute("href",n)}}],[{key:"create",value:function(t){var n=s(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return t=this.sanitize(t),n.setAttribute("href",t),n.setAttribute("target","_blank"),n}},{key:"formats",value:function(t){return t.getAttribute("href")}},{key:"sanitize",value:function(t){return l(t,this.PROTOCOL_WHITELIST)?t:this.SANITIZED_URL}}]),e}(c.default);f.blotName="link",f.tagName="A",f.SANITIZED_URL="about:blank",f.PROTOCOL_WHITELIST=["http","https","mailto","tel"],e.default=f,e.sanitize=l},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){t.setAttribute(e,!("true"===t.getAttribute(e)))}Object.defineProperty(e,"__esModule",{value:!0});var l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=n(25),u=r(s),c=n(106),f=r(c),h=0,p=function(){function t(e){var n=this;o(this,t),this.select=e,this.container=document.createElement("span"),this.buildPicker(),this.select.style.display="none",this.select.parentNode.insertBefore(this.container,this.select),this.label.addEventListener("mousedown",function(){n.togglePicker()}),this.label.addEventListener("keydown",function(t){switch(t.keyCode){case u.default.keys.ENTER:n.togglePicker();break;case u.default.keys.ESCAPE:n.escape(),t.preventDefault()}}),this.select.addEventListener("change",this.update.bind(this))}return a(t,[{key:"togglePicker",value:function(){this.container.classList.toggle("ql-expanded"),i(this.label,"aria-expanded"),i(this.options,"aria-hidden")}},{key:"buildItem",value:function(t){var e=this,n=document.createElement("span");return n.tabIndex="0",n.setAttribute("role","button"),n.classList.add("ql-picker-item"),t.hasAttribute("value")&&n.setAttribute("data-value",t.getAttribute("value")),t.textContent&&n.setAttribute("data-label",t.textContent),n.addEventListener("click",function(){e.selectItem(n,!0)}),n.addEventListener("keydown",function(t){switch(t.keyCode){case u.default.keys.ENTER:e.selectItem(n,!0),t.preventDefault();break;case u.default.keys.ESCAPE:e.escape(),t.preventDefault()}}),n}},{key:"buildLabel",value:function(){var t=document.createElement("span");return t.classList.add("ql-picker-label"),t.innerHTML=f.default,t.tabIndex="0",t.setAttribute("role","button"),t.setAttribute("aria-expanded","false"),this.container.appendChild(t),t}},{key:"buildOptions",value:function(){var t=this,e=document.createElement("span");e.classList.add("ql-picker-options"),e.setAttribute("aria-hidden","true"),e.tabIndex="-1",e.id="ql-picker-options-"+h,h+=1,this.label.setAttribute("aria-controls",e.id),this.options=e,[].slice.call(this.select.options).forEach(function(n){var r=t.buildItem(n);e.appendChild(r),!0===n.selected&&t.selectItem(r)}),this.container.appendChild(e)}},{key:"buildPicker",value:function(){var t=this;[].slice.call(this.select.attributes).forEach(function(e){t.container.setAttribute(e.name,e.value)}),this.container.classList.add("ql-picker"),this.label=this.buildLabel(),this.buildOptions()}},{key:"escape",value:function(){var t=this;this.close(),setTimeout(function(){return t.label.focus()},1)}},{key:"close",value:function(){this.container.classList.remove("ql-expanded"),this.label.setAttribute("aria-expanded","false"),this.options.setAttribute("aria-hidden","true")}},{key:"selectItem",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.container.querySelector(".ql-selected");if(t!==n&&(null!=n&&n.classList.remove("ql-selected"),null!=t&&(t.classList.add("ql-selected"),this.select.selectedIndex=[].indexOf.call(t.parentNode.children,t),t.hasAttribute("data-value")?this.label.setAttribute("data-value",t.getAttribute("data-value")):this.label.removeAttribute("data-value"),t.hasAttribute("data-label")?this.label.setAttribute("data-label",t.getAttribute("data-label")):this.label.removeAttribute("data-label"),e))){if("function"==typeof Event)this.select.dispatchEvent(new Event("change"));else if("object"===("undefined"==typeof Event?"undefined":l(Event))){var r=document.createEvent("Event");r.initEvent("change",!0,!0),this.select.dispatchEvent(r)}this.close()}}},{key:"update",value:function(){var t=void 0;if(this.select.selectedIndex>-1){var e=this.container.querySelector(".ql-picker-options").children[this.select.selectedIndex];t=this.select.options[this.select.selectedIndex],this.selectItem(e)}else this.selectItem(null);var n=null!=t&&t!==this.select.querySelector("option[selected]");this.label.classList.toggle("ql-active",n)}}]),t}();e.default=p},function(t,e,n){"use strict";function r(t){var e=a.find(t);if(null==e)try{e=a.create(t)}catch(n){e=a.create(a.Scope.INLINE),[].slice.call(t.childNodes).forEach(function(t){e.domNode.appendChild(t)}),t.parentNode&&t.parentNode.replaceChild(e.domNode,t),e.attach()}return e}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(47),l=n(27),a=n(1),s=function(t){function e(e){var n=t.call(this,e)||this;return n.build(),n}return o(e,t),e.prototype.appendChild=function(t){this.insertBefore(t)},e.prototype.attach=function(){t.prototype.attach.call(this),this.children.forEach(function(t){t.attach()})},e.prototype.build=function(){var t=this;this.children=new i.default,[].slice.call(this.domNode.childNodes).reverse().forEach(function(e){try{var n=r(e);t.insertBefore(n,t.children.head||void 0)}catch(t){if(t instanceof a.ParchmentError)return;throw t}})},e.prototype.deleteAt=function(t,e){if(0===t&&e===this.length())return this.remove();this.children.forEachAt(t,e,function(t,e,n){t.deleteAt(e,n)})},e.prototype.descendant=function(t,n){var r=this.children.find(n),o=r[0],i=r[1];return null==t.blotName&&t(o)||null!=t.blotName&&o instanceof t?[o,i]:o instanceof e?o.descendant(t,i):[null,-1]},e.prototype.descendants=function(t,n,r){void 0===n&&(n=0),void 0===r&&(r=Number.MAX_VALUE);var o=[],i=r;return this.children.forEachAt(n,r,function(n,r,l){(null==t.blotName&&t(n)||null!=t.blotName&&n instanceof t)&&o.push(n),n instanceof e&&(o=o.concat(n.descendants(t,r,i))),i-=l}),o},e.prototype.detach=function(){this.children.forEach(function(t){t.detach()}),t.prototype.detach.call(this)},e.prototype.formatAt=function(t,e,n,r){this.children.forEachAt(t,e,function(t,e,o){t.formatAt(e,o,n,r)})},e.prototype.insertAt=function(t,e,n){var r=this.children.find(t),o=r[0],i=r[1];if(o)o.insertAt(i,e,n);else{var l=null==n?a.create("text",e):a.create(e,n);this.appendChild(l)}},e.prototype.insertBefore=function(t,e){if(null!=this.statics.allowedChildren&&!this.statics.allowedChildren.some(function(e){return t instanceof e}))throw new a.ParchmentError("Cannot insert "+t.statics.blotName+" into "+this.statics.blotName);t.insertInto(this,e)},e.prototype.length=function(){return this.children.reduce(function(t,e){return t+e.length()},0)},e.prototype.moveChildren=function(t,e){this.children.forEach(function(n){t.insertBefore(n,e)})},e.prototype.optimize=function(e){if(t.prototype.optimize.call(this,e),0===this.children.length)if(null!=this.statics.defaultChild){var n=a.create(this.statics.defaultChild);this.appendChild(n),n.optimize(e)}else this.remove()},e.prototype.path=function(t,n){void 0===n&&(n=!1);var r=this.children.find(t,n),o=r[0],i=r[1],l=[[this,t]];return o instanceof e?l.concat(o.path(i,n)):(null!=o&&l.push([o,i]),l)},e.prototype.removeChild=function(t){this.children.remove(t)},e.prototype.replace=function(n){n instanceof e&&n.moveChildren(this),t.prototype.replace.call(this,n)},e.prototype.split=function(t,e){if(void 0===e&&(e=!1),!e){if(0===t)return this;if(t===this.length())return this.next}var n=this.clone();return this.parent.insertBefore(n,this.next),this.children.forEachAt(t,this.length(),function(t,r,o){t=t.split(r,e),n.appendChild(t)}),n},e.prototype.unwrap=function(){this.moveChildren(this.parent,this.next),this.remove()},e.prototype.update=function(t,e){var n=this,o=[],i=[];t.forEach(function(t){t.target===n.domNode&&"childList"===t.type&&(o.push.apply(o,t.addedNodes),i.push.apply(i,t.removedNodes))}),i.forEach(function(t){if(!(null!=t.parentNode&&"IFRAME"!==t.tagName&&document.body.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_CONTAINED_BY)){var e=a.find(t);null!=e&&(null!=e.domNode.parentNode&&e.domNode.parentNode!==n.domNode||e.detach())}}),o.filter(function(t){return t.parentNode==n.domNode}).sort(function(t,e){return t===e?0:t.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING?1:-1}).forEach(function(t){var e=null;null!=t.nextSibling&&(e=a.find(t.nextSibling));var o=r(t);o.next==e&&null!=o.next||(null!=o.parent&&o.parent.removeChild(n),n.insertBefore(o,e||void 0))})},e}(l.default);e.default=s},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(11),i=n(28),l=n(17),a=n(1),s=function(t){function e(e){var n=t.call(this,e)||this;return n.attributes=new i.default(n.domNode),n}return r(e,t),e.formats=function(t){return"string"==typeof this.tagName||(Array.isArray(this.tagName)?t.tagName.toLowerCase():void 0)},e.prototype.format=function(t,e){var n=a.query(t);n instanceof o.default?this.attributes.attribute(n,e):e&&(null==n||t===this.statics.blotName&&this.formats()[t]===e||this.replaceWith(t,e))},e.prototype.formats=function(){var t=this.attributes.values(),e=this.statics.formats(this.domNode);return null!=e&&(t[this.statics.blotName]=e),t},e.prototype.replaceWith=function(e,n){var r=t.prototype.replaceWith.call(this,e,n);return this.attributes.copy(r),r},e.prototype.update=function(e,n){var r=this;t.prototype.update.call(this,e,n),e.some(function(t){return t.target===r.domNode&&"attributes"===t.type})&&this.attributes.build()},e.prototype.wrap=function(n,r){var o=t.prototype.wrap.call(this,n,r);return o instanceof e&&o.statics.scope===this.statics.scope&&this.attributes.move(o),o},e}(l.default);e.default=s},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(27),i=n(1),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.value=function(t){return!0},e.prototype.index=function(t,e){return this.domNode===t||this.domNode.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_CONTAINED_BY?Math.min(e,1):-1},e.prototype.position=function(t,e){var n=[].indexOf.call(this.parent.domNode.childNodes,this.domNode);return t>0&&(n+=1),[this.parent.domNode,n]},e.prototype.value=function(){return t={},t[this.statics.blotName]=this.statics.value(this.domNode)||!0,t;var t},e.scope=i.Scope.INLINE_BLOT,e}(o.default);e.default=l},function(t,e,n){function r(t){this.ops=t,this.index=0,this.offset=0}var o=n(12),i=n(2),l={attributes:{compose:function(t,e,n){"object"!=typeof t&&(t={}),"object"!=typeof e&&(e={});var r=i(!0,{},e);n||(r=Object.keys(r).reduce(function(t,e){return null!=r[e]&&(t[e]=r[e]),t},{}));for(var o in t)void 0!==t[o]&&void 0===e[o]&&(r[o]=t[o]);return Object.keys(r).length>0?r:void 0},diff:function(t,e){"object"!=typeof t&&(t={}),"object"!=typeof e&&(e={});var n=Object.keys(t).concat(Object.keys(e)).reduce(function(n,r){return o(t[r],e[r])||(n[r]=void 0===e[r]?null:e[r]),n},{});return Object.keys(n).length>0?n:void 0},transform:function(t,e,n){if("object"!=typeof t)return e;if("object"==typeof e){if(!n)return e;var r=Object.keys(e).reduce(function(n,r){return void 0===t[r]&&(n[r]=e[r]),n},{});return Object.keys(r).length>0?r:void 0}}},iterator:function(t){return new r(t)},length:function(t){return"number"==typeof t.delete?t.delete:"number"==typeof t.retain?t.retain:"string"==typeof t.insert?t.insert.length:1}};r.prototype.hasNext=function(){return this.peekLength()<1/0},r.prototype.next=function(t){t||(t=1/0);var e=this.ops[this.index];if(e){var n=this.offset,r=l.length(e);if(t>=r-n?(t=r-n,this.index+=1,this.offset=0):this.offset+=t,"number"==typeof e.delete)return{delete:t};var o={};return e.attributes&&(o.attributes=e.attributes),"number"==typeof e.retain?o.retain=t:"string"==typeof e.insert?o.insert=e.insert.substr(n,t):o.insert=e.insert,o}return{retain:1/0}},r.prototype.peek=function(){return this.ops[this.index]},r.prototype.peekLength=function(){return this.ops[this.index]?l.length(this.ops[this.index])-this.offset:1/0},r.prototype.peekType=function(){return this.ops[this.index]?"number"==typeof this.ops[this.index].delete?"delete":"number"==typeof this.ops[this.index].retain?"retain":"insert":"retain"},t.exports=l},function(t,e){var n=function(){"use strict";function t(t,e){return null!=e&&t instanceof e}function e(n,r,o,i,c){function f(n,o){if(null===n)return null;if(0===o)return n;var y,v;if("object"!=typeof n)return n;if(t(n,a))y=new a;else if(t(n,s))y=new s;else if(t(n,u))y=new u(function(t,e){n.then(function(e){t(f(e,o-1))},function(t){e(f(t,o-1))})});else if(e.__isArray(n))y=[];else if(e.__isRegExp(n))y=new RegExp(n.source,l(n)),n.lastIndex&&(y.lastIndex=n.lastIndex);else if(e.__isDate(n))y=new Date(n.getTime());else{if(d&&Buffer.isBuffer(n))return y=new Buffer(n.length),n.copy(y),y;t(n,Error)?y=Object.create(n):void 0===i?(v=Object.getPrototypeOf(n),y=Object.create(v)):(y=Object.create(i),v=i)}if(r){var b=h.indexOf(n);if(-1!=b)return p[b];h.push(n),p.push(y)}t(n,a)&&n.forEach(function(t,e){var n=f(e,o-1),r=f(t,o-1);y.set(n,r)}),t(n,s)&&n.forEach(function(t){var e=f(t,o-1);y.add(e)});for(var g in n){var m;v&&(m=Object.getOwnPropertyDescriptor(v,g)),m&&null==m.set||(y[g]=f(n[g],o-1))}if(Object.getOwnPropertySymbols)for(var _=Object.getOwnPropertySymbols(n),g=0;g<_.length;g++){var O=_[g],w=Object.getOwnPropertyDescriptor(n,O);(!w||w.enumerable||c)&&(y[O]=f(n[O],o-1),w.enumerable||Object.defineProperty(y,O,{enumerable:!1}))}if(c)for(var x=Object.getOwnPropertyNames(n),g=0;g<x.length;g++){var k=x[g],w=Object.getOwnPropertyDescriptor(n,k);w&&w.enumerable||(y[k]=f(n[k],o-1),Object.defineProperty(y,k,{enumerable:!1}))}return y}"object"==typeof r&&(o=r.depth,i=r.prototype,c=r.includeNonEnumerable,r=r.circular);var h=[],p=[],d="undefined"!=typeof Buffer;return void 0===r&&(r=!0),void 0===o&&(o=1/0),f(n,o)}function n(t){return Object.prototype.toString.call(t)}function r(t){return"object"==typeof t&&"[object Date]"===n(t)}function o(t){return"object"==typeof t&&"[object Array]"===n(t)}function i(t){return"object"==typeof t&&"[object RegExp]"===n(t)}function l(t){var e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),e}var a;try{a=Map}catch(t){a=function(){}}var s;try{s=Set}catch(t){s=function(){}}var u;try{u=Promise}catch(t){u=function(){}}return e.clonePrototype=function(t){if(null===t)return null;var e=function(){};return e.prototype=t,new e},e.__objToStr=n,e.__isDate=r,e.__isArray=o,e.__isRegExp=i,e.__getRegExpFlags=l,e}();"object"==typeof t&&t.exports&&(t.exports=n)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){if(Array.isArray(t)){for(var e=0,n=Array(t.length);e<t.length;e++)n[e]=t[e];return n}return Array.from(t)}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){try{e.parentNode}catch(t){return!1}return e instanceof Text&&(e=e.parentNode),t.contains(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Range=void 0;var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=n(0),c=r(u),f=n(21),h=r(f),p=n(12),d=r(p),y=n(9),v=r(y),b=n(10),g=r(b),m=(0,g.default)("quill:selection"),_=function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;i(this,t),this.index=e,this.length=n},O=function(){function t(e,n){var r=this;i(this,t),this.emitter=n,this.scroll=e,this.composing=!1,this.mouseDown=!1,this.root=this.scroll.domNode,this.cursor=c.default.create("cursor",this),this.lastRange=this.savedRange=new _(0,0),this.handleComposition(),this.handleDragging(),this.emitter.listenDOM("selectionchange",document,function(){r.mouseDown||setTimeout(r.update.bind(r,v.default.sources.USER),1)}),this.emitter.on(v.default.events.EDITOR_CHANGE,function(t,e){t===v.default.events.TEXT_CHANGE&&e.length()>0&&r.update(v.default.sources.SILENT)}),this.emitter.on(v.default.events.SCROLL_BEFORE_UPDATE,function(){if(r.hasFocus()){var t=r.getNativeRange();null!=t&&t.start.node!==r.cursor.textNode&&r.emitter.once(v.default.events.SCROLL_UPDATE,function(){try{r.setNativeRange(t.start.node,t.start.offset,t.end.node,t.end.offset)}catch(t){}})}}),this.emitter.on(v.default.events.SCROLL_OPTIMIZE,function(t,e){if(e.range){var n=e.range,o=n.startNode,i=n.startOffset,l=n.endNode,a=n.endOffset;r.setNativeRange(o,i,l,a)}}),this.update(v.default.sources.SILENT)}return s(t,[{key:"handleComposition",value:function(){var t=this;this.root.addEventListener("compositionstart",function(){t.composing=!0}),this.root.addEventListener("compositionend",function(){if(t.composing=!1,t.cursor.parent){var e=t.cursor.restore();if(!e)return;setTimeout(function(){t.setNativeRange(e.startNode,e.startOffset,e.endNode,e.endOffset)},1)}})}},{key:"handleDragging",value:function(){var t=this;this.emitter.listenDOM("mousedown",document.body,function(){t.mouseDown=!0}),this.emitter.listenDOM("mouseup",document.body,function(){t.mouseDown=!1,t.update(v.default.sources.USER)})}},{key:"focus",value:function(){this.hasFocus()||(this.root.focus(),this.setRange(this.savedRange))}},{key:"format",value:function(t,e){if(null==this.scroll.whitelist||this.scroll.whitelist[t]){this.scroll.update();var n=this.getNativeRange();if(null!=n&&n.native.collapsed&&!c.default.query(t,c.default.Scope.BLOCK)){if(n.start.node!==this.cursor.textNode){var r=c.default.find(n.start.node,!1);if(null==r)return;if(r instanceof c.default.Leaf){var o=r.split(n.start.offset);r.parent.insertBefore(this.cursor,o)}else r.insertBefore(this.cursor,n.start.node);this.cursor.attach()}this.cursor.format(t,e),this.scroll.optimize(),this.setNativeRange(this.cursor.textNode,this.cursor.textNode.data.length),this.update()}}}},{key:"getBounds",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=this.scroll.length();t=Math.min(t,n-1),e=Math.min(t+e,n-1)-t;var r=void 0,o=this.scroll.leaf(t),i=a(o,2),l=i[0],s=i[1];if(null==l)return null;var u=l.position(s,!0),c=a(u,2);r=c[0],s=c[1];var f=document.createRange();if(e>0){f.setStart(r,s);var h=this.scroll.leaf(t+e),p=a(h,2);if(l=p[0],s=p[1],null==l)return null;var d=l.position(s,!0),y=a(d,2);return r=y[0],s=y[1],f.setEnd(r,s),f.getBoundingClientRect()}var v="left",b=void 0;return r instanceof Text?(s<r.data.length?(f.setStart(r,s),f.setEnd(r,s+1)):(f.setStart(r,s-1),f.setEnd(r,s),v="right"),b=f.getBoundingClientRect()):(b=l.domNode.getBoundingClientRect(),s>0&&(v="right")),{bottom:b.top+b.height,height:b.height,left:b[v],right:b[v],top:b.top,width:0}}},{key:"getNativeRange",value:function(){var t=document.getSelection();if(null==t||t.rangeCount<=0)return null;var e=t.getRangeAt(0);if(null==e)return null;var n=this.normalizeNative(e);return m.info("getNativeRange",n),n}},{key:"getRange",value:function(){var t=this.getNativeRange();return null==t?[null,null]:[this.normalizedToRange(t),t]}},{key:"hasFocus",value:function(){return document.activeElement===this.root}},{key:"normalizedToRange",value:function(t){var e=this,n=[[t.start.node,t.start.offset]];t.native.collapsed||n.push([t.end.node,t.end.offset]);var r=n.map(function(t){var n=a(t,2),r=n[0],o=n[1],i=c.default.find(r,!0),l=i.offset(e.scroll);return 0===o?l:i instanceof c.default.Container?l+i.length():l+i.index(r,o)}),i=Math.min(Math.max.apply(Math,o(r)),this.scroll.length()-1),l=Math.min.apply(Math,[i].concat(o(r)));return new _(l,i-l)}},{key:"normalizeNative",value:function(t){if(!l(this.root,t.startContainer)||!t.collapsed&&!l(this.root,t.endContainer))return null;var e={start:{node:t.startContainer,offset:t.startOffset},end:{node:t.endContainer,offset:t.endOffset},native:t};return[e.start,e.end].forEach(function(t){for(var e=t.node,n=t.offset;!(e instanceof Text)&&e.childNodes.length>0;)if(e.childNodes.length>n)e=e.childNodes[n],n=0;else{if(e.childNodes.length!==n)break;e=e.lastChild,n=e instanceof Text?e.data.length:e.childNodes.length+1}t.node=e,t.offset=n}),e}},{key:"rangeToNative",value:function(t){var e=this,n=t.collapsed?[t.index]:[t.index,t.index+t.length],r=[],o=this.scroll.length();return n.forEach(function(t,n){t=Math.min(o-1,t);var i=void 0,l=e.scroll.leaf(t),s=a(l,2),u=s[0],c=s[1],f=u.position(c,0!==n),h=a(f,2);i=h[0],c=h[1],r.push(i,c)}),r.length<2&&(r=r.concat(r)),r}},{key:"scrollIntoView",value:function(t){var e=this.lastRange;if(null!=e){var n=this.getBounds(e.index,e.length);if(null!=n){var r=this.scroll.length()-1,o=this.scroll.line(Math.min(e.index,r)),i=a(o,1),l=i[0],s=l;if(e.length>0){var u=this.scroll.line(Math.min(e.index+e.length,r));s=a(u,1)[0]}if(null!=l&&null!=s){var c=t.getBoundingClientRect();n.top<c.top?t.scrollTop-=c.top-n.top:n.bottom>c.bottom&&(t.scrollTop+=n.bottom-c.bottom)}}}}},{key:"setNativeRange",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t,r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:e,o=arguments.length>4&&void 0!==arguments[4]&&arguments[4];if(m.info("setNativeRange",t,e,n,r),null==t||null!=this.root.parentNode&&null!=t.parentNode&&null!=n.parentNode){var i=document.getSelection();if(null!=i)if(null!=t){this.hasFocus()||this.root.focus();var l=(this.getNativeRange()||{}).native;if(null==l||o||t!==l.startContainer||e!==l.startOffset||n!==l.endContainer||r!==l.endOffset){"BR"==t.tagName&&(e=[].indexOf.call(t.parentNode.childNodes,t),t=t.parentNode),"BR"==n.tagName&&(r=[].indexOf.call(n.parentNode.childNodes,n),n=n.parentNode);var a=document.createRange();a.setStart(t,e),a.setEnd(n,r),i.removeAllRanges(),i.addRange(a)}}else i.removeAllRanges(),this.root.blur(),document.body.focus()}}},{key:"setRange",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:v.default.sources.API;if("string"==typeof e&&(n=e,e=!1),m.info("setRange",t),null!=t){var r=this.rangeToNative(t);this.setNativeRange.apply(this,o(r).concat([e]))}else this.setNativeRange(null);this.update(n)}},{key:"update",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:v.default.sources.USER,e=this.lastRange,n=this.getRange(),r=a(n,2),o=r[0],i=r[1];if(this.lastRange=o,null!=this.lastRange&&(this.savedRange=this.lastRange),!(0,d.default)(e,this.lastRange)){var l;!this.composing&&null!=i&&i.native.collapsed&&i.start.node!==this.cursor.textNode&&this.cursor.restore();var s=[v.default.events.SELECTION_CHANGE,(0,h.default)(this.lastRange),(0,h.default)(e),t];if((l=this.emitter).emit.apply(l,[v.default.events.EDITOR_CHANGE].concat(s)),t!==v.default.sources.SILENT){var u;(u=this.emitter).emit.apply(u,s)}}}}]),t}();e.Range=_,e.default=O},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=n(0),s=r(a),u=n(3),c=r(u),f=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),e}(s.default.Container);f.allowedChildren=[c.default,u.BlockEmbed,f],e.default=f},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.ColorStyle=e.ColorClass=e.ColorAttributor=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"value",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t);return n.startsWith("rgb(")?(n=n.replace(/^[^\d]+/,"").replace(/[^\d]+$/,""),"#"+n.split(",").map(function(t){return("00"+parseInt(t).toString(16)).slice(-2)}).join("")):n}}]),e}(u.default.Attributor.Style),f=new u.default.Attributor.Class("color","ql-color",{scope:u.default.Scope.INLINE}),h=new c("color","color",{scope:u.default.Scope.INLINE});e.ColorAttributor=c,e.ColorClass=f,e.ColorStyle=h},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n,r=t===D.keys.LEFT?"prefix":"suffix";return n={key:t,shiftKey:e,altKey:null},o(n,r,/^$/),o(n,"handler",function(n){var r=n.index;t===D.keys.RIGHT&&(r+=n.length+1);var o=this.quill.getLeaf(r);return!(b(o,1)[0]instanceof T.default.Embed)||(t===D.keys.LEFT?e?this.quill.setSelection(n.index-1,n.length+1,S.default.sources.USER):this.quill.setSelection(n.index-1,S.default.sources.USER):e?this.quill.setSelection(n.index,n.length+1,S.default.sources.USER):this.quill.setSelection(n.index+n.length+1,S.default.sources.USER),!1)}),n}function u(t,e){if(!(0===t.index||this.quill.getLength()<=1)){var n=this.quill.getLine(t.index),r=b(n,1),o=r[0],i={};if(0===e.offset){var l=this.quill.getLine(t.index-1),a=b(l,1),s=a[0];if(null!=s&&s.length()>1){var u=o.formats(),c=this.quill.getFormat(t.index-1,1);i=A.default.attributes.diff(u,c)||{}}}var f=/[\uD800-\uDBFF][\uDC00-\uDFFF]$/.test(e.prefix)?2:1;this.quill.deleteText(t.index-f,f,S.default.sources.USER),Object.keys(i).length>0&&this.quill.formatLine(t.index-f,f,i,S.default.sources.USER),this.quill.focus()}}function c(t,e){var n=/^[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(e.suffix)?2:1;if(!(t.index>=this.quill.getLength()-n)){var r={},o=0,i=this.quill.getLine(t.index),l=b(i,1),a=l[0];if(e.offset>=a.length()-1){var s=this.quill.getLine(t.index+1),u=b(s,1),c=u[0];if(c){var f=a.formats(),h=this.quill.getFormat(t.index,1);r=A.default.attributes.diff(f,h)||{},o=c.length()}}this.quill.deleteText(t.index,n,S.default.sources.USER),Object.keys(r).length>0&&this.quill.formatLine(t.index+o-1,n,r,S.default.sources.USER)}}function f(t){var e=this.quill.getLines(t),n={};if(e.length>1){var r=e[0].formats(),o=e[e.length-1].formats();n=A.default.attributes.diff(o,r)||{}}this.quill.deleteText(t,S.default.sources.USER),Object.keys(n).length>0&&this.quill.formatLine(t.index,1,n,S.default.sources.USER),this.quill.setSelection(t.index,S.default.sources.SILENT),this.quill.focus()}function h(t,e){var n=this;t.length>0&&this.quill.scroll.deleteAt(t.index,t.length);var r=Object.keys(e.format).reduce(function(t,n){return T.default.query(n,T.default.Scope.BLOCK)&&!Array.isArray(e.format[n])&&(t[n]=e.format[n]),t},{});this.quill.insertText(t.index,"\n",r,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.focus(),Object.keys(e.format).forEach(function(t){null==r[t]&&(Array.isArray(e.format[t])||"link"!==t&&n.quill.format(t,e.format[t],S.default.sources.USER))})}function p(t){return{key:D.keys.TAB,shiftKey:!t,format:{"code-block":!0},handler:function(e){var n=T.default.query("code-block"),r=e.index,o=e.length,i=this.quill.scroll.descendant(n,r),l=b(i,2),a=l[0],s=l[1];if(null!=a){var u=this.quill.getIndex(a),c=a.newlineIndex(s,!0)+1,f=a.newlineIndex(u+s+o),h=a.domNode.textContent.slice(c,f).split("\n");s=0,h.forEach(function(e,i){t?(a.insertAt(c+s,n.TAB),s+=n.TAB.length,0===i?r+=n.TAB.length:o+=n.TAB.length):e.startsWith(n.TAB)&&(a.deleteAt(c+s,n.TAB.length),s-=n.TAB.length,0===i?r-=n.TAB.length:o-=n.TAB.length),s+=e.length+1}),this.quill.update(S.default.sources.USER),this.quill.setSelection(r,o,S.default.sources.SILENT)}}}}function d(t){return{key:t[0].toUpperCase(),shortKey:!0,handler:function(e,n){this.quill.format(t,!n.format[t],S.default.sources.USER)}}}function y(t){if("string"==typeof t||"number"==typeof t)return y({key:t});if("object"===(void 0===t?"undefined":v(t))&&(t=(0,_.default)(t,!1)),"string"==typeof t.key)if(null!=D.keys[t.key.toUpperCase()])t.key=D.keys[t.key.toUpperCase()];else{if(1!==t.key.length)return null;t.key=t.key.toUpperCase().charCodeAt(0)}return t.shortKey&&(t[B]=t.shortKey,delete t.shortKey),t}Object.defineProperty(e,"__esModule",{value:!0}),e.SHORTKEY=e.default=void 0;var v="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},b=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),g=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),m=n(21),_=r(m),O=n(12),w=r(O),x=n(2),k=r(x),E=n(4),N=r(E),j=n(20),A=r(j),q=n(0),T=r(q),P=n(6),S=r(P),C=n(10),L=r(C),M=n(7),R=r(M),I=(0,L.default)("quill:keyboard"),B=/Mac/i.test(navigator.platform)?"metaKey":"ctrlKey",D=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.bindings={},Object.keys(r.options.bindings).forEach(function(e){("list autofill"!==e||null==t.scroll.whitelist||t.scroll.whitelist.list)&&r.options.bindings[e]&&r.addBinding(r.options.bindings[e])}),r.addBinding({key:e.keys.ENTER,shiftKey:null},h),r.addBinding({key:e.keys.ENTER,metaKey:null,ctrlKey:null,altKey:null},function(){}),/Firefox/i.test(navigator.userAgent)?(r.addBinding({key:e.keys.BACKSPACE},{collapsed:!0},u),r.addBinding({key:e.keys.DELETE},{collapsed:!0},c)):(r.addBinding({key:e.keys.BACKSPACE},{collapsed:!0,prefix:/^.?$/},u),r.addBinding({key:e.keys.DELETE},{collapsed:!0,suffix:/^.?$/},c)),r.addBinding({key:e.keys.BACKSPACE},{collapsed:!1},f),r.addBinding({key:e.keys.DELETE},{collapsed:!1},f),r.addBinding({key:e.keys.BACKSPACE,altKey:null,ctrlKey:null,metaKey:null,shiftKey:null},{collapsed:!0,offset:0},u),r.listen(),r}return a(e,t),g(e,null,[{key:"match",value:function(t,e){return e=y(e),!["altKey","ctrlKey","metaKey","shiftKey"].some(function(n){return!!e[n]!==t[n]&&null!==e[n]})&&e.key===(t.which||t.keyCode)}}]),g(e,[{key:"addBinding",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=y(t);if(null==r||null==r.key)return I.warn("Attempted to add invalid keyboard binding",r);"function"==typeof e&&(e={handler:e}),"function"==typeof n&&(n={handler:n}),r=(0,k.default)(r,e,n),this.bindings[r.key]=this.bindings[r.key]||[],this.bindings[r.key].push(r)}},{key:"listen",value:function(){var t=this;this.quill.root.addEventListener("keydown",function(n){if(!n.defaultPrevented){var r=n.which||n.keyCode,o=(t.bindings[r]||[]).filter(function(t){return e.match(n,t)});if(0!==o.length){var i=t.quill.getSelection();if(null!=i&&t.quill.hasFocus()){var l=t.quill.getLine(i.index),a=b(l,2),s=a[0],u=a[1],c=t.quill.getLeaf(i.index),f=b(c,2),h=f[0],p=f[1],d=0===i.length?[h,p]:t.quill.getLeaf(i.index+i.length),y=b(d,2),g=y[0],m=y[1],_=h instanceof T.default.Text?h.value().slice(0,p):"",O=g instanceof T.default.Text?g.value().slice(m):"",x={collapsed:0===i.length,empty:0===i.length&&s.length()<=1,format:t.quill.getFormat(i),offset:u,prefix:_,suffix:O};o.some(function(e){if(null!=e.collapsed&&e.collapsed!==x.collapsed)return!1;if(null!=e.empty&&e.empty!==x.empty)return!1;if(null!=e.offset&&e.offset!==x.offset)return!1;if(Array.isArray(e.format)){if(e.format.every(function(t){return null==x.format[t]}))return!1}else if("object"===v(e.format)&&!Object.keys(e.format).every(function(t){return!0===e.format[t]?null!=x.format[t]:!1===e.format[t]?null==x.format[t]:(0,w.default)(e.format[t],x.format[t])}))return!1;return!(null!=e.prefix&&!e.prefix.test(x.prefix))&&(!(null!=e.suffix&&!e.suffix.test(x.suffix))&&!0!==e.handler.call(t,i,x))})&&n.preventDefault()}}}})}}]),e}(R.default);D.keys={BACKSPACE:8,TAB:9,ENTER:13,ESCAPE:27,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46},D.DEFAULTS={bindings:{bold:d("bold"),italic:d("italic"),underline:d("underline"),indent:{key:D.keys.TAB,format:["blockquote","indent","list"],handler:function(t,e){if(e.collapsed&&0!==e.offset)return!0;this.quill.format("indent","+1",S.default.sources.USER)}},outdent:{key:D.keys.TAB,shiftKey:!0,format:["blockquote","indent","list"],handler:function(t,e){if(e.collapsed&&0!==e.offset)return!0;this.quill.format("indent","-1",S.default.sources.USER)}},"outdent backspace":{key:D.keys.BACKSPACE,collapsed:!0,shiftKey:null,metaKey:null,ctrlKey:null,altKey:null,format:["indent","list"],offset:0,handler:function(t,e){null!=e.format.indent?this.quill.format("indent","-1",S.default.sources.USER):null!=e.format.list&&this.quill.format("list",!1,S.default.sources.USER)}},"indent code-block":p(!0),"outdent code-block":p(!1),"remove tab":{key:D.keys.TAB,shiftKey:!0,collapsed:!0,prefix:/\t$/,handler:function(t){this.quill.deleteText(t.index-1,1,S.default.sources.USER)}},tab:{key:D.keys.TAB,handler:function(t){this.quill.history.cutoff();var e=(new N.default).retain(t.index).delete(t.length).insert("\t");this.quill.updateContents(e,S.default.sources.USER),this.quill.history.cutoff(),this.quill.setSelection(t.index+1,S.default.sources.SILENT)}},"list empty enter":{key:D.keys.ENTER,collapsed:!0,format:["list"],empty:!0,handler:function(t,e){this.quill.format("list",!1,S.default.sources.USER),e.format.indent&&this.quill.format("indent",!1,S.default.sources.USER)}},"checklist enter":{key:D.keys.ENTER,collapsed:!0,format:{list:"checked"},handler:function(t){var e=this.quill.getLine(t.index),n=b(e,2),r=n[0],o=n[1],i=(0,k.default)({},r.formats(),{list:"checked"}),l=(new N.default).retain(t.index).insert("\n",i).retain(r.length()-o-1).retain(1,{list:"unchecked"});this.quill.updateContents(l,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.scrollIntoView()}},"header enter":{key:D.keys.ENTER,collapsed:!0,format:["header"],suffix:/^$/,handler:function(t,e){var n=this.quill.getLine(t.index),r=b(n,2),o=r[0],i=r[1],l=(new N.default).retain(t.index).insert("\n",e.format).retain(o.length()-i-1).retain(1,{header:null});this.quill.updateContents(l,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.scrollIntoView()}},"list autofill":{key:" ",collapsed:!0,format:{list:!1},prefix:/^\s*?(\d+\.|-|\*|\[ ?\]|\[x\])$/,handler:function(t,e){var n=e.prefix.length,r=this.quill.getLine(t.index),o=b(r,2),i=o[0],l=o[1];if(l>n)return!0;var a=void 0;switch(e.prefix.trim()){case"[]":case"[ ]":a="unchecked";break;case"[x]":a="checked";break;case"-":case"*":a="bullet";break;default:a="ordered"}this.quill.insertText(t.index," ",S.default.sources.USER),this.quill.history.cutoff();var s=(new N.default).retain(t.index-l).delete(n+1).retain(i.length()-2-l).retain(1,{list:a});this.quill.updateContents(s,S.default.sources.USER),this.quill.history.cutoff(),this.quill.setSelection(t.index-n,S.default.sources.SILENT)}},"code exit":{key:D.keys.ENTER,collapsed:!0,format:["code-block"],prefix:/\n\n$/,suffix:/^\s+$/,handler:function(t){var e=this.quill.getLine(t.index),n=b(e,2),r=n[0],o=n[1],i=(new N.default).retain(t.index+r.length()-o-2).retain(1,{"code-block":null}).delete(1);this.quill.updateContents(i,S.default.sources.USER)}},"embed left":s(D.keys.LEFT,!1),"embed left shift":s(D.keys.LEFT,!0),"embed right":s(D.keys.RIGHT,!1),"embed right shift":s(D.keys.RIGHT,!0)}},e.default=D,e.SHORTKEY=B},function(t,e,n){"use strict";t.exports={align:{"":n(75),center:n(76),right:n(77),justify:n(78)},background:n(79),blockquote:n(80),bold:n(81),clean:n(82),code:n(40),"code-block":n(40),color:n(83),direction:{"":n(84),rtl:n(85)},float:{center:n(86),full:n(87),left:n(88),right:n(89)},formula:n(90),header:{1:n(91),2:n(92)},italic:n(93),image:n(94),indent:{"+1":n(95),"-1":n(96)},link:n(97),list:{ordered:n(98),bullet:n(99),check:n(100)},script:{sub:n(101),super:n(102)},strike:n(103),underline:n(104),video:n(105)}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(1),o=function(){function t(t){this.domNode=t,this.domNode[r.DATA_KEY]={blot:this}}return Object.defineProperty(t.prototype,"statics",{get:function(){return this.constructor},enumerable:!0,configurable:!0}),t.create=function(t){if(null==this.tagName)throw new r.ParchmentError("Blot definition missing tagName");var e;return Array.isArray(this.tagName)?("string"==typeof t&&(t=t.toUpperCase(),parseInt(t).toString()===t&&(t=parseInt(t))),e="number"==typeof t?document.createElement(this.tagName[t-1]):this.tagName.indexOf(t)>-1?document.createElement(t):document.createElement(this.tagName[0])):e=document.createElement(this.tagName),this.className&&e.classList.add(this.className),e},t.prototype.attach=function(){null!=this.parent&&(this.scroll=this.parent.scroll)},t.prototype.clone=function(){var t=this.domNode.cloneNode(!1);return r.create(t)},t.prototype.detach=function(){null!=this.parent&&this.parent.removeChild(this),delete this.domNode[r.DATA_KEY]},t.prototype.deleteAt=function(t,e){this.isolate(t,e).remove()},t.prototype.formatAt=function(t,e,n,o){var i=this.isolate(t,e);if(null!=r.query(n,r.Scope.BLOT)&&o)i.wrap(n,o);else if(null!=r.query(n,r.Scope.ATTRIBUTE)){var l=r.create(this.statics.scope);i.wrap(l),l.format(n,o)}},t.prototype.insertAt=function(t,e,n){var o=null==n?r.create("text",e):r.create(e,n),i=this.split(t);this.parent.insertBefore(o,i)},t.prototype.insertInto=function(t,e){void 0===e&&(e=null),null!=this.parent&&this.parent.children.remove(this);var n=null;t.children.insertBefore(this,e),null!=e&&(n=e.domNode),this.domNode.parentNode==t.domNode&&this.domNode.nextSibling==n||t.domNode.insertBefore(this.domNode,n),this.parent=t,this.attach()},t.prototype.isolate=function(t,e){var n=this.split(t);return n.split(e),n},t.prototype.length=function(){return 1},t.prototype.offset=function(t){return void 0===t&&(t=this.parent),null==this.parent||this==t?0:this.parent.children.offset(this)+this.parent.offset(t)},t.prototype.optimize=function(t){null!=this.domNode[r.DATA_KEY]&&delete this.domNode[r.DATA_KEY].mutations},t.prototype.remove=function(){null!=this.domNode.parentNode&&this.domNode.parentNode.removeChild(this.domNode),this.detach()},t.prototype.replace=function(t){null!=t.parent&&(t.parent.insertBefore(this,t.next),t.remove())},t.prototype.replaceWith=function(t,e){var n="string"==typeof t?r.create(t,e):t;return n.replace(this),n},t.prototype.split=function(t,e){return 0===t?this:this.next},t.prototype.update=function(t,e){},t.prototype.wrap=function(t,e){var n="string"==typeof t?r.create(t,e):t;return null!=this.parent&&this.parent.insertBefore(n,this.next),n.appendChild(this),n},t.blotName="abstract",t}();e.default=o},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(11),o=n(29),i=n(30),l=n(1),a=function(){function t(t){this.attributes={},this.domNode=t,this.build()}return t.prototype.attribute=function(t,e){e?t.add(this.domNode,e)&&(null!=t.value(this.domNode)?this.attributes[t.attrName]=t:delete this.attributes[t.attrName]):(t.remove(this.domNode),delete this.attributes[t.attrName])},t.prototype.build=function(){var t=this;this.attributes={};var e=r.default.keys(this.domNode),n=o.default.keys(this.domNode),a=i.default.keys(this.domNode);e.concat(n).concat(a).forEach(function(e){var n=l.query(e,l.Scope.ATTRIBUTE);n instanceof r.default&&(t.attributes[n.attrName]=n)})},t.prototype.copy=function(t){var e=this;Object.keys(this.attributes).forEach(function(n){var r=e.attributes[n].value(e.domNode);t.format(n,r)})},t.prototype.move=function(t){var e=this;this.copy(t),Object.keys(this.attributes).forEach(function(t){e.attributes[t].remove(e.domNode)}),this.attributes={}},t.prototype.values=function(){var t=this;return Object.keys(this.attributes).reduce(function(e,n){return e[n]=t.attributes[n].value(t.domNode),e},{})},t}();e.default=a},function(t,e,n){"use strict";function r(t,e){return(t.getAttribute("class")||"").split(/\s+/).filter(function(t){return 0===t.indexOf(e+"-")})}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(11),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.keys=function(t){return(t.getAttribute("class")||"").split(/\s+/).map(function(t){return t.split("-").slice(0,-1).join("-")})},e.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(this.remove(t),t.classList.add(this.keyName+"-"+e),!0)},e.prototype.remove=function(t){r(t,this.keyName).forEach(function(e){t.classList.remove(e)}),0===t.classList.length&&t.removeAttribute("class")},e.prototype.value=function(t){var e=r(t,this.keyName)[0]||"",n=e.slice(this.keyName.length+1);return this.canAdd(t,n)?n:""},e}(i.default);e.default=l},function(t,e,n){"use strict";function r(t){var e=t.split("-"),n=e.slice(1).map(function(t){return t[0].toUpperCase()+t.slice(1)}).join("");return e[0]+n}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(11),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.keys=function(t){return(t.getAttribute("style")||"").split(";").map(function(t){return t.split(":")[0].trim()})},e.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(t.style[r(this.keyName)]=e,!0)},e.prototype.remove=function(t){t.style[r(this.keyName)]="",t.getAttribute("style")||t.removeAttribute("style")},e.prototype.value=function(t){var e=t.style[r(this.keyName)];return this.canAdd(t,e)?e:""},e}(i.default);e.default=l},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(0),f=r(c),h=n(8),p=r(h),d=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.selection=n,r.textNode=document.createTextNode(e.CONTENTS),r.domNode.appendChild(r.textNode),r._length=0,r}return l(e,t),u(e,null,[{key:"value",value:function(){}}]),u(e,[{key:"detach",value:function(){null!=this.parent&&this.parent.removeChild(this)}},{key:"format",value:function(t,n){if(0!==this._length)return s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n);for(var r=this,o=0;null!=r&&r.statics.scope!==f.default.Scope.BLOCK_BLOT;)o+=r.offset(r.parent),r=r.parent;null!=r&&(this._length=e.CONTENTS.length,r.optimize(),r.formatAt(o,e.CONTENTS.length,t,n),this._length=0)}},{key:"index",value:function(t,n){return t===this.textNode?0:s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"index",this).call(this,t,n)}},{key:"length",value:function(){return this._length}},{key:"position",value:function(){return[this.textNode,this.textNode.data.length]}},{key:"remove",value:function(){s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"remove",this).call(this),this.parent=null}},{key:"restore",value:function(){if(!this.selection.composing&&null!=this.parent){var t=this.textNode,n=this.selection.getNativeRange(),r=void 0,o=void 0,i=void 0;if(null!=n&&n.start.node===t&&n.end.node===t){var l=[t,n.start.offset,n.end.offset];r=l[0],o=l[1],i=l[2]}for(;null!=this.domNode.lastChild&&this.domNode.lastChild!==this.textNode;)this.domNode.parentNode.insertBefore(this.domNode.lastChild,this.domNode);if(this.textNode.data!==e.CONTENTS){var s=this.textNode.data.split(e.CONTENTS).join("");this.next instanceof p.default?(r=this.next.domNode,this.next.insertAt(0,s),this.textNode.data=e.CONTENTS):(this.textNode.data=s,this.parent.insertBefore(f.default.create(this.textNode),this),this.textNode=document.createTextNode(e.CONTENTS),this.domNode.appendChild(this.textNode))}if(this.remove(),null!=o){var u=[o,i].map(function(t){return Math.max(0,Math.min(r.data.length,t-1))}),c=a(u,2);return o=c[0],i=c[1],{startNode:r,startOffset:o,endNode:r,endOffset:i}}}}},{key:"update",value:function(t,e){var n=this;if(t.some(function(t){return"characterData"===t.type&&t.target===n.textNode})){var r=this.restore();r&&(e.range=r)}}},{key:"value",value:function(){return""}}]),e}(f.default.Embed);d.blotName="cursor",d.className="ql-cursor",d.tagName="span",d.CONTENTS="\ufeff",e.default=d},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e,n){r(this,t),this.quill=e,this.options=n,this.modules={}}return o(t,[{key:"init",value:function(){var t=this;Object.keys(this.options.modules).forEach(function(e){null==t.modules[e]&&t.addModule(e)})}},{key:"addModule",value:function(t){var e=this.quill.constructor.import("modules/"+t);return this.modules[t]=new e(this.quill,this.options.modules[t]||{}),this.modules[t]}}]),t}();i.DEFAULTS={modules:{}},i.themes={default:i},e.default=i},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(0),c=r(u),f=n(8),h=r(f),p="\ufeff",d=function(t){function e(t){o(this,e);var n=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return n.contentNode=document.createElement("span"),n.contentNode.setAttribute("contenteditable",!1),[].slice.call(n.domNode.childNodes).forEach(function(t){n.contentNode.appendChild(t)}),n.leftGuard=document.createTextNode(p),n.rightGuard=document.createTextNode(p),n.domNode.appendChild(n.leftGuard),n.domNode.appendChild(n.contentNode),n.domNode.appendChild(n.rightGuard),n}return l(e,t),a(e,[{key:"index",value:function(t,n){return t===this.leftGuard?0:t===this.rightGuard?1:s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"index",this).call(this,t,n)}},{key:"restore",value:function(t){var e=void 0,n=void 0,r=t.data.split(p).join("");if(t===this.leftGuard)if(this.prev instanceof h.default){var o=this.prev.length();this.prev.insertAt(o,r),e={startNode:this.prev.domNode,startOffset:o+r.length}}else n=document.createTextNode(r),this.parent.insertBefore(c.default.create(n),this),e={startNode:n,startOffset:r.length};else t===this.rightGuard&&(this.next instanceof h.default?(this.next.insertAt(0,r),e={startNode:this.next.domNode,startOffset:r.length}):(n=document.createTextNode(r),this.parent.insertBefore(c.default.create(n),this.next),e={startNode:n,startOffset:r.length}));return t.data=p,e}},{key:"update",value:function(t,e){var n=this;t.forEach(function(t){if("characterData"===t.type&&(t.target===n.leftGuard||t.target===n.rightGuard)){var r=n.restore(t.target);r&&(e.range=r)}})}}]),e}(c.default.Embed);e.default=d},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.AlignStyle=e.AlignClass=e.AlignAttribute=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i={scope:o.default.Scope.BLOCK,whitelist:["right","center","justify"]},l=new o.default.Attributor.Attribute("align","align",i),a=new o.default.Attributor.Class("align","ql-align",i),s=new o.default.Attributor.Style("align","text-align",i);e.AlignAttribute=l,e.AlignClass=a,e.AlignStyle=s},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.BackgroundStyle=e.BackgroundClass=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i=n(24),l=new o.default.Attributor.Class("background","ql-bg",{scope:o.default.Scope.INLINE}),a=new i.ColorAttributor("background","background-color",{scope:o.default.Scope.INLINE});e.BackgroundClass=l,e.BackgroundStyle=a},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.DirectionStyle=e.DirectionClass=e.DirectionAttribute=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i={scope:o.default.Scope.BLOCK,whitelist:["rtl"]},l=new o.default.Attributor.Attribute("direction","dir",i),a=new o.default.Attributor.Class("direction","ql-direction",i),s=new o.default.Attributor.Style("direction","direction",i);e.DirectionAttribute=l,e.DirectionClass=a,e.DirectionStyle=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.FontClass=e.FontStyle=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c={scope:u.default.Scope.INLINE,whitelist:["serif","monospace"]},f=new u.default.Attributor.Class("font","ql-font",c),h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"value",value:function(t){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t).replace(/["']/g,"")}}]),e}(u.default.Attributor.Style),p=new h("font","font-family",c);e.FontStyle=p,e.FontClass=f},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.SizeStyle=e.SizeClass=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i=new o.default.Attributor.Class("size","ql-size",{scope:o.default.Scope.INLINE,whitelist:["small","large","huge"]}),l=new o.default.Attributor.Style("size","font-size",{scope:o.default.Scope.INLINE,whitelist:["10px","18px","32px"]});e.SizeClass=i,e.SizeStyle=l},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"optimize",value:function(t){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.domNode.tagName!==this.statics.tagName[0]&&this.replaceWith(this.statics.blotName)}}],[{key:"create",value:function(){return a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this)}},{key:"formats",value:function(){return!0}}]),e}(u.default);c.blotName="bold",c.tagName=["STRONG","B"],e.default=c},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polyline class="ql-even ql-stroke" points="5 7 3 9 5 11"></polyline> <polyline class="ql-even ql-stroke" points="13 7 15 9 13 11"></polyline> <line class=ql-stroke x1=10 x2=8 y1=5 y2=13></line> </svg>'},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(16),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return i.label.innerHTML=n,i.container.classList.add("ql-color-picker"),[].slice.call(i.container.querySelectorAll(".ql-picker-item"),0,7).forEach(function(t){t.classList.add("ql-primary")}),i}return i(e,t),l(e,[{key:"buildItem",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"buildItem",this).call(this,t);return n.style.backgroundColor=t.getAttribute("value")||"",n}},{key:"selectItem",value:function(t,n){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"selectItem",this).call(this,t,n);var r=this.label.querySelector(".ql-color-label"),o=t?t.getAttribute("data-value")||"":"";r&&("line"===r.tagName?r.style.stroke=o:r.style.fill=o)}}]),e}(u.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(16),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return i.container.classList.add("ql-icon-picker"),[].forEach.call(i.container.querySelectorAll(".ql-picker-item"),function(t){t.innerHTML=n[t.getAttribute("data-value")||""]}),i.defaultItem=i.container.querySelector(".ql-selected"),i.selectItem(i.defaultItem),i}return i(e,t),l(e,[{key:"selectItem",value:function(t,n){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"selectItem",this).call(this,t,n),t=t||this.defaultItem,this.label.innerHTML=t.innerHTML}}]),e}(u.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e,n){var o=this;r(this,t),this.quill=e,this.boundsContainer=n||document.body,this.root=e.addContainer("ql-tooltip"),this.root.innerHTML=this.constructor.TEMPLATE,this.quill.root===this.quill.scrollingContainer&&this.quill.root.addEventListener("scroll",function(){o.root.style.marginTop=-1*o.quill.root.scrollTop+"px"}),this.hide()}return o(t,[{key:"hide",value:function(){this.root.classList.add("ql-hidden")}},{key:"position",value:function(t){var e=t.left+t.width/2-this.root.offsetWidth/2,n=t.bottom+this.quill.root.scrollTop;this.root.style.left=e+"px",this.root.style.top=n+"px",this.root.classList.remove("ql-flip");var r=this.boundsContainer.getBoundingClientRect(),o=this.root.getBoundingClientRect(),i=0;if(o.right>r.right&&(i=r.right-o.right,this.root.style.left=e+i+"px"),o.left<r.left&&(i=r.left-o.left,this.root.style.left=e+i+"px"),o.bottom>r.bottom){var l=o.bottom-o.top,a=t.bottom-t.top+l;this.root.style.top=n-a+"px",this.root.classList.add("ql-flip")}return i}},{key:"show",value:function(){this.root.classList.remove("ql-editing"),this.root.classList.remove("ql-hidden")}}]),t}();e.default=i},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=t.match(/^(?:(https?):\/\/)?(?:(?:www|m)\.)?youtube\.com\/watch.*v=([a-zA-Z0-9_-]+)/)||t.match(/^(?:(https?):\/\/)?(?:(?:www|m)\.)?youtu\.be\/([a-zA-Z0-9_-]+)/);return e?(e[1]||"https")+"://www.youtube.com/embed/"+e[2]+"?showinfo=0":(e=t.match(/^(?:(https?):\/\/)?(?:www\.)?vimeo\.com\/(\d+)/))?(e[1]||"https")+"://player.vimeo.com/video/"+e[2]+"/":t}function s(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2];e.forEach(function(e){var r=document.createElement("option");e===n?r.setAttribute("selected","selected"):r.setAttribute("value",e),t.appendChild(r)})}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BaseTooltip=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},f=n(2),h=r(f),p=n(4),d=r(p),y=n(9),v=r(y),b=n(25),g=r(b),m=n(32),_=r(m),O=n(41),w=r(O),x=n(42),k=r(x),E=n(16),N=r(E),j=n(43),A=r(j),q=[!1,"center","right","justify"],T=["#000000","#e60000","#ff9900","#ffff00","#008a00","#0066cc","#9933ff","#ffffff","#facccc","#ffebcc","#ffffcc","#cce8cc","#cce0f5","#ebd6ff","#bbbbbb","#f06666","#ffc266","#ffff66","#66b966","#66a3e0","#c285ff","#888888","#a10000","#b26b00","#b2b200","#006100","#0047b2","#6b24b2","#444444","#5c0000","#663d00","#666600","#003700","#002966","#3d1466"],P=[!1,"serif","monospace"],S=["1","2","3",!1],C=["small",!1,"large","huge"],L=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n)),l=function e(n){if(!document.body.contains(t.root))return document.body.removeEventListener("click",e);null==r.tooltip||r.tooltip.root.contains(n.target)||document.activeElement===r.tooltip.textbox||r.quill.hasFocus()||r.tooltip.hide(),null!=r.pickers&&r.pickers.forEach(function(t){t.container.contains(n.target)||t.close()})};return t.emitter.listenDOM("click",document.body,l),r}return l(e,t),u(e,[{key:"addModule",value:function(t){var n=c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"addModule",this).call(this,t);return"toolbar"===t&&this.extendToolbar(n),n}},{key:"buildButtons",value:function(t,e){t.forEach(function(t){(t.getAttribute("class")||"").split(/\s+/).forEach(function(n){if(n.startsWith("ql-")&&(n=n.slice("ql-".length),null!=e[n]))if("direction"===n)t.innerHTML=e[n][""]+e[n].rtl;else if("string"==typeof e[n])t.innerHTML=e[n];else{var r=t.value||"";null!=r&&e[n][r]&&(t.innerHTML=e[n][r])}})})}},{key:"buildPickers",value:function(t,e){var n=this;this.pickers=t.map(function(t){if(t.classList.contains("ql-align"))return null==t.querySelector("option")&&s(t,q),new k.default(t,e.align);if(t.classList.contains("ql-background")||t.classList.contains("ql-color")){var n=t.classList.contains("ql-background")?"background":"color";return null==t.querySelector("option")&&s(t,T,"background"===n?"#ffffff":"#000000"),new w.default(t,e[n])}return null==t.querySelector("option")&&(t.classList.contains("ql-font")?s(t,P):t.classList.contains("ql-header")?s(t,S):t.classList.contains("ql-size")&&s(t,C)),new N.default(t)});var r=function(){n.pickers.forEach(function(t){t.update()})};this.quill.on(v.default.events.EDITOR_CHANGE,r)}}]),e}(_.default);L.DEFAULTS=(0,h.default)(!0,{},_.default.DEFAULTS,{modules:{toolbar:{handlers:{formula:function(){this.quill.theme.tooltip.edit("formula")},image:function(){var t=this,e=this.container.querySelector("input.ql-image[type=file]");null==e&&(e=document.createElement("input"),e.setAttribute("type","file"),e.setAttribute("accept","image/png, image/gif, image/jpeg, image/bmp, image/x-icon"),e.classList.add("ql-image"),e.addEventListener("change",function(){if(null!=e.files&&null!=e.files[0]){var n=new FileReader;n.onload=function(n){var r=t.quill.getSelection(!0);t.quill.updateContents((new d.default).retain(r.index).delete(r.length).insert({image:n.target.result}),v.default.sources.USER),t.quill.setSelection(r.index+1,v.default.sources.SILENT),e.value=""},n.readAsDataURL(e.files[0])}}),this.container.appendChild(e)),e.click()},video:function(){this.quill.theme.tooltip.edit("video")}}}}});var M=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.textbox=r.root.querySelector('input[type="text"]'),r.listen(),r}return l(e,t),u(e,[{key:"listen",value:function(){var t=this;this.textbox.addEventListener("keydown",function(e){g.default.match(e,"enter")?(t.save(),e.preventDefault()):g.default.match(e,"escape")&&(t.cancel(),e.preventDefault())})}},{key:"cancel",value:function(){this.hide()}},{key:"edit",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"link",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;this.root.classList.remove("ql-hidden"),this.root.classList.add("ql-editing"),null!=e?this.textbox.value=e:t!==this.root.getAttribute("data-mode")&&(this.textbox.value=""),this.position(this.quill.getBounds(this.quill.selection.savedRange)),this.textbox.select(),this.textbox.setAttribute("placeholder",this.textbox.getAttribute("data-"+t)||""),this.root.setAttribute("data-mode",t)}},{key:"restoreFocus",value:function(){var t=this.quill.scrollingContainer.scrollTop;this.quill.focus(),this.quill.scrollingContainer.scrollTop=t}},{key:"save",value:function(){var t=this.textbox.value;switch(this.root.getAttribute("data-mode")){case"link":var e=this.quill.root.scrollTop;this.linkRange?(this.quill.formatText(this.linkRange,"link",t,v.default.sources.USER),delete this.linkRange):(this.restoreFocus(),this.quill.format("link",t,v.default.sources.USER)),this.quill.root.scrollTop=e;break;case"video":t=a(t);case"formula":if(!t)break;var n=this.quill.getSelection(!0);if(null!=n){var r=n.index+n.length;this.quill.insertEmbed(r,this.root.getAttribute("data-mode"),t,v.default.sources.USER),"formula"===this.root.getAttribute("data-mode")&&this.quill.insertText(r+1," ",v.default.sources.USER),this.quill.setSelection(r+2,v.default.sources.USER)}}this.textbox.value="",this.hide()}}]),e}(A.default);e.BaseTooltip=M,e.default=L},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=n(46),i=r(o),l=n(34),a=n(36),s=n(62),u=n(63),c=r(u),f=n(64),h=r(f),p=n(65),d=r(p),y=n(35),v=n(24),b=n(37),g=n(38),m=n(39),_=r(m),O=n(66),w=r(O),x=n(15),k=r(x),E=n(67),N=r(E),j=n(68),A=r(j),q=n(69),T=r(q),P=n(70),S=r(P),C=n(71),L=r(C),M=n(13),R=r(M),I=n(72),B=r(I),D=n(73),U=r(D),F=n(74),H=r(F),K=n(26),z=r(K),Z=n(16),V=r(Z),W=n(41),G=r(W),Y=n(42),X=r(Y),$=n(43),Q=r($),J=n(107),tt=r(J),et=n(108),nt=r(et);i.default.register({"attributors/attribute/direction":a.DirectionAttribute,"attributors/class/align":l.AlignClass,"attributors/class/background":y.BackgroundClass,"attributors/class/color":v.ColorClass,"attributors/class/direction":a.DirectionClass,"attributors/class/font":b.FontClass,"attributors/class/size":g.SizeClass,"attributors/style/align":l.AlignStyle,"attributors/style/background":y.BackgroundStyle,"attributors/style/color":v.ColorStyle,"attributors/style/direction":a.DirectionStyle,"attributors/style/font":b.FontStyle,"attributors/style/size":g.SizeStyle},!0),i.default.register({"formats/align":l.AlignClass,"formats/direction":a.DirectionClass,"formats/indent":s.IndentClass,"formats/background":y.BackgroundStyle,"formats/color":v.ColorStyle,"formats/font":b.FontClass,"formats/size":g.SizeClass,"formats/blockquote":c.default,"formats/code-block":R.default,"formats/header":h.default,"formats/list":d.default,"formats/bold":_.default,"formats/code":M.Code,"formats/italic":w.default,"formats/link":k.default,"formats/script":N.default,"formats/strike":A.default,"formats/underline":T.default,"formats/image":S.default,"formats/video":L.default,"formats/list/item":p.ListItem,"modules/formula":B.default,"modules/syntax":U.default,"modules/toolbar":H.default,"themes/bubble":tt.default,"themes/snow":nt.default,"ui/icons":z.default,"ui/picker":V.default,"ui/icon-picker":X.default,"ui/color-picker":G.default,"ui/tooltip":Q.default},!0),e.default=i.default},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=n(0),i=r(o),l=n(6),a=r(l),s=n(3),u=r(s),c=n(14),f=r(c),h=n(23),p=r(h),d=n(31),y=r(d),v=n(33),b=r(v),g=n(5),m=r(g),_=n(59),O=r(_),w=n(8),x=r(w),k=n(60),E=r(k),N=n(61),j=r(N),A=n(25),q=r(A);a.default.register({"blots/block":u.default,"blots/block/embed":s.BlockEmbed,"blots/break":f.default,"blots/container":p.default,"blots/cursor":y.default,"blots/embed":b.default,"blots/inline":m.default,"blots/scroll":O.default,"blots/text":x.default,"modules/clipboard":E.default,"modules/history":j.default,"modules/keyboard":q.default}),i.default.register(u.default,f.default,y.default,m.default,O.default,x.default),e.default=a.default},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=function(){function t(){this.head=this.tail=null,this.length=0}return t.prototype.append=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];this.insertBefore(t[0],null),t.length>1&&this.append.apply(this,t.slice(1))},t.prototype.contains=function(t){for(var e,n=this.iterator();e=n();)if(e===t)return!0;return!1},t.prototype.insertBefore=function(t,e){t&&(t.next=e,null!=e?(t.prev=e.prev,null!=e.prev&&(e.prev.next=t),e.prev=t,e===this.head&&(this.head=t)):null!=this.tail?(this.tail.next=t,t.prev=this.tail,this.tail=t):(t.prev=null,this.head=this.tail=t),this.length+=1)},t.prototype.offset=function(t){for(var e=0,n=this.head;null!=n;){if(n===t)return e;e+=n.length(),n=n.next}return-1},t.prototype.remove=function(t){this.contains(t)&&(null!=t.prev&&(t.prev.next=t.next),null!=t.next&&(t.next.prev=t.prev),t===this.head&&(this.head=t.next),t===this.tail&&(this.tail=t.prev),this.length-=1)},t.prototype.iterator=function(t){return void 0===t&&(t=this.head),function(){var e=t;return null!=t&&(t=t.next),e}},t.prototype.find=function(t,e){void 0===e&&(e=!1);for(var n,r=this.iterator();n=r();){var o=n.length();if(t<o||e&&t===o&&(null==n.next||0!==n.next.length()))return[n,t];t-=o}return[null,0]},t.prototype.forEach=function(t){for(var e,n=this.iterator();e=n();)t(e)},t.prototype.forEachAt=function(t,e,n){if(!(e<=0))for(var r,o=this.find(t),i=o[0],l=o[1],a=t-l,s=this.iterator(i);(r=s())&&a<t+e;){var u=r.length();t>a?n(r,t-a,Math.min(e,a+u-t)):n(r,0,Math.min(u,t+e-a)),a+=u}},t.prototype.map=function(t){return this.reduce(function(e,n){return e.push(t(n)),e},[])},t.prototype.reduce=function(t,e){for(var n,r=this.iterator();n=r();)e=t(e,n);return e},t}();e.default=r},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(17),i=n(1),l={attributes:!0,characterData:!0,characterDataOldValue:!0,childList:!0,subtree:!0},a=function(t){function e(e){var n=t.call(this,e)||this;return n.scroll=n,n.observer=new MutationObserver(function(t){n.update(t)}),n.observer.observe(n.domNode,l),n.attach(),n}return r(e,t),e.prototype.detach=function(){t.prototype.detach.call(this),this.observer.disconnect()},e.prototype.deleteAt=function(e,n){this.update(),0===e&&n===this.length()?this.children.forEach(function(t){t.remove()}):t.prototype.deleteAt.call(this,e,n)},e.prototype.formatAt=function(e,n,r,o){this.update(),t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.insertAt=function(e,n,r){this.update(),t.prototype.insertAt.call(this,e,n,r)},e.prototype.optimize=function(e,n){var r=this;void 0===e&&(e=[]),void 0===n&&(n={}),t.prototype.optimize.call(this,n);for(var l=[].slice.call(this.observer.takeRecords());l.length>0;)e.push(l.pop());for(var a=function(t,e){void 0===e&&(e=!0),null!=t&&t!==r&&null!=t.domNode.parentNode&&(null==t.domNode[i.DATA_KEY].mutations&&(t.domNode[i.DATA_KEY].mutations=[]),e&&a(t.parent))},s=function(t){null!=t.domNode[i.DATA_KEY]&&null!=t.domNode[i.DATA_KEY].mutations&&(t instanceof o.default&&t.children.forEach(s),t.optimize(n))},u=e,c=0;u.length>0;c+=1){if(c>=100)throw new Error("[Parchment] Maximum optimize iterations reached");for(u.forEach(function(t){var e=i.find(t.target,!0);null!=e&&(e.domNode===t.target&&("childList"===t.type?(a(i.find(t.previousSibling,!1)),[].forEach.call(t.addedNodes,function(t){var e=i.find(t,!1);a(e,!1),e instanceof o.default&&e.children.forEach(function(t){a(t,!1)})})):"attributes"===t.type&&a(e.prev)),a(e))}),this.children.forEach(s),u=[].slice.call(this.observer.takeRecords()),l=u.slice();l.length>0;)e.push(l.pop())}},e.prototype.update=function(e,n){var r=this;void 0===n&&(n={}),e=e||this.observer.takeRecords(),e.map(function(t){var e=i.find(t.target,!0);return null==e?null:null==e.domNode[i.DATA_KEY].mutations?(e.domNode[i.DATA_KEY].mutations=[t],e):(e.domNode[i.DATA_KEY].mutations.push(t),null)}).forEach(function(t){null!=t&&t!==r&&null!=t.domNode[i.DATA_KEY]&&t.update(t.domNode[i.DATA_KEY].mutations||[],n)}),null!=this.domNode[i.DATA_KEY].mutations&&t.prototype.update.call(this,this.domNode[i.DATA_KEY].mutations,n),this.optimize(e,n)},e.blotName="scroll",e.defaultChild="block",e.scope=i.Scope.BLOCK_BLOT,e.tagName="DIV",e}(o.default);e.default=a},function(t,e,n){"use strict";function r(t,e){if(Object.keys(t).length!==Object.keys(e).length)return!1;for(var n in t)if(t[n]!==e[n])return!1;return!0}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(18),l=n(1),a=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.formats=function(n){if(n.tagName!==e.tagName)return t.formats.call(this,n)},e.prototype.format=function(n,r){var o=this;n!==this.statics.blotName||r?t.prototype.format.call(this,n,r):(this.children.forEach(function(t){t instanceof i.default||(t=t.wrap(e.blotName,!0)),o.attributes.copy(t)}),this.unwrap())},e.prototype.formatAt=function(e,n,r,o){if(null!=this.formats()[r]||l.query(r,l.Scope.ATTRIBUTE)){this.isolate(e,n).format(r,o)}else t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.optimize=function(n){t.prototype.optimize.call(this,n);var o=this.formats();if(0===Object.keys(o).length)return this.unwrap();var i=this.next;i instanceof e&&i.prev===this&&r(o,i.formats())&&(i.moveChildren(this),i.remove())},e.blotName="inline",e.scope=l.Scope.INLINE_BLOT,e.tagName="SPAN",e}(i.default);e.default=a},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(18),i=n(1),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.formats=function(n){var r=i.query(e.blotName).tagName;if(n.tagName!==r)return t.formats.call(this,n)},e.prototype.format=function(n,r){null!=i.query(n,i.Scope.BLOCK)&&(n!==this.statics.blotName||r?t.prototype.format.call(this,n,r):this.replaceWith(e.blotName))},e.prototype.formatAt=function(e,n,r,o){null!=i.query(r,i.Scope.BLOCK)?this.format(r,o):t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.insertAt=function(e,n,r){if(null==r||null!=i.query(n,i.Scope.INLINE))t.prototype.insertAt.call(this,e,n,r);else{var o=this.split(e),l=i.create(n,r);o.parent.insertBefore(l,o)}},e.prototype.update=function(e,n){navigator.userAgent.match(/Trident/)?this.build():t.prototype.update.call(this,e,n)},e.blotName="block",e.scope=i.Scope.BLOCK_BLOT,e.tagName="P",e}(o.default);e.default=l},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(19),i=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.formats=function(t){},e.prototype.format=function(e,n){t.prototype.formatAt.call(this,0,this.length(),e,n)},e.prototype.formatAt=function(e,n,r,o){0===e&&n===this.length()?this.format(r,o):t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.formats=function(){return this.statics.formats(this.domNode)},e}(o.default);e.default=i},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(19),i=n(1),l=function(t){function e(e){var n=t.call(this,e)||this;return n.text=n.statics.value(n.domNode),n}return r(e,t),e.create=function(t){return document.createTextNode(t)},e.value=function(t){var e=t.data;return e.normalize&&(e=e.normalize()),e},e.prototype.deleteAt=function(t,e){this.domNode.data=this.text=this.text.slice(0,t)+this.text.slice(t+e)},e.prototype.index=function(t,e){return this.domNode===t?e:-1},e.prototype.insertAt=function(e,n,r){null==r?(this.text=this.text.slice(0,e)+n+this.text.slice(e),this.domNode.data=this.text):t.prototype.insertAt.call(this,e,n,r)},e.prototype.length=function(){return this.text.length},e.prototype.optimize=function(n){t.prototype.optimize.call(this,n),this.text=this.statics.value(this.domNode),0===this.text.length?this.remove():this.next instanceof e&&this.next.prev===this&&(this.insertAt(this.length(),this.next.value()),this.next.remove())},e.prototype.position=function(t,e){return void 0===e&&(e=!1),[this.domNode,t]},e.prototype.split=function(t,e){if(void 0===e&&(e=!1),!e){if(0===t)return this;if(t===this.length())return this.next}var n=i.create(this.domNode.splitText(t));return this.parent.insertBefore(n,this.next),this.text=this.statics.value(this.domNode),n},e.prototype.update=function(t,e){var n=this;t.some(function(t){return"characterData"===t.type&&t.target===n.domNode})&&(this.text=this.statics.value(this.domNode))},e.prototype.value=function(){return this.text},e.blotName="text",e.scope=i.Scope.INLINE_BLOT,e}(o.default);e.default=l},function(t,e,n){"use strict";var r=document.createElement("div");if(r.classList.toggle("test-class",!1),r.classList.contains("test-class")){var o=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(t,e){return arguments.length>1&&!this.contains(t)==!e?e:o.call(this,t)}}String.prototype.startsWith||(String.prototype.startsWith=function(t,e){return e=e||0,this.substr(e,t.length)===t}),String.prototype.endsWith||(String.prototype.endsWith=function(t,e){var n=this.toString();("number"!=typeof e||!isFinite(e)||Math.floor(e)!==e||e>n.length)&&(e=n.length),e-=t.length;var r=n.indexOf(t,e);return-1!==r&&r===e}),Array.prototype.find||Object.defineProperty(Array.prototype,"find",{value:function(t){if(null===this)throw new TypeError("Array.prototype.find called on null or undefined");if("function"!=typeof t)throw new TypeError("predicate must be a function");for(var e,n=Object(this),r=n.length>>>0,o=arguments[1],i=0;i<r;i++)if(e=n[i],t.call(o,e,i,n))return e}}),document.addEventListener("DOMContentLoaded",function(){document.execCommand("enableObjectResizing",!1,!1),document.execCommand("autoUrlDetect",!1,!1)})},function(t,e){function n(t,e,n){if(t==e)return t?[[v,t]]:[];(n<0||t.length<n)&&(n=null);var o=l(t,e),i=t.substring(0,o);t=t.substring(o),e=e.substring(o),o=a(t,e);var s=t.substring(t.length-o);t=t.substring(0,t.length-o),e=e.substring(0,e.length-o);var c=r(t,e);return i&&c.unshift([v,i]),s&&c.push([v,s]),u(c),null!=n&&(c=f(c,n)),c=h(c)}function r(t,e){var r;if(!t)return[[y,e]];if(!e)return[[d,t]];var i=t.length>e.length?t:e,l=t.length>e.length?e:t,a=i.indexOf(l);if(-1!=a)return r=[[y,i.substring(0,a)],[v,l],[y,i.substring(a+l.length)]],t.length>e.length&&(r[0][0]=r[2][0]=d),r;if(1==l.length)return[[d,t],[y,e]];var u=s(t,e);if(u){var c=u[0],f=u[1],h=u[2],p=u[3],b=u[4],g=n(c,h),m=n(f,p);return g.concat([[v,b]],m)}return o(t,e)}function o(t,e){for(var n=t.length,r=e.length,o=Math.ceil((n+r)/2),l=o,a=2*o,s=new Array(a),u=new Array(a),c=0;c<a;c++)s[c]=-1,u[c]=-1;s[l+1]=0,u[l+1]=0;for(var f=n-r,h=f%2!=0,p=0,v=0,b=0,g=0,m=0;m<o;m++){for(var _=-m+p;_<=m-v;_+=2){var O,w=l+_;O=_==-m||_!=m&&s[w-1]<s[w+1]?s[w+1]:s[w-1]+1;for(var x=O-_;O<n&&x<r&&t.charAt(O)==e.charAt(x);)O++,x++;if(s[w]=O,O>n)v+=2;else if(x>r)p+=2;else if(h){var k=l+f-_;if(k>=0&&k<a&&-1!=u[k]){var E=n-u[k];if(O>=E)return i(t,e,O,x)}}}for(var N=-m+b;N<=m-g;N+=2){var E,k=l+N;E=N==-m||N!=m&&u[k-1]<u[k+1]?u[k+1]:u[k-1]+1;for(var j=E-N;E<n&&j<r&&t.charAt(n-E-1)==e.charAt(r-j-1);)E++,j++;if(u[k]=E,E>n)g+=2;else if(j>r)b+=2;else if(!h){var w=l+f-N;if(w>=0&&w<a&&-1!=s[w]){var O=s[w],x=l+O-w;if(E=n-E,O>=E)return i(t,e,O,x)}}}}return[[d,t],[y,e]]}function i(t,e,r,o){var i=t.substring(0,r),l=e.substring(0,o),a=t.substring(r),s=e.substring(o),u=n(i,l),c=n(a,s);return u.concat(c)}function l(t,e){if(!t||!e||t.charAt(0)!=e.charAt(0))return 0;for(var n=0,r=Math.min(t.length,e.length),o=r,i=0;n<o;)t.substring(i,o)==e.substring(i,o)?(n=o,i=n):r=o,o=Math.floor((r-n)/2+n);return o}function a(t,e){if(!t||!e||t.charAt(t.length-1)!=e.charAt(e.length-1))return 0;for(var n=0,r=Math.min(t.length,e.length),o=r,i=0;n<o;)t.substring(t.length-o,t.length-i)==e.substring(e.length-o,e.length-i)?(n=o,i=n):r=o,o=Math.floor((r-n)/2+n);return o}function s(t,e){function n(t,e,n){for(var r,o,i,s,u=t.substring(n,n+Math.floor(t.length/4)),c=-1,f="";-1!=(c=e.indexOf(u,c+1));){var h=l(t.substring(n),e.substring(c)),p=a(t.substring(0,n),e.substring(0,c));f.length<p+h&&(f=e.substring(c-p,c)+e.substring(c,c+h),r=t.substring(0,n-p),o=t.substring(n+h),i=e.substring(0,c-p),s=e.substring(c+h))}return 2*f.length>=t.length?[r,o,i,s,f]:null}var r=t.length>e.length?t:e,o=t.length>e.length?e:t;if(r.length<4||2*o.length<r.length)return null;var i,s=n(r,o,Math.ceil(r.length/4)),u=n(r,o,Math.ceil(r.length/2));if(!s&&!u)return null;i=u?s&&s[4].length>u[4].length?s:u:s;var c,f,h,p;return t.length>e.length?(c=i[0],f=i[1],h=i[2],p=i[3]):(h=i[0],p=i[1],c=i[2],f=i[3]),[c,f,h,p,i[4]]}function u(t){t.push([v,""]);for(var e,n=0,r=0,o=0,i="",s="";n<t.length;)switch(t[n][0]){case y:o++,s+=t[n][1],n++;break;case d:r++,i+=t[n][1],n++;break;case v:r+o>1?(0!==r&&0!==o&&(e=l(s,i),0!==e&&(n-r-o>0&&t[n-r-o-1][0]==v?t[n-r-o-1][1]+=s.substring(0,e):(t.splice(0,0,[v,s.substring(0,e)]),n++),s=s.substring(e),i=i.substring(e)),0!==(e=a(s,i))&&(t[n][1]=s.substring(s.length-e)+t[n][1],s=s.substring(0,s.length-e),i=i.substring(0,i.length-e))),0===r?t.splice(n-o,r+o,[y,s]):0===o?t.splice(n-r,r+o,[d,i]):t.splice(n-r-o,r+o,[d,i],[y,s]),n=n-r-o+(r?1:0)+(o?1:0)+1):0!==n&&t[n-1][0]==v?(t[n-1][1]+=t[n][1],t.splice(n,1)):n++,o=0,r=0,i="",s=""}""===t[t.length-1][1]&&t.pop();var c=!1;for(n=1;n<t.length-1;)t[n-1][0]==v&&t[n+1][0]==v&&(t[n][1].substring(t[n][1].length-t[n-1][1].length)==t[n-1][1]?(t[n][1]=t[n-1][1]+t[n][1].substring(0,t[n][1].length-t[n-1][1].length),t[n+1][1]=t[n-1][1]+t[n+1][1],t.splice(n-1,1),c=!0):t[n][1].substring(0,t[n+1][1].length)==t[n+1][1]&&(t[n-1][1]+=t[n+1][1],t[n][1]=t[n][1].substring(t[n+1][1].length)+t[n+1][1],t.splice(n+1,1),c=!0)),n++;c&&u(t)}function c(t,e){if(0===e)return[v,t];for(var n=0,r=0;r<t.length;r++){var o=t[r];if(o[0]===d||o[0]===v){var i=n+o[1].length;if(e===i)return[r+1,t];if(e<i){t=t.slice();var l=e-n,a=[o[0],o[1].slice(0,l)],s=[o[0],o[1].slice(l)];return t.splice(r,1,a,s),[r+1,t]}n=i}}throw new Error("cursor_pos is out of bounds!")}function f(t,e){var n=c(t,e),r=n[1],o=n[0],i=r[o],l=r[o+1];if(null==i)return t;if(i[0]!==v)return t;if(null!=l&&i[1]+l[1]===l[1]+i[1])return r.splice(o,2,l,i),p(r,o,2);if(null!=l&&0===l[1].indexOf(i[1])){r.splice(o,2,[l[0],i[1]],[0,i[1]]);var a=l[1].slice(i[1].length);return a.length>0&&r.splice(o+2,0,[l[0],a]),p(r,o,3)}return t}function h(t){for(var e=!1,n=function(t){return t.charCodeAt(0)>=56320&&t.charCodeAt(0)<=57343},r=2;r<t.length;r+=1)t[r-2][0]===v&&function(t){return t.charCodeAt(t.length-1)>=55296&&t.charCodeAt(t.length-1)<=56319}(t[r-2][1])&&t[r-1][0]===d&&n(t[r-1][1])&&t[r][0]===y&&n(t[r][1])&&(e=!0,t[r-1][1]=t[r-2][1].slice(-1)+t[r-1][1],t[r][1]=t[r-2][1].slice(-1)+t[r][1],t[r-2][1]=t[r-2][1].slice(0,-1));if(!e)return t;for(var o=[],r=0;r<t.length;r+=1)t[r][1].length>0&&o.push(t[r]);return o}function p(t,e,n){for(var r=e+n-1;r>=0&&r>=e-1;r--)if(r+1<t.length){var o=t[r],i=t[r+1];o[0]===i[1]&&t.splice(r,2,[o[0],o[1]+i[1]])}return t}var d=-1,y=1,v=0,b=n;b.INSERT=y,b.DELETE=d,b.EQUAL=v,t.exports=b},function(t,e){function n(t){var e=[];for(var n in t)e.push(n);return e}e=t.exports="function"==typeof Object.keys?Object.keys:n,e.shim=n},function(t,e){function n(t){return"[object Arguments]"==Object.prototype.toString.call(t)}function r(t){return t&&"object"==typeof t&&"number"==typeof t.length&&Object.prototype.hasOwnProperty.call(t,"callee")&&!Object.prototype.propertyIsEnumerable.call(t,"callee")||!1}var o="[object Arguments]"==function(){return Object.prototype.toString.call(arguments)}();e=t.exports=o?n:r,e.supported=n,e.unsupported=r},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){return Object.keys(e).reduce(function(n,r){return null==t[r]?n:(e[r]===t[r]?n[r]=e[r]:Array.isArray(e[r])?e[r].indexOf(t[r])<0&&(n[r]=e[r].concat([t[r]])):n[r]=[e[r],t[r]],n)},{})}function a(t){return t.reduce(function(t,e){if(1===e.insert){var n=(0,N.default)(e.attributes);return delete n.image,t.insert({image:e.attributes.image},n)}if(null==e.attributes||!0!==e.attributes.list&&!0!==e.attributes.bullet||(e=(0,N.default)(e),e.attributes.list?e.attributes.list="ordered":(e.attributes.list="bullet",delete e.attributes.bullet)),"string"==typeof e.insert){var r=e.insert.replace(/\r\n/g,"\n").replace(/\r/g,"\n");return t.insert(r,e.attributes)}return t.push(e)},new h.default)}Object.defineProperty(e,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},u=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),c=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(4),h=r(f),p=n(20),d=r(p),y=n(0),v=r(y),b=n(13),g=r(b),m=n(31),_=r(m),O=n(3),w=r(O),x=n(14),k=r(x),E=n(21),N=r(E),j=n(12),A=r(j),q=n(2),T=r(q),P=/^[ -~]*$/,S=function(){function t(e){i(this,t),this.scroll=e,this.delta=this.getDelta()}return c(t,[{key:"applyDelta",value:function(t){var e=this,n=!1;this.scroll.update();var r=this.scroll.length();return this.scroll.batchStart(),t=a(t),t.reduce(function(t,o){var i=o.retain||o.delete||o.insert.length||1,l=o.attributes||{};if(null!=o.insert){if("string"==typeof o.insert){var a=o.insert;a.endsWith("\n")&&n&&(n=!1,a=a.slice(0,-1)),t>=r&&!a.endsWith("\n")&&(n=!0),e.scroll.insertAt(t,a);var c=e.scroll.line(t),f=u(c,2),h=f[0],p=f[1],y=(0,T.default)({},(0,O.bubbleFormats)(h));if(h instanceof w.default){var b=h.descendant(v.default.Leaf,p),g=u(b,1),m=g[0];y=(0,T.default)(y,(0,O.bubbleFormats)(m))}l=d.default.attributes.diff(y,l)||{}}else if("object"===s(o.insert)){var _=Object.keys(o.insert)[0];if(null==_)return t;e.scroll.insertAt(t,_,o.insert[_])}r+=i}return Object.keys(l).forEach(function(n){e.scroll.formatAt(t,i,n,l[n])}),t+i},0),t.reduce(function(t,n){return"number"==typeof n.delete?(e.scroll.deleteAt(t,n.delete),t):t+(n.retain||n.insert.length||1)},0),this.scroll.batchEnd(),this.update(t)}},{key:"deleteText",value:function(t,e){return this.scroll.deleteAt(t,e),this.update((new h.default).retain(t).delete(e))}},{key:"formatLine",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return this.scroll.update(),Object.keys(r).forEach(function(o){if(null==n.scroll.whitelist||n.scroll.whitelist[o]){var i=n.scroll.lines(t,Math.max(e,1)),l=e;i.forEach(function(e){var i=e.length();if(e instanceof g.default){var a=t-e.offset(n.scroll),s=e.newlineIndex(a+l)-a+1;e.formatAt(a,s,o,r[o])}else e.format(o,r[o]);l-=i})}}),this.scroll.optimize(),this.update((new h.default).retain(t).retain(e,(0,N.default)(r)))}},{key:"formatText",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return Object.keys(r).forEach(function(o){n.scroll.formatAt(t,e,o,r[o])}),this.update((new h.default).retain(t).retain(e,(0,N.default)(r)))}},{key:"getContents",value:function(t,e){return this.delta.slice(t,t+e)}},{key:"getDelta",value:function(){return this.scroll.lines().reduce(function(t,e){return t.concat(e.delta())},new h.default)}},{key:"getFormat",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=[],r=[];0===e?this.scroll.path(t).forEach(function(t){var e=u(t,1),o=e[0];o instanceof w.default?n.push(o):o instanceof v.default.Leaf&&r.push(o)}):(n=this.scroll.lines(t,e),r=this.scroll.descendants(v.default.Leaf,t,e));var o=[n,r].map(function(t){if(0===t.length)return{};for(var e=(0,O.bubbleFormats)(t.shift());Object.keys(e).length>0;){var n=t.shift();if(null==n)return e;e=l((0,O.bubbleFormats)(n),e)}return e});return T.default.apply(T.default,o)}},{key:"getText",value:function(t,e){return this.getContents(t,e).filter(function(t){return"string"==typeof t.insert}).map(function(t){return t.insert}).join("")}},{key:"insertEmbed",value:function(t,e,n){return this.scroll.insertAt(t,e,n),this.update((new h.default).retain(t).insert(o({},e,n)))}},{key:"insertText",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return e=e.replace(/\r\n/g,"\n").replace(/\r/g,"\n"),this.scroll.insertAt(t,e),Object.keys(r).forEach(function(o){n.scroll.formatAt(t,e.length,o,r[o])}),this.update((new h.default).retain(t).insert(e,(0,N.default)(r)))}},{key:"isBlank",value:function(){if(0==this.scroll.children.length)return!0;if(this.scroll.children.length>1)return!1;var t=this.scroll.children.head;return t.statics.blotName===w.default.blotName&&(!(t.children.length>1)&&t.children.head instanceof k.default)}},{key:"removeFormat",value:function(t,e){var n=this.getText(t,e),r=this.scroll.line(t+e),o=u(r,2),i=o[0],l=o[1],a=0,s=new h.default;null!=i&&(a=i instanceof g.default?i.newlineIndex(l)-l+1:i.length()-l,s=i.delta().slice(l,l+a-1).insert("\n"));var c=this.getContents(t,e+a),f=c.diff((new h.default).insert(n).concat(s)),p=(new h.default).retain(t).concat(f);return this.applyDelta(p)}},{key:"update",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:void 0,r=this.delta;if(1===e.length&&"characterData"===e[0].type&&e[0].target.data.match(P)&&v.default.find(e[0].target)){var o=v.default.find(e[0].target),i=(0,O.bubbleFormats)(o),l=o.offset(this.scroll),a=e[0].oldValue.replace(_.default.CONTENTS,""),s=(new h.default).insert(a),u=(new h.default).insert(o.value());t=(new h.default).retain(l).concat(s.diff(u,n)).reduce(function(t,e){return e.insert?t.insert(e.insert,i):t.push(e)},new h.default),this.delta=r.compose(t)}else this.delta=this.getDelta(),t&&(0,A.default)(r.compose(t),this.delta)||(t=r.diff(this.delta,n));return t}}]),t}();e.default=S},function(t,e){"use strict";function n(){}function r(t,e,n){this.fn=t,this.context=e,this.once=n||!1}function o(){this._events=new n,this._eventsCount=0}var i=Object.prototype.hasOwnProperty,l="~";Object.create&&(n.prototype=Object.create(null),(new n).__proto__||(l=!1)),o.prototype.eventNames=function(){var t,e,n=[];if(0===this._eventsCount)return n;for(e in t=this._events)i.call(t,e)&&n.push(l?e.slice(1):e);return Object.getOwnPropertySymbols?n.concat(Object.getOwnPropertySymbols(t)):n},o.prototype.listeners=function(t,e){var n=l?l+t:t,r=this._events[n];if(e)return!!r;if(!r)return[];if(r.fn)return[r.fn];for(var o=0,i=r.length,a=new Array(i);o<i;o++)a[o]=r[o].fn;return a},o.prototype.emit=function(t,e,n,r,o,i){var a=l?l+t:t;if(!this._events[a])return!1;var s,u,c=this._events[a],f=arguments.length;if(c.fn){switch(c.once&&this.removeListener(t,c.fn,void 0,!0),f){case 1:return c.fn.call(c.context),!0;case 2:return c.fn.call(c.context,e),!0;case 3:return c.fn.call(c.context,e,n),!0;case 4:return c.fn.call(c.context,e,n,r),!0;case 5:return c.fn.call(c.context,e,n,r,o),!0;case 6:return c.fn.call(c.context,e,n,r,o,i),!0}for(u=1,s=new Array(f-1);u<f;u++)s[u-1]=arguments[u];c.fn.apply(c.context,s)}else{var h,p=c.length;for(u=0;u<p;u++)switch(c[u].once&&this.removeListener(t,c[u].fn,void 0,!0),f){case 1:c[u].fn.call(c[u].context);break;case 2:c[u].fn.call(c[u].context,e);break;case 3:c[u].fn.call(c[u].context,e,n);break;case 4:c[u].fn.call(c[u].context,e,n,r);break;default:if(!s)for(h=1,s=new Array(f-1);h<f;h++)s[h-1]=arguments[h];c[u].fn.apply(c[u].context,s)}}return!0},o.prototype.on=function(t,e,n){var o=new r(e,n||this),i=l?l+t:t;return this._events[i]?this._events[i].fn?this._events[i]=[this._events[i],o]:this._events[i].push(o):(this._events[i]=o,this._eventsCount++),this},o.prototype.once=function(t,e,n){var o=new r(e,n||this,!0),i=l?l+t:t;return this._events[i]?this._events[i].fn?this._events[i]=[this._events[i],o]:this._events[i].push(o):(this._events[i]=o,this._eventsCount++),this},o.prototype.removeListener=function(t,e,r,o){var i=l?l+t:t;if(!this._events[i])return this;if(!e)return 0==--this._eventsCount?this._events=new n:delete this._events[i],this;var a=this._events[i];if(a.fn)a.fn!==e||o&&!a.once||r&&a.context!==r||(0==--this._eventsCount?this._events=new n:delete this._events[i]);else{for(var s=0,u=[],c=a.length;s<c;s++)(a[s].fn!==e||o&&!a[s].once||r&&a[s].context!==r)&&u.push(a[s]);u.length?this._events[i]=1===u.length?u[0]:u:0==--this._eventsCount?this._events=new n:delete this._events[i]}return this},o.prototype.removeAllListeners=function(t){var e;return t?(e=l?l+t:t,this._events[e]&&(0==--this._eventsCount?this._events=new n:delete this._events[e])):(this._events=new n,this._eventsCount=0),this},o.prototype.off=o.prototype.removeListener,o.prototype.addListener=o.prototype.on,o.prototype.setMaxListeners=function(){return this},o.prefixed=l,o.EventEmitter=o,void 0!==t&&(t.exports=o)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){return t instanceof v.default||t instanceof y.BlockEmbed}Object.defineProperty(e,"__esModule",{value:!0});var s=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},f=n(0),h=r(f),p=n(9),d=r(p),y=n(3),v=r(y),b=n(14),g=r(b),m=n(13),_=r(m),O=n(23),w=r(O),x=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.emitter=n.emitter,Array.isArray(n.whitelist)&&(r.whitelist=n.whitelist.reduce(function(t,e){return t[e]=!0,t},{})),r.domNode.addEventListener("DOMNodeInserted",function(){}),r.optimize(),r.enable(),r}return l(e,t),u(e,[{key:"batchStart",value:function(){this.batch=!0}},{key:"batchEnd",value:function(){this.batch=!1,this.optimize()}},{key:"deleteAt",value:function(t,n){var r=this.line(t),o=s(r,2),i=o[0],l=o[1],a=this.line(t+n),u=s(a,1),f=u[0];if(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"deleteAt",this).call(this,t,n),null!=f&&i!==f&&l>0){if(i instanceof y.BlockEmbed||f instanceof y.BlockEmbed)return void this.optimize();if(i instanceof _.default){var h=i.newlineIndex(i.length(),!0);if(h>-1&&(i=i.split(h+1))===f)return void this.optimize()}else if(f instanceof _.default){var p=f.newlineIndex(0);p>-1&&f.split(p+1)}var d=f.children.head instanceof g.default?null:f.children.head;i.moveChildren(f,d),i.remove()}this.optimize()}},{key:"enable",value:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.domNode.setAttribute("contenteditable",t)}},{key:"formatAt",value:function(t,n,r,o){(null==this.whitelist||this.whitelist[r])&&(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,n,r,o),this.optimize())}},{key:"insertAt",value:function(t,n,r){if(null==r||null==this.whitelist||this.whitelist[n]){if(t>=this.length())if(null==r||null==h.default.query(n,h.default.Scope.BLOCK)){var o=h.default.create(this.statics.defaultChild);this.appendChild(o),null==r&&n.endsWith("\n")&&(n=n.slice(0,-1)),o.insertAt(0,n,r)}else{var i=h.default.create(n,r);this.appendChild(i)}else c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r);this.optimize()}}},{key:"insertBefore",value:function(t,n){if(t.statics.scope===h.default.Scope.INLINE_BLOT){var r=h.default.create(this.statics.defaultChild);r.appendChild(t),t=r}c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n)}},{key:"leaf",value:function(t){return this.path(t).pop()||[null,-1]}},{key:"line",value:function(t){return t===this.length()?this.line(t-1):this.descendant(a,t)}},{key:"lines",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Number.MAX_VALUE;return function t(e,n,r){var o=[],i=r;return e.children.forEachAt(n,r,function(e,n,r){a(e)?o.push(e):e instanceof h.default.Container&&(o=o.concat(t(e,n,i))),i-=r}),o}(this,t,e)}},{key:"optimize",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};!0!==this.batch&&(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t,n),t.length>0&&this.emitter.emit(d.default.events.SCROLL_OPTIMIZE,t,n))}},{key:"path",value:function(t){return c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"path",this).call(this,t).slice(1)}},{key:"update",value:function(t){if(!0!==this.batch){var n=d.default.sources.USER;"string"==typeof t&&(n=t),Array.isArray(t)||(t=this.observer.takeRecords()),t.length>0&&this.emitter.emit(d.default.events.SCROLL_BEFORE_UPDATE,n,t),c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"update",this).call(this,t.concat([])),t.length>0&&this.emitter.emit(d.default.events.SCROLL_UPDATE,n,t)}}}]),e}(h.default.Scroll);x.blotName="scroll",x.className="ql-editor",x.tagName="DIV",x.defaultChild="block",x.allowedChildren=[v.default,y.BlockEmbed,w.default],e.default=x},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e,n){return"object"===(void 0===e?"undefined":x(e))?Object.keys(e).reduce(function(t,n){return s(t,n,e[n])},t):t.reduce(function(t,r){return r.attributes&&r.attributes[e]?t.push(r):t.insert(r.insert,(0,j.default)({},o({},e,n),r.attributes))},new q.default)}function u(t){if(t.nodeType!==Node.ELEMENT_NODE)return{};return t["__ql-computed-style"]||(t["__ql-computed-style"]=window.getComputedStyle(t))}function c(t,e){for(var n="",r=t.ops.length-1;r>=0&&n.length<e.length;--r){var o=t.ops[r];if("string"!=typeof o.insert)break;n=o.insert+n}return n.slice(-1*e.length)===e}function f(t){return 0!==t.childNodes.length&&["block","list-item"].indexOf(u(t).display)>-1}function h(t,e,n){return t.nodeType===t.TEXT_NODE?n.reduce(function(e,n){return n(t,e)},new q.default):t.nodeType===t.ELEMENT_NODE?[].reduce.call(t.childNodes||[],function(r,o){var i=h(o,e,n);return o.nodeType===t.ELEMENT_NODE&&(i=e.reduce(function(t,e){return e(o,t)},i),i=(o[W]||[]).reduce(function(t,e){return e(o,t)},i)),r.concat(i)},new q.default):new q.default}function p(t,e,n){return s(n,t,!0)}function d(t,e){var n=P.default.Attributor.Attribute.keys(t),r=P.default.Attributor.Class.keys(t),o=P.default.Attributor.Style.keys(t),i={};return n.concat(r).concat(o).forEach(function(e){var n=P.default.query(e,P.default.Scope.ATTRIBUTE);null!=n&&(i[n.attrName]=n.value(t),i[n.attrName])||(n=Y[e],null==n||n.attrName!==e&&n.keyName!==e||(i[n.attrName]=n.value(t)||void 0),null==(n=X[e])||n.attrName!==e&&n.keyName!==e||(n=X[e],i[n.attrName]=n.value(t)||void 0))}),Object.keys(i).length>0&&(e=s(e,i)),e}function y(t,e){var n=P.default.query(t);if(null==n)return e;if(n.prototype instanceof P.default.Embed){var r={},o=n.value(t);null!=o&&(r[n.blotName]=o,e=(new q.default).insert(r,n.formats(t)))}else"function"==typeof n.formats&&(e=s(e,n.blotName,n.formats(t)));return e}function v(t,e){return c(e,"\n")||e.insert("\n"),e}function b(){return new q.default}function g(t,e){var n=P.default.query(t);if(null==n||"list-item"!==n.blotName||!c(e,"\n"))return e;for(var r=-1,o=t.parentNode;!o.classList.contains("ql-clipboard");)"list"===(P.default.query(o)||{}).blotName&&(r+=1),o=o.parentNode;return r<=0?e:e.compose((new q.default).retain(e.length()-1).retain(1,{indent:r}))}function m(t,e){return c(e,"\n")||(f(t)||e.length()>0&&t.nextSibling&&f(t.nextSibling))&&e.insert("\n"),e}function _(t,e){if(f(t)&&null!=t.nextElementSibling&&!c(e,"\n\n")){var n=t.offsetHeight+parseFloat(u(t).marginTop)+parseFloat(u(t).marginBottom);t.nextElementSibling.offsetTop>t.offsetTop+1.5*n&&e.insert("\n")}return e}function O(t,e){var n={},r=t.style||{};return r.fontStyle&&"italic"===u(t).fontStyle&&(n.italic=!0),r.fontWeight&&(u(t).fontWeight.startsWith("bold")||parseInt(u(t).fontWeight)>=700)&&(n.bold=!0),Object.keys(n).length>0&&(e=s(e,n)),parseFloat(r.textIndent||0)>0&&(e=(new q.default).insert("\t").concat(e)),e}function w(t,e){var n=t.data;if("O:P"===t.parentNode.tagName)return e.insert(n.trim());if(0===n.trim().length&&t.parentNode.classList.contains("ql-clipboard"))return e;if(!u(t.parentNode).whiteSpace.startsWith("pre")){var r=function(t,e){return e=e.replace(/[^\u00a0]/g,""),e.length<1&&t?" ":e};n=n.replace(/\r\n/g," ").replace(/\n/g," "),n=n.replace(/\s\s+/g,r.bind(r,!0)),(null==t.previousSibling&&f(t.parentNode)||null!=t.previousSibling&&f(t.previousSibling))&&(n=n.replace(/^\s+/,r.bind(r,!1))),(null==t.nextSibling&&f(t.parentNode)||null!=t.nextSibling&&f(t.nextSibling))&&(n=n.replace(/\s+$/,r.bind(r,!1)))}return e.insert(n)}Object.defineProperty(e,"__esModule",{value:!0}),e.matchText=e.matchSpacing=e.matchNewline=e.matchBlot=e.matchAttributor=e.default=void 0;var x="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},k=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),E=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),N=n(2),j=r(N),A=n(4),q=r(A),T=n(0),P=r(T),S=n(6),C=r(S),L=n(10),M=r(L),R=n(7),I=r(R),B=n(34),D=n(35),U=n(13),F=r(U),H=n(24),K=n(36),z=n(37),Z=n(38),V=(0,M.default)("quill:clipboard"),W="__ql-matcher",G=[[Node.TEXT_NODE,w],[Node.TEXT_NODE,m],["br",v],[Node.ELEMENT_NODE,m],[Node.ELEMENT_NODE,y],[Node.ELEMENT_NODE,_],[Node.ELEMENT_NODE,d],[Node.ELEMENT_NODE,O],["li",g],["b",p.bind(p,"bold")],["i",p.bind(p,"italic")],["style",b]],Y=[B.AlignAttribute,K.DirectionAttribute].reduce(function(t,e){return t[e.keyName]=e,t},{}),X=[B.AlignStyle,D.BackgroundStyle,H.ColorStyle,K.DirectionStyle,z.FontStyle,Z.SizeStyle].reduce(function(t,e){return t[e.keyName]=e,t},{}),$=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.root.addEventListener("paste",r.onPaste.bind(r)),r.container=r.quill.addContainer("ql-clipboard"),r.container.setAttribute("contenteditable",!0),r.container.setAttribute("tabindex",-1),r.matchers=[],G.concat(r.options.matchers).forEach(function(t){var e=k(t,2),o=e[0],i=e[1];(n.matchVisual||i!==_)&&r.addMatcher(o,i)}),r}return a(e,t),E(e,[{key:"addMatcher",value:function(t,e){this.matchers.push([t,e])}},{key:"convert",value:function(t){if("string"==typeof t)return this.container.innerHTML=t.replace(/\>\r?\n +\</g,"><"),this.convert();var e=this.quill.getFormat(this.quill.selection.savedRange.index);if(e[F.default.blotName]){var n=this.container.innerText;return this.container.innerHTML="",(new q.default).insert(n,o({},F.default.blotName,e[F.default.blotName]))}var r=this.prepareMatching(),i=k(r,2),l=i[0],a=i[1],s=h(this.container,l,a);return c(s,"\n")&&null==s.ops[s.ops.length-1].attributes&&(s=s.compose((new q.default).retain(s.length()-1).delete(1))),V.log("convert",this.container.innerHTML,s),this.container.innerHTML="",s}},{key:"dangerouslyPasteHTML",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:C.default.sources.API;if("string"==typeof t)this.quill.setContents(this.convert(t),e),this.quill.setSelection(0,C.default.sources.SILENT);else{var r=this.convert(e);this.quill.updateContents((new q.default).retain(t).concat(r),n),this.quill.setSelection(t+r.length(),C.default.sources.SILENT)}}},{key:"onPaste",value:function(t){var e=this;if(!t.defaultPrevented&&this.quill.isEnabled()){var n=this.quill.getSelection(),r=(new q.default).retain(n.index),o=this.quill.scrollingContainer.scrollTop;this.container.focus(),this.quill.selection.update(C.default.sources.SILENT),setTimeout(function(){r=r.concat(e.convert()).delete(n.length),e.quill.updateContents(r,C.default.sources.USER),e.quill.setSelection(r.length()-n.length,C.default.sources.SILENT),e.quill.scrollingContainer.scrollTop=o,e.quill.focus()},1)}}},{key:"prepareMatching",value:function(){var t=this,e=[],n=[];return this.matchers.forEach(function(r){var o=k(r,2),i=o[0],l=o[1];switch(i){case Node.TEXT_NODE:n.push(l);break;case Node.ELEMENT_NODE:e.push(l);break;default:[].forEach.call(t.container.querySelectorAll(i),function(t){t[W]=t[W]||[],t[W].push(l)})}}),[e,n]}}]),e}(I.default);$.DEFAULTS={matchers:[],matchVisual:!0},e.default=$,e.matchAttributor=d,e.matchBlot=y,e.matchNewline=m,e.matchSpacing=_,e.matchText=w},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=t.ops[t.ops.length-1];return null!=e&&(null!=e.insert?"string"==typeof e.insert&&e.insert.endsWith("\n"):null!=e.attributes&&Object.keys(e.attributes).some(function(t){return null!=f.default.query(t,f.default.Scope.BLOCK)}))}function s(t){var e=t.reduce(function(t,e){return t+=e.delete||0},0),n=t.length()-e;return a(t)&&(n-=1),n}Object.defineProperty(e,"__esModule",{value:!0}),e.getLastChangeIndex=e.default=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(0),f=r(c),h=n(6),p=r(h),d=n(7),y=r(d),v=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.lastRecorded=0,r.ignoreChange=!1,r.clear(),r.quill.on(p.default.events.EDITOR_CHANGE,function(t,e,n,o){t!==p.default.events.TEXT_CHANGE||r.ignoreChange||(r.options.userOnly&&o!==p.default.sources.USER?r.transform(e):r.record(e,n))}),r.quill.keyboard.addBinding({key:"Z",shortKey:!0},r.undo.bind(r)),r.quill.keyboard.addBinding({key:"Z",shortKey:!0,shiftKey:!0},r.redo.bind(r)),/Win/i.test(navigator.platform)&&r.quill.keyboard.addBinding({key:"Y",shortKey:!0},r.redo.bind(r)),r}return l(e,t),u(e,[{key:"change",value:function(t,e){if(0!==this.stack[t].length){var n=this.stack[t].pop();this.stack[e].push(n),this.lastRecorded=0,this.ignoreChange=!0,this.quill.updateContents(n[t],p.default.sources.USER),this.ignoreChange=!1;var r=s(n[t]);this.quill.setSelection(r)}}},{key:"clear",value:function(){this.stack={undo:[],redo:[]}}},{key:"cutoff",value:function(){this.lastRecorded=0}},{key:"record",value:function(t,e){if(0!==t.ops.length){this.stack.redo=[];var n=this.quill.getContents().diff(e),r=Date.now();if(this.lastRecorded+this.options.delay>r&&this.stack.undo.length>0){var o=this.stack.undo.pop();n=n.compose(o.undo),t=o.redo.compose(t)}else this.lastRecorded=r;this.stack.undo.push({redo:t,undo:n}),this.stack.undo.length>this.options.maxStack&&this.stack.undo.shift()}}},{key:"redo",value:function(){this.change("redo","undo")}},{key:"transform",value:function(t){this.stack.undo.forEach(function(e){e.undo=t.transform(e.undo,!0),e.redo=t.transform(e.redo,!0)}),this.stack.redo.forEach(function(e){e.undo=t.transform(e.undo,!0),e.redo=t.transform(e.redo,!0)})}},{key:"undo",value:function(){this.change("undo","redo")}}]),e}(y.default);v.DEFAULTS={delay:1e3,maxStack:100,userOnly:!1},e.default=v,e.getLastChangeIndex=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.IndentClass=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"add",value:function(t,n){if("+1"===n||"-1"===n){var r=this.value(t)||0;n="+1"===n?r+1:r-1}return 0===n?(this.remove(t),!0):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"add",this).call(this,t,n)}},{key:"canAdd",value:function(t,n){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"canAdd",this).call(this,t,n)||a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"canAdd",this).call(this,t,parseInt(n))}},{key:"value",value:function(t){return parseInt(a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t))||void 0}}]),e}(u.default.Attributor.Class),f=new c("indent","ql-indent",{scope:u.default.Scope.BLOCK,whitelist:[1,2,3,4,5,6,7,8]});e.IndentClass=f},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(3),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="blockquote",s.tagName="blockquote",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(3),s=function(t){return t&&t.__esModule?t:{default:t}}(a),u=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,null,[{key:"formats",value:function(t){return this.tagName.indexOf(t.tagName)+1}}]),e}(s.default);u.blotName="header",u.tagName=["H1","H2","H3","H4","H5","H6"],e.default=u},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ListItem=void 0;var s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(0),f=r(c),h=n(3),p=r(h),d=n(23),y=r(d),v=function(t){function e(){return i(this,e),l(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return a(e,t),s(e,[{key:"format",value:function(t,n){t!==b.blotName||n?u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n):this.replaceWith(f.default.create(this.statics.scope))}},{key:"remove",value:function(){null==this.prev&&null==this.next?this.parent.remove():u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"remove",this).call(this)}},{key:"replaceWith",value:function(t,n){return this.parent.isolate(this.offset(this.parent),this.length()),t===this.parent.statics.blotName?(this.parent.replaceWith(t,n),this):(this.parent.unwrap(),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replaceWith",this).call(this,t,n))}}],[{key:"formats",value:function(t){return t.tagName===this.tagName?void 0:u(e.__proto__||Object.getPrototypeOf(e),"formats",this).call(this,t)}}]),e}(p.default);v.blotName="list-item",v.tagName="LI";var b=function(t){function e(t){i(this,e);var n=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t)),r=function(e){if(e.target.parentNode===t){var r=n.statics.formats(t),o=f.default.find(e.target);"checked"===r?o.format("list","unchecked"):"unchecked"===r&&o.format("list","checked")}};return t.addEventListener("touchstart",r),t.addEventListener("mousedown",r),n}return a(e,t),s(e,null,[{key:"create",value:function(t){var n="ordered"===t?"OL":"UL",r=u(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,n);return"checked"!==t&&"unchecked"!==t||r.setAttribute("data-checked","checked"===t),r}},{key:"formats",value:function(t){return"OL"===t.tagName?"ordered":"UL"===t.tagName?t.hasAttribute("data-checked")?"true"===t.getAttribute("data-checked")?"checked":"unchecked":"bullet":void 0}}]),s(e,[{key:"format",value:function(t,e){this.children.length>0&&this.children.tail.format(t,e)}},{key:"formats",value:function(){return o({},this.statics.blotName,this.statics.formats(this.domNode))}},{key:"insertBefore",value:function(t,n){if(t instanceof v)u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n);else{var r=null==n?this.length():n.offset(this),o=this.split(r);o.parent.insertBefore(t,o)}}},{key:"optimize",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t);var n=this.next;null!=n&&n.prev===this&&n.statics.blotName===this.statics.blotName&&n.domNode.tagName===this.domNode.tagName&&n.domNode.getAttribute("data-checked")===this.domNode.getAttribute("data-checked")&&(n.moveChildren(this),n.remove())}},{key:"replace",value:function(t){if(t.statics.blotName!==this.statics.blotName){var n=f.default.create(this.statics.defaultChild);t.moveChildren(n),this.appendChild(n)}u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replace",this).call(this,t)}}]),e}(y.default);b.blotName="list",b.scope=f.default.Scope.BLOCK_BLOT,b.tagName=["OL","UL"],b.defaultChild="list-item",b.allowedChildren=[v],e.ListItem=v,e.default=b},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(39),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="italic",s.tagName=["EM","I"],e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,null,[{key:"create",value:function(t){return"super"===t?document.createElement("sup"):"sub"===t?document.createElement("sub"):a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t)}},{key:"formats",value:function(t){return"SUB"===t.tagName?"sub":"SUP"===t.tagName?"super":void 0}}]),e}(u.default);c.blotName="script",c.tagName=["SUB","SUP"],e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(5),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="strike",s.tagName="S",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(5),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="underline",s.tagName="U",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=n(15),f=["alt","height","width"],h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"format",value:function(t,n){f.indexOf(t)>-1?n?this.domNode.setAttribute(t,n):this.domNode.removeAttribute(t):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}],[{key:"create",value:function(t){var n=a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return"string"==typeof t&&n.setAttribute("src",this.sanitize(t)),n}},{key:"formats",value:function(t){return f.reduce(function(e,n){return t.hasAttribute(n)&&(e[n]=t.getAttribute(n)),e},{})}},{key:"match",value:function(t){return/\.(jpe?g|gif|png)$/.test(t)||/^data:image\/.+;base64/.test(t)}},{key:"sanitize",value:function(t){return(0,c.sanitize)(t,["http","https","data"])?t:"//:0"}},{key:"value",value:function(t){return t.getAttribute("src")}}]),e}(u.default.Embed);h.blotName="image",h.tagName="IMG",e.default=h},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(3),u=n(15),c=function(t){return t&&t.__esModule?t:{default:t}}(u),f=["height","width"],h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"format",value:function(t,n){f.indexOf(t)>-1?n?this.domNode.setAttribute(t,n):this.domNode.removeAttribute(t):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}],[{key:"create",value:function(t){var n=a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return n.setAttribute("frameborder","0"),n.setAttribute("allowfullscreen",!0),n.setAttribute("src",this.sanitize(t)),n}},{key:"formats",value:function(t){return f.reduce(function(e,n){return t.hasAttribute(n)&&(e[n]=t.getAttribute(n)),e},{})}},{key:"sanitize",value:function(t){return c.default.sanitize(t)}},{key:"value",value:function(t){return t.getAttribute("src")}}]),e}(s.BlockEmbed);h.blotName="video",h.className="ql-video",h.tagName="IFRAME",e.default=h},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.FormulaBlot=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(33),c=r(u),f=n(6),h=r(f),p=n(7),d=r(p),y=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,null,[{key:"create",value:function(t){var n=s(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return"string"==typeof t&&(window.katex.render(t,n,{throwOnError:!1,errorColor:"#f00"}),n.setAttribute("data-value",t)),n}},{key:"value",value:function(t){return t.getAttribute("data-value")}}]),e}(c.default);y.blotName="formula",y.className="ql-formula",y.tagName="SPAN";var v=function(t){function e(){o(this,e);var t=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));if(null==window.katex)throw new Error("Formula module requires KaTeX.");return t}return l(e,t),a(e,null,[{key:"register",value:function(){h.default.register(y,!0)}}]),e}(d.default);e.FormulaBlot=y,e.default=v},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.CodeToken=e.CodeBlock=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(0),c=r(u),f=n(6),h=r(f),p=n(7),d=r(p),y=n(13),v=r(y),b=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,[{key:"replaceWith",value:function(t){this.domNode.textContent=this.domNode.textContent,this.attach(),s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replaceWith",this).call(this,t)}},{key:"highlight",value:function(t){var e=this.domNode.textContent;this.cachedText!==e&&((e.trim().length>0||null==this.cachedText)&&(this.domNode.innerHTML=t(e),this.domNode.normalize(),this.attach()),this.cachedText=e)}}]),e}(v.default);b.className="ql-syntax";var g=new c.default.Attributor.Class("token","hljs",{scope:c.default.Scope.INLINE}),m=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));if("function"!=typeof r.options.highlight)throw new Error("Syntax module requires highlight.js. Please include the library on the page before Quill.");var l=null;return r.quill.on(h.default.events.SCROLL_OPTIMIZE,function(){clearTimeout(l),l=setTimeout(function(){r.highlight(),l=null},r.options.interval)}),r.highlight(),r}return l(e,t),a(e,null,[{key:"register",value:function(){h.default.register(g,!0),h.default.register(b,!0)}}]),a(e,[{key:"highlight",value:function(){var t=this;if(!this.quill.selection.composing){this.quill.update(h.default.sources.USER);var e=this.quill.getSelection();this.quill.scroll.descendants(b).forEach(function(e){e.highlight(t.options.highlight)}),this.quill.update(h.default.sources.SILENT),null!=e&&this.quill.setSelection(e,h.default.sources.SILENT)}}}]),e}(d.default);m.DEFAULTS={highlight:function(){return null==window.hljs?null:function(t){return window.hljs.highlightAuto(t).value}}(),interval:1e3},e.CodeBlock=b,e.CodeToken=g,e.default=m},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e,n){var r=document.createElement("button");r.setAttribute("type","button"),r.classList.add("ql-"+e),null!=n&&(r.value=n),t.appendChild(r)}function u(t,e){Array.isArray(e[0])||(e=[e]),e.forEach(function(e){var n=document.createElement("span");n.classList.add("ql-formats"),e.forEach(function(t){if("string"==typeof t)s(n,t);else{var e=Object.keys(t)[0],r=t[e];Array.isArray(r)?c(n,e,r):s(n,e,r)}}),t.appendChild(n)})}function c(t,e,n){var r=document.createElement("select");r.classList.add("ql-"+e),n.forEach(function(t){var e=document.createElement("option");!1!==t?e.setAttribute("value",t):e.setAttribute("selected","selected"),r.appendChild(e)}),t.appendChild(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.addControls=e.default=void 0;var f=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),h=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),p=n(4),d=r(p),y=n(0),v=r(y),b=n(6),g=r(b),m=n(10),_=r(m),O=n(7),w=r(O),x=(0,_.default)("quill:toolbar"),k=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));if(Array.isArray(r.options.container)){var o=document.createElement("div");u(o,r.options.container),t.container.parentNode.insertBefore(o,t.container),r.container=o}else"string"==typeof r.options.container?r.container=document.querySelector(r.options.container):r.container=r.options.container;if(!(r.container instanceof HTMLElement)){var a;return a=x.error("Container required for toolbar",r.options),l(r,a)}return r.container.classList.add("ql-toolbar"),r.controls=[],r.handlers={},Object.keys(r.options.handlers).forEach(function(t){r.addHandler(t,r.options.handlers[t])}),[].forEach.call(r.container.querySelectorAll("button, select"),function(t){r.attach(t)}),r.quill.on(g.default.events.EDITOR_CHANGE,function(t,e){t===g.default.events.SELECTION_CHANGE&&r.update(e)}),r.quill.on(g.default.events.SCROLL_OPTIMIZE,function(){var t=r.quill.selection.getRange(),e=f(t,1),n=e[0];r.update(n)}),r}return a(e,t),h(e,[{key:"addHandler",value:function(t,e){this.handlers[t]=e}},{key:"attach",value:function(t){var e=this,n=[].find.call(t.classList,function(t){return 0===t.indexOf("ql-")});if(n){if(n=n.slice("ql-".length),"BUTTON"===t.tagName&&t.setAttribute("type","button"),null==this.handlers[n]){if(null!=this.quill.scroll.whitelist&&null==this.quill.scroll.whitelist[n])return void x.warn("ignoring attaching to disabled format",n,t);if(null==v.default.query(n))return void x.warn("ignoring attaching to nonexistent format",n,t)}var r="SELECT"===t.tagName?"change":"click";t.addEventListener(r,function(r){var i=void 0;if("SELECT"===t.tagName){if(t.selectedIndex<0)return;var l=t.options[t.selectedIndex];i=!l.hasAttribute("selected")&&(l.value||!1)}else i=!t.classList.contains("ql-active")&&(t.value||!t.hasAttribute("value")),r.preventDefault();e.quill.focus();var a=e.quill.selection.getRange(),s=f(a,1),u=s[0];if(null!=e.handlers[n])e.handlers[n].call(e,i);else if(v.default.query(n).prototype instanceof v.default.Embed){if(!(i=prompt("Enter "+n)))return;e.quill.updateContents((new d.default).retain(u.index).delete(u.length).insert(o({},n,i)),g.default.sources.USER)}else e.quill.format(n,i,g.default.sources.USER);e.update(u)}),this.controls.push([n,t])}}},{key:"update",value:function(t){var e=null==t?{}:this.quill.getFormat(t);this.controls.forEach(function(n){var r=f(n,2),o=r[0],i=r[1];if("SELECT"===i.tagName){var l=void 0;if(null==t)l=null;else if(null==e[o])l=i.querySelector("option[selected]");else if(!Array.isArray(e[o])){var a=e[o];"string"==typeof a&&(a=a.replace(/\"/g,'\\"')),l=i.querySelector('option[value="'+a+'"]')}null==l?(i.value="",i.selectedIndex=-1):l.selected=!0}else if(null==t)i.classList.remove("ql-active");else if(i.hasAttribute("value")){var s=e[o]===i.getAttribute("value")||null!=e[o]&&e[o].toString()===i.getAttribute("value")||null==e[o]&&!i.getAttribute("value");i.classList.toggle("ql-active",s)}else i.classList.toggle("ql-active",null!=e[o])})}}]),e}(w.default);k.DEFAULTS={},k.DEFAULTS={container:null,handlers:{clean:function(){var t=this,e=this.quill.getSelection();if(null!=e)if(0==e.length){var n=this.quill.getFormat();Object.keys(n).forEach(function(e){null!=v.default.query(e,v.default.Scope.INLINE)&&t.quill.format(e,!1)})}else this.quill.removeFormat(e,g.default.sources.USER)},direction:function(t){var e=this.quill.getFormat().align;"rtl"===t&&null==e?this.quill.format("align","right",g.default.sources.USER):t||"right"!==e||this.quill.format("align",!1,g.default.sources.USER),this.quill.format("direction",t,g.default.sources.USER)},indent:function(t){var e=this.quill.getSelection(),n=this.quill.getFormat(e),r=parseInt(n.indent||0);if("+1"===t||"-1"===t){var o="+1"===t?1:-1;"rtl"===n.direction&&(o*=-1),this.quill.format("indent",r+o,g.default.sources.USER)}},link:function(t){!0===t&&(t=prompt("Enter link URL:")),this.quill.format("link",t,g.default.sources.USER)},list:function(t){var e=this.quill.getSelection(),n=this.quill.getFormat(e);"check"===t?"checked"===n.list||"unchecked"===n.list?this.quill.format("list",!1,g.default.sources.USER):this.quill.format("list","unchecked",g.default.sources.USER):this.quill.format("list",t,g.default.sources.USER)}}},e.default=k,e.addControls=u},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=3 x2=13 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=9 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=14 x2=4 y1=14 y2=14></line> <line class=ql-stroke x1=12 x2=6 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=15 x2=5 y1=14 y2=14></line> <line class=ql-stroke x1=15 x2=9 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=15 x2=3 y1=14 y2=14></line> <line class=ql-stroke x1=15 x2=3 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <g class="ql-fill ql-color-label"> <polygon points="6 6.868 6 6 5 6 5 7 5.942 7 6 6.868"></polygon> <rect height=1 width=1 x=4 y=4></rect> <polygon points="6.817 5 6 5 6 6 6.38 6 6.817 5"></polygon> <rect height=1 width=1 x=2 y=6></rect> <rect height=1 width=1 x=3 y=5></rect> <rect height=1 width=1 x=4 y=7></rect> <polygon points="4 11.439 4 11 3 11 3 12 3.755 12 4 11.439"></polygon> <rect height=1 width=1 x=2 y=12></rect> <rect height=1 width=1 x=2 y=9></rect> <rect height=1 width=1 x=2 y=15></rect> <polygon points="4.63 10 4 10 4 11 4.192 11 4.63 10"></polygon> <rect height=1 width=1 x=3 y=8></rect> <path d=M10.832,4.2L11,4.582V4H10.708A1.948,1.948,0,0,1,10.832,4.2Z></path> <path d=M7,4.582L7.168,4.2A1.929,1.929,0,0,1,7.292,4H7V4.582Z></path> <path d=M8,13H7.683l-0.351.8a1.933,1.933,0,0,1-.124.2H8V13Z></path> <rect height=1 width=1 x=12 y=2></rect> <rect height=1 width=1 x=11 y=3></rect> <path d=M9,3H8V3.282A1.985,1.985,0,0,1,9,3Z></path> <rect height=1 width=1 x=2 y=3></rect> <rect height=1 width=1 x=6 y=2></rect> <rect height=1 width=1 x=3 y=2></rect> <rect height=1 width=1 x=5 y=3></rect> <rect height=1 width=1 x=9 y=2></rect> <rect height=1 width=1 x=15 y=14></rect> <polygon points="13.447 10.174 13.469 10.225 13.472 10.232 13.808 11 14 11 14 10 13.37 10 13.447 10.174"></polygon> <rect height=1 width=1 x=13 y=7></rect> <rect height=1 width=1 x=15 y=5></rect> <rect height=1 width=1 x=14 y=6></rect> <rect height=1 width=1 x=15 y=8></rect> <rect height=1 width=1 x=14 y=9></rect> <path d=M3.775,14H3v1H4V14.314A1.97,1.97,0,0,1,3.775,14Z></path> <rect height=1 width=1 x=14 y=3></rect> <polygon points="12 6.868 12 6 11.62 6 12 6.868"></polygon> <rect height=1 width=1 x=15 y=2></rect> <rect height=1 width=1 x=12 y=5></rect> <rect height=1 width=1 x=13 y=4></rect> <polygon points="12.933 9 13 9 13 8 12.495 8 12.933 9"></polygon> <rect height=1 width=1 x=9 y=14></rect> <rect height=1 width=1 x=8 y=15></rect> <path d=M6,14.926V15H7V14.316A1.993,1.993,0,0,1,6,14.926Z></path> <rect height=1 width=1 x=5 y=15></rect> <path d=M10.668,13.8L10.317,13H10v1h0.792A1.947,1.947,0,0,1,10.668,13.8Z></path> <rect height=1 width=1 x=11 y=15></rect> <path d=M14.332,12.2a1.99,1.99,0,0,1,.166.8H15V12H14.245Z></path> <rect height=1 width=1 x=14 y=15></rect> <rect height=1 width=1 x=15 y=11></rect> </g> <polyline class=ql-stroke points="5.5 13 9 5 12.5 13"></polyline> <line class=ql-stroke x1=11.63 x2=6.38 y1=11 y2=11></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class="ql-fill ql-stroke" height=3 width=3 x=4 y=5></rect> <rect class="ql-fill ql-stroke" height=3 width=3 x=11 y=5></rect> <path class="ql-even ql-fill ql-stroke" d=M7,8c0,4.031-3,5-3,5></path> <path class="ql-even ql-fill ql-stroke" d=M14,8c0,4.031-3,5-3,5></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-stroke d=M5,4H9.5A2.5,2.5,0,0,1,12,6.5v0A2.5,2.5,0,0,1,9.5,9H5A0,0,0,0,1,5,9V4A0,0,0,0,1,5,4Z></path> <path class=ql-stroke d=M5,9h5.5A2.5,2.5,0,0,1,13,11.5v0A2.5,2.5,0,0,1,10.5,14H5a0,0,0,0,1,0,0V9A0,0,0,0,1,5,9Z></path> </svg>'},function(t,e){t.exports='<svg class="" viewbox="0 0 18 18"> <line class=ql-stroke x1=5 x2=13 y1=3 y2=3></line> <line class=ql-stroke x1=6 x2=9.35 y1=12 y2=3></line> <line class=ql-stroke x1=11 x2=15 y1=11 y2=15></line> <line class=ql-stroke x1=15 x2=11 y1=11 y2=15></line> <rect class=ql-fill height=1 rx=0.5 ry=0.5 width=7 x=2 y=14></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class="ql-color-label ql-stroke ql-transparent" x1=3 x2=15 y1=15 y2=15></line> <polyline class=ql-stroke points="5.5 11 9 3 12.5 11"></polyline> <line class=ql-stroke x1=11.63 x2=6.38 y1=9 y2=9></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class="ql-stroke ql-fill" points="3 11 5 9 3 7 3 11"></polygon> <line class="ql-stroke ql-fill" x1=15 x2=11 y1=4 y2=4></line> <path class=ql-fill d=M11,3a3,3,0,0,0,0,6h1V3H11Z></path> <rect class=ql-fill height=11 width=1 x=11 y=4></rect> <rect class=ql-fill height=11 width=1 x=13 y=4></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class="ql-stroke ql-fill" points="15 12 13 10 15 8 15 12"></polygon> <line class="ql-stroke ql-fill" x1=9 x2=5 y1=4 y2=4></line> <path class=ql-fill d=M5,3A3,3,0,0,0,5,9H6V3H5Z></path> <rect class=ql-fill height=11 width=1 x=5 y=4></rect> <rect class=ql-fill height=11 width=1 x=7 y=4></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M14,16H4a1,1,0,0,1,0-2H14A1,1,0,0,1,14,16Z /> <path class=ql-fill d=M14,4H4A1,1,0,0,1,4,2H14A1,1,0,0,1,14,4Z /> <rect class=ql-fill x=3 y=6 width=12 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M13,16H5a1,1,0,0,1,0-2h8A1,1,0,0,1,13,16Z /> <path class=ql-fill d=M13,4H5A1,1,0,0,1,5,2h8A1,1,0,0,1,13,4Z /> <rect class=ql-fill x=2 y=6 width=14 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15,8H13a1,1,0,0,1,0-2h2A1,1,0,0,1,15,8Z /> <path class=ql-fill d=M15,12H13a1,1,0,0,1,0-2h2A1,1,0,0,1,15,12Z /> <path class=ql-fill d=M15,16H5a1,1,0,0,1,0-2H15A1,1,0,0,1,15,16Z /> <path class=ql-fill d=M15,4H5A1,1,0,0,1,5,2H15A1,1,0,0,1,15,4Z /> <rect class=ql-fill x=2 y=6 width=8 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M5,8H3A1,1,0,0,1,3,6H5A1,1,0,0,1,5,8Z /> <path class=ql-fill d=M5,12H3a1,1,0,0,1,0-2H5A1,1,0,0,1,5,12Z /> <path class=ql-fill d=M13,16H3a1,1,0,0,1,0-2H13A1,1,0,0,1,13,16Z /> <path class=ql-fill d=M13,4H3A1,1,0,0,1,3,2H13A1,1,0,0,1,13,4Z /> <rect class=ql-fill x=8 y=6 width=8 height=6 rx=1 ry=1 transform="translate(24 18) rotate(-180)"/> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M11.759,2.482a2.561,2.561,0,0,0-3.53.607A7.656,7.656,0,0,0,6.8,6.2C6.109,9.188,5.275,14.677,4.15,14.927a1.545,1.545,0,0,0-1.3-.933A0.922,0.922,0,0,0,2,15.036S1.954,16,4.119,16s3.091-2.691,3.7-5.553c0.177-.826.36-1.726,0.554-2.6L8.775,6.2c0.381-1.421.807-2.521,1.306-2.676a1.014,1.014,0,0,0,1.02.56A0.966,0.966,0,0,0,11.759,2.482Z></path> <rect class=ql-fill height=1.6 rx=0.8 ry=0.8 width=5 x=5.15 y=6.2></rect> <path class=ql-fill d=M13.663,12.027a1.662,1.662,0,0,1,.266-0.276q0.193,0.069.456,0.138a2.1,2.1,0,0,0,.535.069,1.075,1.075,0,0,0,.767-0.3,1.044,1.044,0,0,0,.314-0.8,0.84,0.84,0,0,0-.238-0.619,0.8,0.8,0,0,0-.594-0.239,1.154,1.154,0,0,0-.781.3,4.607,4.607,0,0,0-.781,1q-0.091.15-.218,0.346l-0.246.38c-0.068-.288-0.137-0.582-0.212-0.885-0.459-1.847-2.494-.984-2.941-0.8-0.482.2-.353,0.647-0.094,0.529a0.869,0.869,0,0,1,1.281.585c0.217,0.751.377,1.436,0.527,2.038a5.688,5.688,0,0,1-.362.467,2.69,2.69,0,0,1-.264.271q-0.221-.08-0.471-0.147a2.029,2.029,0,0,0-.522-0.066,1.079,1.079,0,0,0-.768.3A1.058,1.058,0,0,0,9,15.131a0.82,0.82,0,0,0,.832.852,1.134,1.134,0,0,0,.787-0.3,5.11,5.11,0,0,0,.776-0.993q0.141-.219.215-0.34c0.046-.076.122-0.194,0.223-0.346a2.786,2.786,0,0,0,.918,1.726,2.582,2.582,0,0,0,2.376-.185c0.317-.181.212-0.565,0-0.494A0.807,0.807,0,0,1,14.176,15a5.159,5.159,0,0,1-.913-2.446l0,0Q13.487,12.24,13.663,12.027Z></path> </svg>'},function(t,e){t.exports='<svg viewBox="0 0 18 18"> <path class=ql-fill d=M10,4V14a1,1,0,0,1-2,0V10H3v4a1,1,0,0,1-2,0V4A1,1,0,0,1,3,4V8H8V4a1,1,0,0,1,2,0Zm6.06787,9.209H14.98975V7.59863a.54085.54085,0,0,0-.605-.60547h-.62744a1.01119,1.01119,0,0,0-.748.29688L11.645,8.56641a.5435.5435,0,0,0-.022.8584l.28613.30762a.53861.53861,0,0,0,.84717.0332l.09912-.08789a1.2137,1.2137,0,0,0,.2417-.35254h.02246s-.01123.30859-.01123.60547V13.209H12.041a.54085.54085,0,0,0-.605.60547v.43945a.54085.54085,0,0,0,.605.60547h4.02686a.54085.54085,0,0,0,.605-.60547v-.43945A.54085.54085,0,0,0,16.06787,13.209Z /> </svg>'},function(t,e){t.exports='<svg viewBox="0 0 18 18"> <path class=ql-fill d=M16.73975,13.81445v.43945a.54085.54085,0,0,1-.605.60547H11.855a.58392.58392,0,0,1-.64893-.60547V14.0127c0-2.90527,3.39941-3.42187,3.39941-4.55469a.77675.77675,0,0,0-.84717-.78125,1.17684,1.17684,0,0,0-.83594.38477c-.2749.26367-.561.374-.85791.13184l-.4292-.34082c-.30811-.24219-.38525-.51758-.1543-.81445a2.97155,2.97155,0,0,1,2.45361-1.17676,2.45393,2.45393,0,0,1,2.68408,2.40918c0,2.45312-3.1792,2.92676-3.27832,3.93848h2.79443A.54085.54085,0,0,1,16.73975,13.81445ZM9,3A.99974.99974,0,0,0,8,4V8H3V4A1,1,0,0,0,1,4V14a1,1,0,0,0,2,0V10H8v4a1,1,0,0,0,2,0V4A.99974.99974,0,0,0,9,3Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=13 y1=4 y2=4></line> <line class=ql-stroke x1=5 x2=11 y1=14 y2=14></line> <line class=ql-stroke x1=8 x2=10 y1=14 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class=ql-stroke height=10 width=12 x=3 y=4></rect> <circle class=ql-fill cx=6 cy=7 r=1></circle> <polyline class="ql-even ql-fill" points="5 12 5 11 7 9 8 10 11 7 13 9 13 12 5 12"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class="ql-fill ql-stroke" points="3 7 3 11 5 9 3 7"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class=ql-stroke points="5 7 5 11 3 9 5 7"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=11 y1=7 y2=11></line> <path class="ql-even ql-stroke" d=M8.9,4.577a3.476,3.476,0,0,1,.36,4.679A3.476,3.476,0,0,1,4.577,8.9C3.185,7.5,2.035,6.4,4.217,4.217S7.5,3.185,8.9,4.577Z></path> <path class="ql-even ql-stroke" d=M13.423,9.1a3.476,3.476,0,0,0-4.679-.36,3.476,3.476,0,0,0,.36,4.679c1.392,1.392,2.5,2.542,4.679.36S14.815,10.5,13.423,9.1Z></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=7 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=7 x2=15 y1=14 y2=14></line> <line class="ql-stroke ql-thin" x1=2.5 x2=4.5 y1=5.5 y2=5.5></line> <path class=ql-fill d=M3.5,6A0.5,0.5,0,0,1,3,5.5V3.085l-0.276.138A0.5,0.5,0,0,1,2.053,3c-0.124-.247-0.023-0.324.224-0.447l1-.5A0.5,0.5,0,0,1,4,2.5v3A0.5,0.5,0,0,1,3.5,6Z></path> <path class="ql-stroke ql-thin" d=M4.5,10.5h-2c0-.234,1.85-1.076,1.85-2.234A0.959,0.959,0,0,0,2.5,8.156></path> <path class="ql-stroke ql-thin" d=M2.5,14.846a0.959,0.959,0,0,0,1.85-.109A0.7,0.7,0,0,0,3.75,14a0.688,0.688,0,0,0,.6-0.736,0.959,0.959,0,0,0-1.85-.109></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=6 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=6 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=6 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=3 y1=4 y2=4></line> <line class=ql-stroke x1=3 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=3 x2=3 y1=14 y2=14></line> </svg>'},function(t,e){t.exports='<svg class="" viewbox="0 0 18 18"> <line class=ql-stroke x1=9 x2=15 y1=4 y2=4></line> <polyline class=ql-stroke points="3 4 4 5 6 3"></polyline> <line class=ql-stroke x1=9 x2=15 y1=14 y2=14></line> <polyline class=ql-stroke points="3 14 4 15 6 13"></polyline> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class=ql-stroke points="3 9 4 10 6 8"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15.5,15H13.861a3.858,3.858,0,0,0,1.914-2.975,1.8,1.8,0,0,0-1.6-1.751A1.921,1.921,0,0,0,12.021,11.7a0.50013,0.50013,0,1,0,.957.291h0a0.914,0.914,0,0,1,1.053-.725,0.81,0.81,0,0,1,.744.762c0,1.076-1.16971,1.86982-1.93971,2.43082A1.45639,1.45639,0,0,0,12,15.5a0.5,0.5,0,0,0,.5.5h3A0.5,0.5,0,0,0,15.5,15Z /> <path class=ql-fill d=M9.65,5.241a1,1,0,0,0-1.409.108L6,7.964,3.759,5.349A1,1,0,0,0,2.192,6.59178Q2.21541,6.6213,2.241,6.649L4.684,9.5,2.241,12.35A1,1,0,0,0,3.71,13.70722q0.02557-.02768.049-0.05722L6,11.036,8.241,13.65a1,1,0,1,0,1.567-1.24277Q9.78459,12.3777,9.759,12.35L7.316,9.5,9.759,6.651A1,1,0,0,0,9.65,5.241Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15.5,7H13.861a4.015,4.015,0,0,0,1.914-2.975,1.8,1.8,0,0,0-1.6-1.751A1.922,1.922,0,0,0,12.021,3.7a0.5,0.5,0,1,0,.957.291,0.917,0.917,0,0,1,1.053-.725,0.81,0.81,0,0,1,.744.762c0,1.077-1.164,1.925-1.934,2.486A1.423,1.423,0,0,0,12,7.5a0.5,0.5,0,0,0,.5.5h3A0.5,0.5,0,0,0,15.5,7Z /> <path class=ql-fill d=M9.651,5.241a1,1,0,0,0-1.41.108L6,7.964,3.759,5.349a1,1,0,1,0-1.519,1.3L4.683,9.5,2.241,12.35a1,1,0,1,0,1.519,1.3L6,11.036,8.241,13.65a1,1,0,0,0,1.519-1.3L7.317,9.5,9.759,6.651A1,1,0,0,0,9.651,5.241Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class="ql-stroke ql-thin" x1=15.5 x2=2.5 y1=8.5 y2=9.5></line> <path class=ql-fill d=M9.007,8C6.542,7.791,6,7.519,6,6.5,6,5.792,7.283,5,9,5c1.571,0,2.765.679,2.969,1.309a1,1,0,0,0,1.9-.617C13.356,4.106,11.354,3,9,3,6.2,3,4,4.538,4,6.5a3.2,3.2,0,0,0,.5,1.843Z></path> <path class=ql-fill d=M8.984,10C11.457,10.208,12,10.479,12,11.5c0,0.708-1.283,1.5-3,1.5-1.571,0-2.765-.679-2.969-1.309a1,1,0,1,0-1.9.617C4.644,13.894,6.646,15,9,15c2.8,0,5-1.538,5-3.5a3.2,3.2,0,0,0-.5-1.843Z></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-stroke d=M5,3V9a4.012,4.012,0,0,0,4,4H9a4.012,4.012,0,0,0,4-4V3></path> <rect class=ql-fill height=1 rx=0.5 ry=0.5 width=12 x=3 y=15></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class=ql-stroke height=12 width=12 x=3 y=3></rect> <rect class=ql-fill height=12 width=1 x=5 y=3></rect> <rect class=ql-fill height=12 width=1 x=12 y=3></rect> <rect class=ql-fill height=2 width=8 x=5 y=8></rect> <rect class=ql-fill height=1 width=3 x=3 y=5></rect> <rect class=ql-fill height=1 width=3 x=3 y=7></rect> <rect class=ql-fill height=1 width=3 x=3 y=10></rect> <rect class=ql-fill height=1 width=3 x=3 y=12></rect> <rect class=ql-fill height=1 width=3 x=12 y=5></rect> <rect class=ql-fill height=1 width=3 x=12 y=7></rect> <rect class=ql-fill height=1 width=3 x=12 y=10></rect> <rect class=ql-fill height=1 width=3 x=12 y=12></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class=ql-stroke points="7 11 9 13 11 11 7 11"></polygon> <polygon class=ql-stroke points="7 7 9 5 11 7 7 7"></polygon> </svg>'},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BubbleTooltip=void 0;var a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=n(2),c=r(u),f=n(9),h=r(f),p=n(44),d=r(p),y=n(22),v=n(26),b=r(v),g=[["bold","italic","link"],[{header:1},{header:2},"blockquote"]],m=function(t){function e(t,n){o(this,e),null!=n.modules.toolbar&&null==n.modules.toolbar.container&&(n.modules.toolbar.container=g);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.container.classList.add("ql-bubble"),r}return l(e,t),s(e,[{key:"extendToolbar",value:function(t){this.tooltip=new _(this.quill,this.options.bounds),this.tooltip.root.appendChild(t.container),this.buildButtons([].slice.call(t.container.querySelectorAll("button")),b.default),this.buildPickers([].slice.call(t.container.querySelectorAll("select")),b.default)}}]),e}(d.default);m.DEFAULTS=(0,c.default)(!0,{},d.default.DEFAULTS,{modules:{toolbar:{handlers:{link:function(t){t?this.quill.theme.tooltip.edit():this.quill.format("link",!1)}}}}});var _=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.on(h.default.events.EDITOR_CHANGE,function(t,e,n,o){if(t===h.default.events.SELECTION_CHANGE)if(null!=e&&e.length>0&&o===h.default.sources.USER){r.show(),r.root.style.left="0px",r.root.style.width="",r.root.style.width=r.root.offsetWidth+"px";var i=r.quill.getLines(e.index,e.length);if(1===i.length)r.position(r.quill.getBounds(e));else{var l=i[i.length-1],a=r.quill.getIndex(l),s=Math.min(l.length()-1,e.index+e.length-a),u=r.quill.getBounds(new y.Range(a,s));r.position(u)}}else document.activeElement!==r.textbox&&r.quill.hasFocus()&&r.hide()}),r}return l(e,t),s(e,[{key:"listen",value:function(){var t=this;a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"listen",this).call(this),this.root.querySelector(".ql-close").addEventListener("click",function(){t.root.classList.remove("ql-editing")}),this.quill.on(h.default.events.SCROLL_OPTIMIZE,function(){setTimeout(function(){if(!t.root.classList.contains("ql-hidden")){var e=t.quill.getSelection();null!=e&&t.position(t.quill.getBounds(e))}},1)})}},{key:"cancel",value:function(){this.show()}},{key:"position",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"position",this).call(this,t),r=this.root.querySelector(".ql-tooltip-arrow");if(r.style.marginLeft="",0===n)return n;r.style.marginLeft=-1*n-r.offsetWidth/2+"px"}}]),e}(p.BaseTooltip);_.TEMPLATE=['<span class="ql-tooltip-arrow"></span>','<div class="ql-tooltip-editor">','<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">','<a class="ql-close"></a>',"</div>"].join(""),e.BubbleTooltip=_,e.default=m},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(2),f=r(c),h=n(9),p=r(h),d=n(44),y=r(d),v=n(15),b=r(v),g=n(22),m=n(26),_=r(m),O=[[{header:["1","2","3",!1]}],["bold","italic","underline","link"],[{list:"ordered"},{list:"bullet"}],["clean"]],w=function(t){function e(t,n){o(this,e),null!=n.modules.toolbar&&null==n.modules.toolbar.container&&(n.modules.toolbar.container=O);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.container.classList.add("ql-snow"),r}return l(e,t),u(e,[{key:"extendToolbar",value:function(t){t.container.classList.add("ql-snow"),this.buildButtons([].slice.call(t.container.querySelectorAll("button")),_.default),this.buildPickers([].slice.call(t.container.querySelectorAll("select")),_.default),this.tooltip=new x(this.quill,this.options.bounds),t.container.querySelector(".ql-link")&&this.quill.keyboard.addBinding({key:"K",shortKey:!0},function(e,n){t.handlers.link.call(t,!n.format.link)})}}]),e}(y.default);w.DEFAULTS=(0,f.default)(!0,{},y.default.DEFAULTS,{modules:{toolbar:{handlers:{link:function(t){if(t){var e=this.quill.getSelection();if(null==e||0==e.length)return;var n=this.quill.getText(e);/^\S+@\S+\.\S+$/.test(n)&&0!==n.indexOf("mailto:")&&(n="mailto:"+n);this.quill.theme.tooltip.edit("link",n)}else this.quill.format("link",!1)}}}}});var x=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.preview=r.root.querySelector("a.ql-preview"),r}return l(e,t),u(e,[{key:"listen",value:function(){var t=this;s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"listen",this).call(this),this.root.querySelector("a.ql-action").addEventListener("click",function(e){t.root.classList.contains("ql-editing")?t.save():t.edit("link",t.preview.textContent),e.preventDefault()}),this.root.querySelector("a.ql-remove").addEventListener("click",function(e){if(null!=t.linkRange){var n=t.linkRange;t.restoreFocus(),t.quill.formatText(n,"link",!1,p.default.sources.USER),delete t.linkRange}e.preventDefault(),t.hide()}),this.quill.on(p.default.events.SELECTION_CHANGE,function(e,n,r){if(null!=e){if(0===e.length&&r===p.default.sources.USER){var o=t.quill.scroll.descendant(b.default,e.index),i=a(o,2),l=i[0],s=i[1];if(null!=l){t.linkRange=new g.Range(e.index-s,l.length());var u=b.default.formats(l.domNode);return t.preview.textContent=u,t.preview.setAttribute("href",u),t.show(),void t.position(t.quill.getBounds(t.linkRange))}}else delete t.linkRange;t.hide()}})}},{key:"show",value:function(){s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"show",this).call(this),this.root.removeAttribute("data-mode")}}]),e}(d.BaseTooltip);x.TEMPLATE=['<a class="ql-preview" target="_blank" href="about:blank"></a>','<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">','<a class="ql-action"></a>','<a class="ql-remove"></a>'].join(""),e.default=w}]).default});
-//# sourceMappingURL=quill.min.js.map
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/js/site.js b/Oqtane.Client/wwwroot/js/site.js
deleted file mode 100644
index 139597f9..00000000
--- a/Oqtane.Client/wwwroot/js/site.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Oqtane.Client/wwwroot/loading.gif b/Oqtane.Client/wwwroot/loading.gif
deleted file mode 100644
index cc70a7a8..00000000
Binary files a/Oqtane.Client/wwwroot/loading.gif and /dev/null differ
diff --git a/Oqtane.Client/wwwroot/oqtane.png b/Oqtane.Client/wwwroot/oqtane.png
deleted file mode 100644
index 8d18cc15..00000000
Binary files a/Oqtane.Client/wwwroot/oqtane.png and /dev/null differ
diff --git a/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
similarity index 66%
rename from Oqtane.Framework.nuspec
rename to Oqtane.Package/Oqtane.Framework.nuspec
index 50e48e6f..b537a230 100644
--- a/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>0.0.1</version>
+    <version>0.9.0</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -17,8 +17,9 @@
     <summary>A modular application framework for Blazor</summary>
   </metadata>
   <files>
-    <file src="Oqtane.Client\bin\Release\netstandard2.0\Oqtane.Client.dll" target="lib" /> 
-    <file src="Oqtane.Server\bin\Release\netcoreapp3.0\Oqtane.Server.dll" target="lib" /> 
-    <file src="Oqtane.Shared\bin\Release\netstandard2.0\Oqtane.Shared.dll" target="lib" /> 
+    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib" /> 
+    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" target="lib" /> 
   </files>
 </package>
\ No newline at end of file
diff --git a/Oqtane.Package/nuget.exe b/Oqtane.Package/nuget.exe
new file mode 100644
index 00000000..3ae0060a
Binary files /dev/null and b/Oqtane.Package/nuget.exe differ
diff --git a/Oqtane.Package/pack.cmd b/Oqtane.Package/pack.cmd
new file mode 100644
index 00000000..aea8d441
--- /dev/null
+++ b/Oqtane.Package/pack.cmd
@@ -0,0 +1,3 @@
+DEL "*.nupkg"
+nuget.exe pack Oqtane.Framework.nuspec
+ 
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs
index dc4bf37b..0bbdde97 100644
--- a/Oqtane.Server/Controllers/AliasController.cs
+++ b/Oqtane.Server/Controllers/AliasController.cs
@@ -1,27 +1,31 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure;
 using System.Linq;
 using System;
 using System.Net;
 using System.Globalization;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+using Microsoft.AspNetCore.Http;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class AliasController : Controller
     {
         private readonly IAliasRepository _aliases;
+        private readonly IHttpContextAccessor _accessor;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public AliasController(IAliasRepository aliases, ISyncManager syncManager, ILogManager logger)
+        public AliasController(IAliasRepository aliases, IHttpContextAccessor accessor, ISyncManager syncManager, ILogManager logger)
         {
             _aliases = aliases;
+            _accessor = accessor;
             _syncManager = syncManager;
             _logger = logger;
         }
@@ -42,30 +46,42 @@ namespace Oqtane.Controllers
             return _aliases.GetAlias(id);
         }
 
-        // GET api/<controller>/name/localhost:12345?lastsyncdate=yyyyMMddHHmmssfff
+        // GET api/<controller>/name/xxx?sync=yyyyMMddHHmmssfff
         [HttpGet("name/{name}")]
-        public Alias Get(string name, string lastsyncdate)
+        public Alias Get(string name, string sync)
         {
-            name = WebUtility.UrlDecode(name);
-            List<Alias> aliases = _aliases.GetAliases().ToList();
+            List<Alias> aliases = _aliases.GetAliases().ToList(); // cached
             Alias alias = null;
-            alias = aliases.FirstOrDefault(item => item.Name == name);
-            if (name != null && (alias == null && name.Contains("/")))
+            if (_accessor.HttpContext != null)
             {
-                // lookup alias without folder name
-                alias = aliases.Find(item => item.Name == name.Substring(0, name.IndexOf("/", StringComparison.Ordinal)));
+                name = (name == "~") ? "" : name;
+                name = _accessor.HttpContext.Request.Host.Value + "/" + WebUtility.UrlDecode(name);
+                var segments = name.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+
+                // iterate segments in reverse order
+                for (int i = segments.Length; i > 0; i--)
+                {
+                    name = string.Join("/", segments, 0, i);
+                    alias = aliases.Find(item => item.Name == name);
+                    if (alias != null)
+                    {
+                        break; // found a matching alias
+                    }
+                }
             }
-            if (alias == null && aliases.Count > 0)
+            if (alias == null && aliases.Any())
             {
                 // use first alias if name does not exist
                 alias = aliases.FirstOrDefault();
             }
 
             // get sync events
-            alias.SyncDate = DateTime.UtcNow;
-            alias.SyncEvents = _syncManager.GetSyncEvents(DateTime.ParseExact(lastsyncdate, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
-
-            return alias; 
+            if (alias != null)
+            {
+                alias.SyncDate = DateTime.UtcNow;
+                alias.SyncEvents = _syncManager.GetSyncEvents(alias.TenantId, DateTime.ParseExact(sync, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
+            }
+            return alias;
         }
         
         // POST api/<controller>
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index 4cc7ac9a..6c3223c9 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -2,8 +2,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Oqtane.Infrastructure;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System;
@@ -15,10 +13,15 @@ using Oqtane.Security;
 using System.Linq;
 using System.Drawing;
 using System.Net;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+
+// ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class FileController : Controller
     {
         private readonly IWebHostEnvironment _environment;
@@ -78,22 +81,22 @@ namespace Oqtane.Controllers
             Folder folder = _folders.GetFolder(siteId, folderPath);
             List<Models.File> files;
             if (folder != null)
+            {
                 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);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Folder {folder}", folder);
                     HttpContext.Response.StatusCode = 401;
                     return null;
                 }
+            }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "Folder not found {path}",
-                    path);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "Folder Not Found {SiteId} {Path}", siteId, path);
+                HttpContext.Response.StatusCode = 404;
                 return null;
             }
 
@@ -105,14 +108,23 @@ namespace Oqtane.Controllers
         public Models.File Get(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+            if (file != null)
             {
-                return file;
+                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;
+                }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {File}", file);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Not Found {FileId}", id);
+                HttpContext.Response.StatusCode = 404;
                 return null;
             }
         }
@@ -143,22 +155,30 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (_userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
+            if (file != null)
             {
-                _files.DeleteFile(id);
-
-                string filepath = Path.Combine(GetFolderPath(file.Folder) + file.Name);
-                if (System.IO.File.Exists(filepath))
+                if (_userPermissions.IsAuthorized(User, EntityNames.Folder, file.Folder.FolderId, PermissionNames.Edit))
                 {
-                    System.IO.File.Delete(filepath);
-                }
+                    _files.DeleteFile(id);
 
-                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
+                    string filepath = Path.Combine(GetFolderPath(file.Folder), file.Name);
+                    if (System.IO.File.Exists(filepath))
+                    {
+                        System.IO.File.Delete(filepath);
+                    }
+
+                    _logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
+                }
+                else
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete File {FileId}", id);
+                    HttpContext.Response.StatusCode = 401;
+                }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "User Not Authorized To Delete File {FileId}", id);
-                HttpContext.Response.StatusCode = 401;
+                _logger.Log(LogLevel.Error, this, LogFunction.Delete, "File Not Found {FileId}", id);
+                HttpContext.Response.StatusCode = 404;
             }
         }
 
@@ -170,23 +190,24 @@ namespace Oqtane.Controllers
             Folder folder = _folders.GetFolder(int.Parse(folderid));
             if (folder != null && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.Permissions))
             {
-                string folderpath = GetFolderPath(folder);
-                CreateDirectory(folderpath);
+                string folderPath = GetFolderPath(folder);
+                CreateDirectory(folderPath);
                 string filename = url.Substring(url.LastIndexOf("/", StringComparison.Ordinal) + 1);
                 // check for allowable file extensions
                 if (Constants.UploadableFiles.Contains(Path.GetExtension(filename).Replace(".", "")))
                 {
                     try
                     {
-                        var client = new System.Net.WebClient();
+                        var client = new WebClient();
+                        string targetPath = Path.Combine(folderPath, filename);
                         // remove file if it already exists
-                        if (System.IO.File.Exists(folderpath + filename))
+                        if (System.IO.File.Exists(targetPath))
                         {
-                            System.IO.File.Delete(folderpath + filename);
+                            System.IO.File.Delete(targetPath);
                         }
 
-                        client.DownloadFile(url, folderpath + filename);
-                        _files.AddFile(CreateFile(filename, folder.FolderId, folderpath + filename));
+                        client.DownloadFile(url, targetPath);
+                        _files.AddFile(CreateFile(filename, folder.FolderId, targetPath));
                     }
                     catch
                     {
@@ -202,7 +223,6 @@ namespace Oqtane.Controllers
             {
                 _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Download File {Url} {FolderId}", url, folderid);
                 HttpContext.Response.StatusCode = 401;
-                file = null;
             }
 
             return file;
@@ -214,36 +234,36 @@ namespace Oqtane.Controllers
         {
             if (file.Length > 0)
             {
-                string folderpath = "";
-                int folderid = -1;
-                if (int.TryParse(folder, out folderid))
+                string folderPath = "";
+
+                if (int.TryParse(folder, out int folderId))
                 {
-                    Folder Folder = _folders.GetFolder(folderid);
-                    if (Folder != null && _userPermissions.IsAuthorized(User, PermissionNames.Edit, Folder.Permissions))
+                    Folder virtualFolder = _folders.GetFolder(folderId);
+                    if (virtualFolder != null && _userPermissions.IsAuthorized(User, PermissionNames.Edit, virtualFolder.Permissions))
                     {
-                        folderpath = GetFolderPath(Folder);
+                        folderPath = GetFolderPath(virtualFolder);
                     }
                 }
                 else
                 {
                     if (User.IsInRole(Constants.HostRole))
                     {
-                        folderpath = GetFolderPath(folder);
+                        folderPath = GetFolderPath(folder);
                     }
                 }
 
-                if (folderpath != "")
+                if (folderPath != "")
                 {
-                    CreateDirectory(folderpath);
-                    using (var stream = new FileStream(Path.Combine(folderpath, file.FileName), FileMode.Create))
+                    CreateDirectory(folderPath);
+                    using (var stream = new FileStream(Path.Combine(folderPath, file.FileName), FileMode.Create))
                     {
                         await file.CopyToAsync(stream);
                     }
 
-                    string upload = await MergeFile(folderpath, file.FileName);
-                    if (upload != "" && folderid != -1)
+                    string upload = await MergeFile(folderPath, file.FileName);
+                    if (upload != "" && folderId != -1)
                     {
-                        _files.AddFile(CreateFile(upload, folderid, folderpath + upload));
+                        _files.AddFile(CreateFile(upload, folderId, Path.Combine(folderPath, upload)));
                     }
                 }
                 else
@@ -341,7 +361,7 @@ namespace Oqtane.Controllers
             {
                 int attempts = 0;
                 bool locked = true;
-                while (attempts < 5 && locked == true)
+                while (attempts < 5 && locked)
                 {
                     try
                     {
@@ -377,37 +397,46 @@ namespace Oqtane.Controllers
         public IActionResult Download(int id)
         {
             Models.File file = _files.GetFile(id);
-            if (file != null && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
+            if (file != null)
             {
-                string filepath = GetFolderPath(file.Folder) + file.Name;
-                if (System.IO.File.Exists(filepath))
+                if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
                 {
-                    byte[] filebytes = System.IO.File.ReadAllBytes(filepath);
-                    return File(filebytes, "application/octet-stream", file.Name);
+                    string filepath = Path.Combine(GetFolderPath(file.Folder) , file.Name);
+                    if (System.IO.File.Exists(filepath))
+                    {
+                        byte[] filebytes = System.IO.File.ReadAllBytes(filepath);
+                        return File(filebytes, "application/octet-stream", file.Name);
+                    }
+                    else
+                    {
+                        _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {FileId} {FilePath}", id, filepath);
+                        HttpContext.Response.StatusCode = 404;
+                        return null;
+                    }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {File}", file);
-                    HttpContext.Response.StatusCode = 404;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
+                    HttpContext.Response.StatusCode = 401;
                     return null;
                 }
             }
             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 Not Found {FileId}", id);
+                HttpContext.Response.StatusCode = 404;
                 return null;
             }
         }
 
         private string GetFolderPath(Folder folder)
         {
-            return _environment.ContentRootPath + "\\Content\\Tenants\\" + _tenants.GetTenant().TenantId.ToString() + "\\Sites\\" + folder.SiteId.ToString() + "\\" + folder.Path;
+            return Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", _tenants.GetTenant().TenantId.ToString(), "Sites", folder.SiteId.ToString(), folder.Path);
         }
 
         private string GetFolderPath(string folder)
         {
-            return Path.Combine(_environment.WebRootPath, folder);
+            return Utilities.PathCombine(_environment.WebRootPath, folder);
         }
 
         private void CreateDirectory(string folderpath)
@@ -415,10 +444,11 @@ namespace Oqtane.Controllers
             if (!Directory.Exists(folderpath))
             {
                 string path = "";
-                string[] folders = folderpath.Split(new char[] {'\\'}, StringSplitOptions.RemoveEmptyEntries);
+                var separators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar };
+                string[] folders = folderpath.Split(separators, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string folder in folders)
                 {
-                    path += folder + "\\";
+                    path = Utilities.PathCombine(path, folder,"\\");
                     if (!Directory.Exists(path))
                     {
                         Directory.CreateDirectory(path);
diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs
index 24da6e17..68a01e23 100644
--- a/Oqtane.Server/Controllers/FolderController.cs
+++ b/Oqtane.Server/Controllers/FolderController.cs
@@ -1,17 +1,20 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
 using System.Net;
+using Oqtane.Enums;
+using Oqtane.Extensions;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 using Oqtane.Security;
+using System.IO;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class FolderController : Controller
     {
         private readonly IFolderRepository _folders;
@@ -86,61 +89,63 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Folder Post([FromBody] Folder Folder)
+        public Folder Post([FromBody] Folder folder)
         {
             if (ModelState.IsValid)
             {
                 string permissions;
-                if (Folder.ParentId != null)
+                if (folder.ParentId != null)
                 {
-                    permissions = _folders.GetFolder(Folder.ParentId.Value).Permissions;
+                    permissions = _folders.GetFolder(folder.ParentId.Value).Permissions;
                 }
                 else
                 {
-                    permissions = UserSecurity.SetPermissionStrings(new List<PermissionString> { new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole } });
+                    permissions = new List<Permission> {
+                        new Permission(PermissionNames.Edit, Constants.AdminRole, true),
+                    }.EncodePermissions();
                 }
                 if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
                 {
-                    if (string.IsNullOrEmpty(Folder.Path) && Folder.ParentId != null)
+                    if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null)
                     {
-                        Folder parent = _folders.GetFolder(Folder.ParentId.Value);
-                        Folder.Path = parent.Path + Folder.Name + "\\";
+                        Folder parent = _folders.GetFolder(folder.ParentId.Value);
+                        folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\");
                     }
-                    Folder = _folders.AddFolder(Folder);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", Folder);
+                    folder = _folders.AddFolder(folder);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "Folder Added {Folder}", folder);
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Folder {Folder}", Folder);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Folder {Folder}", folder);
                     HttpContext.Response.StatusCode = 401;
-                    Folder = null;
+                    folder = null;
                 }
             }
-            return Folder;
+            return folder;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Folder Put(int id, [FromBody] Folder Folder)
+        public Folder Put(int id, [FromBody] Folder folder)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, Folder.FolderId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
             {
-                if (string.IsNullOrEmpty(Folder.Path) && Folder.ParentId != null)
+                if (string.IsNullOrEmpty(folder.Path) && folder.ParentId != null)
                 {
-                    Folder parent = _folders.GetFolder(Folder.ParentId.Value);
-                    Folder.Path = parent.Path + Folder.Name + "\\";
+                    Folder parent = _folders.GetFolder(folder.ParentId.Value);
+                    folder.Path = Utilities.PathCombine(parent.Path, folder.Name,"\\");
                 }
-                Folder = _folders.UpdateFolder(Folder);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", Folder);
+                folder = _folders.UpdateFolder(folder);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Updated {Folder}", folder);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder {Folder}", Folder);
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Folder {Folder}", folder);
                 HttpContext.Response.StatusCode = 401;
-                Folder = null;
+                folder = null;
             }
-            return Folder;
+            return folder;
         }
 
         // PUT api/<controller>/?siteid=x&folderid=y&parentid=z
diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index 7f8b358f..b16f54f6 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -1,309 +1,59 @@
-using DbUp;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Shared;
-using System;
-using System.Data.SqlClient;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class InstallationController : Controller
     {
         private readonly IConfigurationRoot _config;
         private readonly IInstallationManager _installationManager;
+        private readonly IDatabaseManager _databaseManager;
 
-        public InstallationController(IConfigurationRoot config, IInstallationManager installationManager)
+        public InstallationController(IConfigurationRoot config, IInstallationManager installationManager, IDatabaseManager databaseManager)
         {
             _config = config;
             _installationManager = installationManager;
+            _databaseManager = databaseManager;
         }
 
         // POST api/<controller>
         [HttpPost]
-        public GenericResponse Post([FromBody] string connectionstring)
+        public Installation Post([FromBody] InstallConfig config)
         {
-            var response = new GenericResponse { Success = false, Message = "" };
+            var installation = new Installation {Success = false, Message = ""};
 
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && (User.IsInRole(Constants.HostRole) || string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
             {
-                bool master = false;
-                string defaultconnectionstring = _config.GetConnectionString("DefaultConnection");
-                if (string.IsNullOrEmpty(defaultconnectionstring) || connectionstring == defaultconnectionstring)
-                {
-                    master = true;
-                }
-
-                bool exists = false;
-                if (master)
-                {
-                    exists = IsInstalled().Success;
-                }
-
-                if (!exists)
-                {
-                    string datadirectory = AppDomain.CurrentDomain.GetData("DataDirectory").ToString();
-                    connectionstring = connectionstring.Replace("|DataDirectory|", datadirectory);
-
-                    SqlConnection connection = new SqlConnection(connectionstring);
-                    try
-                    {
-                        using (connection)
-                        {
-                            connection.Open();
-                        }
-                        exists = true;
-                    }
-                    catch
-                    {
-                        // database does not exist
-                    }
-
-                    // try to create database if it does not exist
-                    if (!exists)
-                    {
-                        string masterConnectionString = "";
-                        string databaseName = "";
-                        string[] fragments = connectionstring.Split(';', StringSplitOptions.RemoveEmptyEntries);
-                        foreach (string fragment in fragments)
-                        {
-                            if (fragment.ToLower().Contains("initial catalog=") || fragment.ToLower().Contains("database="))
-                            {
-                                databaseName = fragment.Substring(fragment.IndexOf("=") + 1);
-                            }
-                            else
-                            {
-                                if (!fragment.ToLower().Contains("attachdbfilename="))
-                                {
-                                    masterConnectionString += fragment + ";";
-                                }
-                            }
-                        }
-                        connection = new SqlConnection(masterConnectionString);
-                        try
-                        {
-                            using (connection)
-                            {
-                                connection.Open();
-                                SqlCommand command;
-                                if (connectionstring.ToLower().Contains("attachdbfilename=")) // LocalDB
-                                {
-                                    command = new SqlCommand("CREATE DATABASE [" + databaseName + "] ON ( NAME = '" + databaseName + "', FILENAME = '" + datadirectory + "\\" + databaseName + ".mdf')", connection);
-                                }
-                                else
-                                {
-                                    command = new SqlCommand("CREATE DATABASE [" + databaseName + "]", connection);
-                                }
-                                command.ExecuteNonQuery();
-                                exists = true;
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            response.Message = "Can Not Create Database - " + ex.Message;
-                        }
-
-                        // sleep to allow SQL server to attach new database
-                        Thread.Sleep(5000);
-                    }
-
-                    if (exists)
-                    {
-                        // get master initialization script and update connectionstring and alias in seed data
-                        string initializationScript = "";
-                        if (master)
-                        {
-                            using (StreamReader reader = new StreamReader(Directory.GetCurrentDirectory() + "\\Scripts\\Master.sql"))
-                            {
-                                initializationScript = reader.ReadToEnd();
-                            }
-                            initializationScript = initializationScript.Replace("{ConnectionString}", connectionstring.Replace(datadirectory, "|DataDirectory|"));
-                            initializationScript = initializationScript.Replace("{Alias}", HttpContext.Request.Host.Value);
-                        }
-
-                        var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionstring)
-                            .WithScript(new DbUp.Engine.SqlScript("Master.sql", initializationScript))
-                            .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly()); // tenant scripts should be added to /Scripts folder as Embedded Resources
-                        var dbUpgrade = dbUpgradeConfig.Build();
-                        if (dbUpgrade.IsUpgradeRequired())
-                        {
-                            var result = dbUpgrade.PerformUpgrade();
-                            if (!result.Successful)
-                            {
-                                response.Message = result.Error.Message;
-                            }
-                            else
-                            {
-                                // update appsettings
-                                if (master)
-                                {
-                                    string config = "";
-                                    using (StreamReader reader = new StreamReader(Directory.GetCurrentDirectory() + "\\appsettings.json"))
-                                    {
-                                        config = reader.ReadToEnd();
-                                    }
-                                    connectionstring = connectionstring.Replace(datadirectory, "|DataDirectory|");
-                                    connectionstring = connectionstring.Replace(@"\", @"\\");
-                                    config = config.Replace("DefaultConnection\": \"", "DefaultConnection\": \"" + connectionstring);
-                                    using (StreamWriter writer = new StreamWriter(Directory.GetCurrentDirectory() + "\\appsettings.json"))
-                                    {
-                                        writer.WriteLine(config);
-                                    }
-                                    _config.Reload();
-                                }
-                                response.Success = true;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    response.Message = "Application Is Already Installed";
-                }
+                installation = _databaseManager.Install(config);
             }
-            return response;
+            else
+            {
+                installation.Message = "Installation Not Authorized";
+            }
+
+            return installation;
         }
 
         // GET api/<controller>/installed
         [HttpGet("installed")]
-        public GenericResponse IsInstalled()
+        public Installation IsInstalled()
         {
-            var response = new GenericResponse { Success = false, Message = "" };
-
-            string datadirectory = AppDomain.CurrentDomain.GetData("DataDirectory").ToString();
-            string connectionString = _config.GetConnectionString("DefaultConnection");
-            connectionString = connectionString.Replace("|DataDirectory|", datadirectory);
-
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                SqlConnection connection = new SqlConnection(connectionString);
-                try
-                {
-                    using (connection)
-                    {
-                        connection.Open();
-                    }
-                    response.Success = true;
-                }
-                catch
-                {
-                    // database does not exist
-                    response.Message = "Database Does Not Exist";
-                }
-            }
-            else
-            {
-                response.Message = "Connection String Has Not Been Specified In Oqtane.Server\\appsettings.json";
-            }
-
-            if (response.Success)
-            {
-                var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)
-                    .WithScript(new DbUp.Engine.SqlScript("Master.sql", ""));
-                var dbUpgrade = dbUpgradeConfig.Build();
-                response.Success = !dbUpgrade.IsUpgradeRequired();
-                if (!response.Success)
-                {
-                    response.Message = "Master Installation Scripts Have Not Been Executed";
-                }
-                else
-                {
-                    using (var db = new InstallationContext(connectionString))
-                    {
-                        ApplicationVersion version = db.ApplicationVersion.ToList().LastOrDefault();
-                        if (version == null || version.Version != Constants.Version)
-                        {
-                            version = new ApplicationVersion();
-                            version.Version = Constants.Version;
-                            version.CreatedOn = DateTime.UtcNow;
-                            db.ApplicationVersion.Add(version);
-                            db.SaveChanges();
-                        }
-                    }
-
-                    Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies()
-                        .Where(item => item.FullName.Contains(".Module.")).ToArray();
-
-                    // get tenants
-                    using (var db = new InstallationContext(connectionString))
-                    {
-                        foreach (Tenant tenant in db.Tenant.ToList())
-                        {
-                            connectionString = tenant.DBConnectionString;
-                            connectionString = connectionString.Replace("|DataDirectory|", datadirectory);
-
-                            // upgrade framework
-                            dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)
-                                .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly());
-                            dbUpgrade = dbUpgradeConfig.Build();
-                            if (dbUpgrade.IsUpgradeRequired())
-                            {
-                                var result = dbUpgrade.PerformUpgrade();
-                                if (!result.Successful)
-                                {
-                                    // TODO: log result.Error.Message - problem is logger is not available here
-                                }
-                            }
-                            // iterate through Oqtane module assemblies and execute any database scripts
-                            foreach (Assembly assembly in assemblies)
-                            {
-                                InstallModule(assembly, connectionString);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return response;
-        }
-
-        private void InstallModule(Assembly assembly, string connectionstring)
-        {
-            var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionstring)
-                .WithScriptsEmbeddedInAssembly(assembly); // scripts must be included as Embedded Resources
-            var dbUpgrade = dbUpgradeConfig.Build();
-            if (dbUpgrade.IsUpgradeRequired())
-            {
-                var result = dbUpgrade.PerformUpgrade();
-                if (!result.Successful)
-                {
-                    // TODO: log result.Error.Message - problem is logger is not available here
-                }
-            }
+            bool isInstalled = _databaseManager.IsInstalled();
+            return new Installation {Success = isInstalled, Message = string.Empty};
         }
 
         [HttpGet("upgrade")]
         [Authorize(Roles = Constants.HostRole)]
-        public GenericResponse Upgrade()
+        public Installation Upgrade()
         {
-            var response = new GenericResponse { Success = true, Message = "" };
+            var installation = new Installation {Success = true, Message = ""};
             _installationManager.UpgradeFramework();
-            return response;
+            return installation;
         }
     }
-
-    public class InstallationContext : DbContext
-    {
-        private readonly string _connectionString;
-
-        public InstallationContext(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-           => optionsBuilder.UseSqlServer(_connectionString);
-
-        public virtual DbSet<ApplicationVersion> ApplicationVersion { get; set; }
-        public virtual DbSet<Tenant> Tenant { get; set; }
-    }
 }
diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs
index 0f5bdea3..8e1993aa 100644
--- a/Oqtane.Server/Controllers/JobController.cs
+++ b/Oqtane.Server/Controllers/JobController.cs
@@ -1,17 +1,18 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure;
 using System;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class JobController : Controller
     {
         private readonly IJobRepository _jobs;
@@ -44,27 +45,27 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.HostRole)]
-        public Job Post([FromBody] Job Job)
+        public Job Post([FromBody] Job job)
         {
             if (ModelState.IsValid)
             {
-                Job = _jobs.AddJob(Job);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Added {Job}", Job);
+                job = _jobs.AddJob(job);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Added {Job}", job);
             }
-            return Job;
+            return job;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.HostRole)]
-        public Job Put(int id, [FromBody] Job Job)
+        public Job Put(int id, [FromBody] Job job)
         {
             if (ModelState.IsValid)
             {
-                Job = _jobs.UpdateJob(Job);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Updated {Job}", Job);
+                job = _jobs.UpdateJob(job);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Updated {Job}", job);
             }
-            return Job;
+            return job;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs
index 2d9d4b7e..0c3f8bc5 100644
--- a/Oqtane.Server/Controllers/JobLogController.cs
+++ b/Oqtane.Server/Controllers/JobLogController.cs
@@ -1,14 +1,15 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class JobLogController : Controller
     {
         private readonly IJobLogRepository _jobLogs;
@@ -39,27 +40,27 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.HostRole)]
-        public JobLog Post([FromBody] JobLog JobLog)
+        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);
+                jobLog = _jobLogs.AddJobLog(jobLog);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Job Log Added {JobLog}", jobLog);
             }
-            return JobLog;
+            return jobLog;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.HostRole)]
-        public JobLog Put(int id, [FromBody] JobLog JobLog)
+        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);
+                jobLog = _jobLogs.UpdateJobLog(jobLog);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Job Log Updated {JobLog}", jobLog);
             }
-            return JobLog;
+            return jobLog;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs
index 9942cf8b..8cccfd12 100644
--- a/Oqtane.Server/Controllers/LogController.cs
+++ b/Oqtane.Server/Controllers/LogController.cs
@@ -1,15 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Models;
 using System.Collections.Generic;
-using Oqtane.Repository;
-using Oqtane.Infrastructure;
 using Microsoft.AspNetCore.Authorization;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 using Oqtane.Shared;
 
 namespace Oqtane.Controllers
 {
 
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class LogController : Controller
     {
         private readonly ILogManager _logger;
@@ -39,11 +39,11 @@ namespace Oqtane.Controllers
 
         // POST api/<controller>
         [HttpPost]
-        public void Post([FromBody] Log Log)
+        public void Post([FromBody] Log log)
         {
             if (ModelState.IsValid)
             {
-                _logger.Log(Log);
+                _logger.Log(log);
             }
         }
     }
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index 40df2585..1afc13d6 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -1,17 +1,17 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
-using System.Reflection;
+using Oqtane.Enums;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class ModuleController : Controller
     {
         private readonly IModuleRepository _modules;
@@ -31,15 +31,15 @@ namespace Oqtane.Controllers
 
         // GET: api/<controller>?siteid=x
         [HttpGet]
-        public IEnumerable<Models.Module> Get(string siteid)
+        public IEnumerable<Module> Get(string siteid)
         {
             List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList();
-            List<Models.Module> modules = new List<Models.Module>();
+            List<Module> modules = new List<Module>();
             foreach (PageModule pagemodule in _pageModules.GetPageModules(int.Parse(siteid)))
             {
                 if (_userPermissions.IsAuthorized(User,PermissionNames.View, pagemodule.Module.Permissions))
                 {
-                    Models.Module module = new Models.Module();
+                    Module module = new Module();
                     module.SiteId = pagemodule.Module.SiteId;
                     module.ModuleDefinitionName = pagemodule.Module.ModuleDefinitionName;
                     module.Permissions = pagemodule.Module.Permissions;
@@ -67,9 +67,9 @@ namespace Oqtane.Controllers
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        public Models.Module Get(int id)
+        public Module Get(int id)
         {
-            Models.Module module = _modules.GetModule(id);
+            Module module = _modules.GetModule(id);
             if (_userPermissions.IsAuthorized(User,PermissionNames.View, module.Permissions))
             {
                 List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
@@ -87,39 +87,39 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Models.Module Post([FromBody] Models.Module Module)
+        public Module Post([FromBody] Module module)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, Module.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
             {
-                Module = _modules.AddModule(Module);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", Module);
+                module = _modules.AddModule(module);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", module);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Module {Module}", Module);
+                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Module {Module}", module);
                 HttpContext.Response.StatusCode = 401;
-                Module = null;
+                module = null;
             }
-            return Module;
+            return module;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Models.Module Put(int id, [FromBody] Models.Module Module)
+        public Module Put(int id, [FromBody] Module module)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, Module.ModuleId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
-                Module = _modules.UpdateModule(Module);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", Module);
+                module = _modules.UpdateModule(module);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", module);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Module {Module}", Module);
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Module {Module}", module);
                 HttpContext.Response.StatusCode = 401;
-                Module = null;
+                module = null;
             }
-            return Module;
+            return module;
         }
 
         // DELETE api/<controller>/5
@@ -160,12 +160,12 @@ namespace Oqtane.Controllers
         // POST api/<controller>/import?moduleid=x
         [HttpPost("import")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public bool Import(int moduleid, [FromBody] string Content)
+        public bool Import(int moduleid, [FromBody] string content)
         {
             bool success = false;
             if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, moduleid, PermissionNames.Edit))
             {
-                success = _modules.ImportModule(moduleid, Content);
+                success = _modules.ImportModule(moduleid, content);
             }
             else
             {
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index 10bd92e7..7ef9f7e1 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -1,33 +1,43 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Infrastructure;
 using System.IO;
 using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 using Oqtane.Security;
+using System;
+using Microsoft.Extensions.DependencyInjection;
+// ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class ModuleDefinitionController : Controller
     {
         private readonly IModuleDefinitionRepository _moduleDefinitions;
+        private readonly IModuleRepository _modules;
+        private readonly ITenantRepository _tenants;
         private readonly IUserPermissions _userPermissions;
         private readonly IInstallationManager _installationManager;
         private readonly IWebHostEnvironment _environment;
+        private readonly IServiceProvider _serviceProvider;
         private readonly ILogManager _logger;
 
-        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, ILogManager logger)
+        public ModuleDefinitionController(IModuleDefinitionRepository moduleDefinitions, IModuleRepository modules,ITenantRepository tenants, IUserPermissions userPermissions, IInstallationManager installationManager, IWebHostEnvironment environment, IServiceProvider serviceProvider, ILogManager logger)
         {
             _moduleDefinitions = moduleDefinitions;
+            _modules = modules;
+            _tenants = tenants;
             _userPermissions = userPermissions;
             _installationManager = installationManager;
             _environment = environment;
+            _serviceProvider = serviceProvider;
             _logger = logger;
         }
 
@@ -66,12 +76,12 @@ namespace Oqtane.Controllers
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.AdminRole)]
-        public void Put(int id, [FromBody] ModuleDefinition ModuleDefinition)
+        public void Put(int id, [FromBody] ModuleDefinition moduleDefinition)
         {
             if (ModelState.IsValid)
             {
-                _moduleDefinitions.UpdateModuleDefinition(ModuleDefinition);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", ModuleDefinition);
+                _moduleDefinitions.UpdateModuleDefinition(moduleDefinition);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", moduleDefinition);
             }
         }
 
@@ -88,39 +98,160 @@ namespace Oqtane.Controllers
         [Authorize(Roles = Constants.HostRole)]
         public void Delete(int id, int siteid)
         {
-            List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(siteid).ToList();
-            ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionId == id).FirstOrDefault();
+            ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, siteid);
             if (moduledefinition != null)
             {
-                string moduledefinitionname = moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","));
-
-                string folder = Path.Combine(_environment.WebRootPath, "Modules\\" + moduledefinitionname);
-                if (Directory.Exists(folder))
+                if (!string.IsNullOrEmpty(moduledefinition.ServerManagerType))
                 {
-                    Directory.Delete(folder, true);
+                    Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+                    if (moduletype != null && moduletype.GetInterface("IInstallable") != null)
+                    {
+                        foreach (Tenant tenant in _tenants.GetTenants())
+                        {
+                            try
+                            {
+                                var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
+                                ((IInstallable)moduleobject).Uninstall(tenant);
+                            }
+                            catch
+                            {
+                                // an error occurred executing the uninstall
+                            }
+                        }
+                    }
                 }
 
-                string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-                foreach (string file in Directory.EnumerateFiles(binfolder, moduledefinitionname + "*.dll"))
+                // format root assembly name
+                string assemblyname = Utilities.GetAssemblyName(moduledefinition.ModuleDefinitionName);
+                if (assemblyname != "Oqtane.Client")
                 {
-                    System.IO.File.Delete(file);
+                    assemblyname = assemblyname.Replace(".Client", "");
+
+                    // clean up module static resource folder
+                    string folder = Path.Combine(_environment.WebRootPath, Path.Combine("Modules",assemblyname));
+                    if (Directory.Exists(folder))
+                    {
+                        Directory.Delete(folder, true);
+                        _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Static Resources Removed For {AssemblynName}", assemblyname);
+                    }
+
+                    // remove module assembly from /bin
+                    string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                    foreach (string file in Directory.EnumerateFiles(binfolder, assemblyname + "*.*"))
+                    {
+                        System.IO.File.Delete(file);
+                        _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Assembly Removed {Filename}", file);
+                    }
                 }
 
+                // remove module definition
                 _moduleDefinitions.DeleteModuleDefinition(id, siteid);
-                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleDefinitionId}", id);
+                _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Definition Deleted {ModuleDefinitionName}", moduledefinition.Name);
+
+                // restart application
+                _installationManager.RestartApplication();
+            }
+        }
+
+        // GET api/<controller>/load/assembyname
+        [HttpGet("load/{assemblyname}")]
+        public IActionResult Load(string assemblyname)
+        {
+            if (Path.GetExtension(assemblyname).ToLower() == ".dll")
+            {
+                string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                byte[] file = System.IO.File.ReadAllBytes(Path.Combine(binfolder, assemblyname));
+                return File(file, "application/octet-stream", assemblyname);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Download Assembly {Assembly}", assemblyname);
+                HttpContext.Response.StatusCode = 401;
+                return null;
+            }
+        }
+
+        // POST api/<controller>?moduleid=x
+        [HttpPost]
+        [Authorize(Roles = Constants.HostRole)]
+        public void Post([FromBody] ModuleDefinition moduleDefinition, string moduleid)
+        {
+            if (ModelState.IsValid)
+            {
+                string rootPath;
+                DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
+                string templatePath = Utilities.PathCombine(rootFolder.FullName, "Oqtane.Client", "Modules", "Admin", "ModuleCreator", "Templates",moduleDefinition.Template,"\\");
+
+                if (moduleDefinition.Template == "internal")
+                {
+                    rootPath = Utilities.PathCombine(rootFolder.FullName,"\\");
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, Oqtane.Client";
+                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
+                }
+                else
+                {
+                    rootPath = Utilities.PathCombine(rootFolder.Parent.FullName , moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module","\\");
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Modules, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Client";                    
+                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Module.Server";
+                }
+
+                ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, moduleDefinition);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Definition Created {ModuleDefinition}", moduleDefinition);
+
+                Models.Module module = _modules.GetModule(int.Parse(moduleid));
+                module.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName;
+                _modules.UpdateModule(module);
+
+                if (moduleDefinition.Template == "internal")
+                {
+                     // need logic to add embedded scripts to Oqtane.Server.csproj - also you need to remove them on uninstall
+                }
 
                 _installationManager.RestartApplication();
             }
         }
 
-        // GET api/<controller>/load/filename
-        [HttpGet("load/{filename}")]
-        public IActionResult Load(string assemblyname)
+        private void ProcessTemplatesRecursively(DirectoryInfo current, string rootPath, string rootFolder, string templatePath, ModuleDefinition moduleDefinition)
         {
-            string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            byte[] file = System.IO.File.ReadAllBytes(Path.Combine(binfolder, assemblyname));
-            return File(file, "application/octet-stream", assemblyname);
-        }
+            // process folder
+            string folderPath = Utilities.PathCombine(rootPath, current.FullName.Replace(templatePath, ""));
+            folderPath = folderPath.Replace("[Owner]", moduleDefinition.Owner);
+            folderPath = folderPath.Replace("[Module]", moduleDefinition.Name);
+            if (!Directory.Exists(folderPath))
+            {
+                Directory.CreateDirectory(folderPath);
+            }
 
+            FileInfo[] files = current.GetFiles("*.*");
+            if (files != null)
+            {
+                foreach (FileInfo file in files)
+                {
+                    // process file
+                    string filePath = Path.Combine(folderPath, file.Name);
+                    filePath = filePath.Replace("[Owner]", moduleDefinition.Owner);
+                    filePath = filePath.Replace("[Module]", moduleDefinition.Name);
+
+                    string text = System.IO.File.ReadAllText(file.FullName);
+                    text = text.Replace("[Owner]", moduleDefinition.Owner);
+                    text = text.Replace("[Module]", moduleDefinition.Name);
+                    text = text.Replace("[Description]", moduleDefinition.Description);
+                    text = text.Replace("[RootPath]", rootPath);
+                    text = text.Replace("[RootFolder]", rootFolder);
+                    text = text.Replace("[ServerManagerType]", moduleDefinition.ServerManagerType);
+                    text = text.Replace("[Folder]", folderPath);
+                    text = text.Replace("[File]", Path.GetFileName(filePath));
+                    text = text.Replace("[FrameworkVersion]", Constants.Version);
+                    System.IO.File.WriteAllText(filePath, text);
+                }
+
+                DirectoryInfo[] folders = current.GetDirectories();
+
+                foreach (DirectoryInfo folder in folders.Reverse())
+                {
+                    ProcessTemplatesRecursively(folder, rootPath, rootFolder, templatePath, moduleDefinition);
+                }
+            }
+        }
     }
 }
diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs
index cecc9216..5310f5c7 100644
--- a/Oqtane.Server/Controllers/NotificationController.cs
+++ b/Oqtane.Server/Controllers/NotificationController.cs
@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
-using Microsoft.AspNetCore.Http;
+using Oqtane.Repository;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class NotificationController : Controller
     {
         private readonly INotificationRepository _notifications;
@@ -49,38 +49,38 @@ namespace Oqtane.Controllers
         [Authorize(Roles = Constants.RegisteredRole)]
         public Notification Get(int id)
         {
-            Notification Notification = _notifications.GetNotification(id);
-            if (!(IsAuthorized(Notification.FromUserId) || IsAuthorized(Notification.ToUserId)))
+            Notification notification = _notifications.GetNotification(id);
+            if (!(IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId)))
             {
-                Notification = null;
+                notification = null;
             }
-            return Notification;
+            return notification;
         }
 
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Notification Post([FromBody] Notification Notification)
+        public Notification Post([FromBody] Notification notification)
         {
-            if (IsAuthorized(Notification.FromUserId))
+            if (IsAuthorized(notification.FromUserId))
             {
-                Notification = _notifications.AddNotification(Notification);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {Notification}", Notification);
+                notification = _notifications.AddNotification(notification);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Notification Added {Notification}", notification);
             }
-            return Notification;
+            return notification;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Notification Put(int id, [FromBody] Notification Notification)
+        public Notification Put(int id, [FromBody] Notification notification)
         {
-            if (IsAuthorized(Notification.FromUserId))
+            if (IsAuthorized(notification.FromUserId))
             {
-                Notification = _notifications.UpdateNotification(Notification);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {Folder}", Notification);
+                notification = _notifications.UpdateNotification(notification);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Notification Updated {Folder}", notification);
             }
-            return Notification;
+            return notification;
         }
 
         // DELETE api/<controller>/5
@@ -88,8 +88,8 @@ namespace Oqtane.Controllers
         [Authorize(Roles = Constants.RegisteredRole)]
         public void Delete(int id)
         {
-            Notification Notification = _notifications.GetNotification(id);
-            if (IsAuthorized(Notification.FromUserId) || IsAuthorized(Notification.ToUserId))
+            Notification notification = _notifications.GetNotification(id);
+            if (IsAuthorized(notification.FromUserId) || IsAuthorized(notification.ToUserId))
             {
                 _notifications.DeleteNotification(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Notification Deleted {NotificationId}", id);
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index 5b69d426..51194245 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -11,10 +11,11 @@ using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Authorization;
 using Oqtane.Shared;
+// ReSharper disable PartialTypeWithSinglePart
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class PackageController : Controller
     {
         private readonly IWebHostEnvironment _environment;
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index f7167a38..16afb06e 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -1,32 +1,36 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
-using Oqtane.Infrastructure;
 using Oqtane.Security;
 using System.Net;
+using Oqtane.Enums;
+using Oqtane.Extensions;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class PageController : Controller
     {
         private readonly IPageRepository _pages;
         private readonly IModuleRepository _modules;
         private readonly IPageModuleRepository _pageModules;
         private readonly IUserPermissions _userPermissions;
+        private readonly ITenantResolver _tenants;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger)
+        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
         {
             _pages = pages;
             _modules = modules;
             _pageModules = pageModules;
             _userPermissions = userPermissions;
+            _tenants = tenants;
             _syncManager = syncManager;
             _logger = logger;
         }
@@ -99,34 +103,36 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Page Post([FromBody] Page Page)
+        public Page Post([FromBody] Page page)
         {
             if (ModelState.IsValid)
             {
                 string permissions;
-                if (Page.ParentId != null)
+                if (page.ParentId != null)
                 {
-                    permissions = _pages.GetPage(Page.ParentId.Value).Permissions;
+                    permissions = _pages.GetPage(page.ParentId.Value).Permissions;
                 }
                 else
                 {
-                    permissions = UserSecurity.SetPermissionStrings(new List<PermissionString> { new PermissionString { PermissionName = PermissionNames.Edit, Permissions = Constants.AdminRole } });
+                    permissions = new List<Permission> {
+                        new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                    }.EncodePermissions();
                 }
             
                 if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions))
                 {
-                    Page = _pages.AddPage(Page);
-                    _syncManager.AddSyncEvent(EntityNames.Site, Page.SiteId);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page);
+                    page = _pages.AddPage(page);
+                    _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, page.SiteId);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", page);
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", Page);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Page {Page}", page);
                     HttpContext.Response.StatusCode = 401;
-                    Page = null;
+                    page = null;
                 }
             }
-            return Page;
+            return page;
         }
 
         // POST api/<controller>/5?userid=x
@@ -141,22 +147,24 @@ namespace Oqtane.Controllers
                 page = new Page();
                 page.SiteId = parent.SiteId;
                 page.Name = parent.Name;
+                page.Title = parent.Title;
                 page.Path = parent.Path;
                 page.ParentId = parent.PageId;
                 page.Order = 0;
                 page.IsNavigation = false;
+                page.Url = "";
                 page.EditMode = false;
                 page.ThemeType = parent.ThemeType;
                 page.LayoutType = parent.LayoutType;
                 page.Icon = parent.Icon;
-                List<PermissionString> permissions = new List<PermissionString>();
-                permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = "[" + userid + "]" });
-                permissions.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = "[" + userid + "]" });
-                page.Permissions = UserSecurity.SetPermissionStrings(permissions);
+                page.Permissions = new List<Permission> {
+                    new Permission(PermissionNames.View, userid, true),
+                    new Permission(PermissionNames.Edit, userid, true)
+                }.EncodePermissions();
                 page.IsPersonalizable = false;
                 page.UserId = int.Parse(userid);
                 page = _pages.AddPage(page);
-                _syncManager.AddSyncEvent(EntityNames.Site, page.SiteId);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, page.SiteId);
 
                 // copy modules
                 List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId).ToList();
@@ -166,10 +174,10 @@ namespace Oqtane.Controllers
                     module.SiteId = page.SiteId;
                     module.PageId = page.PageId;
                     module.ModuleDefinitionName = pm.Module.ModuleDefinitionName;
-                    permissions = new List<PermissionString>();
-                    permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = "[" + userid + "]" });
-                    permissions.Add(new PermissionString { PermissionName = PermissionNames.Edit, Permissions = "[" + userid + "]" });
-                    module.Permissions = UserSecurity.SetPermissionStrings(permissions);
+                    module.Permissions = new List<Permission> {
+                        new Permission(PermissionNames.View, userid, true),
+                        new Permission(PermissionNames.Edit, userid, true)
+                    }.EncodePermissions();
                     module = _modules.AddModule(module);
 
                     string content = _modules.ExportModule(pm.ModuleId);
@@ -195,21 +203,21 @@ namespace Oqtane.Controllers
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public Page Put(int id, [FromBody] Page Page)
+        public Page Put(int id, [FromBody] Page page)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, Page.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
-                Page = _pages.UpdatePage(Page);
-                _syncManager.AddSyncEvent(EntityNames.Site, Page.SiteId);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", Page);
+                page = _pages.UpdatePage(page);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, page.SiteId);
+                _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);
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Page {Page}", page);
                 HttpContext.Response.StatusCode = 401;
-                Page = null;
+                page = null;
             }
-            return Page;
+            return page;
         }
 
         // PUT api/<controller>/?siteid=x&pageid=y&parentid=z
@@ -230,7 +238,7 @@ namespace Oqtane.Controllers
                     }
                     order += 2;
                 }
-                _syncManager.AddSyncEvent(EntityNames.Site, siteid);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, siteid);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {PageId} {ParentId}", siteid, pageid, parentid);
             }
             else
@@ -249,7 +257,7 @@ namespace Oqtane.Controllers
             if (_userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
                 _pages.DeletePage(page.PageId);
-                _syncManager.AddSyncEvent(EntityNames.Site, page.SiteId);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, page.SiteId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", page.PageId);
             }
             else
diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs
index 265a3f00..f2c0d489 100644
--- a/Oqtane.Server/Controllers/PageModuleController.cs
+++ b/Oqtane.Server/Controllers/PageModuleController.cs
@@ -1,29 +1,30 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
+using Oqtane.Enums;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 using Oqtane.Security;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class PageModuleController : Controller
     {
         private readonly IPageModuleRepository _pageModules;
-        private readonly IModuleRepository _modules;
         private readonly IUserPermissions _userPermissions;
+        private readonly ITenantResolver _tenants;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public PageModuleController(IPageModuleRepository pageModules, IModuleRepository modules, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger)
+        public PageModuleController(IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
         {
             _pageModules = pageModules;
-            _modules = modules;
             _userPermissions = userPermissions;
+            _tenants = tenants;
             _syncManager = syncManager;
             _logger = logger;
         }
@@ -65,41 +66,41 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public PageModule Post([FromBody] PageModule PageModule)
+        public PageModule Post([FromBody] PageModule pageModule)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, PageModule.PageId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
             {
-                PageModule = _pageModules.AddPageModule(PageModule);
-                _syncManager.AddSyncEvent(EntityNames.Page, PageModule.PageId);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", PageModule);
+                pageModule = _pageModules.AddPageModule(pageModule);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageModule.PageId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", pageModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add PageModule {PageModule}", PageModule);
+                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add PageModule {PageModule}", pageModule);
                 HttpContext.Response.StatusCode = 401;
-                PageModule = null;
+                pageModule = null;
             }
-            return PageModule;
+            return pageModule;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.RegisteredRole)]
-        public PageModule Put(int id, [FromBody] PageModule PageModule)
+        public PageModule Put(int id, [FromBody] PageModule pageModule)
         {
-            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, PageModule.ModuleId, PermissionNames.Edit))
+            if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit))
             {
-                PageModule = _pageModules.UpdatePageModule(PageModule);
-                _syncManager.AddSyncEvent(EntityNames.Page, PageModule.PageId);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", PageModule);
+                pageModule = _pageModules.UpdatePageModule(pageModule);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageModule.PageId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", pageModule);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update PageModule {PageModule}", PageModule);
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update PageModule {PageModule}", pageModule);
                 HttpContext.Response.StatusCode = 401;
-                PageModule = null;
+                pageModule = null;
             }
-            return PageModule;
+            return pageModule;
         }
 
         // PUT api/<controller>/?pageid=x&pane=y
@@ -120,7 +121,7 @@ namespace Oqtane.Controllers
                     }
                     order += 2;
                 }
-                _syncManager.AddSyncEvent(EntityNames.Page, pageid);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageid);
                 _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
             }
             else
@@ -139,7 +140,7 @@ namespace Oqtane.Controllers
             if (_userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
             {
                 _pageModules.DeletePageModule(id);
-                _syncManager.AddSyncEvent(EntityNames.Page, pagemodule.PageId);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pagemodule.PageId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
             }
             else
diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs
index b325fccf..aa1158ac 100644
--- a/Oqtane.Server/Controllers/ProfileController.cs
+++ b/Oqtane.Server/Controllers/ProfileController.cs
@@ -1,14 +1,15 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class ProfileController : Controller
     {
         private readonly IProfileRepository _profiles;
@@ -37,27 +38,27 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.AdminRole)]
-        public Profile Post([FromBody] Profile Profile)
+        public Profile Post([FromBody] Profile profile)
         {
             if (ModelState.IsValid)
             {
-                Profile = _profiles.AddProfile(Profile);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", Profile);
+                profile = _profiles.AddProfile(profile);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", profile);
             }
-            return Profile;
+            return profile;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.AdminRole)]
-        public Profile Put(int id, [FromBody] Profile Profile)
+        public Profile Put(int id, [FromBody] Profile profile)
         {
             if (ModelState.IsValid)
             {
-                Profile = _profiles.UpdateProfile(Profile);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", Profile);
+                profile = _profiles.UpdateProfile(profile);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", profile);
             }
-            return Profile;
+            return profile;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs
index 7de3ae22..418382c5 100644
--- a/Oqtane.Server/Controllers/RoleController.cs
+++ b/Oqtane.Server/Controllers/RoleController.cs
@@ -1,14 +1,15 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class RoleController : Controller
     {
         private readonly IRoleRepository _roles;
@@ -39,27 +40,27 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.AdminRole)]
-        public Role Post([FromBody] Role Role)
+        public Role Post([FromBody] Role role)
         {
             if (ModelState.IsValid)
             {
-                Role = _roles.AddRole(Role);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", Role);
+                role = _roles.AddRole(role);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", role);
             }
-            return Role;
+            return role;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.AdminRole)]
-        public Role Put(int id, [FromBody] Role Role)
+        public Role Put(int id, [FromBody] Role role)
         {
             if (ModelState.IsValid)
             {
-                Role = _roles.UpdateRole(Role);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", Role);
+                role = _roles.UpdateRole(role);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", role);
             }
-            return Role;
+            return role;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index c0a8571d..e9be3798 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Security;
-using Oqtane.Infrastructure;
 using System.Linq;
-using Microsoft.AspNetCore.Http;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class SettingController : Controller
     {
         private readonly ISettingRepository _settings;
@@ -62,38 +62,38 @@ namespace Oqtane.Controllers
 
         // POST api/<controller>
         [HttpPost]
-        public Setting Post([FromBody] Setting Setting)
+        public Setting Post([FromBody] Setting setting)
         {
-            if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId, PermissionNames.Edit))
+            if (ModelState.IsValid && IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.Edit))
             {
-                Setting = _settings.AddSetting(Setting);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", Setting);
+                setting = _settings.AddSetting(setting);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", setting);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", Setting);
+                _logger.Log(LogLevel.Error, this, LogFunction.Create, "User Not Authorized To Add Setting {Setting}", setting);
                 HttpContext.Response.StatusCode = 401;
-                Setting = null;
+                setting = null;
             }
-            return Setting;
+            return setting;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
-        public Setting Put(int id, [FromBody] Setting Setting)
+        public Setting Put(int id, [FromBody] Setting setting)
         {
-            if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId, PermissionNames.Edit))
+            if (ModelState.IsValid && IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.Edit))
             {
-                Setting = _settings.UpdateSetting(Setting);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", Setting);
+                setting = _settings.UpdateSetting(setting);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", setting);
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", Setting);
+                _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update Setting {Setting}", setting);
                 HttpContext.Response.StatusCode = 401;
-                Setting = null;
+                setting = null;
             }
-            return Setting;
+            return setting;
         }
 
         // DELETE api/<controller>/5
@@ -113,17 +113,17 @@ namespace Oqtane.Controllers
             }
         }
 
-        private bool IsAuthorized(string EntityName, int EntityId, string PermissionName)
+        private bool IsAuthorized(string entityName, int entityId, string permissionName)
         {
             bool authorized = false;
-            if (EntityName == EntityNames.PageModule)
+            if (entityName == EntityNames.PageModule)
             {
-                EntityName = EntityNames.Module;
-                EntityId = _pageModules.GetPageModule(EntityId).ModuleId;
+                entityName = EntityNames.Module;
+                entityId = _pageModules.GetPageModule(entityId).ModuleId;
             }
-            switch (EntityName)
+            switch (entityName)
             {
-                case EntityNames.Host:
+                case EntityNames.Tenant:
                     authorized = User.IsInRole(Constants.HostRole);
                     break;
                 case EntityNames.Site:
@@ -132,13 +132,13 @@ namespace Oqtane.Controllers
                 case EntityNames.Page:
                 case EntityNames.Module:
                 case EntityNames.Folder:
-                    authorized = _userPermissions.IsAuthorized(User, EntityName, EntityId, PermissionName);
+                    authorized = _userPermissions.IsAuthorized(User, entityName, entityId, permissionName);
                     break;
                 case EntityNames.User:
                     authorized = true;
-                    if (PermissionName == PermissionNames.Edit)
+                    if (permissionName == PermissionNames.Edit)
                     {
-                        authorized = User.IsInRole(Constants.AdminRole) || (_userPermissions.GetUser(User).UserId == EntityId);
+                        authorized = User.IsInRole(Constants.AdminRole) || (_userPermissions.GetUser(User).UserId == entityId);
                     }
                     break;
             }
diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
index 47939bf4..c358ea3c 100644
--- a/Oqtane.Server/Controllers/SiteController.cs
+++ b/Oqtane.Server/Controllers/SiteController.cs
@@ -1,30 +1,27 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
-using System.IO;
-using Microsoft.AspNetCore.Hosting;
+using Oqtane.Enums;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class SiteController : Controller
     {
         private readonly ISiteRepository _sites;
         private readonly ITenantResolver _tenants;
-        private readonly IWebHostEnvironment _environment;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public SiteController(ISiteRepository sites, ITenantResolver tenants, IWebHostEnvironment environment, ISyncManager syncManager, ILogManager logger)
+        public SiteController(ISiteRepository sites, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
         {
             _sites = sites;
             _tenants = tenants;
-            _environment = environment;
             _syncManager = syncManager;
             _logger = logger;
         }
@@ -46,7 +43,7 @@ namespace Oqtane.Controllers
 
         // POST api/<controller>
         [HttpPost]
-        public Site Post([FromBody] Site Site)
+        public Site Post([FromBody] Site site)
         {
             if (ModelState.IsValid)
             {
@@ -56,7 +53,7 @@ namespace Oqtane.Controllers
                     // provision initial site during installation
                     authorized = true; 
                     Tenant tenant = _tenants.GetTenant();
-                    Site.TenantId = tenant.TenantId;
+                    site.TenantId = tenant.TenantId;
                 }
                 else
                 {
@@ -64,25 +61,25 @@ namespace Oqtane.Controllers
                 }
                 if (authorized)
                 {
-                    Site = _sites.AddSite(Site);
-                    _logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
+                    site = _sites.AddSite(site);
+                    _logger.Log(site.SiteId, LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", site);
                 }
             }
-            return Site;
+            return site;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
-        [Authorize(Roles = Constants.HostRole)]
-        public Site Put(int id, [FromBody] Site Site)
+        [Authorize(Roles = Constants.AdminRole)]
+        public Site Put(int id, [FromBody] Site site)
         {
             if (ModelState.IsValid)
             {
-                Site = _sites.UpdateSite(Site);
-                _syncManager.AddSyncEvent(EntityNames.Site, Site.SiteId);
-                _logger.Log(Site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
+                site = _sites.UpdateSite(site);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, site.SiteId);
+                _logger.Log(site.SiteId, LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", site);
             }
-            return Site;
+            return site;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs
new file mode 100644
index 00000000..2f709fb1
--- /dev/null
+++ b/Oqtane.Server/Controllers/SiteTemplateController.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using Oqtane.Models;
+using Oqtane.Repository;
+
+namespace Oqtane.Controllers
+{
+    [Route("{alias}/api/[controller]")]
+    public class SiteTemplateController : Controller
+    {
+        private readonly ISiteTemplateRepository _siteTemplates;
+
+        public SiteTemplateController(ISiteTemplateRepository siteTemplates)
+        {
+            _siteTemplates = siteTemplates;
+        }
+
+        // GET: api/<controller>
+        [HttpGet]
+        public IEnumerable<SiteTemplate> Get()
+        {
+            return _siteTemplates.GetSiteTemplates();
+        }
+    }
+}
diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs
new file mode 100644
index 00000000..5bce5a92
--- /dev/null
+++ b/Oqtane.Server/Controllers/SqlController.cs
@@ -0,0 +1,65 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Oqtane.Models;
+using System.Collections.Generic;
+using Oqtane.Shared;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+using Oqtane.Enums;
+using System.Data.SqlClient;
+using System.Data;
+using System.Dynamic;
+using Newtonsoft.Json;
+using System;
+
+namespace Oqtane.Controllers
+{
+    [Route("{alias}/api/[controller]")]
+    public class SqlController : Controller
+    {
+        private readonly ITenantRepository _tenants;
+        private readonly ISqlRepository _sql;
+        private readonly ILogManager _logger;
+
+        public SqlController(ITenantRepository tenants, ISqlRepository sql, ILogManager logger)
+        {
+            _tenants = tenants;
+            _sql = sql;
+            _logger = logger;
+        }
+
+        // POST: api/<controller>
+        [HttpPost]
+        [Authorize(Roles = Constants.HostRole)]
+        public SqlQuery Post([FromBody] SqlQuery sqlquery)
+        {
+            var results = new List<Dictionary<string, string>>();
+            Dictionary<string, string> row;
+            Tenant tenant = _tenants.GetTenant(sqlquery.TenantId);
+            try
+            {
+                foreach (string query in sqlquery.Query.Split("GO", StringSplitOptions.RemoveEmptyEntries))
+                {
+                    SqlDataReader dr = _sql.ExecuteReader(tenant, query);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId}", query, sqlquery.TenantId);
+                    while (dr.Read())
+                    {
+                        row = new Dictionary<string, string>();
+                        for (var field = 0; field < dr.FieldCount; field++)
+                        {
+                            row[dr.GetName(field)] = dr.IsDBNull(field) ? "" : dr.GetValue(field).ToString();
+                        }
+                        results.Add(row);
+                    }
+                }
+            }
+            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);
+            }
+            sqlquery.Results = results;
+            return sqlquery;
+        }
+
+    }
+}
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
new file mode 100644
index 00000000..2f5d7339
--- /dev/null
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using System.Collections.Generic;
+using Oqtane.Shared;
+using System;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Oqtane.Controllers
+{
+    [Route("{alias}/api/[controller]")]
+    public class SystemController : Controller
+    {
+        private readonly IWebHostEnvironment _environment;
+
+        public SystemController(IWebHostEnvironment environment)
+        {
+            _environment = environment;
+        }
+
+        // GET: api/<controller>
+        [HttpGet]
+        [Authorize(Roles = Constants.HostRole)]
+        public Dictionary<string, string> Get()
+        {
+            Dictionary<string, string> systeminfo = new Dictionary<string, string>();
+            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());
+            return systeminfo;
+        }
+
+    }
+}
diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs
index 61ecae8e..0f76fc78 100644
--- a/Oqtane.Server/Controllers/TenantController.cs
+++ b/Oqtane.Server/Controllers/TenantController.cs
@@ -1,14 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using System.Collections.Generic;
+using Oqtane.Enums;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class TenantController : Controller
     {
         private readonly ITenantRepository _tenants;
@@ -22,7 +23,7 @@ namespace Oqtane.Controllers
 
         // GET: api/<controller>
         [HttpGet]
-        [Authorize(Roles = Constants.HostRole)]
+        [Authorize(Roles = Constants.AdminRole)]
         public IEnumerable<Tenant> Get()
         {
             return _tenants.GetTenants();
@@ -30,7 +31,7 @@ namespace Oqtane.Controllers
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        [Authorize(Roles = Constants.HostRole)]
+        [Authorize(Roles = Constants.AdminRole)]
         public Tenant Get(int id)
         {
             return _tenants.GetTenant(id);
@@ -39,27 +40,27 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.HostRole)]
-        public Tenant Post([FromBody] Tenant Tenant)
+        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);
+                tenant = _tenants.AddTenant(tenant);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "Tenant Added {TenantId}", tenant.TenantId);
             }
-            return Tenant;
+            return tenant;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.HostRole)]
-        public Tenant Put(int id, [FromBody] Tenant Tenant)
+        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);
+                tenant = _tenants.UpdateTenant(tenant);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Tenant Updated {TenantId}", tenant.TenantId);
             }
-            return Tenant;
+            return tenant;
         }
 
         // DELETE api/<controller>/5
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 6ae226a7..fa182dfa 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -1,18 +1,21 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Microsoft.AspNetCore.Authorization;
 using Oqtane.Shared;
-using Oqtane.Infrastructure;
 using System.IO;
 using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
+
+// ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class ThemeController : Controller
     {
         private readonly IThemeRepository _themes;
@@ -55,7 +58,7 @@ namespace Oqtane.Controllers
             {
                 themename = theme.ThemeName.Substring(0, theme.ThemeName.IndexOf(","));
 
-                string folder = Path.Combine(_environment.WebRootPath, "Themes\\" + themename);
+                string folder = Path.Combine(_environment.WebRootPath, "Themes" , themename);
                 if (Directory.Exists(folder))
                 {
                     Directory.Delete(folder, true);
@@ -72,13 +75,23 @@ namespace Oqtane.Controllers
             }
         }
 
-        // GET api/<controller>/load/filename
-        [HttpGet("load/{filename}")]
-        public IActionResult Load(string filename)
+        // GET api/<controller>/load/assembyname
+        [HttpGet("load/{assemblyname}")]
+        public IActionResult Load(string assemblyname)
         {
-            string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            byte[] file = System.IO.File.ReadAllBytes(Path.Combine(binfolder, filename));
-            return File(file, "application/octet-stream", filename);
+            if (Path.GetExtension(assemblyname).ToLower() == ".dll")
+            {
+                string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                byte[] file = System.IO.File.ReadAllBytes(Path.Combine(binfolder, assemblyname));
+                return File(file, "application/octet-stream", assemblyname);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Download Assembly {Assembly}", assemblyname);
+                HttpContext.Response.StatusCode = 401;
+                return null;
+            }
         }
+
     }
 }
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index c338a0cc..fce08020 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -2,21 +2,21 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Microsoft.AspNetCore.Identity;
 using System.Threading.Tasks;
 using System.Linq;
 using System.Security.Claims;
 using Oqtane.Shared;
-using Oqtane.Infrastructure;
 using System;
-using Microsoft.AspNetCore.Http;
 using System.Net;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class UserController : Controller
     {
         private readonly IUserRepository _users;
@@ -28,9 +28,10 @@ namespace Oqtane.Controllers
         private readonly INotificationRepository _notifications;
         private readonly IFolderRepository _folders;
         private readonly ISyncManager _syncManager;
+        private readonly ISiteRepository _sites;
         private readonly ILogManager _logger;
 
-        public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, ITenantResolver tenants, INotificationRepository notifications, IFolderRepository folders, ISyncManager syncManager, ILogManager logger)
+        public UserController(IUserRepository users, IRoleRepository roles, IUserRoleRepository userRoles, UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, ITenantResolver tenants, INotificationRepository notifications, IFolderRepository folders, ISyncManager syncManager, ISiteRepository sites, ILogManager logger)
         {
             _users = users;
             _roles = roles;
@@ -41,6 +42,7 @@ namespace Oqtane.Controllers
             _folders = folders;
             _notifications = notifications;
             _syncManager = syncManager;
+            _sites = sites;
             _logger = logger;
         }
 
@@ -73,43 +75,61 @@ namespace Oqtane.Controllers
 
         // POST api/<controller>
         [HttpPost]
-        public async Task<User> Post([FromBody] User User)
+        public async Task<User> Post([FromBody] User user)
         {
-            User user = null;
-
             if (ModelState.IsValid)
             {
-                bool verified = true;
-                // users created by non-administrators must be verified
-                if (!base.User.IsInRole(Constants.AdminRole) && User.Username != Constants.HostUser)
-                {
-                    verified = false;
-                }
+                var newUser = await CreateUser(user);
+                return newUser;
+            }
 
-                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+            return null;
+        }
+
+        //TODO shoud be moved to another layer
+        private async Task<User> CreateUser(User user)
+        {
+            User newUser = null;
+
+            bool verified;
+            bool allowregistration;
+            if (user.Username == Constants.HostUser || User.IsInRole(Constants.AdminRole))
+            {
+                verified = true;
+                allowregistration = true;
+            }
+            else
+            {
+                verified = false;
+                allowregistration = _sites.GetSite(user.SiteId).AllowRegistration;
+            }
+
+            if (allowregistration)
+            {
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser == null)
                 {
                     identityuser = new IdentityUser();
-                    identityuser.UserName = User.Username;
-                    identityuser.Email = User.Email;
+                    identityuser.UserName = user.Username;
+                    identityuser.Email = user.Email;
                     identityuser.EmailConfirmed = verified;
-                    var result = await _identityUserManager.CreateAsync(identityuser, User.Password);
+                    var result = await _identityUserManager.CreateAsync(identityuser, user.Password);
                     if (result.Succeeded)
                     {
-                        User.LastLoginOn = null;
-                        User.LastIPAddress = "";
-                        user = _users.AddUser(User);
+                        user.LastLoginOn = null;
+                        user.LastIPAddress = "";
+                        newUser = _users.AddUser(user);
                         if (!verified)
                         {
                             Notification notification = new Notification();
-                            notification.SiteId = User.SiteId;
+                            notification.SiteId = user.SiteId;
                             notification.FromUserId = null;
-                            notification.ToUserId = user.UserId;
+                            notification.ToUserId = newUser.UserId;
                             notification.ToEmail = "";
                             notification.Subject = "User Account Verification";
                             string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
-                            string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
-                            notification.Body = "Dear " + User.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
+                            string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
+                            notification.Body = "Dear " + user.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
                             notification.ParentId = null;
                             notification.CreatedOn = DateTime.UtcNow;
                             notification.IsDelivered = false;
@@ -118,11 +138,11 @@ namespace Oqtane.Controllers
                         }
 
                         // assign to host role if this is the host user ( initial installation )
-                        if (User.Username == Constants.HostUser)
+                        if (user.Username == Constants.HostUser)
                         {
-                            int hostroleid = _roles.GetRoles(User.SiteId, true).Where(item => item.Name == Constants.HostRole).FirstOrDefault().RoleId;
+                            int hostroleid = _roles.GetRoles(user.SiteId, true).Where(item => item.Name == Constants.HostRole).FirstOrDefault().RoleId;
                             UserRole userrole = new UserRole();
-                            userrole.UserId = user.UserId;
+                            userrole.UserId = newUser.UserId;
                             userrole.RoleId = hostroleid;
                             userrole.EffectiveDate = null;
                             userrole.ExpiryDate = null;
@@ -130,75 +150,92 @@ namespace Oqtane.Controllers
                         }
 
                         // add folder for user
-                        Folder folder = _folders.GetFolder(User.SiteId, "Users\\");
+                        Folder folder = _folders.GetFolder(user.SiteId, Utilities.PathCombine("Users","\\"));
                         if (folder != null)
                         {
-                            _folders.AddFolder(new Folder { SiteId = folder.SiteId, ParentId = folder.FolderId, Name = "My Folder", Path = folder.Path + user.UserId.ToString() + "\\", Order = 1, IsSystem = true, 
-                                Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + user.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" + user.UserId.ToString() + "]\"}]" });
+                            _folders.AddFolder(new Folder
+                            {
+                                SiteId = folder.SiteId,
+                                ParentId = folder.FolderId,
+                                Name = "My Folder",
+                                Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),"\\"),
+                                Order = 1,
+                                IsSystem = true,
+                                Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" +
+                                              newUser.UserId.ToString() + "]\"}]"
+                            });
                         }
                     }
                 }
                 else
                 {
-                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
+                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
                     if (result.Succeeded)
                     {
-                        user = _users.GetUser(User.Username);
+                        newUser = _users.GetUser(user.Username);
                     }
                 }
 
-                if (user != null && User.Username != Constants.HostUser)
+                if (newUser != null && user.Username != Constants.HostUser)
                 {
                     // add auto assigned roles to user for site
-                    List<Role> roles = _roles.GetRoles(User.SiteId).Where(item => item.IsAutoAssigned == true).ToList();
+                    List<Role> roles = _roles.GetRoles(user.SiteId).Where(item => item.IsAutoAssigned).ToList();
                     foreach (Role role in roles)
                     {
                         UserRole userrole = new UserRole();
-                        userrole.UserId = user.UserId;
+                        userrole.UserId = newUser.UserId;
                         userrole.RoleId = role.RoleId;
                         userrole.EffectiveDate = null;
                         userrole.ExpiryDate = null;
                         _userRoles.AddUserRole(userrole);
                     }
                 }
-                user.Password = ""; // remove sensitive information
-                _logger.Log(User.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
+
+                if (newUser != null)
+                {
+                    newUser.Password = ""; // remove sensitive information
+                    _logger.Log(user.SiteId, LogLevel.Information, this, LogFunction.Create, "User Added {User}", newUser);
+                }
+            }
+            else
+            {
+                _logger.Log(user.SiteId, LogLevel.Error, this, LogFunction.Create, "User Registration Is Not Enabled For Site. User Was Not Added {User}", user);
             }
 
-            return user;
+            return newUser;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize]
-        public async Task<User> Put(int id, [FromBody] User User)
+        public async Task<User> Put(int id, [FromBody] User user)
         {
             if (ModelState.IsValid)
             {
-                if (base.User.IsInRole(Constants.AdminRole) || base.User.Identity.Name == User.Username)
+                if (User.IsInRole(Constants.AdminRole) || User.Identity.Name == user.Username)
                 {
-                    if (User.Password != "")
+                    if (user.Password != "")
                     {
-                        IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+                        IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                         if (identityuser != null)
                         {
-                            identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, User.Password);
+                            identityuser.PasswordHash = _identityUserManager.PasswordHasher.HashPassword(identityuser, user.Password);
                             await _identityUserManager.UpdateAsync(identityuser);
                         }
                     }
-                    User = _users.UpdateUser(User);
-                    _syncManager.AddSyncEvent(EntityNames.User, User.UserId);
-                    User.Password = ""; // remove sensitive information
-                    _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", User);
+                    user = _users.UpdateUser(user);
+                    _syncManager.AddSyncEvent(_tenants.GetTenant().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);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Update, "User Not Authorized To Update User {User}", user);
                     HttpContext.Response.StatusCode = 401;
-                    User = null;
+                    user = null;
                 }
             }
-            return User;
+            return user;
         }
 
         // DELETE api/<controller>/5?siteid=x
@@ -222,170 +259,173 @@ namespace Oqtane.Controllers
 
         // POST api/<controller>/login
         [HttpPost("login")]
-        public async Task<User> Login([FromBody] User User, bool SetCookie, bool IsPersistent)
+        public async Task<User> Login([FromBody] User user, bool setCookie, bool isPersistent)
         {
-            User user = new Models.User { Username = User.Username, IsAuthenticated = false };
+            User loginUser = new User { Username = user.Username, IsAuthenticated = false };
 
             if (ModelState.IsValid)
             {
-                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null)
                 {
-                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
+                    var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
                     if (result.Succeeded)
                     {
-                        user = _users.GetUser(identityuser.UserName);
-                        if (user != null)
+                        loginUser = _users.GetUser(identityuser.UserName);
+                        if (loginUser != null)
                         {
                             if (identityuser.EmailConfirmed)
                             {
-                                user.IsAuthenticated = true;
-                                user.LastLoginOn = DateTime.UtcNow;
-                                user.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
-                                _users.UpdateUser(user);
-                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
-                                if (SetCookie)
+                                loginUser.IsAuthenticated = true;
+                                loginUser.LastLoginOn = DateTime.UtcNow;
+                                loginUser.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
+                                _users.UpdateUser(loginUser);
+                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", user.Username);
+                                if (setCookie)
                                 {
-                                    await _identitySignInManager.SignInAsync(identityuser, IsPersistent);
+                                    await _identitySignInManager.SignInAsync(identityuser, isPersistent);
                                 }
                             }
                             else
                             {
-                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", User.Username);
+                                _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Not Verified {Username}", user.Username);
                             }
                         }
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", User.Username);
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", user.Username);
                     }
                 }
             }
 
-            return user;
+            return loginUser;
         }
 
         // POST api/<controller>/logout
         [HttpPost("logout")]
         [Authorize]
-        public async Task Logout([FromBody] User User)
+        public async Task Logout([FromBody] User user)
         {
             await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
-            _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
+            _logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", (user != null) ? user.Username : "");
         }
 
         // POST api/<controller>/verify
         [HttpPost("verify")]
-        public async Task<User> Verify([FromBody] User User, string token)
+        public async Task<User> Verify([FromBody] User user, string token)
         {
             if (ModelState.IsValid)
             {
-                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null)
                 {
                     var result = await _identityUserManager.ConfirmEmailAsync(identityuser, token);
                     if (result.Succeeded)
                     {
-                        _logger.Log(LogLevel.Information, this, LogFunction.Security, "Email Verified For {Username}", User.Username);
+                        _logger.Log(LogLevel.Information, this, LogFunction.Security, "Email Verified For {Username}", user.Username);
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
-                        User = null;
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", user.Username);
+                        user = null;
                     }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", User.Username);
-                    User = null;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", user.Username);
+                    user = null;
                 }
             }
-            return User;
+            return user;
         }
         
         // POST api/<controller>/forgot
         [HttpPost("forgot")]
-        public async Task Forgot([FromBody] User User)
+        public async Task Forgot([FromBody] User user)
         {
             if (ModelState.IsValid)
             {
-                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null)
                 {
                     Notification notification = new Notification();
-                    notification.SiteId = User.SiteId;
+                    notification.SiteId = user.SiteId;
                     notification.FromUserId = null;
-                    notification.ToUserId = User.UserId;
+                    notification.ToUserId = user.UserId;
                     notification.ToEmail = "";
                     notification.Subject = "User Password Reset";
                     string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
-                    string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/reset?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
-                    notification.Body = "Dear " + User.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
+                    string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
+                    notification.Body = "Dear " + user.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
                     notification.ParentId = null;
                     notification.CreatedOn = DateTime.UtcNow;
                     notification.IsDelivered = false;
                     notification.DeliveredOn = null;
                     _notifications.AddNotification(notification);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", User.Username);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username);
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Notification Failed For {Username}", User.Username);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Notification Failed For {Username}", user.Username);
                 }
             }
         }
 
         // POST api/<controller>/reset
         [HttpPost("reset")]
-        public async Task<User> Reset([FromBody] User User, string token)
+        public async Task<User> Reset([FromBody] User user, string token)
         {
             if (ModelState.IsValid)
             {
-                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(User.Username);
+                IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null && !string.IsNullOrEmpty(token))
                 {
-                    var result = await _identityUserManager.ResetPasswordAsync(identityuser, token, User.Password);
+                    var result = await _identityUserManager.ResetPasswordAsync(identityuser, token, user.Password);
                     if (result.Succeeded)
                     {
-                        _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset For {Username}", User.Username);
-                        User.Password = "";
+                        _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset For {Username}", user.Username);
+                        user.Password = "";
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
-                        User = null;
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", user.Username);
+                        user = null;
                     }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", User.Username);
-                    User = null;
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", user.Username);
+                    user = null;
                 }
             }
-            return User;
+            return user;
         }
 
         // GET api/<controller>/current
         [HttpGet("authenticate")]
         public User Authenticate()
         {
-            User user = new User();
-            user.Username = User.Identity.Name;
-            user.IsAuthenticated = User.Identity.IsAuthenticated;
-            string roles = "";
-            foreach (var claim in User.Claims.Where(item => item.Type == ClaimTypes.Role))
+            User user = new User { IsAuthenticated = User.Identity.IsAuthenticated, Username = "", UserId = -1, Roles = "" };            
+            if (user.IsAuthenticated)
             {
-                roles += claim.Value + ";";
+                user.Username = User.Identity.Name;
+                user.UserId = int.Parse(User.Claims.First(item => item.Type == ClaimTypes.PrimarySid).Value);
+                string roles = "";
+                foreach (var claim in User.Claims.Where(item => item.Type == ClaimTypes.Role))
+                {
+                    roles += claim.Value + ";";
+                }
+                if (roles != "") roles = ";" + roles;
+                user.Roles = roles;
             }
-            if (roles != "") roles = ";" + roles;
-            user.Roles = roles;
             return user;
         }
 
-        private string GetUserRoles(int UserId, int SiteId)
+        private string GetUserRoles(int userId, int siteId)
         {
             string roles = "";
-            List<UserRole> userroles = _userRoles.GetUserRoles(UserId, SiteId).ToList();
+            List<UserRole> userroles = _userRoles.GetUserRoles(userId, siteId).ToList();
             foreach (UserRole userrole in userroles)
             {
                 roles += userrole.Role.Name + ";";
diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs
index 7345beb9..b4398aa9 100644
--- a/Oqtane.Server/Controllers/UserRoleController.cs
+++ b/Oqtane.Server/Controllers/UserRoleController.cs
@@ -1,24 +1,27 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Repository;
+using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
 
 namespace Oqtane.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class UserRoleController : Controller
     {
         private readonly IUserRoleRepository _userRoles;
+        private readonly ITenantResolver _tenants;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
 
-        public UserRoleController(IUserRoleRepository userRoles, ISyncManager syncManager, ILogManager logger)
+        public UserRoleController(IUserRoleRepository userRoles, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
         {
             _userRoles = userRoles;
             _syncManager = syncManager;
+            _tenants = tenants;
             _logger = logger;
         }
 
@@ -41,29 +44,29 @@ namespace Oqtane.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = Constants.AdminRole)]
-        public UserRole Post([FromBody] UserRole UserRole)
+        public UserRole Post([FromBody] UserRole userRole)
         {
             if (ModelState.IsValid)
             {
-                UserRole = _userRoles.AddUserRole(UserRole);
-                _syncManager.AddSyncEvent(EntityNames.User, UserRole.UserId);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
+                userRole = _userRoles.AddUserRole(userRole);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole);
             }
-            return UserRole;
+            return userRole;
         }
 
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Roles = Constants.AdminRole)]
-        public UserRole Put(int id, [FromBody] UserRole UserRole)
+        public UserRole Put(int id, [FromBody] UserRole userRole)
         {
             if (ModelState.IsValid)
             {
-                UserRole = _userRoles.UpdateUserRole(UserRole);
-                _syncManager.AddSyncEvent(EntityNames.User, UserRole.UserId);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
+                userRole = _userRoles.UpdateUserRole(userRole);
+                _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", userRole);
             }
-            return UserRole;
+            return userRole;
         }
 
         // DELETE api/<controller>/5
@@ -73,7 +76,7 @@ namespace Oqtane.Controllers
         {
             UserRole userRole = _userRoles.GetUserRole(id);
             _userRoles.DeleteUserRole(id);
-            _syncManager.AddSyncEvent(EntityNames.User, userRole.UserId);
+            _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId);
             _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole);
         }
     }
diff --git a/Oqtane.Server/Extensions/AssemblyExtensions.cs b/Oqtane.Server/Extensions/AssemblyExtensions.cs
index 7c3bb924..8cb7c39d 100644
--- a/Oqtane.Server/Extensions/AssemblyExtensions.cs
+++ b/Oqtane.Server/Extensions/AssemblyExtensions.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
+// ReSharper disable once CheckNamespace
 namespace System.Reflection
 {
     public static class AssemblyExtensions
diff --git a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
index 61a3103c..9464e767 100644
--- a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OqtaneMvcBuilderExtensions
@@ -30,4 +31,4 @@ namespace Microsoft.Extensions.DependencyInjection
             return mvcBuilder;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index c32f7194..685327a9 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -8,15 +8,16 @@ using Microsoft.Extensions.Hosting;
 using Oqtane.Infrastructure;
 using Oqtane.Modules;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OqtaneServiceCollectionExtensions
     {
-        private static readonly IList<Assembly> _oqtaneModuleAssemblies = new List<Assembly>();
+        private static readonly IList<Assembly> OqtaneModuleAssemblies = new List<Assembly>();
 
         private static Assembly[] Assemblies => AppDomain.CurrentDomain.GetAssemblies();
 
-        internal static IEnumerable<Assembly> GetOqtaneModuleAssemblies() => _oqtaneModuleAssemblies;
+        internal static IEnumerable<Assembly> GetOqtaneModuleAssemblies() => OqtaneModuleAssemblies;
 
         public static IServiceCollection AddOqtaneModules(this IServiceCollection services)
         {
@@ -42,6 +43,18 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
+        public static IServiceCollection AddOqtaneSiteTemplates(this IServiceCollection services)
+        {
+            if (services is null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            LoadAssemblies("SiteTemplate");
+
+            return services;
+        }
+
         public static IServiceCollection AddOqtaneServices(this IServiceCollection services)
         {
             if (services is null)
@@ -50,15 +63,17 @@ namespace Microsoft.Extensions.DependencyInjection
             }
 
             // dynamically register module services, contexts, and repository classes
-            var assemblies = Assemblies.
-                Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".Module.")).ToArray();
+            var assemblies = Assemblies.Where(item => item.FullName != null && (item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".Module."))).ToArray();
             foreach (var assembly in assemblies)
             {
                 var implementationTypes = assembly.GetInterfaces<IService>();
                 foreach (var implementationType in implementationTypes)
                 {
-                    var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
-                    services.AddScoped(serviceType ?? implementationType, implementationType);
+                    if (implementationType.AssemblyQualifiedName != null)
+                    {
+                        var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                        services.AddScoped(serviceType ?? implementationType, implementationType);
+                    }
                 }
             }
 
@@ -91,22 +106,32 @@ namespace Microsoft.Extensions.DependencyInjection
 
         private static void LoadAssemblies(string pattern)
         {
-            var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+            if (assemblyPath == null) return;
+
             var assembliesFolder = new DirectoryInfo(assemblyPath);
 
-            // iterate through Oqtane theme assemblies in /bin ( filter is narrow to optimize loading process )
-            foreach (var file in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll"))
+            // iterate through Oqtane assemblies in /bin ( filter is narrow to optimize loading process )
+            foreach (var dll in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll"))
             {
                 // check if assembly is already loaded
-                var assembly = Assemblies.Where(a => a.Location == file.FullName).FirstOrDefault();
+                var assembly = Assemblies.FirstOrDefault(a =>!a.IsDynamic && a.Location == dll.FullName);
                 if (assembly == null)
                 {
-                    // load assembly from stream to prevent locking file ( as long as dependencies are in /bin they will load as well )
-                    assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file.FullName)));
+                    // load assembly ( and symbols ) from stream to prevent locking files ( as long as dependencies are in /bin they will load as well )
+                    string pdb = dll.FullName.Replace(".dll", ".pdb");
+                    if (File.Exists(pdb))
+                    {
+                        assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(dll.FullName)), new MemoryStream(File.ReadAllBytes(pdb)));
+                    }
+                    else
+                    {
+                        assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(dll.FullName)));
+                    }
                     if (pattern == "Module")
                     {
                         // build a list of module assemblies
-                        _oqtaneModuleAssemblies.Add(assembly);
+                        OqtaneModuleAssemblies.Add(assembly);
                     }
                 }
             }
diff --git a/Oqtane.Server/Extensions/PermissionExtension.cs b/Oqtane.Server/Extensions/PermissionExtension.cs
new file mode 100644
index 00000000..a4b44036
--- /dev/null
+++ b/Oqtane.Server/Extensions/PermissionExtension.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using Oqtane.Models;
+
+namespace Oqtane.Extensions
+{
+    public static class PermissionExtension
+    {
+        public static string EncodePermissions(this IEnumerable<Permission> permissionList)
+        {
+            List<PermissionString> permissionstrings = new List<PermissionString>();
+            string permissionname = "";
+            string permissions = "";
+            StringBuilder permissionsbuilder = new StringBuilder();
+            string securityid = "";
+            foreach (Permission permission in permissionList.OrderBy(item => item.PermissionName))
+            {
+                // permission collections are grouped by permissionname
+                if (permissionname != permission.PermissionName)
+                {
+                    permissions = permissionsbuilder.ToString();
+                    if (permissions != "")
+                    {
+                        permissionstrings.Add(new PermissionString { PermissionName = permissionname, Permissions = permissions.Substring(0, permissions.Length - 1) });
+                    }
+                    permissionname = permission.PermissionName;
+                    permissionsbuilder = new StringBuilder();
+                }
+
+                // deny permissions are prefixed with a "!"
+                string prefix = !permission.IsAuthorized ? "!" : "";
+
+                // encode permission
+                if (permission.UserId == null)
+                {
+                    securityid = prefix + permission.Role.Name + ";";
+                }
+                else
+                {
+                    securityid = prefix + "[" + permission.UserId + "];";
+                }
+
+                // insert deny permissions at the beginning and append grant permissions at the end
+                if (prefix == "!")
+                {
+                    permissionsbuilder.Insert(0, securityid);
+                }
+                else
+                {
+                    permissionsbuilder.Append(securityid);
+                }
+            }
+
+            permissions = permissionsbuilder.ToString();
+            if (permissions != "")
+            {
+                permissionstrings.Add(new PermissionString { PermissionName = permissionname, Permissions = permissions.Substring(0, permissions.Length - 1) });
+            }
+            return JsonSerializer.Serialize(permissionstrings);
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
new file mode 100644
index 00000000..57551bbb
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -0,0 +1,567 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using DbUp;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using Oqtane.Extensions;
+using Oqtane.Models;
+using Oqtane.Repository;
+using Oqtane.Shared;
+using Oqtane.Enums;
+using File = System.IO.File;
+
+namespace Oqtane.Infrastructure
+{
+    public class DatabaseManager : IDatabaseManager
+    {
+        private readonly IConfigurationRoot _config;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+        private readonly IMemoryCache _cache;
+
+        public DatabaseManager(IConfigurationRoot config, IServiceScopeFactory serviceScopeFactory, IMemoryCache cache)
+        {
+            _config = config;
+            _serviceScopeFactory = serviceScopeFactory;
+            _cache = cache;
+        }
+
+        public bool IsInstalled()
+        {
+            var defaultConnectionString = NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey));
+            var result = !string.IsNullOrEmpty(defaultConnectionString);
+            if (result)
+            {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    var db = scope.ServiceProvider.GetRequiredService<MasterDBContext>();
+                    result = db.Database.CanConnect();
+                    if (result)
+                    {
+                        try
+                        {
+                            result = db.Tenant.Any();
+                        }
+                        catch
+                        {
+                            result = false;
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        public Installation Install()
+        {
+            return Install(null);
+        }
+
+        public Installation Install(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            // get configuration
+            if (install == null)
+            {
+                // startup or silent installation
+                install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = Constants.MasterTenant, IsNewTenant = false };
+
+                if (!IsInstalled())
+                {
+                    install.Aliases = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty);
+                    install.HostPassword = GetInstallationConfig(SettingKeys.HostPasswordKey, string.Empty);
+                    install.HostEmail = GetInstallationConfig(SettingKeys.HostEmailKey, string.Empty);
+
+                    if (!string.IsNullOrEmpty(install.ConnectionString) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.HostPassword) && !string.IsNullOrEmpty(install.HostEmail))
+                    {
+                        // silent install
+                        install.HostName = Constants.HostUser;
+                        install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate);
+                        install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme);
+                        install.DefaultLayout = GetInstallationConfig(SettingKeys.DefaultLayoutKey, Constants.DefaultLayout);
+                        install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer);
+                        install.SiteName = Constants.DefaultSite;
+                        install.IsNewTenant = true;
+                    }
+                    else
+                    {
+                        // silent installation is missing required information
+                        install.ConnectionString = "";
+                    }
+                }
+            }
+            else
+            {
+                // install wizard or add new site
+                if (!string.IsNullOrEmpty(install.Aliases))
+                {
+                    if (string.IsNullOrEmpty(install.SiteTemplate))
+                    {
+                        install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate);
+                    }
+                    if (string.IsNullOrEmpty(install.DefaultTheme))
+                    {
+                        install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme);
+                        if (string.IsNullOrEmpty(install.DefaultLayout))
+                        {
+                            install.DefaultLayout = GetInstallationConfig(SettingKeys.DefaultLayoutKey, Constants.DefaultLayout);
+                        }
+                    }
+                    if (string.IsNullOrEmpty(install.DefaultContainer))
+                    {
+                        install.DefaultContainer = GetInstallationConfig(SettingKeys.DefaultContainerKey, Constants.DefaultContainer);
+                    }
+                }
+                else
+                {
+                    result.Message = "Invalid Installation Configuration";
+                    install.ConnectionString = "";
+                }
+            }
+
+            // proceed with installation/migration
+            if (!string.IsNullOrEmpty(install.ConnectionString))
+            {
+                result = CreateDatabase(install);
+                if (result.Success)
+                {
+                    result = MigrateMaster(install);
+                    if (result.Success)
+                    {
+                        result = CreateTenant(install);
+                        if (result.Success)
+                        {
+                            result = MigrateTenants(install);
+                            if (result.Success)
+                            {
+                                result = MigrateModules(install);
+                                if (result.Success)
+                                {
+                                    result = CreateSite(install);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private Installation CreateDatabase(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            if (install.IsNewTenant)
+            {
+                try
+                {
+                    //create data directory if does not exist
+                    var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
+                    if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory);
+
+                    using (var dbc = new DbContext(new DbContextOptionsBuilder().UseSqlServer(NormalizeConnectionString(install.ConnectionString)).Options))
+                    {
+                        // create empty database if it does not exist       
+                        dbc.Database.EnsureCreated();
+                        result.Success = true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    result.Message = ex.Message;
+                }
+            }
+            else
+            {
+                result.Success = true;
+            }
+
+            return result;
+        }
+
+        private Installation MigrateMaster(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            if (install.TenantName == Constants.MasterTenant)
+            {
+                var upgradeConfig = DeployChanges
+                    .To
+                    .SqlDatabase(NormalizeConnectionString(install.ConnectionString))
+                    .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Master.") && s.EndsWith(".sql",StringComparison.OrdinalIgnoreCase));
+
+                var upgrade = upgradeConfig.Build();
+                if (upgrade.IsUpgradeRequired())
+                {
+                    var upgradeResult = upgrade.PerformUpgrade();
+                    result.Success = upgradeResult.Successful;
+                    if (!result.Success)
+                    {
+                        result.Message = upgradeResult.Error.Message;
+                    }
+                }
+                else
+                {
+                    result.Success = true;
+                }
+
+                if (result.Success)
+                {
+                    UpdateConnectionString(install.ConnectionString);
+                }
+            }
+            else
+            {
+                result.Success = true;
+            }
+
+            return result;
+        }
+
+        private Installation CreateTenant(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            if (!string.IsNullOrEmpty(install.TenantName) && !string.IsNullOrEmpty(install.Aliases))
+            {
+                using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))) 
+                {
+                    Tenant tenant;
+                    if (install.IsNewTenant)
+                    {
+                        tenant = new Tenant { Name = install.TenantName, DBConnectionString = DenormalizeConnectionString(install.ConnectionString), CreatedBy = "", CreatedOn = DateTime.UtcNow, ModifiedBy = "", ModifiedOn = DateTime.UtcNow };
+                        db.Tenant.Add(tenant);
+                        db.SaveChanges();
+                        _cache.Remove("tenants");
+
+                        if (install.TenantName == Constants.MasterTenant)
+                        {
+                            var job = new Job { Name = "Notification Job", JobType = "Oqtane.Infrastructure.NotificationJob, Oqtane.Server", Frequency = "m", Interval = 1, StartDate = null, EndDate = null, IsEnabled = false, IsStarted = false, IsExecuting = false, NextExecution = null, RetentionHistory = 10, CreatedBy = "", CreatedOn = DateTime.UtcNow, ModifiedBy = "", ModifiedOn = DateTime.UtcNow };
+                            db.Job.Add(job);
+                            db.SaveChanges();
+                            _cache.Remove("jobs");
+                        }
+                    }
+                    else
+                    {
+                        tenant = db.Tenant.FirstOrDefault(item => item.Name == install.TenantName);
+                    }
+
+                    foreach (string aliasname in install.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        var alias = new Alias { Name = aliasname, TenantId = tenant.TenantId, SiteId = -1, CreatedBy = "", CreatedOn = DateTime.UtcNow, ModifiedBy = "", ModifiedOn = DateTime.UtcNow };
+                        db.Alias.Add(alias);
+                        db.SaveChanges();
+                    }
+                    _cache.Remove("aliases");
+                }
+            }
+
+            result.Success = true;
+
+            return result;
+        }
+
+        private Installation MigrateTenants(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            string[] versions = Constants.ReleaseVersions.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+            using (var scope = _serviceScopeFactory.CreateScope())
+            {
+                var upgrades = scope.ServiceProvider.GetRequiredService<IUpgradeManager>();
+  
+                using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
+                {
+                    foreach (var tenant in db.Tenant.ToList())
+                    {
+                        var upgradeConfig = DeployChanges.To.SqlDatabase(NormalizeConnectionString(tenant.DBConnectionString))
+                            .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Tenant.") && s.EndsWith(".sql", StringComparison.OrdinalIgnoreCase));
+
+                        var upgrade = upgradeConfig.Build();
+                        if (upgrade.IsUpgradeRequired())
+                        {
+                            var upgradeResult = upgrade.PerformUpgrade();
+                            result.Success = upgradeResult.Successful;
+                            if (!result.Success)
+                            {
+                                result.Message = upgradeResult.Error.Message;
+                            }
+                        }
+
+                        // execute any version specific upgrade logic
+                        string version = tenant.Version;
+                        int index = Array.FindIndex(versions, item => item == version);
+                        if (index != (versions.Length - 1))
+                        {
+                            if (index == -1) index = 0;
+                            for (int i = index; i < versions.Length; i++)
+                            {
+                                upgrades.Upgrade(tenant, versions[i]);
+                            }
+                            tenant.Version = versions[versions.Length - 1];
+                            db.Entry(tenant).State = EntityState.Modified;
+                            db.SaveChanges();
+                        }
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(result.Message))
+            {
+                result.Success = true;
+            }
+
+            return result;
+        }
+
+        private Installation MigrateModules(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            using (var scope = _serviceScopeFactory.CreateScope())
+            {
+                var moduledefinitions = scope.ServiceProvider.GetRequiredService<IModuleDefinitionRepository>();
+                foreach (var moduledefinition in moduledefinitions.GetModuleDefinitions())
+                {
+                    if (!string.IsNullOrEmpty(moduledefinition.ServerManagerType) && !string.IsNullOrEmpty(moduledefinition.ReleaseVersions))
+                    {
+                        string[] versions = moduledefinition.ReleaseVersions.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                        using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
+                        {
+                            foreach (var tenant in db.Tenant.ToList())
+                            {
+                                int index = Array.FindIndex(versions, item => item == moduledefinition.Version);
+                                if (tenant.Name == install.TenantName && install.TenantName != Constants.MasterTenant)
+                                {
+                                    index = -1;
+                                }
+                                if (index != (versions.Length - 1))
+                                {
+                                    if (index == -1) index = 0;
+                                    for (int i = index; i < versions.Length; i++)
+                                    {
+                                        Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+                                        if (moduletype != null && moduletype.GetInterface("IInstallable") != null)
+                                        {
+                                            try
+                                            {
+                                                var moduleobject = ActivatorUtilities.CreateInstance(scope.ServiceProvider, moduletype);
+                                                ((IInstallable)moduleobject).Install(tenant, versions[i]);
+                                            }
+                                            catch (Exception ex)
+                                            {
+                                                result.Message = "An Error Occurred Installing " + moduledefinition.Name + " - " + ex.Message.ToString();
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            if (string.IsNullOrEmpty(result.Message) && moduledefinition.Version != versions[versions.Length - 1])
+                            {
+                                moduledefinition.Version = versions[versions.Length - 1];
+                                db.Entry(moduledefinition).State = EntityState.Modified;
+                                db.SaveChanges();
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(result.Message))
+            {
+                result.Success = true;
+            }
+
+            return result;
+        }
+
+        private Installation CreateSite(InstallConfig install)
+        {
+            var result = new Installation { Success = false, Message = string.Empty };
+
+            if (!string.IsNullOrEmpty(install.TenantName) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.SiteName))
+            {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    // use the SiteState to set the Alias explicitly so the tenant can be resolved
+                    var aliases = scope.ServiceProvider.GetRequiredService<IAliasRepository>();
+                    string firstalias = install.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
+                    var alias = aliases.GetAliases().FirstOrDefault(item => item.Name == firstalias);
+                    var siteState = scope.ServiceProvider.GetRequiredService<SiteState>();
+                    siteState.Alias = alias;
+
+                    var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+                    var site = sites.GetSites().FirstOrDefault(item => item.Name == install.SiteName);
+                    if (site == null)
+                    {
+                        var tenants = scope.ServiceProvider.GetRequiredService<ITenantRepository>();
+                        var users = scope.ServiceProvider.GetRequiredService<IUserRepository>();
+                        var roles = scope.ServiceProvider.GetRequiredService<IRoleRepository>();
+                        var userroles = scope.ServiceProvider.GetRequiredService<IUserRoleRepository>();
+                        var folders = scope.ServiceProvider.GetRequiredService<IFolderRepository>();
+                        var log = scope.ServiceProvider.GetRequiredService<ILogManager>();
+                        var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>();
+
+                        var tenant = tenants.GetTenants().FirstOrDefault(item => item.Name == install.TenantName);
+
+                        site = new Site
+                        {
+                            TenantId = tenant.TenantId,
+                            Name = install.SiteName,
+                            LogoFileId = null,
+                            DefaultThemeType = install.DefaultTheme,
+                            DefaultLayoutType = install.DefaultLayout,
+                            DefaultContainerType = install.DefaultContainer,
+                            SiteTemplateType = install.SiteTemplate
+                        };
+                        site = sites.AddSite(site);
+
+                        IdentityUser identityUser = identityUserManager.FindByNameAsync(Constants.HostUser).GetAwaiter().GetResult();
+                        if (identityUser == null)
+                        {
+                            identityUser = new IdentityUser { UserName = Constants.HostUser, Email = install.HostEmail, EmailConfirmed = true };
+                            var create = identityUserManager.CreateAsync(identityUser, install.HostPassword).GetAwaiter().GetResult();
+                            if (create.Succeeded)
+                            {
+                                var user = new User
+                                {
+                                    SiteId = site.SiteId,
+                                    Username = Constants.HostUser,
+                                    Password = install.HostPassword,
+                                    Email = install.HostEmail,
+                                    DisplayName = install.HostName,
+                                    LastIPAddress = "",
+                                    LastLoginOn = null
+                                };
+
+                                user = users.AddUser(user);
+                                var hostRoleId = roles.GetRoles(user.SiteId, true).FirstOrDefault(item => item.Name == Constants.HostRole)?.RoleId ?? 0;
+                                var userRole = new UserRole { UserId = user.UserId, RoleId = hostRoleId, EffectiveDate = null, ExpiryDate = null };
+                                userroles.AddUserRole(userRole);
+
+                                // add user folder
+                                var folder = folders.GetFolder(user.SiteId, Utilities.PathCombine("Users", "\\"));
+                                if (folder != null)
+                                {
+                                    folders.AddFolder(new Folder
+                                    {
+                                        SiteId = folder.SiteId,
+                                        ParentId = folder.FolderId,
+                                        Name = "My Folder",
+                                        Path = Utilities.PathCombine(folder.Path, user.UserId.ToString(), "\\"),
+                                        Order = 1,
+                                        IsSystem = true,
+                                        Permissions = new List<Permission>
+                                        {
+                                            new Permission(PermissionNames.Browse, user.UserId, true),
+                                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                                            new Permission(PermissionNames.Edit, user.UserId, true),
+                                        }.EncodePermissions(),
+                                    });
+                                }
+                            }
+                        }
+
+                        foreach (string aliasname in install.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                        {
+                            alias = aliases.GetAliases().FirstOrDefault(item => item.Name == aliasname);
+                            alias.SiteId = site.SiteId;
+                            aliases.UpdateAlias(alias);
+                        }
+
+                        tenant.Version = Constants.Version;
+                        tenants.UpdateTenant(tenant);
+
+                        log.Log(site.SiteId, LogLevel.Trace, this, LogFunction.Create, "Site Created {Site}", site);
+                    }
+                }
+            }
+
+            result.Success = true;
+
+            return result;
+        }
+
+        private string NormalizeConnectionString(string connectionString)
+        {
+            var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
+            connectionString = connectionString.Replace("|DataDirectory|", dataDirectory);
+            return connectionString;
+        }
+
+        private string DenormalizeConnectionString(string connectionString)
+        {
+            var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
+            connectionString = connectionString.Replace(dataDirectory, "|DataDirectory|");
+            return connectionString;
+        }
+
+        public void UpdateConnectionString(string connectionString)
+        {
+            connectionString = DenormalizeConnectionString(connectionString);
+            if (_config.GetConnectionString(SettingKeys.ConnectionStringKey) != connectionString)
+            {
+                AddOrUpdateAppSetting($"ConnectionStrings:{SettingKeys.ConnectionStringKey}", connectionString);
+                _config.Reload();
+            }
+        }
+
+        public void AddOrUpdateAppSetting<T>(string sectionPathKey, T value)
+        {
+            try
+            {
+                var filePath = Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json");
+                var json = File.ReadAllText(filePath);
+                dynamic jsonObj = JsonConvert.DeserializeObject(json);
+
+                SetValueRecursively(sectionPathKey, jsonObj, value);
+
+                string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);
+                File.WriteAllText(filePath, output);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Error writing app settings | {0}", ex);
+            }
+        }
+
+        private void SetValueRecursively<T>(string sectionPathKey, dynamic jsonObj, T value)
+        {
+            // split the string at the first ':' character
+            var remainingSections = sectionPathKey.Split(":", 2);
+
+            var currentSection = remainingSections[0];
+            if (remainingSections.Length > 1)
+            {
+                // continue with the process, moving down the tree
+                var nextSection = remainingSections[1];
+                SetValueRecursively(nextSection, jsonObj[currentSection], value);
+            }
+            else
+            {
+                // we've got to the end of the tree, set the value
+                jsonObj[currentSection] = value;
+            }
+        }
+
+        private string GetInstallationConfig(string key, string defaultValue)
+        {
+            var value = _config.GetSection(SettingKeys.InstallationSection).GetValue(key, defaultValue);
+            // double fallback to default value - allow hold sample keys in config
+            if (string.IsNullOrEmpty(value)) value = defaultValue;
+            return value;
+        }
+        
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index b375d21d..4cfbaa6b 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -7,6 +7,7 @@ using System.Xml;
 using Oqtane.Shared;
 using System;
 using System.Diagnostics;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace Oqtane.Infrastructure
 {
@@ -14,34 +15,48 @@ namespace Oqtane.Infrastructure
     {
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
         private readonly IWebHostEnvironment _environment;
+        private readonly IMemoryCache _cache;
 
-        public InstallationManager(IHostApplicationLifetime hostApplicationLifetime, IWebHostEnvironment environment)
+        public InstallationManager(IHostApplicationLifetime hostApplicationLifetime, IWebHostEnvironment environment, IMemoryCache cache)
         {
             _hostApplicationLifetime = hostApplicationLifetime;
             _environment = environment;
+            _cache = cache;
         }
 
-        public void InstallPackages(string Folders, bool Restart)
+        public void InstallPackages(string folders, bool restart)
+        {
+            var webRootPath = _environment.WebRootPath;
+            
+            var install = UnpackPackages(folders, webRootPath);
+
+            if (install && restart)
+            {
+                RestartApplication();
+            }
+        }
+
+        public static bool UnpackPackages(string folders, string webRootPath)
         {
             bool install = false;
-            string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            string binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
 
-            foreach (string Folder in Folders.Split(','))
+            foreach (string folder in folders.Split(','))
             {
-                string folder = Path.Combine(_environment.WebRootPath, Folder);
+                string sourceFolder = Path.Combine(webRootPath, folder);
 
                 // create folder if it does not exist
-                if (!Directory.Exists(folder))
+                if (!Directory.Exists(sourceFolder))
                 {
-                    Directory.CreateDirectory(folder);
+                    Directory.CreateDirectory(sourceFolder);
                 }
 
                 // iterate through packages
-                foreach (string packagename in Directory.GetFiles(folder, "*.nupkg"))
+                foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))
                 {
                     string name = Path.GetFileNameWithoutExtension(packagename);
-                    string[] segments = name.Split('.');
-                    name = string.Join('.', segments, 0, segments.Length - 3);
+                    string[] segments = name?.Split('.');
+                    if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3);
 
                     // iterate through files
                     using (ZipArchive archive = ZipFile.OpenRead(packagename))
@@ -63,6 +78,7 @@ namespace Oqtane.Infrastructure
                                 {
                                     frameworkversion = node.Attributes["version"].Value;
                                 }
+
                                 reader.Close();
                             }
                         }
@@ -78,7 +94,7 @@ namespace Oqtane.Infrastructure
                                 {
                                     case ".pdb":
                                     case ".dll":
-                                        entry.ExtractToFile(Path.Combine(binfolder, filename), true);
+                                        if (binFolder != null) entry.ExtractToFile(Path.Combine(binFolder, filename), true);
                                         break;
                                     case ".png":
                                     case ".jpg":
@@ -87,28 +103,27 @@ namespace Oqtane.Infrastructure
                                     case ".svg":
                                     case ".js":
                                     case ".css":
-                                        filename = folder + "\\" + entry.FullName.Replace("wwwroot", name).Replace("/", "\\");
+                                        string entryPath = Utilities.PathCombine(entry.FullName.Replace("wwwroot", name).Split('/'));
+                                        filename = Path.Combine(sourceFolder, entryPath);
                                         if (!Directory.Exists(Path.GetDirectoryName(filename)))
                                         {
                                             Directory.CreateDirectory(Path.GetDirectoryName(filename));
                                         }
+
                                         entry.ExtractToFile(filename, true);
                                         break;
                                 }
                             }
                         }
                     }
+
                     // remove package
                     File.Delete(packagename);
                     install = true;
                 }
             }
 
-            if (install && Restart)
-            {
-                // restart application
-                RestartApplication();
-            }
+            return install;
         }
 
         public void UpgradeFramework()
@@ -165,26 +180,29 @@ namespace Oqtane.Infrastructure
 
         private void FinishUpgrade()
         {
-            string folder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            string folder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
 
             // check if upgrade application exists
-            if (File.Exists(Path.Combine(folder, "Oqtane.Upgrade.exe")))
+            if (folder == null || !File.Exists(Path.Combine(folder, "Oqtane.Upgrade.exe"))) return;
+            // run upgrade application
+            var process = new Process
             {
-                // run upgrade application
-                var process = new Process();
-                process.StartInfo.FileName = Path.Combine(folder, "Oqtane.Upgrade.exe");
-                process.StartInfo.Arguments = "";
-                process.StartInfo.ErrorDialog = false;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.RedirectStandardOutput = false;
-                process.StartInfo.RedirectStandardError = false;
-                process.Start();
-                process.Dispose();
+                StartInfo =
+                {
+                    FileName = Path.Combine(folder, "Oqtane.Upgrade.exe"),
+                    Arguments = "",
+                    ErrorDialog = false,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    RedirectStandardOutput = false,
+                    RedirectStandardError = false
+                }
+            };
+            process.Start();
+            process.Dispose();
 
-                // stop application so upgrade application can proceed
-                RestartApplication();
-            }
+            // stop application so upgrade application can proceed
+            RestartApplication();
         }
 
         public void RestartApplication()
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs
new file mode 100644
index 00000000..ffb0ff9c
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs
@@ -0,0 +1,12 @@
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Infrastructure
+{
+    public interface IDatabaseManager
+    {
+        bool IsInstalled();
+        Installation Install();
+        Installation Install(InstallConfig install);
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IInstallable.cs b/Oqtane.Server/Infrastructure/Interfaces/IInstallable.cs
new file mode 100644
index 00000000..baef7184
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/IInstallable.cs
@@ -0,0 +1,10 @@
+using Oqtane.Models;
+
+namespace Oqtane.Infrastructure
+{
+    public interface IInstallable
+    {
+        bool Install(Tenant tenant, string version);
+        bool Uninstall(Tenant tenant);
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs
index 52afc3f8..f34165f0 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs
@@ -2,7 +2,7 @@
 {
     public interface IInstallationManager
     {
-        void InstallPackages(string Folders, bool Restart);
+        void InstallPackages(string folders, bool restart);
         void UpgradeFramework();
         void RestartApplication();
     }
diff --git a/Oqtane.Server/Infrastructure/Interfaces/ILogManager.cs b/Oqtane.Server/Infrastructure/Interfaces/ILogManager.cs
index 0798f86c..bd52214c 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/ILogManager.cs
+++ b/Oqtane.Server/Infrastructure/Interfaces/ILogManager.cs
@@ -1,15 +1,16 @@
-using Oqtane.Models;
+using System;
+using Oqtane.Enums;
+using Oqtane.Models;
 using Oqtane.Shared;
-using System;
 
 namespace Oqtane.Infrastructure
 {
     public interface ILogManager
     {
-        void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args);
-        void Log(LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args);
-        void Log(int SiteId, LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args);
-        void Log(int SiteId, LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args);
-        void Log(Log Log);
+        void Log(LogLevel level, object @class, LogFunction function, string message, params object[] args);
+        void Log(LogLevel level, object @class, LogFunction function, Exception exception, string message, params object[] args);
+        void Log(int siteId, LogLevel level, object @class, LogFunction function, string message, params object[] args);
+        void Log(int siteId, LogLevel level, object @class, LogFunction function, Exception exception, string message, params object[] args);
+        void Log(Log log);
     }
 }
diff --git a/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs b/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs
new file mode 100644
index 00000000..4d987a97
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs
@@ -0,0 +1,12 @@
+using Oqtane.Models;
+using System.Collections.Generic;
+
+namespace Oqtane.Infrastructure
+{
+    public interface ISiteTemplate
+    {
+        string Name { get; }
+
+        List<PageTemplate> CreateSite(Site site);
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs b/Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs
index f5bee6df..b82e5196 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs
+++ b/Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs
@@ -1,13 +1,12 @@
-using Oqtane.Models;
-using Oqtane.Shared;
-using System;
+using System;
 using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Infrastructure
 {
     public interface ISyncManager
     {
-        List<SyncEvent> GetSyncEvents(DateTime LastSyncDate);
-        void AddSyncEvent(string EntityName, int EntityId);
+        List<SyncEvent> GetSyncEvents(int tenantId, DateTime lastSyncDate);
+        void AddSyncEvent(int tenantId, string entityName, int entityId);
     }
 }
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IUpgradeManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IUpgradeManager.cs
new file mode 100644
index 00000000..e941bbfd
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/IUpgradeManager.cs
@@ -0,0 +1,9 @@
+using Oqtane.Models;
+
+namespace Oqtane.Infrastructure
+{
+    public interface IUpgradeManager
+    {
+        void Upgrade(Tenant tenant, string version);
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
index 37421b87..35b8b0a9 100644
--- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
@@ -13,7 +13,7 @@ namespace Oqtane.Infrastructure
 {
     public abstract class HostedServiceBase : IHostedService, IDisposable
     {
-        private Task ExecutingTask;
+        private Task _executingTask;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private readonly IServiceScopeFactory _serviceScopeFactory;
 
@@ -34,43 +34,43 @@ namespace Oqtane.Infrastructure
                     using (var scope = _serviceScopeFactory.CreateScope())
                     {
                         // get name of job
-                        string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
+                        string jobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
 
                         // load jobs and find current job
-                        IJobRepository Jobs = scope.ServiceProvider.GetRequiredService<IJobRepository>();
-                        Job Job = Jobs.GetJobs().Where(item => item.JobType == JobType).FirstOrDefault();
-                        if (Job != null && Job.IsEnabled && !Job.IsExecuting)
+                        IJobRepository jobs = scope.ServiceProvider.GetRequiredService<IJobRepository>();
+                        Job job = jobs.GetJobs().Where(item => item.JobType == jobType).FirstOrDefault();
+                        if (job != null && job.IsEnabled && !job.IsExecuting)
                         {
                             // set next execution date
-                            if (Job.NextExecution == null)
+                            if (job.NextExecution == null)
                             {
-                                if (Job.StartDate != null)
+                                if (job.StartDate != null)
                                 {
-                                    Job.NextExecution = Job.StartDate;
+                                    job.NextExecution = job.StartDate;
                                 }
                                 else
                                 {
-                                    Job.NextExecution = DateTime.UtcNow;
+                                    job.NextExecution = DateTime.UtcNow;
                                 }
                             }
 
                             // determine if the job should be run
-                            if (Job.NextExecution <= DateTime.UtcNow && (Job.EndDate == null || Job.EndDate >= DateTime.UtcNow))
+                            if (job.NextExecution <= DateTime.UtcNow && (job.EndDate == null || job.EndDate >= DateTime.UtcNow))
                             {
-                                IJobLogRepository JobLogs = scope.ServiceProvider.GetRequiredService<IJobLogRepository>();
+                                IJobLogRepository jobLogs = scope.ServiceProvider.GetRequiredService<IJobLogRepository>();
 
                                 // create a job log entry
                                 JobLog log = new JobLog();
-                                log.JobId = Job.JobId;
+                                log.JobId = job.JobId;
                                 log.StartDate = DateTime.UtcNow;
                                 log.FinishDate = null;
                                 log.Succeeded = false;
                                 log.Notes = "";
-                                log = JobLogs.AddJobLog(log);
+                                log = jobLogs.AddJobLog(log);
 
                                 // update the job to indicate it is running
-                                Job.IsExecuting = true;
-                                Jobs.UpdateJob(Job);
+                                job.IsExecuting = true;
+                                jobs.UpdateJob(job);
 
                                 // execute the job
                                 try
@@ -86,19 +86,19 @@ namespace Oqtane.Infrastructure
 
                                 // update the job log
                                 log.FinishDate = DateTime.UtcNow;
-                                JobLogs.UpdateJobLog(log);
+                                jobLogs.UpdateJobLog(log);
 
                                 // update the job
-                                Job.NextExecution = CalculateNextExecution(Job.NextExecution.Value, Job.Frequency, Job.Interval);
-                                Job.IsExecuting = false;
-                                Jobs.UpdateJob(Job);
+                                job.NextExecution = CalculateNextExecution(job.NextExecution.Value, job.Frequency, job.Interval);
+                                job.IsExecuting = false;
+                                jobs.UpdateJob(job);
 
                                 // trim the job log
-                                List<JobLog> logs = JobLogs.GetJobLogs().Where(item => item.JobId == Job.JobId)
+                                List<JobLog> logs = jobLogs.GetJobLogs().Where(item => item.JobId == job.JobId)
                                     .OrderByDescending(item => item.JobLogId).ToList();
-                                for (int i = logs.Count; i > Job.RetentionHistory; i--)
+                                for (int i = logs.Count; i > job.RetentionHistory; i--)
                                 {
-                                    JobLogs.DeleteJobLog(logs[i - 1].JobLogId);
+                                    jobLogs.DeleteJobLog(logs[i - 1].JobLogId);
                                 }
                             }
                         }
@@ -115,28 +115,28 @@ namespace Oqtane.Infrastructure
 
         }
 
-        private DateTime CalculateNextExecution(DateTime NextExecution, string Frequency, int Interval)
+        private DateTime CalculateNextExecution(DateTime nextExecution, string frequency, int interval)
         {
-            switch (Frequency)
+            switch (frequency)
             {
                 case "m": // minutes
-                    NextExecution = NextExecution.AddMinutes(Interval);
+                    nextExecution = nextExecution.AddMinutes(interval);
                     break;
                 case "H": // hours
-                    NextExecution = NextExecution.AddHours(Interval);
+                    nextExecution = nextExecution.AddHours(interval);
                     break;
                 case "d": // days
-                    NextExecution = NextExecution.AddDays(Interval);
+                    nextExecution = nextExecution.AddDays(interval);
                     break;
                 case "M": // months
-                    NextExecution = NextExecution.AddMonths(Interval);
+                    nextExecution = nextExecution.AddMonths(interval);
                     break;
             }
-            if (NextExecution < DateTime.UtcNow)
+            if (nextExecution < DateTime.UtcNow)
             {
-                NextExecution = DateTime.UtcNow;
+                nextExecution = DateTime.UtcNow;
             }
-            return NextExecution;
+            return nextExecution;
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
@@ -146,14 +146,14 @@ namespace Oqtane.Infrastructure
                 // set IsExecuting to false in case this job was forcefully terminated previously 
                 using (var scope = _serviceScopeFactory.CreateScope())
                 {
-                    string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
-                    IJobRepository Jobs = scope.ServiceProvider.GetRequiredService<IJobRepository>();
-                    Job Job = Jobs.GetJobs().Where(item => item.JobType == JobType).FirstOrDefault();
-                    if (Job != null)
+                    string jobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
+                    IJobRepository jobs = scope.ServiceProvider.GetRequiredService<IJobRepository>();
+                    Job job = jobs.GetJobs().Where(item => item.JobType == jobType).FirstOrDefault();
+                    if (job != null)
                     {
-                        Job.IsStarted = true;
-                        Job.IsExecuting = false;
-                        Jobs.UpdateJob(Job);
+                        job.IsStarted = true;
+                        job.IsExecuting = false;
+                        jobs.UpdateJob(job);
                     }
                 }
             }
@@ -162,19 +162,19 @@ namespace Oqtane.Infrastructure
                 // can occur during the initial installation as there is no DBContext
             }
 
-            ExecutingTask = ExecuteAsync(_cancellationTokenSource.Token);
+            _executingTask = ExecuteAsync(_cancellationTokenSource.Token);
 
-            if (ExecutingTask.IsCompleted)
+            if (_executingTask.IsCompleted)
             {
-                return ExecutingTask;
+                return _executingTask;
             }
 
             return Task.CompletedTask;
         }
 
-        public async Task StopAsync(CancellationToken CancellationToken)
+        public async Task StopAsync(CancellationToken cancellationToken)
         {
-            if (ExecutingTask == null)
+            if (_executingTask == null)
             {
                 return;
             }
@@ -185,7 +185,7 @@ namespace Oqtane.Infrastructure
             }
             finally
             {
-                await Task.WhenAny(ExecutingTask, Task.Delay(Timeout.Infinite, CancellationToken));
+                await Task.WhenAny(_executingTask, Task.Delay(Timeout.Infinite, cancellationToken));
             }
         }
 
diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
index e693924d..bd667486 100644
--- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
@@ -14,34 +14,34 @@ namespace Oqtane.Infrastructure
     {
         // JobType = "Oqtane.Infrastructure.NotificationJob, Oqtane.Server"
 
-        public NotificationJob(IServiceScopeFactory ServiceScopeFactory) : base(ServiceScopeFactory) {}
+        public NotificationJob(IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory) {}
 
         public override string ExecuteJob(IServiceProvider provider)
         {
             string log = "";
 
             // iterate through aliases in this installation
-            var Aliases = provider.GetRequiredService<IAliasRepository>();
-            List<Alias> aliases = Aliases.GetAliases().ToList();
+            var aliasRepository = provider.GetRequiredService<IAliasRepository>();
+            List<Alias> aliases = aliasRepository.GetAliases().ToList();
             foreach (Alias alias in aliases)
             {
                 // use the SiteState to set the Alias explicitly so the tenant can be resolved
-                var sitestate = provider.GetRequiredService<SiteState>();
-                sitestate.Alias = alias;
+                var siteState = provider.GetRequiredService<SiteState>();
+                siteState.Alias = alias;
 
                 // get services which require tenant resolution
-                var Sites = provider.GetRequiredService<ISiteRepository>();
-                var Settings = provider.GetRequiredService<ISettingRepository>();
-                var Notifications = provider.GetRequiredService<INotificationRepository>();
+                var siteRepository = provider.GetRequiredService<ISiteRepository>();
+                var settingRepository = provider.GetRequiredService<ISettingRepository>();
+                var notificationRepository = provider.GetRequiredService<INotificationRepository>();
 
                 // iterate through sites 
-                List<Site> sites = Sites.GetSites().ToList();
+                List<Site> sites = siteRepository.GetSites().ToList();
                 foreach (Site site in sites)
                 {
                     log += "Processing Notifications For Site: " + site.Name + "\n\n";
 
                     // get site settings
-                    List<Setting> sitesettings = Settings.GetSettings("Site", site.SiteId).ToList();
+                    List<Setting> sitesettings = settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList();
                     Dictionary<string, string> settings = GetSettings(sitesettings);
                     if (settings.ContainsKey("SMTPHost") && settings["SMTPHost"] != "")
                     {
@@ -61,7 +61,7 @@ namespace Oqtane.Infrastructure
 
                         // iterate through notifications
                         int sent = 0;
-                        List<Notification> notifications = Notifications.GetNotifications(site.SiteId, -1, -1).ToList();
+                        List<Notification> notifications = notificationRepository.GetNotifications(site.SiteId, -1, -1).ToList();
                         foreach (Notification notification in notifications)
                         {
                             MailMessage mailMessage = new MailMessage();
@@ -75,7 +75,7 @@ namespace Oqtane.Infrastructure
                             {
                                 mailMessage.Body = "From: " + site.Name + "\n";
                             }
-                            mailMessage.Body += "Sent: " + notification.CreatedOn.ToString() + "\n";
+                            mailMessage.Body += "Sent: " + notification.CreatedOn + "\n";
                             if (notification.ToUserId != null)
                             {
                                 mailMessage.To.Add(new MailAddress(notification.ToUser.Email, notification.ToUser.DisplayName));
@@ -96,15 +96,15 @@ namespace Oqtane.Infrastructure
                                 sent = sent++;
                                 notification.IsDelivered = true;
                                 notification.DeliveredOn = DateTime.UtcNow;
-                                Notifications.UpdateNotification(notification);
+                                notificationRepository.UpdateNotification(notification);
                             }
                             catch (Exception ex)
                             {
                                 // error
-                                log += ex.Message.ToString() + "\n\n";
+                                log += ex.Message + "\n\n";
                             }
                         }
-                        log += "Notifications Delivered: " + sent.ToString() + "\n\n";
+                        log += "Notifications Delivered: " + sent + "\n\n";
                     }
                     else
                     {
@@ -117,10 +117,10 @@ namespace Oqtane.Infrastructure
         }
 
 
-        private Dictionary<string, string> GetSettings(List<Setting> Settings)
+        private Dictionary<string, string> GetSettings(List<Setting> settings)
         {
             Dictionary<string, string> dictionary = new Dictionary<string, string>();
-            foreach (Setting setting in Settings.OrderBy(item => item.SettingName).ToList())
+            foreach (Setting setting in settings.OrderBy(item => item.SettingName).ToList())
             {
                 dictionary.Add(setting.SettingName, setting.SettingValue);
             }
diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs
index 195e9c5b..52a4736a 100644
--- a/Oqtane.Server/Infrastructure/LogManager.cs
+++ b/Oqtane.Server/Infrastructure/LogManager.cs
@@ -2,11 +2,14 @@
 using System;
 using Oqtane.Models;
 using System.Text.Json;
-using Oqtane.Repository;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Http;
 using System.Collections.Generic;
+using Oqtane.Enums;
+using Oqtane.Repository;
 using Oqtane.Security;
+// ReSharper disable StringIndexOfIsCultureSpecific.2
+// ReSharper disable StringIndexOfIsCultureSpecific.1
 
 namespace Oqtane.Infrastructure
 {
@@ -27,25 +30,25 @@ namespace Oqtane.Infrastructure
             _accessor = accessor;
         }
 
-        public void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args)
+        public void Log(LogLevel level, object @class, LogFunction function, string message, params object[] args)
         {
-            Log(-1, Level, Class.GetType().AssemblyQualifiedName, Function, null, Message, Args);
+            Log(-1, level, @class.GetType().AssemblyQualifiedName, function, null, message, args);
         }
 
-        public void Log(LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args)
+        public void Log(LogLevel level, object @class, LogFunction function, Exception exception, string message, params object[] args)
         {
-            Log(-1, Level, Class.GetType().AssemblyQualifiedName, Function, Exception, Message, Args);
+            Log(-1, level, @class.GetType().AssemblyQualifiedName, function, exception, message, args);
         }
 
-        public void Log(int SiteId, LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args)
+        public void Log(int siteId, LogLevel level, object @class, LogFunction function, string message, params object[] args)
         {
-            Log(SiteId, Level, Class.GetType().AssemblyQualifiedName, Function, null, Message, Args);
+            Log(siteId, level, @class.GetType().AssemblyQualifiedName, function, null, message, args);
         }
 
-        public void Log(int SiteId, LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args)
+        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)
+            if (siteId == -1)
             {
                 log.SiteId = null;
                 Alias alias = _tenantResolver.GetAlias();
@@ -56,7 +59,7 @@ namespace Oqtane.Infrastructure
             }
             else
             {
-                log.SiteId = SiteId;
+                log.SiteId = siteId;
             }
             log.PageId = null;
             log.ModuleId = null;
@@ -66,13 +69,17 @@ namespace Oqtane.Infrastructure
             {
                 log.UserId = user.UserId;
             }
-            HttpRequest request = _accessor.HttpContext.Request;
-            if (request != null)
+            log.Url = "";
+            if (_accessor.HttpContext != null)
             {
-                log.Url = request.Scheme.ToString() + "://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString();
+                HttpRequest request = _accessor.HttpContext.Request;
+                if (request != null)
+                {
+                    log.Url = $"{request.Scheme}://{request.Host}{request.Path}{request.QueryString}";
+                }
             }
 
-            Type type = Type.GetType(Class.ToString());
+            Type type = Type.GetType(@class.ToString());
             if (type != null)
             {
                 log.Category = type.AssemblyQualifiedName;
@@ -80,20 +87,20 @@ namespace Oqtane.Infrastructure
             }
             else
             {
-                log.Category = Class.ToString();
+                log.Category = @class.ToString();
                 log.Feature = log.Category;
             }
-            log.Function = Enum.GetName(typeof(LogFunction), Function);
-            log.Level = Enum.GetName(typeof(LogLevel), Level);
-            if (Exception != null)
+            log.Function = Enum.GetName(typeof(LogFunction), function);
+            log.Level = Enum.GetName(typeof(LogLevel), level);
+            if (exception != null)
             {
-                log.Exception = Exception.ToString();
+                log.Exception = exception.ToString();
             }
-            log.Message = Message;
+            log.Message = message;
             log.MessageTemplate = "";
             try
             {
-                log.Properties = JsonSerializer.Serialize(Args);
+                log.Properties = JsonSerializer.Serialize(args);
             }
             catch // serialization error occurred
             {
@@ -102,24 +109,24 @@ namespace Oqtane.Infrastructure
             Log(log);
         }
 
-        public void Log(Log Log)
+        public void Log(Log log)
         {
             LogLevel minlevel = LogLevel.Information;
             var section = _config.GetSection("Logging:LogLevel:Default");
             if (section.Exists())
             {
-                minlevel = Enum.Parse<LogLevel>(_config.GetSection("Logging:LogLevel:Default").ToString());
+                minlevel = Enum.Parse<LogLevel>(section.Value);
             }
 
-            if (Enum.Parse<LogLevel>(Log.Level) >= minlevel)
+            if (Enum.Parse<LogLevel>(log.Level) >= minlevel)
             {
-                Log.LogDate = DateTime.UtcNow;
-                Log.Server = Environment.MachineName;
-                Log.MessageTemplate = Log.Message;
-                Log = ProcessStructuredLog(Log);
+                log.LogDate = DateTime.UtcNow;
+                log.Server = Environment.MachineName;
+                log.MessageTemplate = log.Message;
+                log = ProcessStructuredLog(log);
                 try
                 {
-                    _logs.AddLog(Log);
+                    _logs.AddLog(log);
                 }
                 catch
                 {
@@ -128,16 +135,16 @@ namespace Oqtane.Infrastructure
             }
         }
 
-        private Log ProcessStructuredLog(Log Log)
+        private Log ProcessStructuredLog(Log log)
         {
             try
             {
-                string message = Log.Message;
+                string message = log.Message;
                 string properties = "";
-                if (!string.IsNullOrEmpty(message) && message.Contains("{") && message.Contains("}") && !string.IsNullOrEmpty(Log.Properties))
+                if (!string.IsNullOrEmpty(message) && message.Contains("{") && message.Contains("}") && !string.IsNullOrEmpty(log.Properties))
                 {
                     // get the named holes in the message and replace values
-                    object[] values = JsonSerializer.Deserialize<object[]>(Log.Properties);
+                    object[] values = JsonSerializer.Deserialize<object[]>(log.Properties);
                     List<string> names = new List<string>();
                     int index = message.IndexOf("{");
                     while (index != -1)
@@ -160,28 +167,28 @@ namespace Oqtane.Infrastructure
                         index = message.IndexOf("{", index + 1);
                     }
                     // rebuild properties into dictionary
-                    Dictionary<string, object> propertydictionary = new Dictionary<string, object>();
+                    Dictionary<string, object> propertyDictionary = new Dictionary<string, object>();
                     for (int i = 0; i < values.Length; i++)
                     {
                         if (i < names.Count)
                         {
-                            propertydictionary.Add(names[i], values[i]);
+                            propertyDictionary.Add(names[i], values[i]);
                         }
                         else
                         {
-                            propertydictionary.Add("Property" + i.ToString(), values[i]);
+                            propertyDictionary.Add("Property" + i.ToString(), values[i]);
                         }
                     }
-                    properties = JsonSerializer.Serialize(propertydictionary);
+                    properties = JsonSerializer.Serialize(propertyDictionary);
                 }
-                Log.Message = message;
-                Log.Properties = properties;
+                log.Message = message;
+                log.Properties = properties;
             }
             catch
             {
-                Log.Properties = "";
+                log.Properties = "";
             }
-            return Log;
+            return log;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
new file mode 100644
index 00000000..346e481f
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -0,0 +1,152 @@
+using Oqtane.Models;
+using Oqtane.Infrastructure;
+using System.Collections.Generic;
+using Oqtane.Repository;
+using Microsoft.AspNetCore.Hosting;
+using Oqtane.Extensions;
+using Oqtane.Shared;
+using System.IO;
+
+namespace Oqtane.SiteTemplates
+{
+    public class DefaultSiteTemplate : ISiteTemplate
+    {
+
+        private readonly IWebHostEnvironment _environment;
+        private readonly ISiteRepository _siteRepository;
+        private readonly IFolderRepository _folderRepository;
+        private readonly IFileRepository _fileRepository;
+
+        public DefaultSiteTemplate(IWebHostEnvironment environment, ISiteRepository siteRepository, IFolderRepository folderRepository, IFileRepository fileRepository)
+        {
+            _environment = environment;
+            _siteRepository = siteRepository;
+            _folderRepository = folderRepository;
+            _fileRepository = fileRepository;
+        }
+
+        public string Name
+        {
+            get { return "Default Site Template"; }
+        }
+
+        public List<PageTemplate> CreateSite(Site site)
+        {
+            List<PageTemplate> _pageTemplates = new List<PageTemplate>();
+
+            _pageTemplates.Add(new PageTemplate
+            {
+                Name = "Home",
+                Parent = "",
+                Path = "",
+                Icon = "home",
+                IsNavigation = true,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission> {
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions() ,
+                PageTemplateModules = new List<PageTemplateModule> {
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", 
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
+                        "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
+                        "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
+                        "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
+                    },
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = "<p>Copyright (c) 2019-2020 .NET Foundation</p>" +
+                        "<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" +
+                        "<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>" +
+                        "<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>"
+                    },
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, Constants.RegisteredRole, true),
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = "<p>Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.</p>"
+                    }
+                }
+            });
+            _pageTemplates.Add(new PageTemplate
+            {
+                Name = "Private",
+                Parent = "",
+                Path = "private",
+                Icon = "lock-locked",
+                IsNavigation = true,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission> {
+                    new Permission(PermissionNames.View, Constants.RegisteredRole, true),
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule> {
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, Constants.RegisteredRole, true),
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = "<p>Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.</p>"
+                    }
+                }
+            });
+            _pageTemplates.Add(new PageTemplate
+            {
+                Name = "My Page",
+                Parent = "",
+                Path = "mypage",
+                Icon = "target",
+                IsNavigation = true,
+                IsPersonalizable = true,
+                EditMode = false,
+                PagePermissions = new List<Permission> {
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule> {
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content",
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = "<p>Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.</p>"
+                    }
+                }
+            });
+
+            if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png")))
+            {
+                string folderpath = Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString(),"\\");
+                System.IO.Directory.CreateDirectory(folderpath);
+                if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png")))
+                {
+                    System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo.png"), Path.Combine(folderpath, "logo.png"));
+                }
+                Folder folder = _folderRepository.GetFolder(site.SiteId, "");
+                Oqtane.Models.File file = _fileRepository.AddFile(new Oqtane.Models.File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 });
+                site.LogoFileId = file.FileId;
+                _siteRepository.UpdateSite(site);
+            }
+
+            return _pageTemplates;
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
new file mode 100644
index 00000000..1dfefdf0
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
@@ -0,0 +1,45 @@
+using Oqtane.Models;
+using Oqtane.Infrastructure;
+using System.Collections.Generic;
+using Oqtane.Extensions;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.SiteTemplates
+{
+    public class EmptySiteTemplate : ISiteTemplate
+    {
+        public EmptySiteTemplate()
+        {
+        }
+
+        public string Name
+        {
+            get { return "Empty Site Template"; }
+        }
+
+        public List<PageTemplate> CreateSite(Site site)
+        {
+            List<PageTemplate> _pageTemplates = new List<PageTemplate>();
+
+            _pageTemplates.Add(new PageTemplate
+            {
+                Name = "Home",
+                Parent = "",
+                Path = "",
+                Icon = "home",
+                IsNavigation = true,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission> {
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>()
+            });
+
+            return _pageTemplates;
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/SyncManager.cs b/Oqtane.Server/Infrastructure/SyncManager.cs
index b9495e22..f41c01b0 100644
--- a/Oqtane.Server/Infrastructure/SyncManager.cs
+++ b/Oqtane.Server/Infrastructure/SyncManager.cs
@@ -1,42 +1,28 @@
-using Microsoft.Extensions.DependencyInjection;
-using Oqtane.Models;
-using Oqtane.Repository;
+using Oqtane.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Oqtane.Repository;
 
 namespace Oqtane.Infrastructure
 {
     public class SyncManager : ISyncManager
     {
-        private readonly IServiceScopeFactory ServiceScopeFactory;
         private List<SyncEvent> SyncEvents { get; set; }
 
-        public SyncManager(IServiceScopeFactory ServiceScopeFactory)
+        public SyncManager()
         {
-            this.ServiceScopeFactory = ServiceScopeFactory;
             SyncEvents = new List<SyncEvent>();
         }
 
-        private int TenantId
+        public List<SyncEvent> GetSyncEvents(int tenantId, DateTime lastSyncDate)
         {
-            get 
-            {
-                using (var scope = ServiceScopeFactory.CreateScope())
-                {
-                    return scope.ServiceProvider.GetRequiredService<ITenantResolver>().GetTenant().TenantId;
-                }
-            }
+            return SyncEvents.Where(item => item.TenantId == tenantId && item.ModifiedOn >= lastSyncDate).ToList();
         }
 
-        public List<SyncEvent> GetSyncEvents(DateTime LastSyncDate)
+        public void AddSyncEvent(int tenantId, string entityName, int entityId)
         {
-            return SyncEvents.Where(item => item.TenantId == TenantId && item.ModifiedOn >= LastSyncDate).ToList();
-        }
-
-        public void AddSyncEvent(string EntityName, int EntityId)
-        {
-            SyncEvents.Add(new SyncEvent { TenantId = TenantId, EntityName = EntityName, EntityId = EntityId, ModifiedOn = DateTime.UtcNow });
+            SyncEvents.Add(new SyncEvent { TenantId = tenantId, EntityName = entityName, EntityId = entityId, ModifiedOn = DateTime.UtcNow });
             // trim sync events 
             SyncEvents.RemoveAll(item => item.ModifiedOn < DateTime.UtcNow.AddHours(-1));
         }
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
new file mode 100644
index 00000000..2c538d97
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -0,0 +1,93 @@
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Extensions;
+using Oqtane.Models;
+using Oqtane.Repository;
+using Oqtane.Shared;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Oqtane.Infrastructure
+{
+    public class UpgradeManager : IUpgradeManager
+    {
+        private readonly IAliasRepository _aliases;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+
+        public UpgradeManager(IAliasRepository aliases, IServiceScopeFactory serviceScopeFactory)
+        {
+            _aliases = aliases;
+            _serviceScopeFactory = serviceScopeFactory;
+        }
+
+        public void Upgrade(Tenant tenant, string version)
+        {
+            // core framework upgrade logic - note that you can check if current tenant is Master if you only want to execute logic once
+            var pageTemplates = new List<PageTemplate>();
+
+            switch (version)
+            {
+                case "0.9.0":
+                    // add a page to all existing sites on upgrade
+
+                    //pageTemplates.Add(new PageTemplate
+                    //{
+                    //    Name = "Test",
+                    //    Parent = "",
+                    //    Path = "test",
+                    //    Icon = Icons.Badge,
+                    //    IsNavigation = true,
+                    //    IsPersonalizable = false,
+                    //    EditMode = false,
+                    //    PagePermissions = new List<Permission>
+                    //    {
+                    //        new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    //        new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    //        new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                    //    }.EncodePermissions(),
+                    //            PageTemplateModules = new List<PageTemplateModule>
+                    //    {
+                    //        new PageTemplateModule
+                    //        {
+                    //            ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "Test", Pane = "Content",
+                    //            ModulePermissions = new List<Permission>
+                    //            {
+                    //                new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    //                new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    //                new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                    //            }.EncodePermissions(),
+                    //            Content = ""
+                    //        }
+                    //    }
+                    //});
+                    CreateSitePages(tenant, pageTemplates);
+                    break;
+            }
+        }
+
+        private void CreateSitePages(Tenant tenant, List<PageTemplate> pageTemplates)
+        {
+            if (pageTemplates.Count != 0)
+            {
+                var processed = new List<Site>();
+                foreach (Alias alias in _aliases.GetAliases().Where(item => item.TenantId == tenant.TenantId))
+                {
+                    if (!processed.Exists(item => item.SiteId == alias.SiteId))
+                    {
+                        using (var scope = _serviceScopeFactory.CreateScope())
+                        {
+                            var siteState = scope.ServiceProvider.GetRequiredService<SiteState>();
+                            siteState.Alias = alias;
+                            var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+                            var site = sites.GetSite(alias.SiteId);
+                            if (site != null)
+                            {
+                                sites.CreatePages(site, pageTemplates);
+                            }
+                            processed.Add(site);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
index bb8db89c..fc9495fc 100644
--- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
+++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
@@ -3,14 +3,15 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Modules.HtmlText.Repository;
 using Microsoft.AspNetCore.Http;
-using Oqtane.Infrastructure;
 using Oqtane.Shared;
 using System;
 using System.Collections.Generic;
+using Oqtane.Enums;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Modules.HtmlText.Controllers
 {
-    [Route("{site}/api/[controller]")]
+    [Route("{alias}/api/[controller]")]
     public class HtmlTextController : Controller
     {
         private readonly IHtmlTextRepository _htmlText;
@@ -35,11 +36,11 @@ namespace Oqtane.Modules.HtmlText.Controllers
             var list = new List<HtmlTextInfo>();
             try
             {
-                HtmlTextInfo HtmlText = null;
+                HtmlTextInfo htmlText = null;
                 if (_entityId == id)
                 {
-                    HtmlText = _htmlText.GetHtmlText(id);
-                    list.Add(HtmlText);
+                    htmlText = _htmlText.GetHtmlText(id);
+                    list.Add(htmlText);
                 }
             }
             catch (Exception ex)
@@ -53,16 +54,16 @@ namespace Oqtane.Modules.HtmlText.Controllers
         // POST api/<controller>
         [HttpPost]
         [Authorize(Policy = "EditModule")]
-        public HtmlTextInfo Post([FromBody] HtmlTextInfo HtmlText)
+        public HtmlTextInfo Post([FromBody] HtmlTextInfo htmlText)
         {
             try
             {
-                if (ModelState.IsValid && HtmlText.ModuleId == _entityId)
+                if (ModelState.IsValid && htmlText.ModuleId == _entityId)
                 {
-                    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;
+                return htmlText;
             }
             catch (Exception ex)
             {
@@ -74,16 +75,16 @@ namespace Oqtane.Modules.HtmlText.Controllers
         // PUT api/<controller>/5
         [HttpPut("{id}")]
         [Authorize(Policy = "EditModule")]
-        public HtmlTextInfo Put(int id, [FromBody] HtmlTextInfo HtmlText)
+        public HtmlTextInfo Put(int id, [FromBody] HtmlTextInfo htmlText)
         {
             try
             {
-                if (ModelState.IsValid && HtmlText.ModuleId == _entityId)
+                if (ModelState.IsValid && htmlText.ModuleId == _entityId)
                 {
-                    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;
+                return htmlText;
             }
             catch (Exception ex)
             {
diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs
index 0d87934d..7e068076 100644
--- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs
+++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs
@@ -1,23 +1,37 @@
-using Oqtane.Models;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+using Oqtane.Repository;
 using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Modules.HtmlText.Repository;
 using System.Net;
 
 namespace Oqtane.Modules.HtmlText.Manager
 {
-    public class HtmlTextManager : IPortable
+    public class HtmlTextManager : IInstallable, IPortable
     {
         private IHtmlTextRepository _htmlTexts;
+        private ISqlRepository _sql;
 
-        public HtmlTextManager(IHtmlTextRepository htmltexts)
+        public HtmlTextManager(IHtmlTextRepository htmltexts, ISqlRepository sql)
         {
             _htmlTexts = htmltexts;
+            _sql = sql;
         }
 
-        public string ExportModule(Module Module)
+        public bool Install(Tenant tenant, string version)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "HtmlText." + version + ".sql");
+        }
+
+        public bool Uninstall(Tenant tenant)
+        {
+            return _sql.ExecuteScript(tenant, GetType().Assembly, "HtmlText.Uninstall.sql");
+        }
+
+        public string ExportModule(Module module)
         {
             string content = "";
-            HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(Module.ModuleId);
+            HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(module.ModuleId);
             if (htmltext != null)
             {
                 content = WebUtility.HtmlEncode(htmltext.Content);
@@ -25,20 +39,20 @@ namespace Oqtane.Modules.HtmlText.Manager
             return content;
         }
 
-        public void ImportModule(Module Module, string Content, string Version)
+        public void ImportModule(Module module, string content, string version)
         {
-            Content = WebUtility.HtmlDecode(Content);
-            HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(Module.ModuleId);
+            content = WebUtility.HtmlDecode(content);
+            HtmlTextInfo htmltext = _htmlTexts.GetHtmlText(module.ModuleId);
             if (htmltext != null)
             {
-                htmltext.Content = Content;
+                htmltext.Content = content;
                 _htmlTexts.UpdateHtmlText(htmltext);
             }
             else
             {
                 htmltext = new HtmlTextInfo();
-                htmltext.ModuleId = Module.ModuleId;
-                htmltext.Content = Content;
+                htmltext.ModuleId = module.ModuleId;
+                htmltext.Content = content;
                 _htmlTexts.AddHtmlText(htmltext);
             }
         }
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
index 2ff3e6d2..70cd2065 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs
@@ -9,7 +9,7 @@ namespace Oqtane.Modules.HtmlText.Repository
     {
         public virtual DbSet<HtmlTextInfo> HtmlText { get; set; }
 
-        public HtmlTextContext(ITenantResolver TenantResolver, IHttpContextAccessor accessor) : base(TenantResolver, accessor)
+        public HtmlTextContext(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
         {
             // ContextBase handles multi-tenant database connections
         }
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
index 144ea1e5..c97b0de7 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs
@@ -13,59 +13,31 @@ namespace Oqtane.Modules.HtmlText.Repository
             _db = context;
         }
 
-        public HtmlTextInfo GetHtmlText(int ModuleId)
+        public HtmlTextInfo GetHtmlText(int moduleId)
         {
-            try
-            {
-                return _db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault();
-            }
-            catch
-            {
-                throw;
-            }
+            return _db.HtmlText.FirstOrDefault(item => item.ModuleId == moduleId);
         }
 
 
-        public HtmlTextInfo AddHtmlText(HtmlTextInfo HtmlText)
+        public HtmlTextInfo AddHtmlText(HtmlTextInfo htmlText)
         {
-            try
-            {
-                _db.HtmlText.Add(HtmlText);
-                _db.SaveChanges();
-                return HtmlText;
-            }
-            catch
-            {
-                throw;
-            }
+            _db.HtmlText.Add(htmlText);
+            _db.SaveChanges();
+            return htmlText;
         }
 
-        public HtmlTextInfo UpdateHtmlText(HtmlTextInfo HtmlText)
+        public HtmlTextInfo UpdateHtmlText(HtmlTextInfo htmlText)
         {
-            try
-            {
-                _db.Entry(HtmlText).State = EntityState.Modified;
-                _db.SaveChanges();
-                return HtmlText;
-            }
-            catch
-            {
-                throw;
-            }
+            _db.Entry(htmlText).State = EntityState.Modified;
+            _db.SaveChanges();
+            return htmlText;
         }
 
-        public void DeleteHtmlText(int ModuleId)
+        public void DeleteHtmlText(int moduleId)
         {
-            try
-            {
-                HtmlTextInfo HtmlText = _db.HtmlText.Where(item => item.ModuleId == ModuleId).FirstOrDefault();
-                _db.HtmlText.Remove(HtmlText);
-                _db.SaveChanges();
-            }
-            catch
-            {
-                throw;
-            }
+            HtmlTextInfo htmlText = _db.HtmlText.FirstOrDefault(item => item.ModuleId == moduleId);
+            if (htmlText != null) _db.HtmlText.Remove(htmlText);
+            _db.SaveChanges();
         }
     }
 }
diff --git a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
index 33e368c4..cbe5d0e4 100644
--- a/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
+++ b/Oqtane.Server/Modules/HtmlText/Repository/IHtmlTextRepository.cs
@@ -1,13 +1,12 @@
-using System.Collections.Generic;
-using Oqtane.Modules.HtmlText.Models;
+using Oqtane.Modules.HtmlText.Models;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {
     public interface IHtmlTextRepository
     {
-        HtmlTextInfo GetHtmlText(int ModuleId);
-        HtmlTextInfo AddHtmlText(HtmlTextInfo HtmlText);
-        HtmlTextInfo UpdateHtmlText(HtmlTextInfo HtmlText);
-        void DeleteHtmlText(int ModuleId);
+        HtmlTextInfo GetHtmlText(int moduleId);
+        HtmlTextInfo AddHtmlText(HtmlTextInfo htmlText);
+        HtmlTextInfo UpdateHtmlText(HtmlTextInfo htmlText);
+        void DeleteHtmlText(int moduleId);
     }
 }
diff --git a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql
new file mode 100644
index 00000000..5c54eae2
--- /dev/null
+++ b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql
@@ -0,0 +1,19 @@
+CREATE TABLE [dbo].[HtmlText](
+	[HtmlTextId] [int] IDENTITY(1,1) NOT NULL,
+	[ModuleId] [int] NOT NULL,
+	[Content] [nvarchar](max) NOT NULL,
+	[CreatedBy] [nvarchar](256) NOT NULL,
+	[CreatedOn] [datetime] NOT NULL,
+	[ModifiedBy] [nvarchar](256) NOT NULL,
+	[ModifiedOn] [datetime] NOT NULL,
+  CONSTRAINT [PK_HtmlText] PRIMARY KEY CLUSTERED 
+  (
+	[HtmlTextId] ASC
+  )
+)
+GO
+
+ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId])
+REFERENCES [dbo].[Module] ([ModuleId])
+ON DELETE CASCADE
+GO
diff --git a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql
new file mode 100644
index 00000000..b0831b67
--- /dev/null
+++ b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql
@@ -0,0 +1,2 @@
+DROP TABLE [dbo].[HtmlText]
+GO
diff --git a/Oqtane.Server/Modules/IPortable.cs b/Oqtane.Server/Modules/IPortable.cs
index 871c3045..b4c89735 100644
--- a/Oqtane.Server/Modules/IPortable.cs
+++ b/Oqtane.Server/Modules/IPortable.cs
@@ -6,8 +6,8 @@ namespace Oqtane.Modules
     {
         // You Must Set The "ServerAssemblyName" In Your IModule Interface
 
-        string ExportModule(Module Module);
+        string ExportModule(Module module);
 
-        void ImportModule(Module Module, string Content, string Version);
+        void ImportModule(Module module, string content, string version);
     }
 }
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 2a243897..e115b73a 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -3,13 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
-    <RestoreAdditionalProjectSources>
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Configurations>Debug;Release;Wasm</Configurations>
-    <Version>0.0.1</Version>
+    <Configurations>Debug;Release</Configurations>
+    <Version>0.9.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -22,29 +17,21 @@
     <RootNamespace>Oqtane</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Wasm|AnyCPU'">
-    <DefineConstants>TRACE;WASM</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
-    <None Remove="Scripts\00.00.01.sql" />
-    <None Remove="Scripts\Master.sql" />
+    <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
+    <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
+    <EmbeddedResource Include="Scripts\Master.0.9.0.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.0.9.0.sql" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Scripts\Master.sql" />
-    <EmbeddedResource Include="Scripts\00.00.01.sql" />
-    <EmbeddedResource Include="Scripts\00.00.00.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="dbup" Version="4.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc3" />
+    <PackageReference Include="dbup" Version="4.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.1.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/Oqtane.Server/Pages/Login.cshtml b/Oqtane.Server/Pages/Login.cshtml
index f2eab15f..92433015 100644
--- a/Oqtane.Server/Pages/Login.cshtml
+++ b/Oqtane.Server/Pages/Login.cshtml
@@ -1,3 +1,3 @@
-@page "/pages/login"
+@page "/{alias}/pages/login"
 @namespace  Oqtane.Pages
 @model Oqtane.Pages.LoginModel
diff --git a/Oqtane.Server/Pages/Logout.cshtml b/Oqtane.Server/Pages/Logout.cshtml
index f114ee1e..d477046c 100644
--- a/Oqtane.Server/Pages/Logout.cshtml
+++ b/Oqtane.Server/Pages/Logout.cshtml
@@ -1,3 +1,3 @@
-@page "/pages/logout"
+@page "/{alias}/pages/logout"
 @namespace Oqtane.Pages
 @model Oqtane.Pages.LogoutModel
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index c1c7782f..c6758960 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -1,7 +1,8 @@
 @page "/"
 @namespace Oqtane.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@using Oqtane.Client
+@using Microsoft.Extensions.Configuration
+@inject IConfiguration Configuration
 
 <!DOCTYPE html>
 <html>
@@ -10,6 +11,9 @@
     <meta name="viewport" content="width=device-width">
     <title>Oqtane</title>
     <base href="~/" />
+    <link id="fav-icon" rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+    <!-- stub the PWA manifest but defer the assignment of href -->
+    <link id="pwa-manifest" rel="manifest" />
     <link href="css/quill/quill1.3.6.bubble.css" rel="stylesheet" />
     <link href="css/quill/quill1.3.6.snow.css" rel="stylesheet" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
@@ -17,7 +21,9 @@
 </head>
 <body>
     @(Html.AntiForgeryToken())
-    <app>@(await Html.RenderComponentAsync<App>(RenderMode.Server))</app>
+    <app>
+        <component type="typeof(Oqtane.App)" render-mode="Server" />
+    </app>
 
     <script src="js/site.js"></script>
     <script src="js/interop.js"></script>
@@ -26,6 +32,14 @@
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-    <script src="_framework/blazor.server.js"></script>
+
+    @if (Configuration.GetSection("Runtime").Value == "WebAssembly")
+    {
+        <script src="_framework/blazor.webassembly.js"></script>
+    }
+    else
+    {
+        <script src="_framework/blazor.server.js"></script>
+    }
 </body>
 </html>
diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs
index ca26b836..c4b5492f 100644
--- a/Oqtane.Server/Program.cs
+++ b/Oqtane.Server/Program.cs
@@ -1,32 +1,23 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-using Microsoft.AspNetCore.Blazor.Hosting;
-// used by client-side Blazor
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Server
 {
     public class Program
     {
-#if DEBUG || RELEASE
         public static void Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-#endif
-
-#if WASM
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
+            var host = BuildWebHost(args);
+            using (var serviceScope = host.Services.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            {
+                var databaseManager = serviceScope.ServiceProvider.GetService<IDatabaseManager>();
+                databaseManager.Install();
+            }
+            host.Run();
         }
 
         public static IWebHost BuildWebHost(string[] args) =>
@@ -36,7 +27,5 @@ namespace Oqtane.Server
                     .Build())
                 .UseStartup<Startup>()
                 .Build();
-#endif
-
     }
 }
diff --git a/Oqtane.Server/Properties/launchSettings.json b/Oqtane.Server/Properties/launchSettings.json
index 55612d8c..fcddfc65 100644
--- a/Oqtane.Server/Properties/launchSettings.json
+++ b/Oqtane.Server/Properties/launchSettings.json
@@ -11,6 +11,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -18,6 +19,7 @@
     "Oqtane.Server": {
       "commandName": "Project",
       "launchBrowser": true,
+       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs
index fe16d4d9..ccb26681 100644
--- a/Oqtane.Server/Repository/AliasRepository.cs
+++ b/Oqtane.Server/Repository/AliasRepository.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
-using System;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
@@ -27,30 +27,30 @@ namespace Oqtane.Repository
             });
         }
 
-        public Alias AddAlias(Alias Alias)
+        public Alias AddAlias(Alias alias)
         {
-            _db.Alias.Add(Alias);
+            _db.Alias.Add(alias);
             _db.SaveChanges();
             _cache.Remove("aliases");
-            return Alias;
+            return alias;
         }
 
-        public Alias UpdateAlias(Alias Alias)
+        public Alias UpdateAlias(Alias alias)
         {
-            _db.Entry(Alias).State = EntityState.Modified;
+            _db.Entry(alias).State = EntityState.Modified;
             _db.SaveChanges();
             _cache.Remove("aliases");
-            return Alias;
+            return alias;
         }
 
-        public Alias GetAlias(int AliasId)
+        public Alias GetAlias(int aliasId)
         {
-            return _db.Alias.Find(AliasId);
+            return _db.Alias.Find(aliasId);
         }
 
-        public void DeleteAlias(int AliasId)
+        public void DeleteAlias(int aliasId)
         {
-            Alias alias = _db.Alias.Find(AliasId);
+            Alias alias = _db.Alias.Find(aliasId);
             _db.Alias.Remove(alias);
             _cache.Remove("aliases");
             _db.SaveChanges();
diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs
index 405d43ed..247006bd 100644
--- a/Oqtane.Server/Repository/Context/DBContextBase.cs
+++ b/Oqtane.Server/Repository/Context/DBContextBase.cs
@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.Http;
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
-using System;
-using System.Linq;
 
 namespace Oqtane.Repository
 {
@@ -22,21 +22,11 @@ namespace Oqtane.Repository
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseSqlServer(_tenant.DBConnectionString
-                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString())
+                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
             );
             base.OnConfiguring(optionsBuilder);
         }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            if (_tenant.DBSchema != "")
-            {
-                modelBuilder.HasDefaultSchema(_tenant.DBSchema);
-            }
-        }
-
         public override int SaveChanges()
         {
             ChangeTracker.DetectChanges();
@@ -53,7 +43,7 @@ namespace Oqtane.Repository
 
             foreach(var item in created)
             {
-                if (item.Entity is IAuditable entity)
+                if (item.Entity is IAuditable)
                 {
                     item.CurrentValues[nameof(IAuditable.CreatedBy)] = username;
                     item.CurrentValues[nameof(IAuditable.CreatedOn)] = date;
@@ -65,13 +55,13 @@ namespace Oqtane.Repository
 
             foreach (var item in modified)
             {
-                if (item.Entity is IAuditable entity)
+                if (item.Entity is IAuditable)
                 {
                     item.CurrentValues[nameof(IAuditable.ModifiedBy)] = username;
                     item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date;
                 }
 
-                if (item.Entity is IDeletable deleted && item.State != EntityState.Added)
+                if (item.Entity is IDeletable && item.State != EntityState.Added)
                 {
                     if ((bool)item.CurrentValues[nameof(IDeletable.IsDeleted)]
                         && !item.GetDatabaseValues().GetValue<bool>(nameof(IDeletable.IsDeleted)))
diff --git a/Oqtane.Server/Repository/Context/InstallationContext.cs b/Oqtane.Server/Repository/Context/InstallationContext.cs
new file mode 100644
index 00000000..29bfc281
--- /dev/null
+++ b/Oqtane.Server/Repository/Context/InstallationContext.cs
@@ -0,0 +1,25 @@
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    
+    public class InstallationContext : DbContext
+    {
+        private readonly string _connectionString;
+
+        public InstallationContext(string connectionString)
+        {
+            _connectionString = connectionString;
+        }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+            => optionsBuilder.UseSqlServer(_connectionString);
+
+        public virtual DbSet<Alias> Alias { get; set; }
+        public virtual DbSet<Tenant> Tenant { get; set; }
+        public virtual DbSet<ModuleDefinition> ModuleDefinition { get; set; }
+        public virtual DbSet<Job> Job { get; set; }
+    }
+}
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index e120ff7d..65312819 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Http;
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
-using System;
-using System.Linq;
 
 namespace Oqtane.Repository
 {
@@ -37,7 +37,7 @@ namespace Oqtane.Repository
 
             foreach (var item in created)
             {
-                if (item.Entity is IAuditable entity)
+                if (item.Entity is IAuditable)
                 {
                     item.CurrentValues[nameof(IAuditable.CreatedBy)] = username;
                     item.CurrentValues[nameof(IAuditable.CreatedOn)] = date;
@@ -49,7 +49,7 @@ namespace Oqtane.Repository
 
             foreach (var item in modified)
             {
-                if (item.Entity is IAuditable entity)
+                if (item.Entity is IAuditable)
                 {
                     item.CurrentValues[nameof(IAuditable.ModifiedBy)] = username;
                     item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date;
diff --git a/Oqtane.Server/Repository/Context/TenantDBContext.cs b/Oqtane.Server/Repository/Context/TenantDBContext.cs
index c90f8538..be085b20 100644
--- a/Oqtane.Server/Repository/Context/TenantDBContext.cs
+++ b/Oqtane.Server/Repository/Context/TenantDBContext.cs
@@ -21,7 +21,7 @@ namespace Oqtane.Repository
         public virtual DbSet<Folder> Folder { get; set; }
         public virtual DbSet<File> File { get; set; }
 
-        public TenantDBContext(ITenantResolver TenantResolver, IHttpContextAccessor accessor) : base(TenantResolver, accessor)
+        public TenantDBContext(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
         {
             // DBContextBase handles multi-tenant database connections
         }
diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs
index 5b67bb4a..f532bb6e 100644
--- a/Oqtane.Server/Repository/FileRepository.cs
+++ b/Oqtane.Server/Repository/FileRepository.cs
@@ -1,7 +1,9 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -16,46 +18,46 @@ namespace Oqtane.Repository
             _permissions = permissions;
         }
 
-        public IEnumerable<File> GetFiles(int FolderId)
+        public IEnumerable<File> GetFiles(int folderId)
         {
-            IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", FolderId).ToList();
-            IEnumerable<File> files = _db.File.Where(item => item.FolderId == FolderId).Include(item => item.Folder);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folderId).ToList();
+            IEnumerable<File> files = _db.File.Where(item => item.FolderId == folderId).Include(item => item.Folder);
             foreach (File file in files)
             {
-                file.Folder.Permissions = _permissions.EncodePermissions(FolderId, permissions);
+                file.Folder.Permissions = permissions.EncodePermissions();
             }
             return files;
         }
 
-        public File AddFile(File File)
+        public File AddFile(File file)
         {
-            _db.File.Add(File);
+            _db.File.Add(file);
             _db.SaveChanges();
-            return File;
+            return file;
         }
 
-        public File UpdateFile(File File)
+        public File UpdateFile(File file)
         {
-            _db.Entry(File).State = EntityState.Modified;
+            _db.Entry(file).State = EntityState.Modified;
             _db.SaveChanges();
-            return File;
+            return file;
         }
 
-        public File GetFile(int FileId)
+        public File GetFile(int fileId)
         {
-            File file = _db.File.Where(item => item.FileId == FileId).Include(item => item.Folder).FirstOrDefault();
+            File file = _db.File.Where(item => item.FileId == fileId).Include(item => item.Folder).FirstOrDefault();
             if (file != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", file.FolderId).ToList();
-                file.Folder.Permissions = _permissions.EncodePermissions(file.FolderId, permissions);
+                IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, file.FolderId).ToList();
+                file.Folder.Permissions = permissions.EncodePermissions();
             }
             return file;
         }
 
-        public void DeleteFile(int FileId)
+        public void DeleteFile(int fileId)
         {
-            File File = _db.File.Find(FileId);
-            _db.File.Remove(File);
+            File file = _db.File.Find(fileId);
+            _db.File.Remove(file);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs
index f4a67d5a..56b42c7b 100644
--- a/Oqtane.Server/Repository/FolderRepository.cs
+++ b/Oqtane.Server/Repository/FolderRepository.cs
@@ -1,7 +1,9 @@
-using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -16,60 +18,58 @@ namespace Oqtane.Repository
             _permissions = permissions;
         }
 
-        public IEnumerable<Folder> GetFolders(int SiteId)
+        public IEnumerable<Folder> GetFolders(int siteId)
         {
-            IEnumerable<Permission> permissions = _permissions.GetPermissions(SiteId, "Folder").ToList();
-            IEnumerable<Folder> folders = _db.Folder.Where(item => item.SiteId == SiteId);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Folder).ToList();
+            IEnumerable<Folder> folders = _db.Folder.Where(item => item.SiteId == siteId);
             foreach(Folder folder in folders)
             {
-                folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions);
+                folder.Permissions = permissions.Where(item => item.EntityId == folder.FolderId).EncodePermissions();
             }
             return folders;
         }
 
-        public Folder AddFolder(Folder Folder)
+        public Folder AddFolder(Folder folder)
         {
-            _db.Folder.Add(Folder);
+            _db.Folder.Add(folder);
             _db.SaveChanges();
-            _permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions);
-            return Folder;
+            _permissions.UpdatePermissions(folder.SiteId, EntityNames.Folder, folder.FolderId, folder.Permissions);
+            return folder;
         }
 
-        public Folder UpdateFolder(Folder Folder)
+        public Folder UpdateFolder(Folder folder)
         {
-            _db.Entry(Folder).State = EntityState.Modified;
+            _db.Entry(folder).State = EntityState.Modified;
             _db.SaveChanges();
-            _permissions.UpdatePermissions(Folder.SiteId, "Folder", Folder.FolderId, Folder.Permissions);
-            return Folder;
+            _permissions.UpdatePermissions(folder.SiteId, EntityNames.Folder, folder.FolderId, folder.Permissions);
+            return folder;
         }
 
-        public Folder GetFolder(int FolderId)
+        public Folder GetFolder(int folderId)
         {
-            Folder folder = _db.Folder.Find(FolderId);
+            Folder folder = _db.Folder.Find(folderId);
             if (folder != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList();
-                folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions);
+                folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId);
             }
             return folder;
         }
 
-        public Folder GetFolder(int SiteId, string Path)
+        public Folder GetFolder(int siteId, string path)
         {
-            Folder folder = _db.Folder.Where(item => item.SiteId == SiteId && item.Path == Path).FirstOrDefault();
+            Folder folder = _db.Folder.Where(item => item.SiteId == siteId && item.Path == path).FirstOrDefault();
             if (folder != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList();
-                folder.Permissions = _permissions.EncodePermissions(folder.FolderId, permissions);
+                folder.Permissions = _permissions.GetPermissionString(EntityNames.Folder, folder.FolderId);
             }
             return folder;
         }
 
-        public void DeleteFolder(int FolderId)
+        public void DeleteFolder(int folderId)
         {
-            Folder Folder = _db.Folder.Find(FolderId);
-            _permissions.DeletePermissions(Folder.SiteId, "Folder", FolderId);
-            _db.Folder.Remove(Folder);
+            Folder folder = _db.Folder.Find(folderId);
+            _permissions.DeletePermissions(folder.SiteId, EntityNames.Folder, folderId);
+            _db.Folder.Remove(folder);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
index 3ab61f13..4f258307 100644
--- a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
@@ -6,9 +6,9 @@ namespace Oqtane.Repository
     public interface IAliasRepository
     {
         IEnumerable<Alias> GetAliases();
-        Alias AddAlias(Alias Alias);
-        Alias UpdateAlias(Alias Alias);
-        Alias GetAlias(int AliasId);
-        void DeleteAlias(int AliasId);
+        Alias AddAlias(Alias alias);
+        Alias UpdateAlias(Alias alias);
+        Alias GetAlias(int aliasId);
+        void DeleteAlias(int aliasId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs
index 3122898b..19715187 100644
--- a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs
@@ -5,10 +5,10 @@ namespace Oqtane.Repository
 {
     public interface IFileRepository
     {
-        IEnumerable<File> GetFiles(int FolderId);
-        File AddFile(File File);
-        File UpdateFile(File File);
-        File GetFile(int FileId);
-        void DeleteFile(int FileId);
+        IEnumerable<File> GetFiles(int folderId);
+        File AddFile(File file);
+        File UpdateFile(File file);
+        File GetFile(int fileId);
+        void DeleteFile(int fileId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs
index 86ac797f..65256184 100644
--- a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs
@@ -5,11 +5,11 @@ namespace Oqtane.Repository
 {
     public interface IFolderRepository
     {
-        IEnumerable<Folder> GetFolders(int SiteId);
-        Folder AddFolder(Folder Folder);
-        Folder UpdateFolder(Folder Folder);
-        Folder GetFolder(int FolderId);
-        Folder GetFolder(int SiteId, string Path);
-        void DeleteFolder(int FolderId);
+        IEnumerable<Folder> GetFolders(int siteId);
+        Folder AddFolder(Folder folder);
+        Folder UpdateFolder(Folder folder);
+        Folder GetFolder(int folderId);
+        Folder GetFolder(int siteId, string path);
+        void DeleteFolder(int folderId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
index f99de0d2..d5858da5 100644
--- a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
@@ -6,9 +6,9 @@ namespace Oqtane.Repository
     public interface IJobLogRepository
     {
         IEnumerable<JobLog> GetJobLogs();
-        JobLog AddJobLog(JobLog JobLog);
-        JobLog UpdateJobLog(JobLog JobLog);
-        JobLog GetJobLog(int JobLogId);
-        void DeleteJobLog(int JobLogId);
+        JobLog AddJobLog(JobLog jobLog);
+        JobLog UpdateJobLog(JobLog jobLog);
+        JobLog GetJobLog(int jobLogId);
+        void DeleteJobLog(int jobLogId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
index 8683009f..12be85c1 100644
--- a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
@@ -6,9 +6,9 @@ namespace Oqtane.Repository
     public interface IJobRepository
     {
         IEnumerable<Job> GetJobs();
-        Job AddJob(Job Job);
-        Job UpdateJob(Job Job);
-        Job GetJob(int JobId);
-        void DeleteJob(int JobId);
+        Job AddJob(Job job);
+        Job UpdateJob(Job job);
+        Job GetJob(int jobId);
+        void DeleteJob(int jobId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
index e4a82e09..27752a03 100644
--- a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
@@ -1,12 +1,12 @@
-using Oqtane.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
     public interface ILogRepository
     {
-        IEnumerable<Log> GetLogs(int SiteId, string Level, string Function, int Rows);
-        Log GetLog(int LogId);
-        void AddLog(Log Log);
+        IEnumerable<Log> GetLogs(int siteId, string level, string function, int rows);
+        Log GetLog(int logId);
+        void AddLog(Log log);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
index c629d76f..dd516461 100644
--- a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
@@ -5,9 +5,10 @@ namespace Oqtane.Repository
 {
     public interface IModuleDefinitionRepository
     {
-        IEnumerable<ModuleDefinition> GetModuleDefinitions(int SideId);
-        ModuleDefinition GetModuleDefinition(int ModuleDefinitionId, int SideId);
-        void UpdateModuleDefinition(ModuleDefinition ModuleDefinition);
-        void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId);
+        IEnumerable<ModuleDefinition> GetModuleDefinitions();
+        IEnumerable<ModuleDefinition> GetModuleDefinitions(int sideId);
+        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int sideId);
+        void UpdateModuleDefinition(ModuleDefinition moduleDefinition);
+        void DeleteModuleDefinition(int moduleDefinitionId, int siteId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
index 5dd23858..2ef4185d 100644
--- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
@@ -5,12 +5,12 @@ namespace Oqtane.Repository
 {
     public interface IModuleRepository
     {
-        IEnumerable<Module> GetModules(int SiteId);
-        Module AddModule(Module Module);
-        Module UpdateModule(Module Module);
-        Module GetModule(int ModuleId);
-        void DeleteModule(int ModuleId);
-        string ExportModule(int ModuleId);
-        bool ImportModule(int ModuleId, string Content);
+        IEnumerable<Module> GetModules(int siteId);
+        Module AddModule(Module module);
+        Module UpdateModule(Module module);
+        Module GetModule(int moduleId);
+        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 9b1a6a56..ef53bc3a 100644
--- a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
@@ -5,10 +5,10 @@ namespace Oqtane.Repository
 {
     public interface INotificationRepository
     {
-        IEnumerable<Notification> GetNotifications(int SiteId, int FromUserId, int ToUserId);
-        Notification AddNotification(Notification Notification);
-        Notification UpdateNotification(Notification Notification);
-        Notification GetNotification(int NotificationId);
-        void DeleteNotification(int NotificationId);
+        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId);
+        Notification AddNotification(Notification notification);
+        Notification UpdateNotification(Notification notification);
+        Notification GetNotification(int notificationId);
+        void DeleteNotification(int notificationId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
index 8e275bcb..181fb629 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
@@ -5,12 +5,12 @@ namespace Oqtane.Repository
 {
     public interface IPageModuleRepository
     {
-        IEnumerable<PageModule> GetPageModules(int SiteId);
-        IEnumerable<PageModule> GetPageModules(int PageId, string Pane);
-        PageModule AddPageModule(PageModule PageModule);
-        PageModule UpdatePageModule(PageModule PageModule);
-        PageModule GetPageModule(int PageModuleId);
-        PageModule GetPageModule(int PageId, int ModuleId);
-        void DeletePageModule(int PageModuleId);
+        IEnumerable<PageModule> GetPageModules(int siteId);
+        IEnumerable<PageModule> GetPageModules(int pageId, string pane);
+        PageModule AddPageModule(PageModule pageModule);
+        PageModule UpdatePageModule(PageModule pageModule);
+        PageModule GetPageModule(int pageModuleId);
+        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 9f98c5ac..6db92dba 100644
--- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
@@ -5,12 +5,12 @@ namespace Oqtane.Repository
 {
     public interface IPageRepository
     {
-        IEnumerable<Page> GetPages(int SiteId);
-        Page AddPage(Page Page);
-        Page UpdatePage(Page Page);
-        Page GetPage(int PageId);
-        Page GetPage(int PageId, int UserId);
-        Page GetPage(string Path, int SiteId);
-        void DeletePage(int PageId);
+        IEnumerable<Page> GetPages(int siteId);
+        Page AddPage(Page page);
+        Page UpdatePage(Page page);
+        Page GetPage(int pageId);
+        Page GetPage(int pageId, int userId);
+        Page GetPage(string path, int siteId);
+        void DeletePage(int pageId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs
index 50d53cb0..21c349e4 100644
--- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs
@@ -1,20 +1,25 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
+// ReSharper disable once CheckNamespace
 namespace Oqtane.Repository
 {
     public interface IPermissionRepository
     {
-        IEnumerable<Permission> GetPermissions(int SiteId, string EntityName);
-        IEnumerable<Permission> GetPermissions(string EntityName, int EntityId);
-        IEnumerable<Permission> GetPermissions(string EntityName, int EntityId, string PermissionName);
-        Permission AddPermission(Permission Permission);
-        Permission UpdatePermission(Permission Permission);
-        void UpdatePermissions(int SiteId, string EntityName, int EntityId, string Permissions);
-        Permission GetPermission(int PermissionId);
-        void DeletePermission(int PermissionId);
-        void DeletePermissions(int SiteId, string EntityName, int EntityId);
-        string EncodePermissions(int EntityId, IEnumerable<Permission> Permissions);
-        IEnumerable<Permission> DecodePermissions(string Permissions, int SiteId, string EntityName, int EntityId);
+        IEnumerable<Permission> GetPermissions(int siteId, string entityName);
+        IEnumerable<Permission> GetPermissions(string entityName, int entityId);
+        IEnumerable<Permission> GetPermissions(string entityName, int entityId, string permissionName);
+        
+        string GetPermissionString(int siteId, string entityName);
+        string GetPermissionString(string entityName, int entityId);
+        string GetPermissionString(string entityName, int entityId, string permissionName);
+        
+        Permission AddPermission(Permission permission);
+        Permission UpdatePermission(Permission permission);
+        void UpdatePermissions(int siteId, string entityName, int entityId, string permissionStrings);
+        Permission GetPermission(int permissionId);
+        void DeletePermission(int permissionId);
+        void DeletePermissions(int siteId, string entityName, int entityId);
+        IEnumerable<Permission> DecodePermissions(string permissions, int siteId, string entityName, int entityId);
      }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
index e5300b59..c9b4f34b 100644
--- a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
@@ -5,10 +5,10 @@ namespace Oqtane.Repository
 {
     public interface IProfileRepository
     {
-        IEnumerable<Profile> GetProfiles(int SiteId);
-        Profile AddProfile(Profile Profile);
-        Profile UpdateProfile(Profile Profile);
-        Profile GetProfile(int ProfileId);
-        void DeleteProfile(int ProfileId);
+        IEnumerable<Profile> GetProfiles(int siteId);
+        Profile AddProfile(Profile profile);
+        Profile UpdateProfile(Profile profile);
+        Profile GetProfile(int profileId);
+        void DeleteProfile(int profileId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
index 40541100..35f9315f 100644
--- a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
@@ -5,11 +5,11 @@ namespace Oqtane.Repository
 {
     public interface IRoleRepository
     {
-        IEnumerable<Role> GetRoles(int SiteId);
-        IEnumerable<Role> GetRoles(int SiteId, bool IncludeGlobalRoles);
-        Role AddRole(Role Role);
-        Role UpdateRole(Role Role);
-        Role GetRole(int RoleId);
-        void DeleteRole(int RoleId);
+        IEnumerable<Role> GetRoles(int siteId);
+        IEnumerable<Role> GetRoles(int siteId, bool includeGlobalRoles);
+        Role AddRole(Role role);
+        Role UpdateRole(Role role);
+        Role GetRole(int roleId);
+        void DeleteRole(int roleId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
index 0ffad860..976519fb 100644
--- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
@@ -5,10 +5,10 @@ namespace Oqtane.Repository
 {
     public interface ISettingRepository
     {
-        IEnumerable<Setting> GetSettings(string EntityName, int EntityId);
-        Setting AddSetting(Setting Setting);
-        Setting UpdateSetting(Setting Setting);
-        Setting GetSetting(int SettingId);
-        void DeleteSetting(int SettingId);
+        IEnumerable<Setting> GetSettings(string entityName, int entityId);
+        Setting AddSetting(Setting setting);
+        Setting UpdateSetting(Setting setting);
+        Setting GetSetting(int settingId);
+        void DeleteSetting(int settingId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
index 65cf9aff..c8cfec23 100644
--- a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
@@ -6,9 +6,10 @@ namespace Oqtane.Repository
     public interface ISiteRepository
     {
         IEnumerable<Site> GetSites();
-        Site AddSite(Site Site);
-        Site UpdateSite(Site Site);
-        Site GetSite(int SiteId);
-        void DeleteSite(int SiteId);
+        Site AddSite(Site site);
+        Site UpdateSite(Site site);
+        Site GetSite(int siteId);
+        void DeleteSite(int siteId);
+        void CreatePages(Site site, List<PageTemplate> pageTemplates);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs
new file mode 100644
index 00000000..659226ff
--- /dev/null
+++ b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public interface ISiteTemplateRepository
+    {
+        IEnumerable<SiteTemplate> GetSiteTemplates();
+    }
+}
diff --git a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs
new file mode 100644
index 00000000..a1402e3b
--- /dev/null
+++ b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs
@@ -0,0 +1,14 @@
+using System.Data.SqlClient;
+using System.Reflection;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public interface ISqlRepository
+    {
+        void ExecuteScript(Tenant tenant, string script);
+        bool ExecuteScript(Tenant tenant, Assembly assembly, string filename);
+        int ExecuteNonQuery(Tenant tenant, string query);
+        SqlDataReader ExecuteReader(Tenant tenant, string query);
+    }
+}
diff --git a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs
index 17a8b1d0..5993eb63 100644
--- a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs
@@ -1,14 +1,14 @@
-using Oqtane.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
     public interface ITenantRepository
     {
         IEnumerable<Tenant> GetTenants();
-        Tenant AddTenant(Tenant Tenant);
-        Tenant UpdateTenant(Tenant Tenant);
-        Tenant GetTenant(int TenantId);
-        void DeleteTenant(int TenantId);
+        Tenant AddTenant(Tenant tenant);
+        Tenant UpdateTenant(Tenant tenant);
+        Tenant GetTenant(int tenantId);
+        void DeleteTenant(int tenantId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
index 63757b49..be646e56 100644
--- a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
@@ -6,10 +6,10 @@ namespace Oqtane.Repository
     public interface IUserRepository
     {
         IEnumerable<User> GetUsers();
-        User AddUser(User User);
-        User UpdateUser(User User);
-        User GetUser(int UserId);
-        User GetUser(string Username);
-        void DeleteUser(int UserId);
+        User AddUser(User user);
+        User UpdateUser(User user);
+        User GetUser(int userId);
+        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 14cb81a4..c46a0e50 100644
--- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
@@ -5,11 +5,11 @@ namespace Oqtane.Repository
 {
     public interface IUserRoleRepository
     {
-        IEnumerable<UserRole> GetUserRoles(int SiteId);
-        IEnumerable<UserRole> GetUserRoles(int UserId, int SiteId);
-        UserRole AddUserRole(UserRole UserRole);
-        UserRole UpdateUserRole(UserRole UserRole);
-        UserRole GetUserRole(int UserRoleId);
-        void DeleteUserRole(int UserRoleId);
+        IEnumerable<UserRole> GetUserRoles(int siteId);
+        IEnumerable<UserRole> GetUserRoles(int userId, int siteId);
+        UserRole AddUserRole(UserRole userRole);
+        UserRole UpdateUserRole(UserRole userRole);
+        UserRole GetUserRole(int userRoleId);
+        void DeleteUserRole(int userRoleId);
     }
 }
diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs
index cdfca1c0..440a483d 100644
--- a/Oqtane.Server/Repository/JobLogRepository.cs
+++ b/Oqtane.Server/Repository/JobLogRepository.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
@@ -21,30 +21,30 @@ namespace Oqtane.Repository
                 .ToList();
         }
 
-        public JobLog AddJobLog(JobLog JobLog)
+        public JobLog AddJobLog(JobLog jobLog)
         {
-            _db.JobLog.Add(JobLog);
+            _db.JobLog.Add(jobLog);
             _db.SaveChanges();
-            return JobLog;
+            return jobLog;
         }
 
-        public JobLog UpdateJobLog(JobLog JobLog)
+        public JobLog UpdateJobLog(JobLog jobLog)
         {
-            _db.Entry(JobLog).State = EntityState.Modified;
+            _db.Entry(jobLog).State = EntityState.Modified;
             _db.SaveChanges();
-            return JobLog;
+            return jobLog;
         }
 
-        public JobLog GetJobLog(int JobLogId)
+        public JobLog GetJobLog(int jobLogId)
         {
             return _db.JobLog.Include(item => item.Job) // eager load job
-                .SingleOrDefault(item => item.JobLogId == JobLogId); 
+                .SingleOrDefault(item => item.JobLogId == jobLogId); 
         }
 
-        public void DeleteJobLog(int JobLogId)
+        public void DeleteJobLog(int jobLogId)
         {
-            JobLog Joblog = _db.JobLog.Find(JobLogId);
-            _db.JobLog.Remove(Joblog);
+            JobLog joblog = _db.JobLog.Find(jobLogId);
+            _db.JobLog.Remove(joblog);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs
index 2d146142..cbe51c19 100644
--- a/Oqtane.Server/Repository/JobRepository.cs
+++ b/Oqtane.Server/Repository/JobRepository.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using Microsoft.EntityFrameworkCore;
-using System;
 using Microsoft.Extensions.Caching.Memory;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
@@ -27,30 +27,33 @@ namespace Oqtane.Repository
             });
         }
 
-        public Job AddJob(Job Job)
+        public Job AddJob(Job job)
         {
-            _db.Job.Add(Job);
+            _db.Job.Add(job);
             _db.SaveChanges();
-            return Job;
+            _cache.Remove("jobs");
+            return job;
         }
 
-        public Job UpdateJob(Job Job)
+        public Job UpdateJob(Job job)
         {
-            _db.Entry(Job).State = EntityState.Modified;
+            _db.Entry(job).State = EntityState.Modified;
             _db.SaveChanges();
-            return Job;
+            _cache.Remove("jobs");
+            return job;
         }
 
-        public Job GetJob(int JobId)
+        public Job GetJob(int jobId)
         {
-            return _db.Job.Find(JobId);
+            return _db.Job.Find(jobId);
         }
 
-        public void DeleteJob(int JobId)
+        public void DeleteJob(int jobId)
         {
-            Job Job = _db.Job.Find(JobId);
-            _db.Job.Remove(Job);
+            Job job = _db.Job.Find(jobId);
+            _db.Job.Remove(job);
             _db.SaveChanges();
+            _cache.Remove("jobs");
         }
     }
 }
diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs
index b01bc069..1bcbc2be 100644
--- a/Oqtane.Server/Repository/LogRepository.cs
+++ b/Oqtane.Server/Repository/LogRepository.cs
@@ -1,5 +1,4 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Models;
 
@@ -14,44 +13,38 @@ namespace Oqtane.Repository
             _db = context;
         }
 
-        public IEnumerable<Log> GetLogs(int SiteId, string Level, string Function, int Rows)
+        public IEnumerable<Log> GetLogs(int siteId, string level, string function, int rows)
         {
-            if (Level == null)
+            if (level == null)
             {
-                if (Function == null)
+                if (function == null)
                 {
-                    return _db.Log.Where(item => item.SiteId == SiteId).
-                        OrderByDescending(item => item.LogDate).Take(Rows);
-                }
-                else
-                {
-                    return _db.Log.Where(item => item.SiteId == SiteId && item.Function == Function).
-                        OrderByDescending(item => item.LogDate).Take(Rows);
+                    return _db.Log.Where(item => item.SiteId == siteId).
+                        OrderByDescending(item => item.LogDate).Take(rows);
                 }
+
+                return _db.Log.Where(item => item.SiteId == siteId && item.Function == function).
+                    OrderByDescending(item => item.LogDate).Take(rows);
             }
-            else
+
+            if (function == null)
             {
-                if (Function == null)
-                {
-                    return _db.Log.Where(item => item.SiteId == SiteId && item.Level == Level)
-                        .OrderByDescending(item => item.LogDate).Take(Rows);
-                }
-                else
-                {
-                    return _db.Log.Where(item => item.SiteId == SiteId && item.Level == Level && item.Function == Function)
-                        .OrderByDescending(item => item.LogDate).Take(Rows);
-                }
+                return _db.Log.Where(item => item.SiteId == siteId && item.Level == level)
+                    .OrderByDescending(item => item.LogDate).Take(rows);
             }
+
+            return _db.Log.Where(item => item.SiteId == siteId && item.Level == level && item.Function == function)
+                .OrderByDescending(item => item.LogDate).Take(rows);
         }
 
-        public Log GetLog(int LogId)
+        public Log GetLog(int logId)
         {
-            return _db.Log.Find(LogId);
+            return _db.Log.Find(logId);
         }
 
-        public void AddLog(Log Log)
+        public void AddLog(Log log)
         {
-            _db.Log.Add(Log);
+            _db.Log.Add(log);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index c13b86d2..0e968076 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -1,11 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using System.Reflection;
-using System;
-using Oqtane.Modules;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
+using Oqtane.Extensions;
+using Oqtane.Models;
+using Oqtane.Modules;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
@@ -15,6 +16,7 @@ namespace Oqtane.Repository
         private MasterDBContext _db;
         private readonly IMemoryCache _cache;
         private readonly IPermissionRepository _permissions;
+        private List<ModuleDefinition> _moduleDefinitions; // lazy load
 
         public ModuleDefinitionRepository(MasterDBContext context, IMemoryCache cache, IPermissionRepository permissions)
         {
@@ -23,51 +25,70 @@ namespace Oqtane.Repository
             _permissions = permissions;
         }
 
-        public IEnumerable<ModuleDefinition> GetModuleDefinitions(int SiteId)
+        public IEnumerable<ModuleDefinition> GetModuleDefinitions()
         {
-            return LoadModuleDefinitions(SiteId);
+            return LoadModuleDefinitions(-1); // used only during startup
         }
 
-        public ModuleDefinition GetModuleDefinition(int ModuleDefinitionId, int SiteId)
+        public IEnumerable<ModuleDefinition> GetModuleDefinitions(int siteId)
         {
-            List<ModuleDefinition> moduledefinitions = LoadModuleDefinitions(SiteId);
-            return moduledefinitions.Find(item => item.ModuleDefinitionId == ModuleDefinitionId);
+            return LoadModuleDefinitions(siteId);
         }
 
-        public void UpdateModuleDefinition(ModuleDefinition ModuleDefinition)
+        public ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int siteId)
         {
-            _permissions.UpdatePermissions(ModuleDefinition.SiteId, "ModuleDefinition", ModuleDefinition.ModuleDefinitionId, ModuleDefinition.Permissions);
-            _cache.Remove("moduledefinitions");
+            List<ModuleDefinition> moduledefinitions = LoadModuleDefinitions(siteId);
+            return moduledefinitions.Find(item => item.ModuleDefinitionId == moduleDefinitionId);
         }
 
-        public void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId)
+        public void UpdateModuleDefinition(ModuleDefinition moduleDefinition)
         {
-            ModuleDefinition ModuleDefinition = _db.ModuleDefinition.Find(ModuleDefinitionId);
-            _permissions.DeletePermissions(SiteId, "ModuleDefinition", ModuleDefinitionId);
-            _db.ModuleDefinition.Remove(ModuleDefinition);
+            _db.Entry(moduleDefinition).State = EntityState.Modified;
             _db.SaveChanges();
-            _cache.Remove("moduledefinitions");
+            _permissions.UpdatePermissions(moduleDefinition.SiteId, EntityNames.ModuleDefinition, moduleDefinition.ModuleDefinitionId, moduleDefinition.Permissions);
+            _cache.Remove("moduledefinitions:" + moduleDefinition.SiteId.ToString());
         }
 
-        public List<ModuleDefinition> LoadModuleDefinitions(int SiteId)
+        public void DeleteModuleDefinition(int moduleDefinitionId, int siteId)
         {
-            List<ModuleDefinition> ModuleDefinitions;
+            ModuleDefinition moduleDefinition = _db.ModuleDefinition.Find(moduleDefinitionId);
+            _permissions.DeletePermissions(siteId, EntityNames.ModuleDefinition, moduleDefinitionId);
+            _db.ModuleDefinition.Remove(moduleDefinition);
+            _db.SaveChanges();
+        }
 
-            // get run-time module definitions 
-            ModuleDefinitions = _cache.GetOrCreate("moduledefinitions", entry =>
+        public List<ModuleDefinition> LoadModuleDefinitions(int siteId)
+        {
+            // get module definitions for site
+            List<ModuleDefinition> moduleDefinitions = _cache.GetOrCreate("moduledefinitions:" + siteId.ToString(), entry =>
             {
                 entry.SlidingExpiration = TimeSpan.FromMinutes(30);
-                return LoadModuleDefinitionsFromAssemblies();
+                return LoadSiteModuleDefinitions(siteId);
             });
+            return moduleDefinitions;
+        }
 
-            // get module defintion permissions for site
-            List<Permission> permissions = _permissions.GetPermissions(SiteId, "ModuleDefinition").ToList();
+        private List<ModuleDefinition> LoadSiteModuleDefinitions(int siteId)
+        {
+            if (_moduleDefinitions == null)
+            {
+                // get module assemblies 
+                _moduleDefinitions = LoadModuleDefinitionsFromAssemblies();
+            }
+            List<ModuleDefinition> moduleDefinitions = _moduleDefinitions;
+
+            List<Permission> permissions = new List<Permission>();
+            if (siteId != -1)
+            {
+                // get module definition permissions for site
+                permissions = _permissions.GetPermissions(siteId, EntityNames.ModuleDefinition).ToList();
+            }
 
             // get module definitions in database
             List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
 
-            // sync run-time module definitions with database
-            foreach (ModuleDefinition moduledefinition in ModuleDefinitions)
+            // sync module assemblies with database
+            foreach (ModuleDefinition moduledefinition in moduleDefinitions)
             {
                 ModuleDefinition moduledef = moduledefs.Where(item => item.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).FirstOrDefault();
                 if (moduledef == null)
@@ -76,24 +97,53 @@ namespace Oqtane.Repository
                     moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName };
                     _db.ModuleDefinition.Add(moduledef);
                     _db.SaveChanges();
-                    _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                    if (siteId != -1)
+                    {
+                        _permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                    }
                 }
                 else
                 {
                     // existing module definition
-                    if (permissions.Count == 0)
+                    if (!string.IsNullOrEmpty(moduledef.Name))
                     {
-                        _permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                        moduledefinition.Name = moduledef.Name;
                     }
-                    else
+                    if (!string.IsNullOrEmpty(moduledef.Description))
                     {
-                        moduledefinition.Permissions = _permissions.EncodePermissions(moduledef.ModuleDefinitionId, permissions);
+                        moduledefinition.Description = moduledef.Description;
                     }
-                    // remove module definition from list
-                    moduledefs.Remove(moduledef);  
+                    if (!string.IsNullOrEmpty(moduledef.Categories))
+                    {
+                        moduledefinition.Categories = moduledef.Categories;
+                    }
+                    if (!string.IsNullOrEmpty(moduledef.Version))
+                    {
+                        moduledefinition.Version = moduledef.Version;
+                    }
+                    if (siteId != -1)
+                    {
+                        if (permissions.Count == 0)
+                        {
+                            _permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                        }
+                        else
+                        {
+                            if (permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).Any())
+                            {
+                                moduledefinition.Permissions = permissions.Where(item => item.EntityId == moduledef.ModuleDefinitionId).EncodePermissions();
+                            }
+                            else
+                            {
+                                _permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
+                            }
+                        }
+                    }
+                    // remove module definition from list as it is already synced
+                    moduledefs.Remove(moduledef);
                 }
                 moduledefinition.ModuleDefinitionId = moduledef.ModuleDefinitionId;
-                moduledefinition.SiteId = SiteId;
+                moduledefinition.SiteId = siteId;
                 moduledefinition.CreatedBy = moduledef.CreatedBy;
                 moduledefinition.CreatedOn = moduledef.CreatedOn;
                 moduledefinition.ModifiedBy = moduledef.ModifiedBy;
@@ -103,24 +153,28 @@ namespace Oqtane.Repository
             // any remaining module definitions are orphans
             foreach (ModuleDefinition moduledefinition in moduledefs)
             {
-                _permissions.DeletePermissions(SiteId, "ModuleDefinition", moduledefinition.ModuleDefinitionId);
+                if (siteId != -1)
+                {
+                    _permissions.DeletePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId);
+                }
                 _db.ModuleDefinition.Remove(moduledefinition); // delete
+                _db.SaveChanges();
             }
 
-            return ModuleDefinitions;
+            return moduleDefinitions;
         }
 
         private List<ModuleDefinition> LoadModuleDefinitionsFromAssemblies()
         {
-            List<ModuleDefinition> ModuleDefinitions = new List<ModuleDefinition>();
+            List<ModuleDefinition> moduleDefinitions = new List<ModuleDefinition>();
             // iterate through Oqtane module assemblies
             Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies()
                 .Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".Module.")).ToArray();
             foreach (Assembly assembly in assemblies)
             {
-                ModuleDefinitions = LoadModuleDefinitionsFromAssembly(ModuleDefinitions, assembly);
+                moduleDefinitions = LoadModuleDefinitionsFromAssembly(moduleDefinitions, assembly);
             }
-            return ModuleDefinitions;
+            return moduleDefinitions;
         }
 
         private List<ModuleDefinition> LoadModuleDefinitionsFromAssembly(List<ModuleDefinition> moduledefinitions, Assembly assembly)
@@ -131,84 +185,70 @@ namespace Oqtane.Repository
             {
                 if (modulecontroltype.Name != "ModuleBase" && !modulecontroltype.Namespace.EndsWith(".Controls"))
                 {
-                    string[] typename = modulecontroltype.AssemblyQualifiedName.Split(',').Select(item => item.Trim()).ToList().ToArray();
+                    string[] typename = modulecontroltype.AssemblyQualifiedName?.Split(',').Select(item => item.Trim()).ToArray();
                     string[] segments = typename[0].Split('.');
                     Array.Resize(ref segments, segments.Length - 1);
-                    string ModuleType = string.Join(".", segments);
-                    string QualifiedModuleType = ModuleType + ", " + typename[1];
+                    string moduleType = string.Join(".", segments);
+                    string qualifiedModuleType = moduleType + ", " + typename[1];
 
-                    int index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == QualifiedModuleType);
+                    int index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == qualifiedModuleType);
                     if (index == -1)
                     {
-                        /// determine if this module implements IModule
-                        Type moduletype = assembly.GetTypes()
-                        .Where(item => item.Namespace != null)
-                        .Where(item => item.Namespace.StartsWith(ModuleType))
-                        .Where(item => item.GetInterfaces().Contains(typeof(IModule)))
-                        .FirstOrDefault();
+                        // determine if this module implements IModule
+                        Type moduletype = assembly
+                            .GetTypes()
+                            .Where(item => item.Namespace != null)
+                            .Where(item => item.Namespace.StartsWith(moduleType))
+                            .FirstOrDefault(item => item.GetInterfaces().Contains(typeof(IModule)));
                         if (moduletype != null)
                         {
+                            // get property values from IModule
                             var moduleobject = Activator.CreateInstance(moduletype);
-                            Dictionary<string, string> properties = (Dictionary<string, string>)moduletype.GetProperty("Properties").GetValue(moduleobject);
-                            moduledefinition = new ModuleDefinition
-                            {
-                                ModuleDefinitionName = QualifiedModuleType,
-                                Name = GetProperty(properties, "Name"),
-                                Description = GetProperty(properties, "Description"),
-                                Categories = GetProperty(properties, "Categories"),
-                                Version = GetProperty(properties, "Version"),
-                                Owner = GetProperty(properties, "Owner"),
-                                Url = GetProperty(properties, "Url"),
-                                Contact = GetProperty(properties, "Contact"),
-                                License = GetProperty(properties, "License"),
-                                Dependencies = GetProperty(properties, "Dependencies"),
-                                PermissionNames = GetProperty(properties, "PermissionNames"),
-                                ServerAssemblyName = GetProperty(properties, "ServerAssemblyName"),
-                                ControlTypeTemplate = ModuleType + "." + Constants.ActionToken + ", " + typename[1],
-                                ControlTypeRoutes = "",
-                                AssemblyName = assembly.FullName.Split(",")[0],
-                                Permissions = ""
-                            };
+                            moduledefinition = (ModuleDefinition)moduletype.GetProperty("ModuleDefinition").GetValue(moduleobject);
                         }
                         else
                         {
+                            // set default property values
                             moduledefinition = new ModuleDefinition
                             {
-                                ModuleDefinitionName = QualifiedModuleType,
-                                Name = ModuleType.Substring(ModuleType.LastIndexOf(".") + 1),
-                                Description = ModuleType.Substring(ModuleType.LastIndexOf(".") + 1),
-                                Categories = ((QualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "Admin" : ""),
-                                Version = new Version(1, 0, 0).ToString(),
-                                Owner = "",
-                                Url = "",
-                                Contact = "",
-                                License = "",
-                                Dependencies = "",
-                                PermissionNames = "",
-                                ServerAssemblyName = "",
-                                ControlTypeTemplate = ModuleType + "." + Constants.ActionToken + ", " + typename[1],
-                                ControlTypeRoutes = "",
-                                AssemblyName = assembly.FullName.Split(",")[0],
-                                Permissions = ""
+                                Name = moduleType.Substring(moduleType.LastIndexOf(".") + 1),
+                                Description = "Manage " + moduleType.Substring(moduleType.LastIndexOf(".") + 1),
+                                Categories = ((qualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "Admin" : "")
                             };
                         }
-                        // permissions
+                        // set internal properties
+                        moduledefinition.ModuleDefinitionName = qualifiedModuleType;
+                        moduledefinition.Version = ""; // will be populated from database
+                        moduledefinition.ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1];
+                        moduledefinition.AssemblyName = assembly.GetName().Name;
+                        
+                        if (string.IsNullOrEmpty(moduledefinition.Categories))
+                        {
+                            moduledefinition.Categories = "Common";
+                        }
                         if (moduledefinition.Categories == "Admin")
                         {
-                            moduledefinition.Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"" + Constants.AdminRole + "\"}]";
+                            moduledefinition.Permissions = new List<Permission>
+                            {
+                                new Permission(PermissionNames.Utilize, Constants.AdminRole, true)
+                            }.EncodePermissions();
                         }
                         else
                         {
-                            moduledefinition.Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"" + Constants.AdminRole + ";" + Constants.RegisteredRole + "\"}]";
+                            moduledefinition.Permissions = new List<Permission>
+                            {
+                                new Permission(PermissionNames.Utilize, Constants.AdminRole, true),
+                                new Permission(PermissionNames.Utilize, Constants.RegisteredRole, true)
+                            }.EncodePermissions();
                         }
                         moduledefinitions.Add(moduledefinition);
-                        index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == QualifiedModuleType);
+                        index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == qualifiedModuleType);
                     }
                     moduledefinition = moduledefinitions[index];
                     // actions
                     var modulecontrolobject = Activator.CreateInstance(modulecontroltype);
-                    string actions = (string)modulecontroltype.GetProperty("Actions").GetValue(modulecontrolobject);
-                    if (actions != "")
+                    string actions = (string)modulecontroltype.GetProperty("Actions")?.GetValue(modulecontrolobject);
+                    if (!string.IsNullOrEmpty(actions))
                     {
                         foreach (string action in actions.Split(','))
                         {
@@ -222,14 +262,5 @@ namespace Oqtane.Repository
             return moduledefinitions;
         }
 
-        private string GetProperty(Dictionary<string, string> Properties, string Key)
-        {
-            string Value = "";
-            if (Properties.ContainsKey(Key))
-            {
-                Value = Properties[Key];
-            }
-            return Value;
-        }
     }
 }
diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
index 7abd0c34..a66517fc 100644
--- a/Oqtane.Server/Repository/ModuleRepository.cs
+++ b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -1,12 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
-using System.Reflection;
-using System;
-using Oqtane.Modules;
-using Microsoft.Extensions.DependencyInjection;
 using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Models;
+using Oqtane.Modules;
+using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository
 {
@@ -25,56 +25,56 @@ namespace Oqtane.Repository
             _serviceProvider = serviceProvider;
         }
 
-        public IEnumerable<Models.Module> GetModules(int SiteId)
+        public IEnumerable<Module> GetModules(int siteId)
         {
-            return _db.Module.Where(item => item.SiteId == SiteId).ToList();
+            return _db.Module.Where(item => item.SiteId == siteId).ToList();
         }
 
-        public Models.Module AddModule(Models.Module Module)
+        public Module AddModule(Module module)
         {
-            _db.Module.Add(Module);
+            _db.Module.Add(module);
             _db.SaveChanges();
-            _permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions);
-            return Module;
-        }
-
-        public Models.Module UpdateModule(Models.Module Module)
-        {
-            _db.Entry(Module).State = EntityState.Modified;
-            _db.SaveChanges();
-            _permissions.UpdatePermissions(Module.SiteId, "Module", Module.ModuleId, Module.Permissions);
-            return Module;
-        }
-
-        public Models.Module GetModule(int ModuleId)
-        {
-            Models.Module module = _db.Module.Find(ModuleId);
-            if (module != null)
-            {
-                List<Permission> permissions = _permissions.GetPermissions("Module", module.ModuleId).ToList();
-                module.Permissions = _permissions.EncodePermissions(module.ModuleId, permissions);
-            }
+            _permissions.UpdatePermissions(module.SiteId, "Module", module.ModuleId, module.Permissions);
             return module;
         }
 
-        public void DeleteModule(int ModuleId)
+        public Module UpdateModule(Module module)
         {
-            Models.Module Module = _db.Module.Find(ModuleId);
-            _permissions.DeletePermissions(Module.SiteId, "Module", ModuleId);
-            _db.Module.Remove(Module);
+            _db.Entry(module).State = EntityState.Modified;
+            _db.SaveChanges();
+            _permissions.UpdatePermissions(module.SiteId, "Module", module.ModuleId, module.Permissions);
+            return module;
+        }
+
+        public Module GetModule(int moduleId)
+        {
+            Module module = _db.Module.Find(moduleId);
+            if (module != null)
+            {
+                module.Permissions = _permissions.GetPermissionString("Module", module.ModuleId);
+            }
+
+            return module;
+        }
+
+        public void DeleteModule(int moduleId)
+        {
+            Module module = _db.Module.Find(moduleId);
+            _permissions.DeletePermissions(module.SiteId, "Module", moduleId);
+            _db.Module.Remove(module);
             _db.SaveChanges();
         }
 
-        public string ExportModule(int ModuleId)
+        public string ExportModule(int moduleId)
         {
             string content = "";
             try
             {
-                Models.Module module = GetModule(ModuleId);
+                Module module = GetModule(moduleId);
                 if (module != null)
                 {
                     List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
-                    ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
+                    ModuleDefinition moduledefinition = moduledefinitions.FirstOrDefault(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                     if (moduledefinition != null)
                     {
                         ModuleContent modulecontent = new ModuleContent();
@@ -82,23 +82,23 @@ namespace Oqtane.Repository
                         modulecontent.Version = moduledefinition.Version;
                         modulecontent.Content = "";
 
-                        if (moduledefinition.ServerAssemblyName != "")
+                        if (moduledefinition.ServerManagerType != "")
                         {
-                            Assembly assembly = AppDomain.CurrentDomain.GetAssemblies()
-                                .Where(item => item.FullName.StartsWith(moduledefinition.ServerAssemblyName)).FirstOrDefault();
-                            if (assembly != null)
+                            Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+                            if (moduletype != null && moduletype.GetInterface("IPortable") != null)
                             {
-                                Type moduletype = assembly.GetTypes()
-                                    .Where(item => item.Namespace != null)
-                                    .Where(item => item.Namespace.StartsWith(moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","))))
-                                    .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault();
-                                if (moduletype != null)
+                                try
                                 {
                                     var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
                                     modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
                                 }
+                                catch
+                                {
+                                    // error in IPortable implementation
+                                }
                             }
                         }
+
                         content = JsonSerializer.Serialize(modulecontent);
                     }
                 }
@@ -107,40 +107,40 @@ namespace Oqtane.Repository
             {
                 // error occurred during export
             }
+
             return content;
         }
 
-        public bool ImportModule(int ModuleId, string Content)
+        public bool ImportModule(int moduleId, string content)
         {
             bool success = false;
             try
             {
-                Models.Module module = GetModule(ModuleId);
+                Module module = GetModule(moduleId);
                 if (module != null)
                 {
                     List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
                     ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
                     if (moduledefinition != null)
                     {
-                        ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(Content);
+                        ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(content);
                         if (modulecontent.ModuleDefinitionName == moduledefinition.ModuleDefinitionName)
                         {
-                            if (moduledefinition.ServerAssemblyName != "")
+                            if (moduledefinition.ServerManagerType != "")
                             {
-                                Assembly assembly = AppDomain.CurrentDomain.GetAssemblies()
-                                    .Where(item => item.FullName.StartsWith(moduledefinition.ServerAssemblyName)).FirstOrDefault();
-                                if (assembly != null)
+                                Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+                                if (moduletype != null && moduletype.GetInterface("IPortable") != null)
                                 {
-                                    Type moduletype = assembly.GetTypes()
-                                        .Where(item => item.Namespace != null)
-                                        .Where(item => item.Namespace.StartsWith(moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","))))
-                                        .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault();
-                                    if (moduletype != null)
+                                    try
                                     {
                                         var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
                                         ((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
                                         success = true;
                                     }
+                                    catch 
+                                    {
+                                        // error in IPortable implementation
+                                    }
                                 }
                             }
                         }
@@ -151,8 +151,8 @@ namespace Oqtane.Repository
             {
                 // error occurred during import
             }
+
             return success;
         }
-
     }
 }
diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs
index dbc00564..8f34ff50 100644
--- a/Oqtane.Server/Repository/NotificationRepository.cs
+++ b/Oqtane.Server/Repository/NotificationRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -14,52 +14,50 @@ namespace Oqtane.Repository
             _db = context;
         }
             
-        public IEnumerable<Notification> GetNotifications(int SiteId, int FromUserId, int ToUserId)
+        public IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId)
         {
-            if (ToUserId == -1 && FromUserId == -1)
+            if (toUserId == -1 && fromUserId == -1)
             {
                 return _db.Notification
-                    .Where(item => item.SiteId == SiteId)
+                    .Where(item => item.SiteId == siteId)
                     .Where(item => item.IsDelivered == false)
                     .Include(item => item.FromUser)
                     .Include(item => item.ToUser)
                     .ToList();
             }
-            else
-            {
-                return _db.Notification
-                    .Where(item => item.SiteId == SiteId)
-                    .Where(item => item.ToUserId == ToUserId || ToUserId == -1)
-                    .Where(item => item.FromUserId == FromUserId || FromUserId == -1)
-                    .Include(item => item.FromUser)
-                    .Include(item => item.ToUser)
-                    .ToList();
-            }
+
+            return _db.Notification
+                .Where(item => item.SiteId == siteId)
+                .Where(item => item.ToUserId == toUserId || toUserId == -1)
+                .Where(item => item.FromUserId == fromUserId || fromUserId == -1)
+                .Include(item => item.FromUser)
+                .Include(item => item.ToUser)
+                .ToList();
         }
 
-        public Notification AddNotification(Notification Notification)
+        public Notification AddNotification(Notification notification)
         {
-            _db.Notification.Add(Notification);
+            _db.Notification.Add(notification);
             _db.SaveChanges();
-            return Notification;
+            return notification;
         }
 
-        public Notification UpdateNotification(Notification Notification)
+        public Notification UpdateNotification(Notification notification)
         {
-            _db.Entry(Notification).State = EntityState.Modified;
+            _db.Entry(notification).State = EntityState.Modified;
             _db.SaveChanges();
-            return Notification;
+            return notification;
         }
 
-        public Notification GetNotification(int NotificationId)
+        public Notification GetNotification(int notificationId)
         {
-            return _db.Notification.Find(NotificationId);
+            return _db.Notification.Find(notificationId);
         }
 
-        public void DeleteNotification(int NotificationId)
+        public void DeleteNotification(int notificationId)
         {
-            Notification Notification = _db.Notification.Find(NotificationId);
-            _db.Notification.Remove(Notification);
+            Notification notification = _db.Notification.Find(notificationId);
+            _db.Notification.Remove(notification);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs
index 8493c7f1..e78abb07 100644
--- a/Oqtane.Server/Repository/PageModuleRepository.cs
+++ b/Oqtane.Server/Repository/PageModuleRepository.cs
@@ -1,6 +1,7 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -16,84 +17,82 @@ namespace Oqtane.Repository
             _permissions = permissions;
         }
 
-        public IEnumerable<PageModule> GetPageModules(int SiteId)
+        public IEnumerable<PageModule> GetPageModules(int siteId)
         {
             IEnumerable<PageModule> pagemodules = _db.PageModule
                 .Include(item => item.Module) // eager load modules
-                .Where(item => item.Module.SiteId == SiteId);
-            if (pagemodules != null && pagemodules.Any())
+                .Where(item => item.Module.SiteId == siteId);
+            if (pagemodules.Any())
             {
                 IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
-                    pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions);
+                    pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
                 }
             }
             return pagemodules;
         }
 
-        public IEnumerable<PageModule> GetPageModules(int PageId, string Pane)
+        public IEnumerable<PageModule> GetPageModules(int pageId, string pane)
         {
             IEnumerable<PageModule> pagemodules = _db.PageModule
                 .Include(item => item.Module) // eager load modules
-                .Where(item => item.PageId == PageId);
-            if (Pane != "" && pagemodules != null && pagemodules.Any())
+                .Where(item => item.PageId == pageId);
+            if (pane != "" && pagemodules.Any())
             {
-                pagemodules = pagemodules.Where(item => item.Pane == Pane);
+                pagemodules = pagemodules.Where(item => item.Pane == pane);
             }
-            if (pagemodules != null && pagemodules.Any())
+            if (pagemodules.Any())
             {
                 IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
-                    pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions);
+                    pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
                 }
             }
             return pagemodules;
         }
 
-        public PageModule AddPageModule(PageModule PageModule)
+        public PageModule AddPageModule(PageModule pageModule)
         {
-            _db.PageModule.Add(PageModule);
+            _db.PageModule.Add(pageModule);
             _db.SaveChanges();
-            return PageModule;
+            return pageModule;
         }
 
-        public PageModule UpdatePageModule(PageModule PageModule)
+        public PageModule UpdatePageModule(PageModule pageModule)
         {
-            _db.Entry(PageModule).State = EntityState.Modified;
+            _db.Entry(pageModule).State = EntityState.Modified;
             _db.SaveChanges();
-            return PageModule;
+            return pageModule;
         }
 
-        public PageModule GetPageModule(int PageModuleId)
+        public PageModule GetPageModule(int pageModuleId)
         {
             PageModule pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules
-                .SingleOrDefault(item => item.PageModuleId == PageModuleId);
+                .SingleOrDefault(item => item.PageModuleId == pageModuleId);
             if (pagemodule != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList();
-                pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions);
+                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
             }
             return pagemodule;
         }
 
-        public PageModule GetPageModule(int PageId, int ModuleId)
+        public PageModule GetPageModule(int pageId, int moduleId)
         {
             PageModule pagemodule = _db.PageModule.Include(item => item.Module) // eager load modules
-                .SingleOrDefault(item => item.PageId == PageId && item.ModuleId == ModuleId);
+                .SingleOrDefault(item => item.PageId == pageId && item.ModuleId == moduleId);
             if (pagemodule != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Module", pagemodule.ModuleId).ToList();
-                pagemodule.Module.Permissions = _permissions.EncodePermissions(pagemodule.ModuleId, permissions);
+                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
             }
             return pagemodule;
         }
 
-        public void DeletePageModule(int PageModuleId)
+        public void DeletePageModule(int pageModuleId)
         {
-            PageModule PageModule = _db.PageModule.Find(PageModuleId);
-            _db.PageModule.Remove(PageModule);
+            PageModule pageModule = _db.PageModule.Find(pageModuleId);
+            _db.PageModule.Remove(pageModule);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs
index a016a88c..9db59dc2 100644
--- a/Oqtane.Server/Repository/PageRepository.cs
+++ b/Oqtane.Server/Repository/PageRepository.cs
@@ -1,7 +1,9 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -18,84 +20,78 @@ namespace Oqtane.Repository
             _pageModules = pageModules;
         }
 
-        public IEnumerable<Page> GetPages(int SiteId)
+        public IEnumerable<Page> GetPages(int siteId)
         {
-            IEnumerable<Permission> permissions = _permissions.GetPermissions(SiteId, "Page").ToList();
-            IEnumerable<Page> pages = _db.Page.Where(item => item.SiteId == SiteId && item.UserId == null);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Page).ToList();
+            IEnumerable<Page> pages = _db.Page.Where(item => item.SiteId == siteId && item.UserId == null);
             foreach(Page page in pages)
             {
-                page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
+                page.Permissions = permissions.Where(item => item.EntityId == page.PageId).EncodePermissions();
             }
             return pages;
         }
 
-        public Page AddPage(Page Page)
+        public Page AddPage(Page page)
         {
-            _db.Page.Add(Page);
+            _db.Page.Add(page);
             _db.SaveChanges();
-            _permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions);
-            return Page;
+            _permissions.UpdatePermissions(page.SiteId, EntityNames.Page, page.PageId, page.Permissions);
+            return page;
         }
 
-        public Page UpdatePage(Page Page)
+        public Page UpdatePage(Page page)
         {
-            _db.Entry(Page).State = EntityState.Modified;
+            _db.Entry(page).State = EntityState.Modified;
             _db.SaveChanges();
-            _permissions.UpdatePermissions(Page.SiteId, "Page", Page.PageId, Page.Permissions);
-            return Page;
+            _permissions.UpdatePermissions(page.SiteId, EntityNames.Page, page.PageId, page.Permissions);
+            return page;
         }
 
-        public Page GetPage(int PageId)
+        public Page GetPage(int pageId)
         {
-            Page page = _db.Page.Find(PageId);
+            Page page = _db.Page.Find(pageId);
             if (page != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
-                page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
             }
             return page;
         }
 
-        public Page GetPage(int PageId, int UserId)
+        public Page GetPage(int pageId, int userId)
         {
-            Page page = _db.Page.Find(PageId);
+            Page page = _db.Page.Find(pageId);
             if (page != null)
             {
-                Page personalized = _db.Page.Where(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == UserId).FirstOrDefault();
+                Page personalized = _db.Page.FirstOrDefault(item => item.SiteId == page.SiteId && item.Path == page.Path && item.UserId == userId);
                 if (personalized != null)
                 {
                     page = personalized;
                 }
-                if (page != null)
-                {
-                    IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
-                    page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
-                }
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
             }
             return page;
         }
 
-        public Page GetPage(string Path, int SiteId)
+        public Page GetPage(string path, int siteId)
         {
-            Page page = _db.Page.Where(item => item.Path == Path && item.SiteId == SiteId).FirstOrDefault();
+            Page page = _db.Page.FirstOrDefault(item => item.Path == path && item.SiteId == siteId);
             if (page != null)
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
-                page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
+                page.Permissions = _permissions.GetPermissionString(EntityNames.Page, page.PageId);
             }
             return page;
         }
 
-        public void DeletePage(int PageId)
+        public void DeletePage(int pageId)
         {
-            Page Page = _db.Page.Find(PageId);
-            _permissions.DeletePermissions(Page.SiteId, "Page", PageId);
-            IEnumerable<PageModule> pageModules = _db.PageModule.Where(item => item.PageId == PageId).ToList();
+            Page page = _db.Page.Find(pageId);
+            _permissions.DeletePermissions(page.SiteId, EntityNames.Page, pageId);
+            IEnumerable<PageModule> pageModules = _db.PageModule.Where(item => item.PageId == pageId).ToList();
             foreach (var pageModule in pageModules)
             {
                 _pageModules.DeletePageModule(pageModule.PageModuleId);
             }
-            _db.Page.Remove(Page);
+            _db.Page.Remove(page);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs
index f9edc3b6..7a66b3bf 100644
--- a/Oqtane.Server/Repository/PermissionRepository.cs
+++ b/Oqtane.Server/Repository/PermissionRepository.cs
@@ -1,11 +1,11 @@
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using System.Text;
-using System;
 using System.Text.Json;
-using System.Text.Json.Serialization;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
+using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
@@ -20,55 +20,71 @@ namespace Oqtane.Repository
             _roles = roles;
         }
 
-        public IEnumerable<Permission> GetPermissions(int SiteId, string EntityName)
+        public IEnumerable<Permission> GetPermissions(int siteId, string entityName)
         {
-            return _db.Permission.Where(item => item.SiteId == SiteId)
-                .Where(item => item.EntityName == EntityName)
+            return _db.Permission.Where(item => item.SiteId == siteId)
+                .Where(item => item.EntityName == entityName)
                 .Include(item => item.Role); // eager load roles
         }
 
-        public IEnumerable<Permission> GetPermissions(string EntityName, int EntityId)
+        public IEnumerable<Permission> GetPermissions(string entityName, int entityId)
         {
-            return _db.Permission.Where(item => item.EntityName == EntityName)
-                .Where(item => item.EntityId == EntityId)
+            return _db.Permission.Where(item => item.EntityName == entityName)
+                .Where(item => item.EntityId == entityId)
                 .Include(item => item.Role); // eager load roles
         }
 
-        public IEnumerable<Permission> GetPermissions(string EntityName, int EntityId, string PermissionName)
+        public IEnumerable<Permission> GetPermissions(string entityName, int entityId, string permissionName)
         {
-            return _db.Permission.Where(item => item.EntityName == EntityName)
-                .Where(item => item.EntityId == EntityId)
-                .Where(item => item.PermissionName == PermissionName)
+            return _db.Permission.Where(item => item.EntityName == entityName)
+                .Where(item => item.EntityId == entityId)
+                .Where(item => item.PermissionName == permissionName)
                 .Include(item => item.Role); // eager load roles
         }
 
-        public Permission AddPermission(Permission Permission)
+        public string GetPermissionString(int siteId, string entityName)
         {
-            _db.Permission.Add(Permission);
+            return GetPermissions(siteId, entityName)?.EncodePermissions();
+        }
+
+        public string GetPermissionString(string entityName, int entityId)
+        {
+            return GetPermissions(entityName, entityId)?.EncodePermissions();
+        }
+
+        public string GetPermissionString(string entityName, int entityId, string permissionName)
+        {
+            return GetPermissions(entityName, entityId, permissionName)?.EncodePermissions();
+        }
+
+
+        public Permission AddPermission(Permission permission)
+        {
+            _db.Permission.Add(permission);
             _db.SaveChanges();
-            return Permission;
+            return permission;
         }
 
-        public Permission UpdatePermission(Permission Permission)
+        public Permission UpdatePermission(Permission permission)
         {
-            _db.Entry(Permission).State = EntityState.Modified;
+            _db.Entry(permission).State = EntityState.Modified;
             _db.SaveChanges();
-            return Permission;
+            return permission;
         }
 
-        public void UpdatePermissions(int SiteId, string EntityName, int EntityId, string Permissions)
+        public void UpdatePermissions(int siteId, string entityName, int entityId, string permissionStrings)
         {
             // get current permissions and delete
             IEnumerable<Permission> permissions = _db.Permission
-                .Where(item => item.EntityName == EntityName)
-                .Where(item => item.EntityId == EntityId)
-                .Where(item => item.SiteId == SiteId);
+                .Where(item => item.EntityName == entityName)
+                .Where(item => item.EntityId == entityId)
+                .Where(item => item.SiteId == siteId);
             foreach (Permission permission in permissions)
             {
                 _db.Permission.Remove(permission);
             }
             // add permissions
-            permissions = DecodePermissions(Permissions, SiteId, EntityName, EntityId);
+            permissions = DecodePermissions(permissionStrings, siteId, entityName, entityId);
             foreach (Permission permission in permissions)
             {
                 _db.Permission.Add(permission);
@@ -76,24 +92,24 @@ namespace Oqtane.Repository
             _db.SaveChanges();
         }
 
-        public Permission GetPermission(int PermissionId)
+        public Permission GetPermission(int permissionId)
         {
-            return _db.Permission.Find(PermissionId);
+            return _db.Permission.Find(permissionId);
         }
 
-        public void DeletePermission(int PermissionId)
+        public void DeletePermission(int permissionId)
         {
-            Permission Permission = _db.Permission.Find(PermissionId);
-            _db.Permission.Remove(Permission);
+            Permission permission = _db.Permission.Find(permissionId);
+            _db.Permission.Remove(permission);
             _db.SaveChanges();
         }
 
-        public void DeletePermissions(int SiteId, string EntityName, int EntityId)
+        public void DeletePermissions(int siteId, string entityName, int entityId)
         {
             IEnumerable<Permission> permissions = _db.Permission
-                .Where(item => item.EntityName == EntityName)
-                .Where(item => item.EntityId == EntityId)
-                .Where(item => item.SiteId == SiteId);
+                .Where(item => item.EntityName == entityName)
+                .Where(item => item.EntityId == entityId)
+                .Where(item => item.SiteId == siteId);
             foreach (Permission permission in permissions)
             {
                 _db.Permission.Remove(permission);
@@ -102,14 +118,14 @@ namespace Oqtane.Repository
         }
 
         // permissions are stored in the format "{permissionname:!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]}" where "!" designates Deny permissions
-        public string EncodePermissions(int EntityId, IEnumerable<Permission> Permissions)
+        public string EncodePermissions(IEnumerable<Permission> permissionList)
         {
             List<PermissionString> permissionstrings = new List<PermissionString>();
             string permissionname = "";
             string permissions = "";
             StringBuilder permissionsbuilder = new StringBuilder();
             string securityid = "";
-            foreach (Permission permission in Permissions.Where(item => item.EntityId == EntityId).OrderBy(item => item.PermissionName))
+            foreach (Permission permission in permissionList.OrderBy(item => item.PermissionName))
             {
                 // permission collections are grouped by permissionname
                 if (permissionname != permission.PermissionName)
@@ -133,7 +149,7 @@ namespace Oqtane.Repository
                 }
                 else
                 {
-                    securityid = prefix + "[" + permission.UserId.ToString() + "];";
+                    securityid = prefix + "[" + permission.UserId + "];";
                 }
 
                 // insert deny permissions at the beginning and append grant permissions at the end
@@ -155,20 +171,20 @@ namespace Oqtane.Repository
             return JsonSerializer.Serialize(permissionstrings);
         }
 
-        public IEnumerable<Permission> DecodePermissions(string PermissionStrings, int SiteId, string EntityName, int EntityId)
+        public IEnumerable<Permission> DecodePermissions(string permissionStrings, int siteId, string entityName, int entityId)
         {
             List<Permission> permissions = new List<Permission>();
-            List<Role> roles = _roles.GetRoles(SiteId, true).ToList();
+            List<Role> roles = _roles.GetRoles(siteId, true).ToList();
             string securityid = "";
-            foreach (PermissionString permissionstring in JsonSerializer.Deserialize<List<PermissionString>>(PermissionStrings))
+            foreach (PermissionString permissionstring in JsonSerializer.Deserialize<List<PermissionString>>(permissionStrings))
             {
                 foreach (string id in permissionstring.Permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
                     securityid = id;
                     Permission permission = new Permission();
-                    permission.SiteId = SiteId;
-                    permission.EntityName = EntityName;
-                    permission.EntityId = EntityId;
+                    permission.SiteId = siteId;
+                    permission.EntityName = entityName;
+                    permission.EntityId = entityId;
                     permission.PermissionName = permissionstring.PermissionName;
                     permission.RoleId = null;
                     permission.UserId = null;
@@ -177,7 +193,7 @@ namespace Oqtane.Repository
                     if (securityid.StartsWith("!"))
                     {
                         // deny permission
-                        securityid.Replace("!", "");
+                        securityid = securityid.Replace("!", "");
                         permission.IsAuthorized = false;
                     }
                     if (securityid.StartsWith("[") && securityid.EndsWith("]"))
@@ -189,7 +205,7 @@ namespace Oqtane.Repository
                     else
                     {
                         // role name
-                        Role role = roles.Where(item => item.Name == securityid).SingleOrDefault();
+                        Role role = roles.SingleOrDefault(item => item.Name == securityid);
                         if (role != null)
                         {
                             permission.RoleId = role.RoleId;
diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs
index 91062cf9..8577ea78 100644
--- a/Oqtane.Server/Repository/ProfileRepository.cs
+++ b/Oqtane.Server/Repository/ProfileRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -14,34 +14,34 @@ namespace Oqtane.Repository
             _db = context;
         }
             
-        public IEnumerable<Profile> GetProfiles(int SiteId)
+        public IEnumerable<Profile> GetProfiles(int siteId)
         {
-            return _db.Profile.Where(item => item.SiteId == SiteId || item.SiteId == null);
+            return _db.Profile.Where(item => item.SiteId == siteId || item.SiteId == null);
         }
 
-        public Profile AddProfile(Profile Profile)
+        public Profile AddProfile(Profile profile)
         {
-            _db.Profile.Add(Profile);
+            _db.Profile.Add(profile);
             _db.SaveChanges();
-            return Profile;
+            return profile;
         }
 
-        public Profile UpdateProfile(Profile Profile)
+        public Profile UpdateProfile(Profile profile)
         {
-            _db.Entry(Profile).State = EntityState.Modified;
+            _db.Entry(profile).State = EntityState.Modified;
             _db.SaveChanges();
-            return Profile;
+            return profile;
         }
 
-        public Profile GetProfile(int ProfileId)
+        public Profile GetProfile(int profileId)
         {
-            return _db.Profile.Find(ProfileId);
+            return _db.Profile.Find(profileId);
         }
 
-        public void DeleteProfile(int ProfileId)
+        public void DeleteProfile(int profileId)
         {
-            Profile Profile = _db.Profile.Find(ProfileId);
-            _db.Profile.Remove(Profile);
+            Profile profile = _db.Profile.Find(profileId);
+            _db.Profile.Remove(profile);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index 35aa7fe3..2814d7e0 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -14,40 +14,40 @@ namespace Oqtane.Repository
             _db = context;
         }
             
-        public IEnumerable<Role> GetRoles(int SiteId)
+        public IEnumerable<Role> GetRoles(int siteId)
         {
-            return _db.Role.Where(item => item.SiteId == SiteId);
+            return _db.Role.Where(item => item.SiteId == siteId);
         }
 
-        public IEnumerable<Role> GetRoles(int SiteId, bool IncludeGlobalRoles)
+        public IEnumerable<Role> GetRoles(int siteId, bool includeGlobalRoles)
         {
-            return _db.Role.Where(item => item.SiteId == SiteId || item.SiteId == null);
+            return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null);
         }
 
 
-        public Role AddRole(Role Role)
+        public Role AddRole(Role role)
         {
-            _db.Role.Add(Role);
+            _db.Role.Add(role);
             _db.SaveChanges();
-            return Role;
+            return role;
         }
 
-        public Role UpdateRole(Role Role)
+        public Role UpdateRole(Role role)
         {
-            _db.Entry(Role).State = EntityState.Modified;
+            _db.Entry(role).State = EntityState.Modified;
             _db.SaveChanges();
-            return Role;
+            return role;
         }
 
-        public Role GetRole(int RoleId)
+        public Role GetRole(int roleId)
         {
-            return _db.Role.Find(RoleId);
+            return _db.Role.Find(roleId);
         }
 
-        public void DeleteRole(int RoleId)
+        public void DeleteRole(int roleId)
         {
-            Role Role = _db.Role.Find(RoleId);
-            _db.Role.Remove(Role);
+            Role role = _db.Role.Find(roleId);
+            _db.Role.Remove(role);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index 3d670f55..30b7f676 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -14,35 +14,35 @@ namespace Oqtane.Repository
             _db = context;
         }
 
-        public IEnumerable<Setting> GetSettings(string EntityName, int EntityId)
+        public IEnumerable<Setting> GetSettings(string entityName, int entityId)
         {
-            return _db.Setting.Where(item => item.EntityName == EntityName)
-                .Where(item => item.EntityId == EntityId);
+            return _db.Setting.Where(item => item.EntityName == entityName)
+                .Where(item => item.EntityId == entityId);
         }
 
-        public Setting AddSetting(Setting Setting)
+        public Setting AddSetting(Setting setting)
         {
-            _db.Setting.Add(Setting);
+            _db.Setting.Add(setting);
             _db.SaveChanges();
-            return Setting;
+            return setting;
         }
 
-        public Setting UpdateSetting(Setting Setting)
+        public Setting UpdateSetting(Setting setting)
         {
-            _db.Entry(Setting).State = EntityState.Modified;
+            _db.Entry(setting).State = EntityState.Modified;
             _db.SaveChanges();
-            return Setting;
+            return setting;
         }
 
-        public Setting GetSetting(int SettingId)
+        public Setting GetSetting(int settingId)
         {
-            return _db.Setting.Find(SettingId);
+            return _db.Setting.Find(settingId);
         }
 
-        public void DeleteSetting(int SettingId)
+        public void DeleteSetting(int settingId)
         {
-            Setting Setting = _db.Setting.Find(SettingId);
-            _db.Setting.Remove(Setting);
+            Setting setting = _db.Setting.Find(settingId);
+            _db.Setting.Remove(setting);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 6b6db2c1..3dea955c 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -1,12 +1,16 @@
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using Oqtane.Models;
-using Oqtane.Shared;
-using System;
-using System.Reflection;
-using Oqtane.Modules;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Extensions;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+using Oqtane.Modules;
+using Oqtane.Shared;
+using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository
 {
@@ -16,113 +20,602 @@ namespace Oqtane.Repository
         private readonly IRoleRepository _roleRepository;
         private readonly IProfileRepository _profileRepository;
         private readonly IFolderRepository _folderRepository;
-        private readonly IFileRepository _fileRepository;
         private readonly IPageRepository _pageRepository;
         private readonly IModuleRepository _moduleRepository;
         private readonly IPageModuleRepository _pageModuleRepository;
         private readonly IModuleDefinitionRepository _moduleDefinitionRepository;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly List<PageTemplate> _siteTemplate;
 
-        public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IFileRepository fileRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider)
+        private readonly IServiceProvider _serviceProvider;
+
+        private readonly IConfigurationRoot _config;
+
+        public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IPageRepository pageRepository,
+            IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider,
+            IConfigurationRoot config)
         {
             _db = context;
             _roleRepository = roleRepository;
             _profileRepository = profileRepository;
             _folderRepository = folderRepository;
-            _fileRepository = fileRepository;
             _pageRepository = pageRepository;
             _moduleRepository = moduleRepository;
             _pageModuleRepository = pageModuleRepository;
             _moduleDefinitionRepository = moduleDefinitionRepository;
             _serviceProvider = serviceProvider;
+            _config = config;
+        }
 
-            // define the default site template
-            _siteTemplate = new List<PageTemplate>();
-            _siteTemplate.Add(new PageTemplate { Name = "Home", Parent = "", Path = "", Icon = "home", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]",  
-                    Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
-                    "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img src=\"oqtane.png\"></a><br /><br /><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a><br /><br /></p>" +
-                    "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
-                    "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
-                },
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]",  
-                    Content = "<p>Copyright (c) 2019-2020 .NET Foundation</p>" +
-                    "<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" +
-                    "<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>" +
-                    "<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>"
+        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,
+                EditMode = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
                 }
-            }
-            }); 
-            _siteTemplate.Add(new PageTemplate { Name = "Private", Parent = "", Path = "private", Icon = "lock-locked", IsNavigation = true, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Registered Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]",  
-                    Content = "<p>Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.</p>"
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Register",
+                Parent = "",
+                Path = "register",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
                 }
-            }
-            }); 
-            _siteTemplate.Add(new PageTemplate { Name = "My Page", Parent = "", Path = "mypage", Icon = "target", IsNavigation = true, IsPersonalizable = true, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]",  
-                    Content = "<p>Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.</p>"
+            });
+
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Reset",
+                Parent = "",
+                Path = "reset",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.View, Constants.AllUsersRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
                 }
-            }
-            }); 
-            _siteTemplate.Add(new PageTemplate { Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client", Title = "Admin Dashboard", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = "globe", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Sites, Oqtane.Client", Title = "Site Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Site Settings", Parent = "Admin", Path = "admin/site", Icon = "home", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Site, Oqtane.Client", Title = "Site Settings", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Page Management", Parent = "Admin", Path = "admin/pages", Icon = "layers", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Pages, Oqtane.Client", Title = "Page Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "User Management", Parent = "Admin", Path = "admin/users", Icon = "people", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Users, Oqtane.Client", Title = "User Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Profile Management", Parent = "Admin", Path = "admin/profiles", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Profiles, Oqtane.Client", Title = "Profile Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Role Management", Parent = "Admin", Path = "admin/roles", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Roles, Oqtane.Client", Title = "Role Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Event Log", Parent = "Admin", Path = "admin/log", Icon = "magnifying-glass", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Logs, Oqtane.Client", Title = "Event Log", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "File Management", Parent = "Admin", Path = "admin/files", Icon = "file", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Files, Oqtane.Client", Title = "File Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Recycle Bin", Parent = "Admin", Path = "admin/recyclebin", Icon = "trash", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.RecycleBin, Oqtane.Client", Title = "Recycle Bin", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Tenant Management", Parent = "Admin", Path = "admin/tenants", Icon = "list", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Tenants, Oqtane.Client", Title = "Tenant Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = "browser", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleDefinitions, Oqtane.Client", Title = "Module Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = "brush", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Themes, Oqtane.Client", Title = "Theme Management", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = "timer", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Jobs, Oqtane.Client", Title = "Scheduled Jobs", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Upgrade Service", Parent = "Admin", Path = "admin/upgrade", Icon = "aperture", IsNavigation = false, IsPersonalizable = false, EditMode = true, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Upgrade, Oqtane.Client", Title = "Upgrade Service", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Login", Parent = "", Path = "login", Icon = "lock-locked", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Login, Oqtane.Client", Title = "User Login", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Register", Parent = "", Path = "register", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Register, Oqtane.Client", Title = "User Registration", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Reset", Parent = "", Path = "reset", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.Reset, Oqtane.Client", Title = "Password Reset", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
-            _siteTemplate.Add(new PageTemplate { Name = "Profile", Parent = "", Path = "profile", Icon = "person", IsNavigation = false, IsPersonalizable = false, EditMode = false, PagePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", PageTemplateModules = new List<PageTemplateModule> {
-                new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.UserProfile, Oqtane.Client", Title = "User Profile", Pane = "Content", ModulePermissions = "[{\"PermissionName\":\"View\",\"Permissions\":\"All Users;Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]", Content = "" }
-            }});
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Profile",
+                Parent = "",
+                Path = "profile",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.View, Constants.RegisteredRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.View, Constants.RegisteredRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            
+            // admin pages
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Site Settings",
+                Parent = "Admin",
+                Path = "admin/site",
+                Icon = Icons.Home,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Page Management",
+                Parent = "Admin",
+                Path = "admin/pages",
+                Icon = Icons.Layers,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "User Management",
+                Parent = "Admin",
+                Path = "admin/users",
+                Icon = Icons.People,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Profile Management",
+                Parent = "Admin",
+                Path = "admin/profiles",
+                Icon = Icons.Person,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Role Management",
+                Parent = "Admin",
+                Path = "admin/roles",
+                Icon = Icons.LockLocked,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "File Management",
+                Parent = "Admin",
+                Path = "admin/files",
+                Icon = Icons.File,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Recycle Bin",
+                Parent = "Admin",
+                Path = "admin/recyclebin",
+                Icon = Icons.Trash,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.AdminRole, true),
+                    new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.AdminRole, true),
+                            new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            // host pages
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Event Log",
+                Parent = "Admin",
+                Path = "admin/log",
+                Icon = Icons.MagnifyingGlass,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            }); pageTemplates.Add(new PageTemplate
+            {
+                Name = "Tenant Management",
+                Parent = "Admin",
+                Path = "admin/tenants",
+                Icon = Icons.List,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Tenants.Index).ToModuleDefinitionName(), Title = "Tenant Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = Icons.Globe, IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = Icons.Browser, IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = Icons.Brush, IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Sql Management",
+                Parent = "Admin",
+                Path = "admin/sql",
+                Icon = "spreadsheet",
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "System Info",
+                Parent = "Admin",
+                Path = "admin/system",
+                Icon = "medical-cross",
+                IsNavigation = false,
+                IsPersonalizable = false,
+                EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "System Update", Parent = "Admin", Path = "admin/update", Icon = Icons.Aperture, IsNavigation = false, IsPersonalizable = false, EditMode = true,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, Constants.HostRole, true),
+                    new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, Constants.HostRole, true),
+                            new Permission(PermissionNames.Edit, Constants.HostRole, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+
+            return pageTemplates;
         }
 
         public IEnumerable<Site> GetSites()
@@ -130,19 +623,20 @@ namespace Oqtane.Repository
             return _db.Site;
         }
 
-        public Site AddSite(Site Site)
+        public Site AddSite(Site site)
         {
-            _db.Site.Add(Site);
+            
+            _db.Site.Add(site);
             _db.SaveChanges();
-            CreateSite(Site);
-            return Site;
+            CreateSite(site);
+            return site;
         }
 
-        public Site UpdateSite(Site Site)
+        public Site UpdateSite(Site site)
         {
-            _db.Entry(Site).State = EntityState.Modified;
+            _db.Entry(site).State = EntityState.Modified;
             _db.SaveChanges();
-            return Site;
+            return site;
         }
 
         public Site GetSite(int siteId)
@@ -151,7 +645,7 @@ namespace Oqtane.Repository
         }
 
         public void DeleteSite(int siteId)
-        {       
+        {
             var site = _db.Site.Find(siteId);
             _db.Site.Remove(site);
             _db.SaveChanges();
@@ -159,39 +653,88 @@ namespace Oqtane.Repository
 
         private void CreateSite(Site site)
         {
+            // create default entities for site
             List<Role> roles = _roleRepository.GetRoles(site.SiteId, true).ToList();
             if (!roles.Where(item => item.Name == Constants.AllUsersRole).Any())
             {
-                _roleRepository.AddRole(new Role { SiteId = null, Name = Constants.AllUsersRole, Description = "All Users", IsAutoAssigned = false, IsSystem = true });
+                _roleRepository.AddRole(new Role {SiteId = null, Name = Constants.AllUsersRole, Description = "All Users", IsAutoAssigned = false, IsSystem = true});
             }
+
             if (!roles.Where(item => item.Name == Constants.HostRole).Any())
             {
-                _roleRepository.AddRole(new Role { SiteId = null, Name = Constants.HostRole, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true });
+                _roleRepository.AddRole(new Role {SiteId = null, Name = Constants.HostRole, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true});
             }
 
-            _roleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.RegisteredRole, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true });
-            _roleRepository.AddRole(new Role { SiteId = site.SiteId, Name = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true });
+            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = Constants.RegisteredRole, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true});
+            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true});
 
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder =  2, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false }); 
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired  = false, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false });
-            _profileRepository.AddProfile(new Profile { SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false });
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
+            _profileRepository.AddProfile(
+                new Profile {SiteId = site.SiteId, Name = "City", Title = "City", Description = "City", Category = "Address", ViewOrder = 4, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "Region", Title = "Region", Description = "State Or Province", Category = "Address", ViewOrder = 5, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "Country", Title = "Country", Description = "Country", Category = "Address", ViewOrder = 6, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "PostalCode", Title = "Postal Code", Description = "Postal Code Or Zip Code", Category = "Address", ViewOrder = 7, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
+            _profileRepository.AddProfile(new Profile
+                {SiteId = site.SiteId, Name = "Phone", Title = "Phone Number", Description = "Phone Number", Category = "Contact", ViewOrder = 8, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false});
 
-            Folder folder = _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" });
-            _folderRepository.AddFolder(new Folder { SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = "Users\\", Order = 1, IsSystem = true, Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]" });
-            if (site.Name == "Default Site")
+            Folder folder = _folderRepository.AddFolder(new Folder
             {
-                File file = _fileRepository.AddFile(new File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 });
-                site.LogoFileId = file.FileId;
-                UpdateSite(site);
+                SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true,
+                Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]"
+            });
+            _folderRepository.AddFolder(new Folder
+            {
+                SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = Utilities.PathCombine("Users","\\"), Order = 1, IsSystem = true,
+                Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]"
+            });
+
+            // process site template first
+            if (string.IsNullOrEmpty(site.SiteTemplateType))
+            {
+                var section = _config.GetSection("Installation:SiteTemplate");
+                if (section.Exists())
+                {
+                    if(string.IsNullOrEmpty(section.Value)){
+                        site.SiteTemplateType = Constants.DefaultSiteTemplate;
+                    }
+                    else
+                    {
+                        site.SiteTemplateType = section.Value;
+                    }                    
+                }
+                else
+                {
+                    site.SiteTemplateType = Constants.DefaultSiteTemplate;
+                }
             }
 
+            Type siteTemplateType = Type.GetType(site.SiteTemplateType);
+            if (siteTemplateType != null)
+            {
+                var siteTemplateObject = ActivatorUtilities.CreateInstance(_serviceProvider, siteTemplateType);
+                List<PageTemplate> pageTemplates = ((ISiteTemplate) siteTemplateObject).CreateSite(site);
+                if (pageTemplates != null && pageTemplates.Count > 0)
+                {
+                    CreatePages(site, pageTemplates);
+                }
+            }
+
+            // create admin pages
+            CreatePages(site, CreateAdminPages());
+        }
+
+        public void CreatePages(Site site, List<PageTemplate> pageTemplates)
+        {
             List<ModuleDefinition> moduledefinitions = _moduleDefinitionRepository.GetModuleDefinitions(site.SiteId).ToList();
-            foreach (PageTemplate pagetemplate in _siteTemplate)
+            foreach (PageTemplate pagetemplate in pageTemplates)
             {
                 int? parentid = null;
                 if (pagetemplate.Parent != "")
@@ -206,8 +749,10 @@ namespace Oqtane.Repository
                     SiteId = site.SiteId,
                     ParentId = parentid,
                     Name = pagetemplate.Name,
+                    Title = "",
                     Path = pagetemplate.Path,
                     Order = 1,
+                    Url = "",
                     IsNavigation = pagetemplate.IsNavigation,
                     EditMode = pagetemplate.EditMode,
                     ThemeType = "",
@@ -219,14 +764,14 @@ namespace Oqtane.Repository
                 };
                 page = _pageRepository.AddPage(page);
 
-                foreach(PageTemplateModule pagetemplatemodule in pagetemplate.PageTemplateModules)
+                foreach (PageTemplateModule pagetemplatemodule in pagetemplate.PageTemplateModules)
                 {
                     if (pagetemplatemodule.ModuleDefinitionName != "")
                     {
                         ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == pagetemplatemodule.ModuleDefinitionName).FirstOrDefault();
                         if (moduledefinition != null)
                         {
-                            Models.Module module = new Models.Module
+                            Module module = new Module
                             {
                                 SiteId = site.SiteId,
                                 ModuleDefinitionName = pagetemplatemodule.ModuleDefinitionName,
@@ -234,21 +779,20 @@ namespace Oqtane.Repository
                             };
                             module = _moduleRepository.AddModule(module);
 
-                            if (pagetemplatemodule.Content != "" && moduledefinition.ServerAssemblyName != "")
+                            if (pagetemplatemodule.Content != "" && moduledefinition.ServerManagerType!= "")
                             {
-                                Assembly assembly = AppDomain.CurrentDomain.GetAssemblies()
-                                    .Where(item => item.FullName.StartsWith(moduledefinition.ServerAssemblyName)).FirstOrDefault();
-                                if (assembly != null)
+                                Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+                                if (moduletype != null && moduletype.GetInterface("IPortable") != null)
                                 {
-                                    Type moduletype = assembly.GetTypes()
-                                        .Where(item => item.Namespace != null)
-                                        .Where(item => item.Namespace.StartsWith(moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","))))
-                                        .Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault();
-                                    if (moduletype != null)
+                                    try
                                     {
                                         var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
                                         ((IPortable)moduleobject).ImportModule(module, pagetemplatemodule.Content, moduledefinition.Version);
                                     }
+                                    catch
+                                    {
+                                        // error in IPortable implementation
+                                    }
                                 }
                             }
 
@@ -263,7 +807,6 @@ namespace Oqtane.Repository
                             };
                             _pageModuleRepository.AddPageModule(pagemodule);
                         }
-
                     }
                 }
             }
diff --git a/Oqtane.Server/Repository/SiteTemplateRepository.cs b/Oqtane.Server/Repository/SiteTemplateRepository.cs
new file mode 100644
index 00000000..c471f5c0
--- /dev/null
+++ b/Oqtane.Server/Repository/SiteTemplateRepository.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public class SiteTemplateRepository : ISiteTemplateRepository
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public SiteTemplateRepository(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        private List<SiteTemplate> LoadSiteTemplates()
+        {
+            List<SiteTemplate> siteTemplates = new List<SiteTemplate>();
+
+            // iterate through Oqtane site template assemblies
+            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies()
+                .Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".SiteTemplate.")).ToArray();
+            foreach (Assembly assembly in assemblies)
+            {
+                siteTemplates = LoadSiteTemplatesFromAssembly(siteTemplates, assembly);
+            }
+
+            return siteTemplates;
+        }
+
+        private List<SiteTemplate> LoadSiteTemplatesFromAssembly(List<SiteTemplate> siteTemplates, Assembly assembly)
+        {
+            SiteTemplate siteTemplate;
+            Type[] siteTemplateTypes = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(ISiteTemplate))).ToArray();
+            foreach (Type siteTemplateType in siteTemplateTypes)
+            {
+                var siteTemplateObject = ActivatorUtilities.CreateInstance(_serviceProvider, siteTemplateType);
+                siteTemplate = new SiteTemplate
+                {
+                    Name = (string)siteTemplateType.GetProperty("Name")?.GetValue(siteTemplateObject),
+                    TypeName = siteTemplateType.AssemblyQualifiedName
+                };
+                siteTemplates.Add(siteTemplate);
+            }
+            return siteTemplates;
+        }
+
+        public IEnumerable<SiteTemplate> GetSiteTemplates()
+        {
+            return LoadSiteTemplates();
+        }
+    }
+}
diff --git a/Oqtane.Server/Repository/SqlRepository.cs b/Oqtane.Server/Repository/SqlRepository.cs
new file mode 100644
index 00000000..fcc4caf3
--- /dev/null
+++ b/Oqtane.Server/Repository/SqlRepository.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public class SqlRepository : ISqlRepository
+    {
+
+        public void ExecuteScript(Tenant tenant, string script)
+        {
+            // execute script in curent tenant
+            foreach (string query in script.Split("GO", StringSplitOptions.RemoveEmptyEntries))
+            {
+                ExecuteNonQuery(tenant, query);
+            }
+        }
+
+        public bool ExecuteScript(Tenant tenant, Assembly assembly, string filename)
+        {
+            // script must be included as an Embedded Resource within an assembly
+            bool success = true;
+            string script = "";
+
+            if (assembly != null)
+            {
+                string name = assembly.GetManifestResourceNames().FirstOrDefault(item => item.EndsWith("." + filename));
+                if (name != null)
+                {
+                    Stream resourceStream = assembly.GetManifestResourceStream(name);
+                    if (resourceStream != null)
+                    {
+                        using (var reader = new StreamReader(resourceStream))
+                        {
+                            script = reader.ReadToEnd();
+                        }
+                    }
+                }
+            }
+
+            if (!string.IsNullOrEmpty(script))
+            {
+                try
+                {
+                    ExecuteScript(tenant, script);
+                }
+                catch
+                {
+                    success = false;
+                }
+            }
+
+            return success;
+        }
+
+        public int ExecuteNonQuery(Tenant tenant, string query)
+        {
+            SqlConnection conn = new SqlConnection(FormatConnectionString(tenant.DBConnectionString));
+            SqlCommand cmd = conn.CreateCommand();
+            using (conn)
+            {
+                PrepareCommand(conn, cmd, query);
+                int val = -1;
+                try
+                {
+                    val = cmd.ExecuteNonQuery();
+                }
+                catch
+                {
+                    // an error occurred executing the query
+                }
+                return val;
+            }
+        }
+
+        public SqlDataReader ExecuteReader(Tenant tenant, string query)
+        {
+            SqlConnection conn = new SqlConnection(FormatConnectionString(tenant.DBConnectionString));
+            SqlCommand cmd = conn.CreateCommand();
+            PrepareCommand(conn, cmd, query);
+            var dr = cmd.ExecuteReader(CommandBehavior.CloseConnection);
+            return dr;
+        }
+
+        private void PrepareCommand(SqlConnection conn, SqlCommand cmd, string query)
+        {
+            if (conn.State != ConnectionState.Open)
+            {
+                conn.Open();
+            }
+            cmd.Connection = conn;
+            cmd.CommandText = query;
+            cmd.CommandType = CommandType.Text;
+        }
+
+        private string FormatConnectionString(string connectionString)
+        {
+            return connectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
+        }
+    }
+}
diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs
index 8d8c989e..6c22ba75 100644
--- a/Oqtane.Server/Repository/TenantRepository.cs
+++ b/Oqtane.Server/Repository/TenantRepository.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -28,32 +28,43 @@ namespace Oqtane.Repository
             });
         }
 
-        public Tenant AddTenant(Tenant Tenant)
+        public Tenant AddTenant(Tenant tenant)
         {
-            _db.Tenant.Add(Tenant);
+            _db.Tenant.Add(tenant);
             _db.SaveChanges();
             _cache.Remove("tenants");
-            return Tenant;
+            return tenant;
         }
 
-        public Tenant UpdateTenant(Tenant Tenant)
+        public Tenant UpdateTenant(Tenant tenant)
         {
-            _db.Entry(Tenant).State = EntityState.Modified;
+            var oldTenant =_db.Tenant.AsNoTracking().FirstOrDefault(t=> t.TenantId == tenant.TenantId);
+            
+            if (oldTenant != null && (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
+            {
+                throw new InvalidOperationException("Unable to rename the master tenant.");
+            }
+            
+            _db.Entry(tenant).State = EntityState.Modified;
             _db.SaveChanges();
             _cache.Remove("tenants");
-            return Tenant;
+            return tenant;
         }
 
-        public Tenant GetTenant(int TenantId)
+        public Tenant GetTenant(int tenantId)
         {
-            return _db.Tenant.Find(TenantId);
+            return _db.Tenant.Find(tenantId);
         }
 
-        public void DeleteTenant(int TenantId)
-        { 
-            Tenant tenant = _db.Tenant.Find(TenantId);
-            _db.Tenant.Remove(tenant);
-            _db.SaveChanges();
+        public void DeleteTenant(int tenantId)
+        {
+            var tenant = GetTenant(tenantId);
+            if (tenant != null && !tenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase))
+            {
+                _db.Tenant.Remove(tenant);
+                _db.SaveChanges();
+            }
+
             _cache.Remove("tenants");
         }
     }
diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs
index 7cbfda35..cd273b3a 100644
--- a/Oqtane.Server/Repository/TenantResolver.cs
+++ b/Oqtane.Server/Repository/TenantResolver.cs
@@ -1,71 +1,51 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using Microsoft.AspNetCore.Http;
-using System;
+using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
     public class TenantResolver : ITenantResolver
     {
-        private readonly Alias _alias = null;
-        private readonly Tenant _tenant = null;
+        private readonly Alias _alias;
+        private readonly Tenant _tenant;
 
-        public TenantResolver(IHttpContextAccessor Accessor, IAliasRepository Aliases, ITenantRepository Tenants, SiteState SiteState)
+        public TenantResolver(IHttpContextAccessor accessor, IAliasRepository aliasRepository, ITenantRepository tenantRepository, SiteState siteState)
         {
-            int aliasid = -1;
-            string aliasname = "";
+            int aliasId = -1;
 
-            // get alias identifier based on request context
-            if (Accessor.HttpContext != null)
+            if (siteState != null && siteState.Alias != null)
             {
-                // check if an alias is passed as a querystring parameter ( for cross tenant access )
-                if (Accessor.HttpContext.Request.Query.ContainsKey("aliasid"))
-                {
-                    aliasid = int.Parse(Accessor.HttpContext.Request.Query["aliasid"]);
-                }
-                else // get the alias from the request url
-                {
-                    aliasname = Accessor.HttpContext.Request.Host.Value;
-                    string path = Accessor.HttpContext.Request.Path.Value;
-                    string[] segments = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-                    if (segments.Length > 1 && segments[1] == "api" && segments[0] != "~")
-                    {
-                        aliasname += "/" + segments[0];
-                    }
-                    if (aliasname.EndsWith("/"))
-                    {
-                        aliasname = aliasname.Substring(0, aliasname.Length - 1);
-                    }
-                }
+                // background processes can pass in an alias using the SiteState service
+                _alias = siteState.Alias;
             }
-            else  // background processes can pass in an alias using the SiteState service
+            else
             {
-                if (SiteState != null)
+                // get aliasid identifier based on request
+                if (accessor.HttpContext != null)
                 {
-                    aliasid = SiteState.Alias.AliasId;
+                    string[] segments = accessor.HttpContext.Request.Path.Value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+                    if (segments.Length > 1 && (segments[1] == "api" || segments[1] == "pages") && segments[0] != "~")
+                    {
+                        aliasId = int.Parse(segments[0]);
+                    }
+                }
+
+                // get the alias
+                IEnumerable<Alias> aliases = aliasRepository.GetAliases().ToList(); // cached
+                if (aliasId != -1)
+                {
+                    _alias = aliases.FirstOrDefault(item => item.AliasId == aliasId);
                 }
             }
 
-            // get the alias and tenant
-            if (aliasid != -1 || aliasname != "")
+            if (_alias != null)
             {
-                IEnumerable<Alias> aliases = Aliases.GetAliases(); // cached
-                IEnumerable<Tenant> tenants = Tenants.GetTenants(); // cached
-
-                if (aliasid != -1)
-                {
-                    _alias = aliases.Where(item => item.AliasId == aliasid).FirstOrDefault();
-                }
-                else
-                {
-                    _alias = aliases.Where(item => item.Name == aliasname).FirstOrDefault();
-                }
-                if (_alias != null)
-                {
-                    _tenant = tenants.Where(item => item.TenantId == _alias.TenantId).FirstOrDefault();
-                }
+                // get the tenant
+                IEnumerable<Tenant> tenants = tenantRepository.GetTenants(); // cached
+                _tenant = tenants.FirstOrDefault(item => item.TenantId == _alias.TenantId);
             }
         }
 
@@ -79,4 +59,4 @@ namespace Oqtane.Repository
             return _tenant;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs
index 0de27194..943f42a8 100644
--- a/Oqtane.Server/Repository/ThemeRepository.cs
+++ b/Oqtane.Server/Repository/ThemeRepository.cs
@@ -1,28 +1,44 @@
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Models;
 using System.Reflection;
-using System;
+using Oqtane.Models;
 using Oqtane.Themes;
 
 namespace Oqtane.Repository
 {
     public class ThemeRepository : IThemeRepository
     {
+        private List<Theme> _themes; // lazy load
+
+        public IEnumerable<Theme> GetThemes()
+        {
+            return LoadThemes();
+        }
+
         private List<Theme> LoadThemes()
         {
-            List<Theme> Themes = new List<Theme>();
+            if (_themes == null)
+            {
+                // get themes
+                _themes = LoadThemesFromAssemblies();
+            }
+            return _themes;
+        }
+
+        private List<Theme> LoadThemesFromAssemblies()
+        {
+            List<Theme> themes = new List<Theme>();
 
             // iterate through Oqtane theme assemblies
             Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies()
                 .Where(item => item.FullName.StartsWith("Oqtane.") || item.FullName.Contains(".Theme.")).ToArray();
             foreach (Assembly assembly in assemblies)
             {
-                Themes = LoadThemesFromAssembly(Themes, assembly);
+                themes = LoadThemesFromAssembly(themes, assembly);
             }
 
-            return Themes;
+            return themes;
         }
 
         private List<Theme> LoadThemesFromAssembly(List<Theme> themes, Assembly assembly)
@@ -36,56 +52,37 @@ namespace Oqtane.Repository
                     string[] typename = themeControlType.AssemblyQualifiedName.Split(',').Select(item => item.Trim()).ToList().ToArray();
                     string[] segments = typename[0].Split('.');
                     Array.Resize(ref segments, segments.Length - 1);
-                    string Namespace = string.Join(".", segments);
+                    string @namespace = string.Join(".", segments);
 
-                    int index = themes.FindIndex(item => item.ThemeName == Namespace);
+                    int index = themes.FindIndex(item => item.ThemeName == @namespace);
                     if (index == -1)
                     {
-                        /// determine if this theme implements ITheme
+                        // determine if this theme implements ITheme
                         Type themetype = assembly.GetTypes()
                             .Where(item => item.Namespace != null)
-                            .Where(item => item.Namespace.StartsWith(Namespace))
+                            .Where(item => item.Namespace.StartsWith(@namespace))
                             .Where(item => item.GetInterfaces().Contains(typeof(ITheme))).FirstOrDefault();
                         if (themetype != null)
                         {
                             var themeobject = Activator.CreateInstance(themetype);
-                            Dictionary<string, string> properties = (Dictionary<string, string>)themetype.GetProperty("Properties").GetValue(themeobject);
-                            theme = new Theme
-                            {
-                                ThemeName = Namespace,
-                                Name = GetProperty(properties, "Name"),
-                                Version = GetProperty(properties, "Version"),
-                                Owner = GetProperty(properties, "Owner"),
-                                Url = GetProperty(properties, "Url"),
-                                Contact = GetProperty(properties, "Contact"),
-                                License = GetProperty(properties, "License"),
-                                Dependencies = GetProperty(properties, "Dependencies"),
-                                ThemeControls = "",
-                                PaneLayouts = "",
-                                ContainerControls = "",
-                                AssemblyName = assembly.FullName.Split(",")[0]
-                            };
+                            theme = (Theme)themetype.GetProperty("Theme").GetValue(themeobject);
                         }
                         else
                         {
                             theme = new Theme
                             {
-                                ThemeName = Namespace,
                                 Name = themeControlType.Name,
-                                Version = new Version(1, 0, 0).ToString(),
-                                Owner = "",
-                                Url = "",
-                                Contact = "",
-                                License = "",
-                                Dependencies = "",
-                                ThemeControls = "",
-                                PaneLayouts = "",
-                                ContainerControls = "",
-                                AssemblyName = assembly.FullName.Split(",")[0]
+                                Version = new Version(1, 0, 0).ToString()
                             };
                         }
+                        // set internal properties
+                        theme.ThemeName = @namespace;
+                        theme.ThemeControls = "";
+                        theme.PaneLayouts = "";
+                        theme.ContainerControls = "";
+                        theme.AssemblyName = assembly.FullName.Split(",")[0];
                         themes.Add(theme);
-                        index = themes.FindIndex(item => item.ThemeName == Namespace);
+                        index = themes.FindIndex(item => item.ThemeName == @namespace);
                     }
                     theme = themes[index];
                     theme.ThemeControls += (themeControlType.FullName + ", " + typename[1] + ";");
@@ -93,7 +90,7 @@ namespace Oqtane.Repository
                     // layouts
                     Type[] layouttypes = assembly.GetTypes()
                         .Where(item => item.Namespace != null)
-                        .Where(item => item.Namespace.StartsWith(Namespace))
+                        .Where(item => item.Namespace.StartsWith(@namespace))
                         .Where(item => item.GetInterfaces().Contains(typeof(ILayoutControl))).ToArray();
                     foreach (Type layouttype in layouttypes)
                     {
@@ -107,7 +104,7 @@ namespace Oqtane.Repository
                     // containers
                     Type[] containertypes = assembly.GetTypes()
                         .Where(item => item.Namespace != null)
-                        .Where(item => item.Namespace.StartsWith(Namespace))
+                        .Where(item => item.Namespace.StartsWith(@namespace))
                         .Where(item => item.GetInterfaces().Contains(typeof(IContainerControl))).ToArray();
                     foreach (Type containertype in containertypes)
                     {
@@ -123,20 +120,5 @@ namespace Oqtane.Repository
             }
             return themes;
         }
-
-        private string GetProperty(Dictionary<string, string> Properties, string Key)
-        {
-            string Value = "";
-            if (Properties.ContainsKey(Key))
-            {
-                Value = Properties[Key];
-            }
-            return Value;
-        }
-
-        public IEnumerable<Theme> GetThemes()
-        {
-            return LoadThemes();
-        }
     }
 }
diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs
index 16478504..a9e51afe 100644
--- a/Oqtane.Server/Repository/UserRepository.cs
+++ b/Oqtane.Server/Repository/UserRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -38,9 +38,9 @@ namespace Oqtane.Repository
             return _db.User.Find(userId);
         }
 
-        public User GetUser(string Username)
+        public User GetUser(string username)
         {
-            return _db.User.Where(item => item.Username == Username).FirstOrDefault();
+            return _db.User.Where(item => item.Username == username).FirstOrDefault();
         }
 
         public void DeleteUser(int userId)
diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs
index bf4c9676..79f8a629 100644
--- a/Oqtane.Server/Repository/UserRoleRepository.cs
+++ b/Oqtane.Server/Repository/UserRoleRepository.cs
@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -14,48 +14,48 @@ namespace Oqtane.Repository
             _db = context;
         }
 
-        public IEnumerable<UserRole> GetUserRoles(int SiteId)
+        public IEnumerable<UserRole> GetUserRoles(int siteId)
         {
             return _db.UserRole
                 .Include(item => item.Role) // eager load roles
                 .Include(item => item.User) // eager load users
-                .Where(item => item.Role.SiteId == SiteId || item.Role.SiteId == null);
+                .Where(item => item.Role.SiteId == siteId || item.Role.SiteId == null);
         }
 
-        public IEnumerable<UserRole> GetUserRoles(int UserId, int SiteId)
+        public IEnumerable<UserRole> GetUserRoles(int userId, int siteId)
         {
-            return _db.UserRole.Where(item => item.UserId == UserId)
+            return _db.UserRole.Where(item => item.UserId == userId)
                 .Include(item => item.Role) // eager load roles
                 .Include(item => item.User) // eager load users
-                .Where(item => item.Role.SiteId == SiteId || item.Role.SiteId == null);
+                .Where(item => item.Role.SiteId == siteId || item.Role.SiteId == null);
         }
 
-        public UserRole AddUserRole(UserRole UserRole)
+        public UserRole AddUserRole(UserRole userRole)
         {
-            _db.UserRole.Add(UserRole);
+            _db.UserRole.Add(userRole);
             _db.SaveChanges();
-            return UserRole;
+            return userRole;
         }
 
-        public UserRole UpdateUserRole(UserRole UserRole)
+        public UserRole UpdateUserRole(UserRole userRole)
         {
-            _db.Entry(UserRole).State = EntityState.Modified;
+            _db.Entry(userRole).State = EntityState.Modified;
             _db.SaveChanges();
-            return UserRole;
+            return userRole;
         }
 
-        public UserRole GetUserRole(int UserRoleId)
+        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);
+                .SingleOrDefault(item => item.UserRoleId == userRoleId);
         }
 
-        public void DeleteUserRole(int UserRoleId)
+        public void DeleteUserRole(int userRoleId)
         {
-            UserRole UserRole = _db.UserRole.Find(UserRoleId);
-            _db.UserRole.Remove(UserRole);
+            UserRole userRole = _db.UserRole.Find(userRoleId);
+            _db.UserRole.Remove(userRole);
             _db.SaveChanges();
         }
     }
diff --git a/Oqtane.Server/Scripts/00.00.01.sql b/Oqtane.Server/Scripts/00.00.01.sql
deleted file mode 100644
index 90118490..00000000
--- a/Oqtane.Server/Scripts/00.00.01.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  
-
-ASP.NET Identity Minimal Schema
-
-*/
-
-CREATE TABLE [dbo].[AspNetUsers](
-	[Id] [nvarchar](450) NOT NULL,
-	[UserName] [nvarchar](256) NULL,
-	[NormalizedUserName] [nvarchar](256) NULL,
-	[Email] [nvarchar](256) NULL,
-	[NormalizedEmail] [nvarchar](256) NULL,
-	[EmailConfirmed] [bit] NOT NULL,
-	[PasswordHash] [nvarchar](max) NULL,
-	[SecurityStamp] [nvarchar](max) NULL,
-	[ConcurrencyStamp] [nvarchar](max) NULL,
-	[PhoneNumber] [nvarchar](max) NULL,
-	[PhoneNumberConfirmed] [bit] NOT NULL,
-	[TwoFactorEnabled] [bit] NOT NULL,
-	[LockoutEnd] [datetimeoffset](7) NULL,
-	[LockoutEnabled] [bit] NOT NULL,
-	[AccessFailedCount] [int] NOT NULL,
- CONSTRAINT [PK_AspNetUsers] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[AspNetUserClaims](
-	[Id] [int] IDENTITY(1,1) NOT NULL,
-	[UserId] [nvarchar](450) NOT NULL,
-	[ClaimType] [nvarchar](max) NULL,
-	[ClaimValue] [nvarchar](max) NULL,
- CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [IX_AspNetUserClaims_UserId] ON [dbo].[AspNetUserClaims]
-(
-	[UserId] ASC
-) ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [EmailIndex] ON [dbo].[AspNetUsers]
-(
-	[NormalizedEmail] ASC
-) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] ON [dbo].[AspNetUsers]
-(
-	[NormalizedUserName] ASC
-)
-WHERE ([NormalizedUserName] IS NOT NULL)
-ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[AspNetUserClaims]  WITH CHECK ADD  CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY([UserId])
-REFERENCES [dbo].[AspNetUsers] ([Id])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[AspNetUserClaims] CHECK CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId]
-GO
diff --git a/Oqtane.Server/Scripts/Master.sql b/Oqtane.Server/Scripts/Master.0.9.0.sql
similarity index 63%
rename from Oqtane.Server/Scripts/Master.sql
rename to Oqtane.Server/Scripts/Master.0.9.0.sql
index 45e474c7..8f569dbb 100644
--- a/Oqtane.Server/Scripts/Master.sql
+++ b/Oqtane.Server/Scripts/Master.0.9.0.sql
@@ -7,8 +7,7 @@ CREATE TABLE [dbo].[Tenant](
 	[TenantId] [int] IDENTITY(1,1) NOT NULL,
 	[Name] [nvarchar](100) NOT NULL,
 	[DBConnectionString] [nvarchar](1024) NOT NULL,
-	[DBSchema] [nvarchar](50) NOT NULL,
-	[IsInitialized] [bit] NOT NULL,
+	[Version] [nvarchar](50) NULL,
 	[CreatedBy] [nvarchar](256) NOT NULL,
 	[CreatedOn] [datetime] NOT NULL,
 	[ModifiedBy] [nvarchar](256) NOT NULL,
@@ -40,6 +39,10 @@ GO
 CREATE TABLE [dbo].[ModuleDefinition](
 	[ModuleDefinitionId] [int] IDENTITY(1,1) NOT NULL,
 	[ModuleDefinitionName] [nvarchar](200) NOT NULL,
+	[Name] [nvarchar](200) NULL,
+	[Description] [nvarchar](2000) NULL,
+	[Categories] [nvarchar](200) NULL,
+	[Version] [nvarchar](50) NULL,
 	[CreatedBy] [nvarchar](256) NOT NULL,
 	[CreatedOn] [datetime] NOT NULL,
 	[ModifiedBy] [nvarchar](256) NOT NULL,
@@ -89,17 +92,6 @@ CREATE TABLE [dbo].[JobLog] (
 )
 GO
 
-CREATE TABLE [dbo].[ApplicationVersion](
-	[ApplicationVersionId] [int] IDENTITY(1,1) NOT NULL,
-	[Version] [nvarchar](50) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL
-  CONSTRAINT [PK_ApplicationVersion] PRIMARY KEY CLUSTERED 
-  (
-	[ApplicationVersionId] ASC
-  )
-)
-GO
-
 /*  
 
 Create foreign key relationships
@@ -115,32 +107,4 @@ REFERENCES [dbo].[Job] ([JobId])
 ON DELETE CASCADE
 GO
 
-/*  
-
-Create seed data
-
-*/
-SET IDENTITY_INSERT [dbo].[Tenant] ON 
-GO
-INSERT [dbo].[Tenant] ([TenantId], [Name], [DBConnectionString], [DBSchema], [IsInitialized], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, N'Master', N'{ConnectionString}', N'', 1, '', getdate(), '', getdate())
-GO
-SET IDENTITY_INSERT [dbo].[Tenant] OFF
-GO
-
-SET IDENTITY_INSERT [dbo].[Alias] ON 
-GO
-INSERT [dbo].[Alias] ([AliasId], [Name], [TenantId], [SiteId], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, N'{Alias}', 1, 1, '', getdate(), '', getdate())
-GO
-SET IDENTITY_INSERT [dbo].[Alias] OFF
-GO
-
-SET IDENTITY_INSERT [dbo].[Job] ON 
-GO
-INSERT [dbo].[Job] ([JobId], [Name], [JobType], [Frequency], [Interval], [StartDate], [EndDate], [IsEnabled], [IsStarted], [IsExecuting], [NextExecution], [RetentionHistory],  [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) 
-VALUES (1, N'Notification Job', N'Oqtane.Infrastructure.NotificationJob, Oqtane.Server', N'm', 1, null, null, 0, 0, 0, null, 10, '', getdate(), '', getdate())
-GO
-SET IDENTITY_INSERT [dbo].[Job] OFF
-GO
 
diff --git a/Oqtane.Server/Scripts/00.00.00.sql b/Oqtane.Server/Scripts/Tenant.0.9.0.sql
similarity index 82%
rename from Oqtane.Server/Scripts/00.00.00.sql
rename to Oqtane.Server/Scripts/Tenant.0.9.0.sql
index 666fe978..81a0df24 100644
--- a/Oqtane.Server/Scripts/00.00.00.sql
+++ b/Oqtane.Server/Scripts/Tenant.0.9.0.sql
@@ -9,9 +9,14 @@ CREATE TABLE [dbo].[Site](
 	[TenantId] [int] NOT NULL,
 	[Name] [nvarchar](200) NOT NULL,
 	[LogoFileId] [int] NULL,
+	[FaviconFileId] [int] NULL,
 	[DefaultThemeType] [nvarchar](200) NOT NULL,
 	[DefaultLayoutType] [nvarchar](200) NOT NULL,
 	[DefaultContainerType] [nvarchar](200) NOT NULL,
+	[PwaIsEnabled] [bit] NOT NULL,
+	[PwaAppIconFileId] [int] NULL,
+	[PwaSplashIconFileId] [int] NULL,
+	[AllowRegistration] [bit] NOT NULL,
 	[CreatedBy] [nvarchar](256) NOT NULL,
 	[CreatedOn] [datetime] NOT NULL,
 	[ModifiedBy] [nvarchar](256) NOT NULL,
@@ -31,11 +36,13 @@ CREATE TABLE [dbo].[Page](
 	[SiteId] [int] NOT NULL,
 	[Path] [nvarchar](50) NOT NULL,
 	[Name] [nvarchar](50) NOT NULL,
+	[Title] [nvarchar](200) NULL,
 	[ThemeType] [nvarchar](200) NULL,
 	[Icon] [nvarchar](50) NOT NULL,
 	[ParentId] [int] NULL,
 	[Order] [int] NOT NULL,
 	[IsNavigation] [bit] NOT NULL,
+	[Url] [nvarchar](500) NULL,
 	[LayoutType] [nvarchar](200) NOT NULL,
 	[EditMode] [bit] NOT NULL,
 	[UserId] [int] NULL,
@@ -404,7 +411,7 @@ Create indexes
 
 */
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON dbo.Setting
+CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON [dbo].Setting
 	(
 	EntityName,
 	EntityId,
@@ -412,13 +419,13 @@ CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON dbo.Setting
 	) ON [PRIMARY]
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_User ON dbo.[User]
+CREATE UNIQUE NONCLUSTERED INDEX IX_User ON [dbo].[User]
 	(
 	Username
 	) ON [PRIMARY]
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON dbo.Permission
+CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON [dbo].Permission
 	(
 	SiteId,
 	EntityName,
@@ -429,7 +436,7 @@ CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON dbo.Permission
 	) ON [PRIMARY]
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON dbo.Page
+CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON [dbo].Page
 	(
 	SiteId,
 	[Path],
@@ -437,16 +444,85 @@ CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON dbo.Page
 	) ON [PRIMARY]
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_UserRole ON dbo.UserRole
+CREATE UNIQUE NONCLUSTERED INDEX IX_UserRole ON [dbo].UserRole
 	(
 	RoleId,
 	UserId
 	) ON [PRIMARY]
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Folder ON dbo.Folder
+CREATE UNIQUE NONCLUSTERED INDEX IX_Folder ON [dbo].Folder
 	(
 	SiteId,
 	[Path]
 	) ON [PRIMARY]
 GO
+
+/*  
+
+ASP.NET Identity Minimal Schema
+
+*/
+
+CREATE TABLE [dbo].[AspNetUsers](
+	[Id] [nvarchar](450) NOT NULL,
+	[UserName] [nvarchar](256) NULL,
+	[NormalizedUserName] [nvarchar](256) NULL,
+	[Email] [nvarchar](256) NULL,
+	[NormalizedEmail] [nvarchar](256) NULL,
+	[EmailConfirmed] [bit] NOT NULL,
+	[PasswordHash] [nvarchar](max) NULL,
+	[SecurityStamp] [nvarchar](max) NULL,
+	[ConcurrencyStamp] [nvarchar](max) NULL,
+	[PhoneNumber] [nvarchar](max) NULL,
+	[PhoneNumberConfirmed] [bit] NOT NULL,
+	[TwoFactorEnabled] [bit] NOT NULL,
+	[LockoutEnd] [datetimeoffset](7) NULL,
+	[LockoutEnabled] [bit] NOT NULL,
+	[AccessFailedCount] [int] NOT NULL,
+ CONSTRAINT [PK_AspNetUsers] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[AspNetUserClaims](
+	[Id] [int] IDENTITY(1,1) NOT NULL,
+	[UserId] [nvarchar](450) NOT NULL,
+	[ClaimType] [nvarchar](max) NULL,
+	[ClaimValue] [nvarchar](max) NULL,
+ CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [IX_AspNetUserClaims_UserId] ON [dbo].[AspNetUserClaims]
+(
+	[UserId] ASC
+) ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [EmailIndex] ON [dbo].[AspNetUsers]
+(
+	[NormalizedEmail] ASC
+) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] ON [dbo].[AspNetUsers]
+(
+	[NormalizedUserName] ASC
+)
+WHERE ([NormalizedUserName] IS NOT NULL)
+ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[AspNetUserClaims]  WITH CHECK ADD  CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY([UserId])
+REFERENCES [dbo].[AspNetUsers] ([Id])
+ON DELETE CASCADE
+GO
+
+ALTER TABLE [dbo].[AspNetUserClaims] CHECK CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId]
+GO
diff --git a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
index eadf7c6f..1e945938 100644
--- a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
+++ b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
@@ -2,11 +2,11 @@
 using Microsoft.Extensions.Options;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Oqtane.Repository;
 using Oqtane.Models;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using System.Linq;
+using Oqtane.Repository;
 
 namespace Oqtane.Security
 {
diff --git a/Oqtane.Server/Security/IUserPermissions.cs b/Oqtane.Server/Security/IUserPermissions.cs
index 92e50d1d..b7964383 100644
--- a/Oqtane.Server/Security/IUserPermissions.cs
+++ b/Oqtane.Server/Security/IUserPermissions.cs
@@ -5,9 +5,9 @@ namespace Oqtane.Security
 {
     public interface IUserPermissions
     {
-        bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName);
-        bool IsAuthorized(ClaimsPrincipal User, string PermissionName, string Permissions);
-        User GetUser(ClaimsPrincipal User);
+        bool IsAuthorized(ClaimsPrincipal user, string entityName, int entityId, string permissionName);
+        bool IsAuthorized(ClaimsPrincipal user, string permissionName, string permissions);
+        User GetUser(ClaimsPrincipal user);
         User GetUser();
     }
 }
diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs
index 1f47122b..8735d0d0 100644
--- a/Oqtane.Server/Security/PermissionHandler.cs
+++ b/Oqtane.Server/Security/PermissionHandler.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
+using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Shared;
 
@@ -25,14 +26,14 @@ namespace Oqtane.Security
             var ctx = _httpContextAccessor.HttpContext;
             if (ctx != null && ctx.Request.Query.ContainsKey("entityid"))
             {
-                int EntityId = int.Parse(ctx.Request.Query["entityid"]);
-                if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, EntityId, requirement.PermissionName))
+                int entityId = int.Parse(ctx.Request.Query["entityid"]);
+                if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName))
                 {
                     context.Succeed(requirement);
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, EntityId);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, entityId);
                 }
             }
             return Task.CompletedTask;
diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs
index 3ec92160..1e89c4cd 100644
--- a/Oqtane.Server/Security/UserPermissions.cs
+++ b/Oqtane.Server/Security/UserPermissions.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Http;
 using Oqtane.Models;
-using Oqtane.Repository;
 using System.Linq;
 using System.Security.Claims;
+using Oqtane.Repository;
 
 namespace Oqtane.Security
 {
@@ -17,46 +17,52 @@ namespace Oqtane.Security
             _accessor = accessor;
         }
 
-        public bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName)
+        public bool IsAuthorized(ClaimsPrincipal user, string entityName, int entityId, string permissionName)
         {
-            return IsAuthorized(User, PermissionName, _permissions.EncodePermissions(EntityId, _permissions.GetPermissions(EntityName, EntityId, PermissionName).ToList()));
+            return IsAuthorized(user, permissionName, _permissions.GetPermissionString(entityName, entityId, permissionName));
         }
 
-        public bool IsAuthorized(ClaimsPrincipal User, string PermissionName, string Permissions)
+        public bool IsAuthorized(ClaimsPrincipal user, string permissionName, string permissions)
         {
-            return UserSecurity.IsAuthorized(GetUser(User), PermissionName, Permissions);
+            return UserSecurity.IsAuthorized(GetUser(user), permissionName, permissions);
         }
 
-        public User GetUser(ClaimsPrincipal User)
+        public User GetUser(ClaimsPrincipal user)
         {
-            User user = new User();
-            user.Username = "";
-            user.IsAuthenticated = false;
-            user.UserId = -1;
-            user.Roles = "";
+            User resultUser = new User();
+            resultUser.Username = "";
+            resultUser.IsAuthenticated = false;
+            resultUser.UserId = -1;
+            resultUser.Roles = "";
 
-            if (User != null)
+            if (user == null) return resultUser;
+
+            resultUser.Username = user.Identity.Name;
+            resultUser.IsAuthenticated = user.Identity.IsAuthenticated;
+            var idclaim = user.Claims.FirstOrDefault(item => item.Type == ClaimTypes.PrimarySid);
+            if (idclaim != null)
             {
-                user.Username = User.Identity.Name;
-                user.IsAuthenticated = User.Identity.IsAuthenticated;
-                var idclaim = User.Claims.Where(item => item.Type == ClaimTypes.PrimarySid).FirstOrDefault();
-                if (idclaim != null)
+                resultUser.UserId = int.Parse(idclaim.Value);
+                foreach (var claim in user.Claims.Where(item => item.Type == ClaimTypes.Role))
                 {
-                    user.UserId = int.Parse(idclaim.Value);
-                    foreach (var claim in User.Claims.Where(item => item.Type == ClaimTypes.Role))
-                    {
-                        user.Roles += claim.Value + ";";
-                    }
-                    if (user.Roles != "") user.Roles = ";" + user.Roles;
+                    resultUser.Roles += claim.Value + ";";
                 }
-            }
 
-            return user;
+                if (resultUser.Roles != "") resultUser.Roles = ";" + resultUser.Roles;
+            }
+            return resultUser;
         }
 
         public User GetUser()
         {
-            return GetUser(_accessor.HttpContext.User);
+            if (_accessor.HttpContext != null)
+            {
+                return GetUser(_accessor.HttpContext.User);
+            }
+            else
+            {
+                return null;
+            }
         }
     }
 }
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index acb3b811..00b5f188 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -1,68 +1,56 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.ResponseCompression; // needed for WASM
-using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Http;
 using System;
-using System.Reflection;
-using Microsoft.Extensions.Hosting;
-using Oqtane.Modules;
-using Oqtane.Repository;
 using System.IO;
-using System.Runtime.Loader;
-using Oqtane.Services;
+using System.Linq;
 using System.Net.Http;
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
-using Microsoft.AspNetCore.Identity;
 using System.Threading.Tasks;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Oqtane.Security;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authentication;
-using System.Net;
 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.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
+using Oqtane.Repository;
+using Oqtane.Security;
+using Oqtane.Services;
+using Oqtane.Shared; 
 
-namespace Oqtane.Server
+namespace Oqtane
 {
     public class Startup
     {
         public IConfigurationRoot Configuration { get; }
-
+        private string _webRoot;
+        
         public Startup(IWebHostEnvironment env)
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
             Configuration = builder.Build();
-
+            _webRoot = env.WebRootPath;              
             AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(env.ContentRootPath, "Data"));
         }
 
-#if DEBUG || RELEASE
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddRazorPages();
-#if DEBUG
-            services.AddServerSideBlazor().AddCircuitOptions(options => { options.DetailedErrors = true; });
-#endif
-#if RELEASE
+            services.AddMvc().AddNewtonsoftJson();
             services.AddServerSideBlazor();
-#endif
+
             // setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
             if (!services.Any(x => x.ServiceType == typeof(HttpClient)))
             {
-                services.AddScoped<HttpClient>(s =>
+                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 navigationManager = s.GetRequiredService<NavigationManager>();
                     var httpContextAccessor = s.GetRequiredService<IHttpContextAccessor>();
                     var authToken = httpContextAccessor.HttpContext.Request.Cookies[".AspNetCore.Identity.Application"];
                     var client = new HttpClient(new HttpClientHandler { UseCookies = false });
@@ -70,7 +58,7 @@ namespace Oqtane.Server
                     {
                         client.DefaultRequestHeaders.Add("Cookie", ".AspNetCore.Identity.Application=" + authToken);
                     }
-                    client.BaseAddress = new Uri(NavigationManager.Uri);
+                    client.BaseAddress = new Uri(navigationManager.Uri);
                     return client;
                 });
             }
@@ -78,13 +66,13 @@ namespace Oqtane.Server
             // register authorization services
             services.AddAuthorizationCore(options =>
             {
-                options.AddPolicy("ViewPage", policy => policy.Requirements.Add(new PermissionRequirement("Page", PermissionNames.View)));
-                options.AddPolicy("EditPage", policy => policy.Requirements.Add(new PermissionRequirement("Page", PermissionNames.Edit)));
-                options.AddPolicy("ViewModule", policy => policy.Requirements.Add(new PermissionRequirement("Module", PermissionNames.View)));
-                options.AddPolicy("EditModule", policy => policy.Requirements.Add(new PermissionRequirement("Module", PermissionNames.Edit)));
-                options.AddPolicy("ViewFolder", policy => policy.Requirements.Add(new PermissionRequirement("Folder", PermissionNames.View)));
-                options.AddPolicy("EditFolder", policy => policy.Requirements.Add(new PermissionRequirement("Folder", PermissionNames.Edit)));
-                options.AddPolicy("ListFolder", policy => policy.Requirements.Add(new PermissionRequirement("Folder", "List")));
+                options.AddPolicy("ViewPage", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.View)));
+                options.AddPolicy("EditPage", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.Edit)));
+                options.AddPolicy("ViewModule", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.View)));
+                options.AddPolicy("EditModule", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.Edit)));
+                options.AddPolicy("ViewFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.View)));
+                options.AddPolicy("EditFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Edit)));
+                options.AddPolicy("ListFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Browse)));
             });
 
             // register scoped core services
@@ -111,12 +99,15 @@ namespace Oqtane.Server
             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.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             services.AddDbContext<MasterDBContext>(options =>
                 options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")
-                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString())
+                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
                 ));
             services.AddDbContext<TenantDBContext>(options => { });
 
@@ -160,9 +151,13 @@ namespace Oqtane.Server
             services.AddTransient<IUserClaimsPrincipalFactory<IdentityUser>, ClaimsPrincipalFactory<IdentityUser>>();
 
             // register singleton scoped core services
-            services.AddSingleton<IConfigurationRoot>(Configuration);
+            services.AddSingleton(Configuration);
             services.AddSingleton<IInstallationManager, InstallationManager>();
             services.AddSingleton<ISyncManager, SyncManager>();
+            services.AddSingleton<IDatabaseManager, DatabaseManager>();
+
+            // install any modules or themes ( this needs to occur BEFORE the assemblies are loaded into the app domain )
+            InstallationManager.UnpackPackages("Modules,Themes", _webRoot);
 
             // register transient scoped core services
             services.AddTransient<IModuleDefinitionRepository, ModuleDefinitionRepository>();
@@ -188,12 +183,17 @@ namespace Oqtane.Server
             services.AddTransient<INotificationRepository, NotificationRepository>();
             services.AddTransient<IFolderRepository, FolderRepository>();
             services.AddTransient<IFileRepository, FileRepository>();
+            services.AddTransient<ISiteTemplateRepository, SiteTemplateRepository>();
+            services.AddTransient<ISqlRepository, SqlRepository>();
+            services.AddTransient<IUpgradeManager, UpgradeManager>();
 
+            // load the external assemblies into the app domain
             services.AddOqtaneModules();
             services.AddOqtaneThemes();
+            services.AddOqtaneSiteTemplates();
 
             services.AddMvc()
-                .AddOqtaneApplicationParts()
+                .AddOqtaneApplicationParts() // register any Controllers from custom modules
                 .AddNewtonsoftJson();
 
             services.AddOqtaneServices();
@@ -203,14 +203,17 @@ namespace Oqtane.Server
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "Oqtane", Version = "v1" });
             });
+
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IInstallationManager InstallationManager)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
+                app.UseWebAssemblyDebugging();
             }
             else
             {
@@ -218,13 +221,9 @@ namespace Oqtane.Server
                 app.UseHsts();
             }
 
-            // install any modules or themes
-            InstallationManager.InstallPackages("Modules,Themes", false);
-
             app.UseHttpsRedirection();
-
             app.UseStaticFiles();
-
+            app.UseBlazorFrameworkFiles();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();
@@ -237,165 +236,10 @@ namespace Oqtane.Server
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapRazorPages();
-                endpoints.MapControllers();
                 endpoints.MapBlazorHub();
+                endpoints.MapControllers();
                 endpoints.MapFallbackToPage("/_Host");
             });
         }
-#endif
-
-#if WASM
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // register authorization services
-            services.AddAuthorizationCore(options =>
-            {
-                options.AddPolicy("ViewPage", policy => policy.Requirements.Add(new PermissionRequirement("Page", PermissionNames.View)));
-                options.AddPolicy("EditPage", policy => policy.Requirements.Add(new PermissionRequirement("Page", PermissionNames.Edit)));
-                options.AddPolicy("ViewModule", policy => policy.Requirements.Add(new PermissionRequirement("Module", PermissionNames.View)));
-                options.AddPolicy("EditModule", policy => policy.Requirements.Add(new PermissionRequirement("Module", PermissionNames.Edit)));
-            });
-
-            // register scoped core services
-            services.AddScoped<SiteState>();
-            services.AddScoped<IAuthorizationHandler, PermissionHandler>();
-            
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-            services.AddDbContext<MasterDBContext>(options =>
-                options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")
-                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString())
-                ));
-            services.AddDbContext<TenantDBContext>(options => { });
-
-            services.AddIdentityCore<IdentityUser>(options => { })
-                .AddEntityFrameworkStores<TenantDBContext>()
-                .AddSignInManager()
-                .AddDefaultTokenProviders();
-
-            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.AddAuthentication(IdentityConstants.ApplicationScheme)
-                .AddCookie(IdentityConstants.ApplicationScheme);
-
-            services.ConfigureApplicationCookie(options =>
-            {
-                options.Cookie.HttpOnly = false;
-                options.Events.OnRedirectToLogin = context =>
-                {
-                    context.Response.StatusCode = 401;
-                    return Task.CompletedTask;
-                };
-            });
-
-            // register custom claims principal factory for role claims
-            services.AddTransient<IUserClaimsPrincipalFactory<IdentityUser>, ClaimsPrincipalFactory<IdentityUser>>();
-
-            // register singleton scoped core services
-            services.AddSingleton<IConfigurationRoot>(Configuration);
-            services.AddSingleton<IInstallationManager, InstallationManager>();
-            services.AddSingleton<ISyncManager, SyncManager>();
-
-            // register transient scoped core services
-            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<IJobRepository, JobRepository>();
-            services.AddTransient<IJobLogRepository, JobLogRepository>();
-            services.AddTransient<INotificationRepository, NotificationRepository>();
-            services.AddTransient<IFolderRepository, FolderRepository>();
-            services.AddTransient<IFileRepository, FileRepository>();
-
-            services.AddOqtaneModules();
-            services.AddOqtaneThemes();
-
-            services.AddMvc()
-                .AddOqtaneApplicationParts()
-                .AddNewtonsoftJson();
-
-            services.AddOqtaneServices();
-            services.AddOqtaneHostedServices();
-
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Oqtane", Version = "v1" });
-            });
-
-            services.AddResponseCompression(opts =>
-            {
-                opts.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(
-                    new[] { "application/octet-stream" });
-            });
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IInstallationManager InstallationManager)
-        {
-            app.UseResponseCompression();
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseBlazorDebugging();
-            }
-
-            // install any modules or themes
-            InstallationManager.InstallPackages("Modules,Themes", false);
-
-            app.UseClientSideBlazorFiles<Client.Startup>();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-            app.UseAuthentication();
-            app.UseAuthorization();
-
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "Oqtane V1");
-            });
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapDefaultControllerRoute();
-                endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
-            });
-        }
-#endif
-
     }
 }
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index 7f07c90a..cad2785c 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -1,5 +1,15 @@
 {
   "ConnectionStrings": {
     "DefaultConnection": ""
+  },
+  "Runtime" : "Server",
+  "Installation": {
+    "DefaultAlias": "",
+    "HostPassword": "",
+    "HostEmail": "",
+    "SiteTemplate": "",
+    "DefaultTheme": "",
+    "DefaultLayout": "",
+    "DefaultContainer": ""
   }
 }
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index cacd218a..c69fc61d 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -1,4 +1,8 @@
-
+.breadcrumbs {
+    background-color: #e6e6e6;
+    border-bottom: 1px solid #d6d5d5;
+}
+
 .top-row {
     height: 3.5rem;
     display: flex;
@@ -22,8 +26,8 @@
         background-color: rgba(0,0,0,0.4);
     }
 
-    .sidebar .navbar-brand {
-        font-size: 1.1rem;
+    .sidebar .navbar-toggler .navbar-toggler-icon {
+        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
     }
 
     .sidebar .oi {
@@ -33,6 +37,14 @@
         top: -2px;
     }
 
+.breadcrumb {
+    margin-bottom: 0;
+}
+
+.app-controlpanel {
+    z-index: 9999;
+}
+
 .app-menu .nav-item {
     font-size: 0.9rem;
     padding-bottom: 0.5rem;
@@ -84,17 +96,25 @@
         flex-direction: row;
     }
 
+    .breadcrumbs {
+        position: fixed;
+        left: 275px;
+        top: 0;
+        z-index: 3
+    }
+
     .sidebar {
         width: 250px;
         height: 100vh;
         position: sticky;
         top: 0;
+        z-index: 1
     }
 
     .main .top-row {
         position: sticky;
         top: 0;
-        z-index: 9999;
+        z-index: 2
     }
 
     .main > div {
@@ -110,6 +130,10 @@
         /* Never collapse the sidebar for wide screens */
         display: block;
     }
+
+    .main > .container {
+        margin-top: 30px;
+    }
 }
 
 @-webkit-keyframes sk-stretchdelay {
@@ -133,3 +157,41 @@
         -webkit-transform: scaleY(1.0);
     }
 }
+
+@media (max-width: 767px) {
+    .breadcrumbs {
+        position: fixed;
+        top: 150px;
+        width: 100%;
+        left: 0;
+        z-index: 1;
+    }
+
+    .sidebar {
+        margin-top: 3.5rem;
+        position: fixed;
+        width: 100%;
+        z-index: 2;
+    }
+
+    .main .top-row {
+        z-index: 2;
+    }
+
+    .main > .top-row.px-4 {
+        display: flex;
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+    }
+
+    .ml-md-auto {
+        margin-left: auto;
+    }
+
+    .main > .container {
+        margin-top: 200px;
+    }
+}
+
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index e4253c17..f1c79deb 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -59,7 +59,6 @@ app {
 
     .app-admin-modal .modal-content {
         margin: 5% auto; /* 5% from the top and centered */
-        padding: 20px;
         width: 80%; /* Could be more or less, depending on screen size */
     }
 
@@ -110,3 +109,68 @@ app {
     padding: inherit;
     vertical-align: inherit;
 }
+
+/* Tooltips */
+.app-tooltip {
+    cursor: help;
+    position: relative;
+}
+
+    .app-tooltip::before,
+    .app-tooltip::after {
+        left: 50%;
+        opacity: 0;
+        position: absolute;
+        z-index: -100;
+    }
+
+    .app-tooltip:hover::before,
+    .app-tooltip:focus::before,
+    .app-tooltip:hover::after,
+    .app-tooltip:focus::after {
+        opacity: 1;
+        transform: scale(1) translateY(0);
+        z-index: 100;
+    }
+
+    .app-tooltip::before {
+        border-style: solid;
+        border-width: 1em 0.75em 0 0.75em;
+        border-color: #3E474F transparent transparent transparent;
+        bottom: 100%;
+        content: "";
+        margin-left: -0.5em;
+        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26), opacity .65s .5s;
+        transform: scale(.6) translateY(-90%);
+    }
+
+    .app-tooltip:hover::before,
+    .app-tooltip:focus::before {
+        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
+    }
+
+    .app-tooltip::after {
+        background: #3E474F;
+        border-radius: .25em;
+        bottom: 180%;
+        color: #EDEFF0;
+        content: attr(data-tip);
+        margin-left: -8.75em;
+        padding: 1em;
+        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
+        transform: scale(.6) translateY(50%);
+        width: 17.5em;
+    }
+
+    .app-tooltip:hover::after,
+    .app-tooltip:focus::after {
+        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26);
+    }
+
+@media (max-width: 760px) {
+    .app-tooltip::after {
+        font-size: .75em;
+        margin-left: -5em;
+        width: 10em;
+    }
+}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/images/help.png b/Oqtane.Server/wwwroot/images/help.png
new file mode 100644
index 00000000..f380be58
Binary files /dev/null and b/Oqtane.Server/wwwroot/images/help.png differ
diff --git a/Oqtane.Server/wwwroot/images/logo.png b/Oqtane.Server/wwwroot/images/logo.png
new file mode 100644
index 00000000..94454bf6
Binary files /dev/null and b/Oqtane.Server/wwwroot/images/logo.png differ
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index f2a2421f..aa0529a0 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -20,6 +20,126 @@ window.interop = {
         }
         return "";
     },
+    updateTitle: function (title) {
+        if (document.title !== title) {
+            document.title = title;
+        }
+    },
+    includeMeta: function (id, attribute, name, content) {
+        var meta;
+        if (id !== "") {
+            meta = document.getElementById(id);
+        }
+        else {
+            meta = document.querySelector("meta[" + attribute + "=\"" + CSS.escape(name) + "\"]");
+        }
+        if (meta === null) {
+            meta = document.createElement("meta");
+            meta.setAttribute(attribute, name);
+            if (id !== "") {
+                meta.id = id;
+            }
+            meta.content = content;
+            document.head.appendChild(meta);
+        }
+        else {
+            if (meta.content !== content) {
+                meta.setAttribute("content", content);
+            }
+        }
+    },
+    includeLink: function (id, rel, url, type, integrity, crossorigin) {
+        var link;
+        if (id !== "") {
+            link = document.getElementById(id);
+        }
+        else {
+            link = document.querySelector("link[href=\"" + CSS.escape(url) + "\"]");
+        }
+        if (link === null) {
+            link = document.createElement("link");
+            if (id !== "") {
+                link.id = id;
+            }
+            link.rel = rel;
+            link.href = url;
+            if (type !== "") {
+                link.type = type;
+            }
+            if (integrity !== "") {
+                link.integrity = integrity;
+            }
+            if (crossorigin !== "") {
+                link.crossorigin = crossorigin;
+            }
+            document.head.appendChild(link);
+        }
+        else {
+            if (link.rel !== rel) {
+                link.setAttribute('rel', rel);
+            }
+            if (link.href !== url) {
+                link.setAttribute('href', url);
+            }
+            if (type !== "" && link.type !== type) {
+                link.setAttribute('type', type);
+            }
+            if (integrity !== "" && link.integrity !== integrity) {
+                link.setAttribute('integrity', integrity);
+            }
+            if (crossorigin !== "" && link.crossorigin !== crossorigin) {
+                link.setAttribute('crossorigin', crossorigin);
+            }
+        }
+    },
+    includeScript: function (id, src, content, location, integrity, crossorigin) {
+        var script;
+        if (id !== "") {
+            script = document.getElementById(id);
+        }
+        if (script === null) {
+            script = document.createElement("script");
+            if (id !== "") {
+                script.id = id;
+            }
+            if (src !== "") {
+                script.src = src;
+                if (integrity !== "") {
+                    script.integrity = integrity;
+                }
+                if (crossorigin !== "") {
+                    script.crossorigin = crossorigin;
+                }
+            }
+            else {
+                script.innerHTML = content;
+            }
+            if (location === 'head') {
+                document.head.appendChild(script);
+            }
+            if (location === 'body') {
+                document.body.appendChild(script);
+            }
+        }
+        else {
+            if (src !== "") {
+                if (script.src !== src) {
+                    script.src = src;
+                }
+                if (integrity !== "" && script.integrity !== integrity) {
+                    script.setAttribute('integrity', integrity);
+                }
+                if (crossorigin !== "" && script.crossorigin !== crossorigin) {
+                    script.setAttribute('crossorigin', crossorigin);
+                }
+            }
+            else {
+                if (script.innerHTML !== content) {
+                    script.innerHTML = content;
+                }
+            }
+        }
+    },
     getElementByName: function (name) {
         var elements = document.getElementsByName(name);
         if (elements.length) {
@@ -28,22 +148,6 @@ window.interop = {
             return "";
         }
     },
-    includeCSS: function (id, url) {
-        var link = document.getElementById(id);
-        if (link === null) {
-            link = document.createElement("link");
-            link.id = id;
-            link.type = "text/css";
-            link.rel = "stylesheet";
-            link.href = url;
-            document.head.appendChild(link);
-        }
-        else {
-            if (link.href !== url) {
-                link.setAttribute('href', url);
-            }
-        }
-    },
     submitForm: function (path, fields) {
         const form = document.createElement('form');
         form.method = 'post';
diff --git a/Oqtane.Server/wwwroot/service-worker.js b/Oqtane.Server/wwwroot/service-worker.js
new file mode 100644
index 00000000..0c55c1b1
--- /dev/null
+++ b/Oqtane.Server/wwwroot/service-worker.js
@@ -0,0 +1,2 @@
+// always fetch from the network and do not enable offline support
+self.addEventListener('fetch', () => { });
\ No newline at end of file
diff --git a/Oqtane.Shared/Enums/LogFunction.cs b/Oqtane.Shared/Enums/LogFunction.cs
index 58b4bc35..1fe3cd23 100644
--- a/Oqtane.Shared/Enums/LogFunction.cs
+++ b/Oqtane.Shared/Enums/LogFunction.cs
@@ -1,4 +1,4 @@
-namespace Oqtane.Shared
+namespace Oqtane.Enums
 {
     public enum LogFunction
     {
diff --git a/Oqtane.Shared/Models/ApplicationVersion.cs b/Oqtane.Shared/Models/ApplicationVersion.cs
deleted file mode 100644
index 9babb7cd..00000000
--- a/Oqtane.Shared/Models/ApplicationVersion.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Oqtane.Models
-{
-    public class ApplicationVersion
-    {
-        public int ApplicationVersionId { get; set; }
-        public string Version { get; set; }
-        public DateTime CreatedOn { get; set; }
-    }
-}
diff --git a/Oqtane.Shared/Models/GenericResponse.cs b/Oqtane.Shared/Models/Installation.cs
similarity index 79%
rename from Oqtane.Shared/Models/GenericResponse.cs
rename to Oqtane.Shared/Models/Installation.cs
index 2281d79f..4dc25840 100644
--- a/Oqtane.Shared/Models/GenericResponse.cs
+++ b/Oqtane.Shared/Models/Installation.cs
@@ -1,6 +1,6 @@
 namespace Oqtane.Models
 {
-    public class GenericResponse 
+    public class Installation 
     {
         public bool Success { get; set; }
         public string Message { get; set; }
diff --git a/Oqtane.Shared/Models/Log.cs b/Oqtane.Shared/Models/Log.cs
index 1e8aa8c8..a1ff4c16 100644
--- a/Oqtane.Shared/Models/Log.cs
+++ b/Oqtane.Shared/Models/Log.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
 {
diff --git a/Oqtane.Shared/Models/Module.cs b/Oqtane.Shared/Models/Module.cs
index 0466c326..927377a0 100644
--- a/Oqtane.Shared/Models/Module.cs
+++ b/Oqtane.Shared/Models/Module.cs
@@ -1,7 +1,5 @@
-using Oqtane.Modules;
-using Oqtane.Shared;
+using Oqtane.Shared;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
diff --git a/Oqtane.Shared/Models/ModuleDefinition.cs b/Oqtane.Shared/Models/ModuleDefinition.cs
index 35a27840..504cc890 100644
--- a/Oqtane.Shared/Models/ModuleDefinition.cs
+++ b/Oqtane.Shared/Models/ModuleDefinition.cs
@@ -5,22 +5,37 @@ namespace Oqtane.Models
 {
     public class ModuleDefinition : IAuditable
     {
+        public ModuleDefinition()
+        {
+            Name = "";
+            Description = "";
+            Categories = "";
+            Version = "";
+            Owner = "";
+            Url = "";
+            Contact = "";
+            License = "";
+            Dependencies = "";
+            PermissionNames = "";
+            ServerManagerType = "";
+            ControlTypeRoutes = "";
+            ReleaseVersions = "";
+            Template = "";
+        }
+
         public int ModuleDefinitionId { get; set; }
         public string ModuleDefinitionName { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Categories { get; set; }
+        public string Version { get; set; }
 
         public string CreatedBy { get; set; }
         public DateTime CreatedOn { get; set; }
         public string ModifiedBy { get; set; }
         public DateTime ModifiedOn { get; set; }
 
-        [NotMapped]
-        public string Name { get; set; }
-        [NotMapped]
-        public string Description { get; set; }
-        [NotMapped]
-        public string Categories { get; set; }
-        [NotMapped]
-        public string Version { get; set; }
+        // additional IModule properties 
         [NotMapped]
         public string Owner { get; set; }
         [NotMapped]
@@ -34,16 +49,22 @@ namespace Oqtane.Models
         [NotMapped]
         public string PermissionNames { get; set; }
         [NotMapped]
-        public string ServerAssemblyName { get; set; }
-        [NotMapped]
-        public string ControlTypeTemplate { get; set; }
+        public string ServerManagerType { get; set; }
         [NotMapped]
         public string ControlTypeRoutes { get; set; }
         [NotMapped]
-        public string AssemblyName { get; set; }
+        public string ReleaseVersions { get; set; }
+
+        // internal properties
         [NotMapped]
         public int SiteId { get; set; }
         [NotMapped]
+        public string ControlTypeTemplate { get; set; }
+        [NotMapped]
+        public string AssemblyName { get; set; }
+        [NotMapped]
         public string Permissions { get; set; }
+        [NotMapped]
+        public string Template { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs
index d9c40e36..f1268875 100644
--- a/Oqtane.Shared/Models/Page.cs
+++ b/Oqtane.Shared/Models/Page.cs
@@ -9,8 +9,10 @@ namespace Oqtane.Models
         public int SiteId { get; set; }
         public int? ParentId { get; set; }
         public string Name { get; set; }
+        public string Title { get; set; }
         public string Path { get; set; }
         public int Order { get; set; }
+        public string Url { get; set; }
         public string ThemeType { get; set; }
         public string LayoutType { get; set; }
         public string Icon { get; set; }
diff --git a/Oqtane.Shared/Models/Permission.cs b/Oqtane.Shared/Models/Permission.cs
index 0f7f7b61..aff910f4 100644
--- a/Oqtane.Shared/Models/Permission.cs
+++ b/Oqtane.Shared/Models/Permission.cs
@@ -19,5 +19,23 @@ namespace Oqtane.Models
         public DateTime ModifiedOn { get; set; }
 
         public Role Role { get; set; }
+
+        public Permission()
+        {
+        }
+
+        public Permission(string permissionName, string roleName, bool isAuthorized)
+        {
+            PermissionName = permissionName;
+            Role = new Role { Name = roleName };
+            IsAuthorized = isAuthorized;
+        }
+
+        public Permission(string permissionName, int userId, bool isAuthorized)
+        {
+            PermissionName = permissionName;
+            UserId = userId;
+            IsAuthorized = isAuthorized;
+        }
     }
 }
diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs
index bcb358df..4b6b7f86 100644
--- a/Oqtane.Shared/Models/Site.cs
+++ b/Oqtane.Shared/Models/Site.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
 {
@@ -8,10 +9,14 @@ namespace Oqtane.Models
         public int TenantId { get; set; }
         public string Name { get; set; }
         public int? LogoFileId { get; set; }
+        public int? FaviconFileId { get; set; }
         public string DefaultThemeType { get; set; }
         public string DefaultLayoutType { get; set; }
         public string DefaultContainerType { get; set; }
-
+        public bool PwaIsEnabled { get; set; }
+        public int? PwaAppIconFileId { get; set; }
+        public int? PwaSplashIconFileId { get; set; }
+        public bool AllowRegistration { get; set; }
 
         public string CreatedBy { get; set; }
         public DateTime CreatedOn { get; set; }
@@ -20,5 +25,8 @@ namespace Oqtane.Models
         public string DeletedBy { get; set; }
         public DateTime? DeletedOn { get; set; }
         public bool IsDeleted { get; set; }
+
+        [NotMapped]
+        public string SiteTemplateType { get; set; }
     }
 }
diff --git a/Oqtane.Shared/Models/PageTemplate.cs b/Oqtane.Shared/Models/SiteTemplate.cs
similarity index 86%
rename from Oqtane.Shared/Models/PageTemplate.cs
rename to Oqtane.Shared/Models/SiteTemplate.cs
index c87d2e58..e4e7a02d 100644
--- a/Oqtane.Shared/Models/PageTemplate.cs
+++ b/Oqtane.Shared/Models/SiteTemplate.cs
@@ -2,6 +2,12 @@
 
 namespace Oqtane.Models
 {
+    public class SiteTemplate
+    {
+        public string Name { get; set; }
+        public string TypeName { get; set; }
+    }
+
     public class PageTemplate
     {
         public string Name { get; set; }
diff --git a/Oqtane.Shared/Models/SqlQuery.cs b/Oqtane.Shared/Models/SqlQuery.cs
new file mode 100644
index 00000000..035c1178
--- /dev/null
+++ b/Oqtane.Shared/Models/SqlQuery.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Oqtane.Models
+{
+    public class SqlQuery
+    {
+        public int TenantId { get; set; }
+        public string Query { get; set; }
+        public List<Dictionary<string, string>> Results { get; set; }
+    }
+}
diff --git a/Oqtane.Shared/Models/Tenant.cs b/Oqtane.Shared/Models/Tenant.cs
index bf6c4627..645f1e97 100644
--- a/Oqtane.Shared/Models/Tenant.cs
+++ b/Oqtane.Shared/Models/Tenant.cs
@@ -7,9 +7,7 @@ namespace Oqtane.Models
         public int TenantId { get; set; }
         public string Name { get; set; }
         public string DBConnectionString { get; set; }
-        public string DBSchema { get; set; }
-        public bool IsInitialized { get; set; }
-
+        public string Version { get; set; }
         public string CreatedBy { get; set; }
         public DateTime CreatedOn { get; set; }
         public string ModifiedBy { get; set; }
diff --git a/Oqtane.Shared/Models/Theme.cs b/Oqtane.Shared/Models/Theme.cs
index e4b29cfc..a2dd83df 100644
--- a/Oqtane.Shared/Models/Theme.cs
+++ b/Oqtane.Shared/Models/Theme.cs
@@ -2,6 +2,17 @@
 {
     public class Theme
     {
+        public Theme()
+        {
+            Name = "";
+            Version = "";
+            Owner = "";
+            Url = "";
+            Contact = "";
+            License = "";
+            Dependencies = "";
+        }
+
         public string ThemeName { get; set; }
         public string Name { get; set; }
         public string Version { get; set; }
diff --git a/Oqtane.Shared/Models/HtmlTextInfo.cs b/Oqtane.Shared/Modules/HtmlText/Models/HtmlTextInfo.cs
similarity index 100%
rename from Oqtane.Shared/Models/HtmlTextInfo.cs
rename to Oqtane.Shared/Modules/HtmlText/Models/HtmlTextInfo.cs
diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj
index 79522771..131d6055 100644
--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
-    <Configurations>Debug;Release;Wasm</Configurations>
-    <Version>0.0.1</Version>
+    <Configurations>Debug;Release</Configurations>
+    <Version>0.9.0</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -17,13 +17,9 @@
     <RootNamespace>Oqtane</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Wasm|AnyCPU'">
-    <DefineConstants>TRACE;WASM</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
-    <PackageReference Include="System.Text.Json" Version="4.6.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.Text.Json" Version="4.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Oqtane.Shared/Security/UserSecurity.cs b/Oqtane.Shared/Security/UserSecurity.cs
index 01bbb7e7..a8e85304 100644
--- a/Oqtane.Shared/Security/UserSecurity.cs
+++ b/Oqtane.Shared/Security/UserSecurity.cs
@@ -9,21 +9,21 @@ namespace Oqtane.Security
 {
     public class UserSecurity
     {
-        public static List<PermissionString> GetPermissionStrings(string PermissionStrings)
+        public static List<PermissionString> GetPermissionStrings(string permissionStrings)
         {
-            return JsonSerializer.Deserialize<List<PermissionString>>(PermissionStrings);
+            return JsonSerializer.Deserialize<List<PermissionString>>(permissionStrings);
         }
 
-        public static string SetPermissionStrings(List<PermissionString> PermissionStrings)
+        public static string SetPermissionStrings(List<PermissionString> permissionStrings)
         {
-            return JsonSerializer.Serialize(PermissionStrings);
+            return JsonSerializer.Serialize(permissionStrings);
         }
 
-        public static string GetPermissions(string PermissionName, string PermissionStrings)
+        public static string GetPermissions(string permissionName, string permissionStrings)
         {
             string permissions = "";
-            List<PermissionString> permissionstrings = JsonSerializer.Deserialize<List<PermissionString>>(PermissionStrings);
-            PermissionString permissionstring = permissionstrings.FirstOrDefault(item => item.PermissionName == PermissionName);
+            List<PermissionString> permissionstrings = JsonSerializer.Deserialize<List<PermissionString>>(permissionStrings);
+            PermissionString permissionstring = permissionstrings.FirstOrDefault(item => item.PermissionName == permissionName);
             if (permissionstring != null)
             {
                 permissions = permissionstring.Permissions;
@@ -31,68 +31,68 @@ namespace Oqtane.Security
             return permissions;
         }
 
-        public static bool IsAuthorized(User User, string PermissionName, string PermissionStrings)
+        public static bool IsAuthorized(User user, string permissionName, string permissionStrings)
         {
-            return IsAuthorized(User, GetPermissions(PermissionName, PermissionStrings));
+            return IsAuthorized(user, GetPermissions(permissionName, permissionStrings));
         }
 
         // permissions are stored in the format "!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]" where "!" designates Deny permissions
-        public static bool IsAuthorized(User User, string Permissions)
+        public static bool IsAuthorized(User user, string permissions)
         {
             bool authorized = false;
-            if (Permissions != "")
+            if (permissions != "")
             {
-                if (User == null)
+                if (user == null)
                 {
-                    authorized =  IsAuthorized(-1, "", Permissions); // user is not authenticated but may have access to resource
+                    authorized =  IsAuthorized(-1, "", permissions); // user is not authenticated but may have access to resource
                 }
                 else
                 {
-                    authorized = IsAuthorized(User.UserId, User.Roles, Permissions);
+                    authorized = IsAuthorized(user.UserId, user.Roles, permissions);
                 }
 
             }
             return authorized;
         }
 
-        private static bool IsAuthorized(int UserId, string Roles, string Permissions)
+        private static bool IsAuthorized(int userId, string roles, string permissions)
         {
-            bool IsAuthorized = false;
+            bool isAuthorized = false;
 
-            if (Permissions != null)
+            if (permissions != null)
             {
-                foreach (string permission in Permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                foreach (string permission in permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
                 {
-                    bool? allowed = VerifyPermission(UserId, Roles, permission);
+                    bool? allowed = VerifyPermission(userId, roles, permission);
                     if (allowed.HasValue)
                     {
-                        IsAuthorized = allowed.Value;
+                        isAuthorized = allowed.Value;
                         break;
                     }
                 }
             }
 
-            return IsAuthorized;
+            return isAuthorized;
         }
 
-        private static bool? VerifyPermission(int UserId, string Roles, string Permission)
+        private static bool? VerifyPermission(int userId, string roles, string permission)
         {
             bool? allowed = null;
             //permissions strings are encoded with deny permissions at the beginning and grant permissions at the end for optimal performance
-            if (!String.IsNullOrEmpty(Permission))
+            if (!String.IsNullOrEmpty(permission))
             {
                 // deny permission
-                if (Permission.StartsWith("!"))
+                if (permission.StartsWith("!"))
                 {
-                    string denyRole = Permission.Replace("!", "");
-                    if (denyRole == Constants.AllUsersRole || IsAllowed(UserId, Roles, denyRole))
+                    string denyRole = permission.Replace("!", "");
+                    if (denyRole == Constants.AllUsersRole || IsAllowed(userId, roles, denyRole))
                     {
                         allowed = false;
                     }
                 }
                 else // grant permission
                 {
-                    if (Permission == Constants.AllUsersRole || IsAllowed(UserId, Roles, Permission))
+                    if (permission == Constants.AllUsersRole || IsAllowed(userId, roles, permission))
                     {
                         allowed = true;
                     }
@@ -101,16 +101,16 @@ namespace Oqtane.Security
             return allowed;
         }
 
-        private static bool IsAllowed(int UserId, string Roles, string Permission)
+        private static bool IsAllowed(int userId, string roles, string permission)
         {
-            if ("[" + UserId + "]" == Permission)
+            if ("[" + userId + "]" == permission)
             {
                 return true;
             }
 
-            if (Roles != null)
+            if (roles != null)
             {
-                return Roles.IndexOf(";" + Permission + ";") != -1;
+                return roles.IndexOf(";" + permission + ";") != -1;
             }
             return false;
         }
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 09f5f334..847e7a9e 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -3,7 +3,8 @@
     public class Constants
     {
         public const string PackageId = "Oqtane.Framework";
-        public const string Version = "0.0.1";
+        public const string Version = "0.9.0";
+        public const string ReleaseVersions = "0.9.0";
 
         public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
         public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";
@@ -26,10 +27,15 @@
         public const string ErrorModule = "Oqtane.Modules.Admin.Error.{Action}, Oqtane.Client";
         public const string ModuleMessageComponent = "Oqtane.Modules.Controls.ModuleMessage, Oqtane.Client";
 
+        public const string DefaultSiteTemplate = "Oqtane.SiteTemplates.DefaultSiteTemplate, Oqtane.Server";
+
         public const string ContentUrl = "/api/file/download/";
 
         public const string HostUser = "host";
 
+        public const string MasterTenant = "Master";
+        public const string DefaultSite = "Default Site";
+
         public const string AllUsersRole = "All Users";
         public const string HostRole = "Host Users";
         public const string AdminRole = "Administrators";
diff --git a/Oqtane.Shared/Shared/EntityNames.cs b/Oqtane.Shared/Shared/EntityNames.cs
index ffff34f0..345267f3 100644
--- a/Oqtane.Shared/Shared/EntityNames.cs
+++ b/Oqtane.Shared/Shared/EntityNames.cs
@@ -3,8 +3,9 @@
     public class EntityNames
     {
         public const string Module = "Module";
+        public const string ModuleDefinition = "ModuleDefinition";
         public const string PageModule = "PageModule";
-        public const string Host = "Host";
+        public const string Tenant = "Tenant";
         public const string Site = "Site";
         public const string Page = "Page";
         public const string Folder = "Folder";
diff --git a/Oqtane.Shared/Shared/Icons.cs b/Oqtane.Shared/Shared/Icons.cs
new file mode 100644
index 00000000..586d0bae
--- /dev/null
+++ b/Oqtane.Shared/Shared/Icons.cs
@@ -0,0 +1,231 @@
+namespace Oqtane.Shared
+{
+    //Open Iconic icons set
+    public static class Icons
+    {
+        private const string Prefix = ""; //oi- 
+        public const string AccountLogin = Prefix + "account-login";
+        public const string AccountLogout = Prefix + "account-logout";
+        public const string ActionRedo = Prefix + "action-redo";
+        public const string ActionUndo = Prefix + "action-undo";
+        public const string AlignCenter = Prefix + "align-center";
+        public const string AlignLeft = Prefix + "align-left";
+        public const string AlignRight = Prefix + "align-right";
+        public const string Aperture = Prefix + "aperture";
+        public const string ArrowBottom = Prefix + "arrow-bottom";
+        public const string ArrowCircleBottom = Prefix + "arrow-circle-bottom";
+        public const string ArrowCircleLeft = Prefix + "arrow-circle-left";
+        public const string ArrowCircleRight = Prefix + "arrow-circle-right";
+        public const string ArrowCircleTop = Prefix + "arrow-circle-top";
+        public const string ArrowLeft = Prefix + "arrow-left";
+        public const string ArrowRight = Prefix + "arrow-right";
+        public const string ArrowThickBottom = Prefix + "arrow-thick-bottom";
+        public const string ArrowThickLeft = Prefix + "arrow-thick-left";
+        public const string ArrowThickRight = Prefix + "arrow-thick-right";
+        public const string ArrowThickTop = Prefix + "arrow-thick-top";
+        public const string ArrowTop = Prefix + "arrow-top";
+        public const string AudioSpectrum = Prefix + "audio-spectrum";
+        public const string Audio = Prefix + "audio";
+        public const string Badge = Prefix + "badge";
+        public const string Ban = Prefix + "ban";
+        public const string BarChart = Prefix + "bar-chart";
+        public const string Basket = Prefix + "basket";
+        public const string BatteryEmpty = Prefix + "battery-empty";
+        public const string BatteryFull = Prefix + "battery-full";
+        public const string Beaker = Prefix + "beaker";
+        public const string Bell = Prefix + "bell";
+        public const string Bluetooth = Prefix + "bluetooth";
+        public const string Bold = Prefix + "bold";
+        public const string Bolt = Prefix + "bolt";
+        public const string Book = Prefix + "book";
+        public const string Bookmark = Prefix + "bookmark";
+        public const string Box = Prefix + "box";
+        public const string Briefcase = Prefix + "briefcase";
+        public const string BritishPound = Prefix + "british-pound";
+        public const string Browser = Prefix + "browser";
+        public const string Brush = Prefix + "brush";
+        public const string Bug = Prefix + "bug";
+        public const string Bullhorn = Prefix + "bullhorn";
+        public const string Calculator = Prefix + "calculator";
+        public const string Calendar = Prefix + "calendar";
+        public const string CameraSlr = Prefix + "camera-slr";
+        public const string CaretBottom = Prefix + "caret-bottom";
+        public const string CaretLeft = Prefix + "caret-left";
+        public const string CaretRight = Prefix + "caret-right";
+        public const string CaretTop = Prefix + "caret-top";
+        public const string Cart = Prefix + "cart";
+        public const string Chat = Prefix + "chat";
+        public const string Check = Prefix + "check";
+        public const string ChevronBottom = Prefix + "chevron-bottom";
+        public const string ChevronLeft = Prefix + "chevron-left";
+        public const string ChevronRight = Prefix + "chevron-right";
+        public const string ChevronTop = Prefix + "chevron-top";
+        public const string CircleCheck = Prefix + "circle-check";
+        public const string CircleX = Prefix + "circle-x";
+        public const string Clipboard = Prefix + "clipboard";
+        public const string Clock = Prefix + "clock";
+        public const string CloudDownload = Prefix + "cloud-download";
+        public const string CloudUpload = Prefix + "cloud-upload";
+        public const string Cloud = Prefix + "cloud";
+        public const string Cloudy = Prefix + "cloudy";
+        public const string Code = Prefix + "code";
+        public const string Cog = Prefix + "cog";
+        public const string CollapseDown = Prefix + "collapse-down";
+        public const string CollapseLeft = Prefix + "collapse-left";
+        public const string CollapseRight = Prefix + "collapse-right";
+        public const string CollapseUp = Prefix + "collapse-up";
+        public const string Command = Prefix + "command";
+        public const string CommentSquare = Prefix + "comment-square";
+        public const string Compass = Prefix + "compass";
+        public const string Contrast = Prefix + "contrast";
+        public const string Copywriting = Prefix + "copywriting";
+        public const string CreditCard = Prefix + "credit-card";
+        public const string Crop = Prefix + "crop";
+        public const string Dashboard = Prefix + "dashboard";
+        public const string DataTransferDownload = Prefix + "data-transfer-download";
+        public const string DataTransferUpload = Prefix + "data-transfer-upload";
+        public const string Delete = Prefix + "delete";
+        public const string Dial = Prefix + "dial";
+        public const string Document = Prefix + "document";
+        public const string Dollar = Prefix + "dollar";
+        public const string DoubleQuoteSansLeft = Prefix + "double-quote-sans-left";
+        public const string DoubleQuoteSansRight = Prefix + "double-quote-sans-right";
+        public const string DoubleQuoteSerifLeft = Prefix + "double-quote-serif-left";
+        public const string DoubleQuoteSerifRight = Prefix + "double-quote-serif-right";
+        public const string Droplet = Prefix + "droplet";
+        public const string Eject = Prefix + "eject";
+        public const string Elevator = Prefix + "elevator";
+        public const string Ellipses = Prefix + "ellipses";
+        public const string EnvelopeClosed = Prefix + "envelope-closed";
+        public const string EnvelopeOpen = Prefix + "envelope-open";
+        public const string Euro = Prefix + "euro";
+        public const string Excerpt = Prefix + "excerpt";
+        public const string ExpandDown = Prefix + "expand-down";
+        public const string ExpandLeft = Prefix + "expand-left";
+        public const string ExpandRight = Prefix + "expand-right";
+        public const string ExpandUp = Prefix + "expand-up";
+        public const string ExternalLink = Prefix + "external-link";
+        public const string Eye = Prefix + "eye";
+        public const string Eyedropper = Prefix + "eyedropper";
+        public const string File = Prefix + "file";
+        public const string Fire = Prefix + "fire";
+        public const string Flag = Prefix + "flag";
+        public const string Flash = Prefix + "flash";
+        public const string Folder = Prefix + "folder";
+        public const string Fork = Prefix + "fork";
+        public const string FullscreenEnter = Prefix + "fullscreen-enter";
+        public const string FullscreenExit = Prefix + "fullscreen-exit";
+        public const string Globe = Prefix + "globe";
+        public const string Graph = Prefix + "graph";
+        public const string GridFourUp = Prefix + "grid-four-up";
+        public const string GridThreeUp = Prefix + "grid-three-up";
+        public const string GridTwoUp = Prefix + "grid-two-up";
+        public const string HardDrive = Prefix + "hard-drive";
+        public const string Header = Prefix + "header";
+        public const string Headphones = Prefix + "headphones";
+        public const string Heart = Prefix + "heart";
+        public const string Home = Prefix + "home";
+        public const string Image = Prefix + "image";
+        public const string Inbox = Prefix + "inbox";
+        public const string Infinity = Prefix + "infinity";
+        public const string Info = Prefix + "info";
+        public const string Italic = Prefix + "italic";
+        public const string JustifyCenter = Prefix + "justify-center";
+        public const string JustifyLeft = Prefix + "justify-left";
+        public const string JustifyRight = Prefix + "justify-right";
+        public const string Key = Prefix + "key";
+        public const string Laptop = Prefix + "laptop";
+        public const string Layers = Prefix + "layers";
+        public const string Lightbulb = Prefix + "lightbulb";
+        public const string LinkBroken = Prefix + "link-broken";
+        public const string LinkIntact = Prefix + "link-intact";
+        public const string ListRich = Prefix + "list-rich";
+        public const string List = Prefix + "list";
+        public const string Location = Prefix + "location";
+        public const string LockLocked = Prefix + "lock-locked";
+        public const string LockUnlocked = Prefix + "lock-unlocked";
+        public const string LoopCircular = Prefix + "loop-circular";
+        public const string LoopSquare = Prefix + "loop-square";
+        public const string Loop = Prefix + "loop";
+        public const string MagnifyingGlass = Prefix + "magnifying-glass";
+        public const string MapMarker = Prefix + "map-marker";
+        public const string Map = Prefix + "map";
+        public const string MediaPause = Prefix + "media-pause";
+        public const string MediaPlay = Prefix + "media-play";
+        public const string MediaRecord = Prefix + "media-record";
+        public const string MediaSkipBackward = Prefix + "media-skip-backward";
+        public const string MediaSkipForward = Prefix + "media-skip-forward";
+        public const string MediaStepBackward = Prefix + "media-step-backward";
+        public const string MediaStepForward = Prefix + "media-step-forward";
+        public const string MediaStop = Prefix + "media-stop";
+        public const string MedicalCross = Prefix + "medical-cross";
+        public const string Menu = Prefix + "menu";
+        public const string Microphone = Prefix + "microphone";
+        public const string Minus = Prefix + "minus";
+        public const string Monitor = Prefix + "monitor";
+        public const string Moon = Prefix + "moon";
+        public const string Move = Prefix + "move";
+        public const string MusicalNote = Prefix + "musical-note";
+        public const string Paperclip = Prefix + "paperclip";
+        public const string Pencil = Prefix + "pencil";
+        public const string People = Prefix + "people";
+        public const string Person = Prefix + "person";
+        public const string Phone = Prefix + "phone";
+        public const string PieChart = Prefix + "pie-chart";
+        public const string Pin = Prefix + "pin";
+        public const string PlayCircle = Prefix + "play-circle";
+        public const string Plus = Prefix + "plus";
+        public const string PowerStandby = Prefix + "power-standby";
+        public const string Print = Prefix + "print";
+        public const string Project = Prefix + "project";
+        public const string Pulse = Prefix + "pulse";
+        public const string PuzzlePiece = Prefix + "puzzle-piece";
+        public const string QuestionMark = Prefix + "question-mark";
+        public const string Rain = Prefix + "rain";
+        public const string Random = Prefix + "random";
+        public const string Reload = Prefix + "reload";
+        public const string ResizeBoth = Prefix + "resize-both";
+        public const string ResizeHeight = Prefix + "resize-height";
+        public const string ResizeWidth = Prefix + "resize-width";
+        public const string RssAlt = Prefix + "rss-alt";
+        public const string Rss = Prefix + "rss";
+        public const string Script = Prefix + "script";
+        public const string ShareBoxed = Prefix + "share-boxed";
+        public const string Share = Prefix + "share";
+        public const string Shield = Prefix + "shield";
+        public const string Signal = Prefix + "signal";
+        public const string Signpost = Prefix + "signpost";
+        public const string SortAscending = Prefix + "sort-ascending";
+        public const string SortDescending = Prefix + "sort-descending";
+        public const string Spreadsheet = Prefix + "spreadsheet";
+        public const string Star = Prefix + "star";
+        public const string Sun = Prefix + "sun";
+        public const string Tablet = Prefix + "tablet";
+        public const string Tag = Prefix + "tag";
+        public const string Tags = Prefix + "tags";
+        public const string Target = Prefix + "target";
+        public const string Task = Prefix + "task";
+        public const string Terminal = Prefix + "terminal";
+        public const string Text = Prefix + "text";
+        public const string ThumbDown = Prefix + "thumb-down";
+        public const string ThumbUp = Prefix + "thumb-up";
+        public const string Timer = Prefix + "timer";
+        public const string Transfer = Prefix + "transfer";
+        public const string Trash = Prefix + "trash";
+        public const string Underline = Prefix + "underline";
+        public const string VerticalAlignBottom = Prefix + "vertical-align-bottom";
+        public const string VerticalAlignCenter = Prefix + "vertical-align-center";
+        public const string VerticalAlignTop = Prefix + "vertical-align-top";
+        public const string Video = Prefix + "video";
+        public const string VolumeHigh = Prefix + "volume-high";
+        public const string VolumeLow = Prefix + "volume-low";
+        public const string VolumeOff = Prefix + "volume-off";
+        public const string Warning = Prefix + "warning";
+        public const string Wifi = Prefix + "wifi";
+        public const string Wrench = Prefix + "wrench";
+        public const string X = Prefix + "x";
+        public const string Yen = Prefix + "yen";
+        public const string ZoomIn = Prefix + "zoom-in";
+        public const string ZoomOut = Prefix + "zoom-out";
+    }
+}
diff --git a/Oqtane.Shared/Shared/InstallConfig.cs b/Oqtane.Shared/Shared/InstallConfig.cs
new file mode 100644
index 00000000..2ab74c74
--- /dev/null
+++ b/Oqtane.Shared/Shared/InstallConfig.cs
@@ -0,0 +1,18 @@
+namespace Oqtane.Shared
+{
+    public class InstallConfig
+    {
+        public string ConnectionString { get; set; }
+        public string Aliases { get; set; }
+        public string TenantName { get; set; }
+        public bool IsNewTenant { get; set; }
+        public string SiteName { get; set; }
+        public string HostPassword { get; set; }
+        public string HostEmail { get; set; }
+        public string HostName { get; set; }
+        public string SiteTemplate { get; set; }
+        public string DefaultTheme { get; set; }
+        public string DefaultLayout { get; set; }
+        public string DefaultContainer { get; set; }
+    }
+}
diff --git a/Oqtane.Shared/Shared/SettingKeys.cs b/Oqtane.Shared/Shared/SettingKeys.cs
new file mode 100644
index 00000000..6524e333
--- /dev/null
+++ b/Oqtane.Shared/Shared/SettingKeys.cs
@@ -0,0 +1,15 @@
+namespace Oqtane.Shared
+{
+    public static class SettingKeys
+    {
+        public const string InstallationSection = "Installation";
+        public const string DefaultAliasKey = "DefaultAlias";
+        public const string HostPasswordKey = "HostPassword";
+        public const string HostEmailKey = "HostEmail";
+        public const string SiteTemplateKey = "SiteTemplate";
+        public const string ConnectionStringKey = "DefaultConnection";
+        public const string DefaultThemeKey = "DefaultTheme";
+        public const string DefaultLayoutKey = "DefaultLayout";
+        public const string DefaultContainerKey = "DefaultContainer";
+    }
+}
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index a4d10ce5..11bef4dd 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -1,56 +1,54 @@
-using System.Globalization;
+using Oqtane.Models;
+using System;
+using System.Globalization;
+using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Oqtane.Shared
 {
-    public class Utilities
+    public static class Utilities
     {
+        public static string ToModuleDefinitionName(this Type type)
+        {
+            if (type == null) return null;
+            var assemblyFullName = type.Assembly.FullName;
+            var assemblyName = assemblyFullName.Substring(0,  assemblyFullName.IndexOf(",", StringComparison.Ordinal));
+            return $"{type.Namespace}, {assemblyName}";
+        }
+
         public static string NavigateUrl(string alias, string path, string parameters)
         {
-            string url = "";
-            if (alias != "")
+            var uriBuilder = new UriBuilder
             {
-                url += alias + "/";
-            }
-            if (path != "" && path != "/")
-            {
-                url += path + "/";
-            }
-            if (url.EndsWith("/"))
-            {
-                url = url.Substring(0, url.Length - 1);
-            }
-            if (!string.IsNullOrEmpty(parameters))
-            {
-                url += "?" + parameters;
-            }
-            if (!url.StartsWith("/"))
-            {
-                url = "/" + url;
-            }
-            return url;
+                Path = !string.IsNullOrEmpty(alias)
+                ? (!string.IsNullOrEmpty(path)) 
+                    ? $"{alias}/{path}" 
+                    : $"{alias}"
+                : $"{path}",
+                Query = parameters
+            };
+
+            return uriBuilder.Uri.PathAndQuery;
         }
 
         public static string EditUrl(string alias, string path, int moduleid, string action, string parameters)
         {
-            string url = NavigateUrl(alias, path, "");
-            if (url == "/") url = "";
             if (moduleid != -1)
             {
-                url += "/" + moduleid.ToString();
-            }
-            if (moduleid != -1 && action != "")
-            {
-                url += "/" + action;
-            }
-            if (!string.IsNullOrEmpty(parameters))
-            {
-                url += "?" + parameters;
-            }
-            if (!url.StartsWith("/"))
-            {
-                url = "/" + url;
+                path += $"/{moduleid}";
+                if (!string.IsNullOrEmpty(action))
+                {
+                    path += $"/{action}";
+                }
             }
+            return NavigateUrl(alias, path, parameters);
+        }
+
+        public static string ContentUrl(Alias alias, int fileid)
+        {
+            string url = (alias == null) ? "/~" : "/" + alias.AliasId;
+            url += Constants.ContentUrl + fileid.ToString();
             return url;
         }
 
@@ -78,6 +76,19 @@ namespace Oqtane.Shared
             }
         }
 
+        public static string GetAssemblyName(string fullyqualifiedtypename)
+        {
+            fullyqualifiedtypename = GetFullTypeName(fullyqualifiedtypename);
+            if (fullyqualifiedtypename.Contains(","))
+            {
+                return fullyqualifiedtypename.Substring(fullyqualifiedtypename.IndexOf(",") + 1).Trim();
+            }
+            else
+            {
+                return "";
+            }
+        }
+
         public static string GetTypeNameLastSegment(string typename, int segment)
         {
             if (typename.Contains(","))
@@ -217,5 +228,31 @@ namespace Oqtane.Shared
                 return "";
             }
         }
+
+        public static bool IsValidEmail(string email)
+        {
+            if (string.IsNullOrEmpty(email)) return false;
+
+            return Regex.IsMatch(email,
+                  @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
+                  @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
+                  RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
+        }
+
+        public static string PathCombine(params string[] segments)
+        {
+            var separators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar };
+
+            for (int i =1;i < segments.Length; i++){
+                if(Path.IsPathRooted(segments[i])){
+                    segments[i] = segments[i].TrimStart(separators);
+                    if(String.IsNullOrEmpty(segments[i])){
+                        segments[i]=" ";
+                    }
+                }
+            }
+            
+            return Path.Combine(segments).TrimEnd(); 
+        }
     }
 }
diff --git a/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs b/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs
new file mode 100644
index 00000000..df6a941e
--- /dev/null
+++ b/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs
@@ -0,0 +1,31 @@
+using Oqtane.Shared;
+using Xunit;
+
+namespace Oqtane.Test.Oqtane.Shared.Tests
+{
+    public class UtilitiesTests
+    {
+        [Theory]
+        [InlineData("contoso", "login", "returnUrl=/admin", "/contoso/login?returnUrl=/admin")]
+        [InlineData("contoso", "admin", "", "/contoso/admin")]
+        [InlineData("contoso", "", "pageId=4", "/contoso?pageId=4")]
+        [InlineData("contoso", "", "pageId=4&moduleId=10", "/contoso?pageId=4&moduleId=10")]
+        [InlineData("contoso", "", "", "/contoso")]
+        [InlineData("", "login", "returnUrl=/admin", "/login?returnUrl=/admin")]
+        [InlineData("", "admin", "", "/admin")]
+        [InlineData("", "", "pageId=4", "/?pageId=4")]
+        [InlineData("", "", "pageId=4&moduleId=10", "/?pageId=4&moduleId=10")]
+        [InlineData("", "", "", "/")]
+        public void NavigateUrlTest(string alias, string path, string parameters, string expectedUrl)
+        {
+            // Arrange
+            var navigatedUrl = string.Empty;
+
+            // Act
+            navigatedUrl = Utilities.NavigateUrl(alias, path, parameters);
+
+            // Assert
+            Assert.Equal(expectedUrl, navigatedUrl);
+        }
+    }
+}
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index b8e24038..022b6616 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200310-03" />
     <PackageReference Include="bunit" Version="1.0.0-beta-6" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
diff --git a/Oqtane.Upgrade/Oqtane.Upgrade.csproj b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
index 3e32c64c..f4437db3 100644
--- a/Oqtane.Upgrade/Oqtane.Upgrade.csproj
+++ b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
@@ -1,8 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <OutputType>Exe</OutputType>
+    <Version>0.9.0</Version>
+    <Product>Oqtane</Product>
+    <Authors>Shaun Walker</Authors>
+    <Company>.NET Foundation</Company>
+    <Description>Modular Application Framework for Blazor</Description>
+    <Copyright>.NET Foundation</Copyright>
+    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/oqtane</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageReleaseNotes>Not for production use.</PackageReleaseNotes>
+    <RootNamespace>Oqtane</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs
index 70ede475..f1f0f9b4 100644
--- a/Oqtane.Upgrade/Program.cs
+++ b/Oqtane.Upgrade/Program.cs
@@ -13,11 +13,11 @@ namespace Oqtane.Upgrade
             string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
 
             // assumes that the application executable must be deployed to the /bin of the Oqtane.Server project
-            if (binfolder.Contains("Oqtane.Server\\bin"))
+            if (binfolder.Contains(Path.Combine("Oqtane.Server", "bin")))
             {
                 // ie. binfolder = Oqtane.Server\bin\Debug\netcoreapp3.0\
                 string rootfolder = Directory.GetParent(binfolder).Parent.Parent.FullName;
-                string deployfolder = Path.Combine(rootfolder, "wwwroot\\Framework");
+                string deployfolder = Path.Combine(rootfolder, Path.Combine("wwwroot","Framework"));
 
                 if (Directory.Exists(deployfolder))
                 {
@@ -125,27 +125,25 @@ namespace Oqtane.Upgrade
                     }
                 }
             }
- 
-            return;
         }
 
         private static bool CanAccessFiles(List<string> files, string folder)
         {
             // ensure files are not locked by another process - the shutdownTimeLimit defines the duration for app shutdown
-            bool canaccess = true;
+            bool canAccess = true;
             FileStream stream = null;
             int i = 0;
-            while (i < (files.Count - 1) && canaccess)
+            while (i < (files.Count - 1) && canAccess)
             {
                 string filepath = Path.Combine(folder, Path.GetFileName(files[i]));
                 int attempts = 0;
                 bool locked = true;
                 // try up to 30 times
-                while (attempts < 30 && locked == true)
+                while (attempts < 30 && locked)
                 {
                     try
                     {
-                        stream = System.IO.File.Open(filepath, FileMode.Open, FileAccess.Read, FileShare.None);
+                        stream = File.Open(filepath, FileMode.Open, FileAccess.Read, FileShare.None);
                         locked = false;
                     }
                     catch // file is locked by another process
@@ -154,20 +152,17 @@ namespace Oqtane.Upgrade
                     }
                     finally
                     {
-                        if (stream != null)
-                        {
-                            stream.Close();
-                        }
+                        stream?.Close();
                     }
                     attempts += 1;
                 }
-                if (locked && canaccess)
+                if (locked)
                 {
-                    canaccess = false;
+                    canAccess = false;
                 }
                 i += 1;
             }
-            return canaccess;
+            return canAccess;
         }
     }
 }
diff --git a/Oqtane.sln b/Oqtane.sln
index 4c51a92b..0caeb4f6 100644
--- a/Oqtane.sln
+++ b/Oqtane.sln
@@ -11,45 +11,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Shared", "Oqtane.Sha
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Upgrade", "Oqtane.Upgrade\Oqtane.Upgrade.csproj", "{2E8C6889-37CF-4C8D-88B1-505547F25098}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Test", "Oqtane.Test\Oqtane.Test.csproj", "{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Test", "Oqtane.Test\Oqtane.Test.csproj", "{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Wasm|Any CPU = Wasm|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Release|Any CPU.Build.0 = Release|Any CPU
-		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Wasm|Any CPU.ActiveCfg = Wasm|Any CPU
-		{083BB22D-DF24-43A2-95E5-8F385CCB3318}.Wasm|Any CPU.Build.0 = Wasm|Any CPU
 		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Wasm|Any CPU.ActiveCfg = Wasm|Any CPU
-		{FD15B24A-7F6A-4830-9CA2-9C621771C330}.Wasm|Any CPU.Build.0 = Wasm|Any CPU
 		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Wasm|Any CPU.ActiveCfg = Wasm|Any CPU
-		{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Wasm|Any CPU.Build.0 = Wasm|Any CPU
 		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Wasm|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E8C6889-37CF-4C8D-88B1-505547F25098}.Wasm|Any CPU.Build.0 = Debug|Any CPU
 		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Release|Any CPU.Build.0 = Release|Any CPU
-		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Wasm|Any CPU.ActiveCfg = Debug|Any CPU
-		{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Wasm|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index 289a63d3..15b1222f 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,15 @@ Oqtane is a Modular Application Framework for Blazor
 
 Oqtane uses Blazor, a new web framework for .NET Core that lets you build interactive web UIs using C# instead of JavaScript. Blazor apps are composed of reusable web UI components implemented using C#, HTML, and CSS. Both client and server code is written in C#, allowing you to share code and libraries.
 
+Please note that this project is governed by the **[.NET Foundation Contributor Covenant Code of Conduct](https://dotnetfoundation.org/code-of-conduct)**
+
 **To get started with Oqtane:**
 
-   1.&nbsp;Install **[.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)**.
+   1.&nbsp;Install **[.NET Core 3.2 Preview5 SDK (v3.1.201)](https://dotnet.microsoft.com/download/dotnet-core/3.1)**.
    
-   2.&nbsp;Install the latest edition of [Visual Studio 2019](https://visualstudio.com/vs/) (version 16.4 or higher) with the **ASP.NET and web development** workload. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.  
+   2.&nbsp;Install the Preview edition of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/) (version 16.6 or higher) with the **ASP.NET and web development** workload. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.  
 
-   3.&nbsp;Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file. If you want to develop using **server-side** Blazor (which includes a full debugging experience in Visual Studio) you should choose to Build the solution using the default Debug configuration. If you want to develop using **client-side** Blazor (WebAssembly) you should first choose the "Wasm" configuration option in the Visual Studio toolbar and then Build.
+   3.&nbsp;Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file and Build the solution. 
    
    NOTE: If you have already installed a previous version of Oqtane and you wish to install a newer version, there is currently no upgrade path from one version to the next. The recommended upgrade approach is to get the latest code and build it, and then reset the DefaultConnection value to "" in the appsettings.json file in the Oqtane.server project. This will trigger a re-install when you run the application which will execute the latest database scripts.
    
@@ -20,7 +22,9 @@ Oqtane uses Blazor, a new web framework for .NET Core that lets you build intera
 # Roadmap
 This project is a work in progress and the schedule for implementing enhancements is dependent upon the availability of community members who are willing/able to assist.
 
-V1 (MVP)
+Note: We are planning to release V1 at the same time that Blazor WebAssembly ships on May 21, 2020
+
+V1 (MVP) 
 - [x] Multi-Tenant ( Shared Database & Isolated Database ) 
 - [x] Modular Architecture / Headless API
 - [x] Dynamic Page Compositing Model / Site & Page Management
@@ -37,6 +41,7 @@ V1 (MVP)
 - [x] Auto-Upgrade Framework
 
 V.Next
+- [ ] Use Migrations rather than SQL scripts for database installation/upgrade
 - [ ] Optional Encryption of Settings Values ( ie. via an IsSecure flag )
 - [ ] Localization
 - [ ] Migrate to Code-Behind Pattern ( *.razor.cs )
diff --git a/pack.cmd b/pack.cmd
deleted file mode 100644
index af7998a6..00000000
--- a/pack.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-DEL "*.nupkg"
-C:\Nuget\nuget.exe pack Oqtane.Framework.nuspec
- 
\ No newline at end of file