From 3a19ced2d1728aecf0c238531a81b3db68b0c66a Mon Sep 17 00:00:00 2001
From: Jim Spillane <james.a.spillane@gmail.com>
Date: Sat, 16 May 2020 10:36:16 -0400
Subject: [PATCH 1/7] Fix module pluralization

Added 's' to the module creator sql script in the csproj to fix compilation error.
---
 .../Templates/External/Server/[Owner].[Module]s.Server.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Server.csproj b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Server.csproj
index 0c93403b..f8cc9a95 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Server.csproj
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Server.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Scripts\[Owner].[Module].1.0.0.sql" />
-    <EmbeddedResource Include="Scripts\[Owner].[Module].Uninstall.sql" />
+    <EmbeddedResource Include="Scripts\[Owner].[Module]s.1.0.0.sql" />
+    <EmbeddedResource Include="Scripts\[Owner].[Module]s.Uninstall.sql" />
   </ItemGroup>
 
   <ItemGroup>

From 54d4447d23f59597ffe63067c6f1332be730af5d Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sat, 16 May 2020 12:00:15 -0400
Subject: [PATCH 2/7] Central management of resources ( ie. stylesheets and
 scripts )

---
 .../Themes/BlazorTheme/Default.razor          | 12 +++++++-
 .../Themes/OqtaneTheme/Default.razor          | 19 +++++++++---
 Oqtane.Client/Themes/ThemeBase.cs             |  3 ++
 Oqtane.Client/UI/Interop.cs                   | 16 ++++++++++
 Oqtane.Client/UI/SiteRouter.razor             | 29 +++++++++++++------
 Oqtane.Client/UI/ThemeBuilder.razor           | 22 ++++++++++++++
 Oqtane.Server/wwwroot/js/interop.js           |  9 ++++++
 Oqtane.Shared/Enums/ResourceType.cs           |  8 +++++
 Oqtane.Shared/Interfaces/IThemeControl.cs     |  6 +++-
 Oqtane.Shared/Models/Page.cs                  |  3 ++
 Oqtane.Shared/Models/Resource.cs              | 12 ++++++++
 Oqtane.Shared/Models/Theme.cs                 |  4 ++-
 12 files changed, 127 insertions(+), 16 deletions(-)
 create mode 100644 Oqtane.Shared/Enums/ResourceType.cs
 create mode 100644 Oqtane.Shared/Models/Resource.cs

diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index ecd3596e..4fa2a01d 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -28,9 +28,19 @@
 @code {
     public override string Panes => "Content";
 
+    public override List<Resource> Resources
+    {
+        get
+        {
+            List<Resource> resources = new List<Resource>();
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css", Integrity = "", CrossOrigin = "" });
+            return resources;
+        }
+    }
+
     protected override async Task OnParametersSetAsync()
     {
-        await IncludeCSS("Theme.css");
+        //await IncludeCSS("Theme.css");
     }
 
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index f92823e7..f6238a17 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -19,11 +19,22 @@
 @code {
     public override string Panes => string.Empty;
 
+    public override List<Resource> Resources
+    {
+        get
+        {
+            List<Resource> resources = new List<Resource>();
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" });
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css" });
+            return resources;
+        }
+    }
+
     protected override async Task OnParametersSetAsync()
     {
-    // go to https://www.bootstrapcdn.com/bootswatch/ and take your favorite theme
-    //<link href="https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css" rel="stylesheet" integrity="sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM" crossorigin="anonymous">
-        await LoadBootstrapTheme("https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css","sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM");
-        await IncludeCSS("Theme.css");
+        // go to https://www.bootstrapcdn.com/bootswatch/ and take your favorite theme
+        //<link href="https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css" rel="stylesheet" integrity="sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM" crossorigin="anonymous">
+        //await LoadBootstrapTheme("https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css","sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM");
+        //await IncludeCSS("Theme.css");
     }
 }
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 83694766..3e3136f5 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -1,7 +1,9 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.UI;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Oqtane.Themes
@@ -14,6 +16,7 @@ namespace Oqtane.Themes
         [CascadingParameter]
         protected PageState PageState { get; set; }
         public virtual string Panes { get; set; }
+        public virtual List<Resource> Resources { get; set; }
 
         public string ThemePath()
         {
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 73aaf029..0ae86ac5 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -118,6 +118,22 @@ namespace Oqtane.UI
             }
         }
 
+        public Task RemoveElementsById(string prefix, string first, string last)
+        {
+            try
+            {
+                _jsRuntime.InvokeAsync<string>(
+                    "interop.removeElementsById",
+                    prefix, first, last);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+
         public ValueTask<string> GetElementByName(string name)
         {
             try
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 488c43bf..37676dff 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -355,19 +355,30 @@
                 page.ThemeType = site.DefaultThemeType;
                 page.LayoutType = site.DefaultLayoutType;
             }
-            Type type;
+
+            page.Resources = new List<Resource>();
+
+            Type themetype = Type.GetType(page.ThemeType);
+            var themeobject = Activator.CreateInstance(themetype);
+            if (themeobject != null)
+            {
+                page.Panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
+                var resources = (List<Resource>)themetype.GetProperty("Resources").GetValue(themeobject, null);
+                if (resources != null)
+                {
+                    page.Resources.AddRange(resources);
+                }
+            }
 
             if (!string.IsNullOrEmpty(page.LayoutType))
             {
-                type = Type.GetType(page.LayoutType);
+                themetype = Type.GetType(page.LayoutType);
+                themeobject = Activator.CreateInstance(themetype);
+                if (themeobject != null)
+                {
+                    page.Panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
+                }
             }
-            else
-            {
-                type = Type.GetType(page.ThemeType);
-            }
-
-            var property = type.GetProperty("Panes");
-            page.Panes = (string)property.GetValue(Activator.CreateInstance(type), null);
         }
         catch
         {
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index e2cf9e4a..9289fbfd 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -12,6 +12,8 @@
     protected override async Task OnParametersSetAsync()
     {
         var interop = new Interop(JsRuntime);
+
+        // set page title
         if (!string.IsNullOrEmpty(PageState.Page.Title))
         {
             await interop.UpdateTitle(PageState.Page.Title);
@@ -20,10 +22,30 @@
         {
             await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
         }
+
+        // manage page resources- they cannot be removed first and then added because the browser will "flash" and result in a poor user experience - they need to be updated
+        int index = 0;
+        foreach (Resource resource in PageState.Page.Resources)
+        {
+            index += 1;
+            switch (resource.ResourceType)
+            {
+                case ResourceType.Stylesheet:
+                    await interop.IncludeLink("app-resource" + index.ToString("00"), "stylesheet", resource.Url, "text/css", resource.Integrity, resource.CrossOrigin);
+                    break;
+                case ResourceType.Script:
+                    break;
+            }
+        }
+        // remove any page resources references which are no longer required for this page
+        await interop.RemoveElementsById("app-resource", "app-resource" + (index + 1).ToString("00"), "");
+
+        // add favicon
         if (PageState.Site.FaviconFileId != null)
         {
             await interop.IncludeLink("fav-icon", "shortcut icon", Utilities.ContentUrl(PageState.Alias, PageState.Site.FaviconFileId.Value), "image/x-icon", "", "");
         }
+        // add PWA support
         if (PageState.Site.PwaIsEnabled)
         {
             await InitializePwa(interop);
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 5f41709c..36b6c4f3 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -160,6 +160,15 @@ window.interop = {
             }
         }
     },
+    removeElementsById: function (prefix, first, last) {
+        var elements = document.querySelectorAll('[id^=' + prefix + ']');
+        for (var i = elements.length - 1; i >= 0; i--) {
+            var element = elements[i];
+            if (element.id.startsWith(prefix) && (first === '' || element.id >= first) && (last === '' || element.id <= last)) {
+                element.parentNode.removeChild(element);
+            }
+        }
+    },
     getElementByName: function (name) {
         var elements = document.getElementsByName(name);
         if (elements.length) {
diff --git a/Oqtane.Shared/Enums/ResourceType.cs b/Oqtane.Shared/Enums/ResourceType.cs
new file mode 100644
index 00000000..b2196652
--- /dev/null
+++ b/Oqtane.Shared/Enums/ResourceType.cs
@@ -0,0 +1,8 @@
+namespace Oqtane.Shared
+{
+    public enum ResourceType
+    {
+        Stylesheet,
+        Script
+    }
+}
diff --git a/Oqtane.Shared/Interfaces/IThemeControl.cs b/Oqtane.Shared/Interfaces/IThemeControl.cs
index e9e19e7c..0f6ad00a 100644
--- a/Oqtane.Shared/Interfaces/IThemeControl.cs
+++ b/Oqtane.Shared/Interfaces/IThemeControl.cs
@@ -1,7 +1,11 @@
-namespace Oqtane.Themes
+using Oqtane.Models;
+using System.Collections.Generic;
+
+namespace Oqtane.Themes
 {
     public interface IThemeControl
     {
         string Panes { get; } // identifies all panes in a theme ( delimited by ";" ) - assumed to be a layout if no panes specified
+        List<Resource> Resources { get; } // identifies all resources in a theme
     }
 }
diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs
index 2d3f3624..6512580f 100644
--- a/Oqtane.Shared/Models/Page.cs
+++ b/Oqtane.Shared/Models/Page.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
@@ -33,6 +34,8 @@ namespace Oqtane.Models
         [NotMapped]
         public string Panes { get; set; }
         [NotMapped]
+        public List<Resource> Resources { get; set; }
+        [NotMapped]
         public string Permissions { get; set; }
         [NotMapped]
         public int Level { get; set; }
diff --git a/Oqtane.Shared/Models/Resource.cs b/Oqtane.Shared/Models/Resource.cs
new file mode 100644
index 00000000..81dc50fd
--- /dev/null
+++ b/Oqtane.Shared/Models/Resource.cs
@@ -0,0 +1,12 @@
+using Oqtane.Shared;
+
+namespace Oqtane.Models
+{
+    public class Resource
+    {
+        public ResourceType ResourceType { get; set; }
+        public string Url { get; set; }
+        public string Integrity { get; set; }
+        public string CrossOrigin { get; set; }
+    }
+}
diff --git a/Oqtane.Shared/Models/Theme.cs b/Oqtane.Shared/Models/Theme.cs
index a2dd83df..d5a29552 100644
--- a/Oqtane.Shared/Models/Theme.cs
+++ b/Oqtane.Shared/Models/Theme.cs
@@ -1,4 +1,6 @@
-namespace Oqtane.Models
+using System.Collections.Generic;
+
+namespace Oqtane.Models
 {
     public class Theme
     {

From c426302242f39a21f7f102422ea01fdbcb21e839 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sat, 16 May 2020 13:40:59 -0400
Subject: [PATCH 3/7] enhanced module creator to display location where module
 will be created

---
 .../Modules/Admin/ModuleCreator/Index.razor   | 116 ++++++++++++------
 .../{[Module] => [Owner].[Module]}/Edit.razor |   0
 .../Index.razor                               |   0
 .../ModuleInfo.cs                             |   0
 .../Services/I[Module]Service.cs              |   0
 .../Services/[Module]Service.cs               |   0
 .../Settings.razor                            |   0
 .../Controllers/[Module]Controller.cs         |   0
 .../Manager/[Module]Manager.cs                |   0
 .../Repository/I[Module]Repository.cs         |   0
 .../Repository/[Module]Context.cs             |   0
 .../Repository/[Module]Repository.cs          |   0
 .../Scripts/[Owner].[Module]s.1.0.0.sql       |   0
 .../Scripts/[Owner].[Module]s.Uninstall.sql   |   0
 .../Models/[Module].cs                        |   0
 .../Controllers/ModuleDefinitionController.cs |   4 +-
 16 files changed, 82 insertions(+), 38 deletions(-)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/Edit.razor (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/Index.razor (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/ModuleInfo.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/Services/I[Module]Service.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/Services/[Module]Service.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/{[Module] => [Owner].[Module]}/Settings.razor (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Controllers/[Module]Controller.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Manager/[Module]Manager.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Repository/I[Module]Repository.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Repository/[Module]Context.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Repository/[Module]Repository.cs (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Scripts/[Owner].[Module]s.1.0.0.sql (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/{[Module] => [Owner].[Module]}/Scripts/[Owner].[Module]s.Uninstall.sql (100%)
 rename Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/{[Module] => [Owner].[Module]}/Models/[Module].cs (100%)

diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index 8b4cb758..198ecb9b 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -3,53 +3,66 @@
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IModuleService ModuleService
+@inject ISystemService SystemService
 
-    <table class="table table-borderless">
+<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" @onchange="(e => TemplateChanged(e))">
+                <option value="-">&lt;Select Template&gt;</option>
+                <option value="internal">Internal</option>
+                <option value="external">External</option>
+            </select>
+        </td>
+    </tr>
+    @if (!string.IsNullOrEmpty(_location))
+    {
         <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>
+                <Label For="location" HelpText="Location where the module will be created">Location: </Label>
             </td>
             <td>
-                <input id="owner" class="form-control" @bind="@_owner" />
+                <input id="module" class="form-control" @bind="@_location" readonly />
             </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>
+    }
+</table>
 
 <button type="button" class="btn btn-success" @onclick="CreateModule">Create Module</button>
 
-@code {    
+@code {
     private string _owner = string.Empty;
     private string _module = string.Empty;
     private string _description = string.Empty;
-    private string _template = string.Empty;
+    private string _template = "-";
+    private string _location = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -62,9 +75,9 @@
     {
         try
         {
-            if (!string.IsNullOrEmpty(_owner) && !string.IsNullOrEmpty(_module) && !string.IsNullOrEmpty(_template))
+            if (!string.IsNullOrEmpty(_owner) && !string.IsNullOrEmpty(_module) && _template != "-")
             {
-                var moduleDefinition = new ModuleDefinition { Owner = _owner.Replace(" ",""), Name = _module.Replace(" ", ""), Description = _description, Template = _template };
+                var moduleDefinition = new ModuleDefinition { Owner = _owner.Replace(" ", ""), Name = _module.Replace(" ", ""), Description = _description, Template = _template };
                 await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId);
             }
             else
@@ -77,4 +90,35 @@
             await logger.LogError(ex, "Error Creating Module");
         }
     }
+
+    private async void TemplateChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _location = string.Empty;
+            _template = (string)e.Value;
+            if (_template != "-")
+            {
+                Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+                if (systeminfo != null)
+                {
+                    string[] path = systeminfo["serverpath"].Split('\\');
+                    if (_template == "internal")
+                    {
+                        _location = string.Join("\\", path, 0, path.Length - 1) + "\\Oqtane.Client\\Modules\\" + _owner + "." + _module;
+                    }
+                    else
+                    {
+                        _location = string.Join("\\", path, 0, path.Length - 2) + "\\" + _owner + "." + _module;
+                    }
+                }
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting System Info {Error}", ex.Message);
+            AddModuleMessage("Error Getting System Info", MessageType.Error);
+        }
+    }
 }
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/[Owner].[Module]/Edit.razor
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Edit.razor
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
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/[Owner].[Module]/Index.razor
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Index.razor
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/[Owner].[Module]/ModuleInfo.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/ModuleInfo.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/ModuleInfo.cs
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/[Owner].[Module]/Services/I[Module]Service.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/I[Module]Service.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Services/I[Module]Service.cs
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/[Owner].[Module]/Services/[Module]Service.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/[Module]Service.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Services/[Module]Service.cs
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/[Owner].[Module]/Settings.razor
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Settings.razor
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
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/[Owner].[Module]/Controllers/[Module]Controller.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs
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/[Owner].[Module]/Manager/[Module]Manager.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Manager/[Module]Manager.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Manager/[Module]Manager.cs
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/[Owner].[Module]/Repository/I[Module]Repository.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/I[Module]Repository.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Repository/I[Module]Repository.cs
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/[Owner].[Module]/Repository/[Module]Context.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Context.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Repository/[Module]Context.cs
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/[Owner].[Module]/Repository/[Module]Repository.cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Repository.cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Repository/[Module]Repository.cs
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module]s.1.0.0.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Scripts/[Owner].[Module]s.1.0.0.sql
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module]s.1.0.0.sql
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Scripts/[Owner].[Module]s.1.0.0.sql
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module]s.Uninstall.sql b/Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Scripts/[Owner].[Module]s.Uninstall.sql
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module]s.Uninstall.sql
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Scripts/[Owner].[Module]s.Uninstall.sql
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/[Owner].[Module]/Models/[Module].cs
similarity index 100%
rename from Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/[Module]/Models/[Module].cs
rename to Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Shared/Modules/[Owner].[Module]/Models/[Module].cs
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index 039d6782..29dd91d2 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -231,8 +231,8 @@ namespace Oqtane.Controllers
                 {
                     // add embedded resources to project
                     List<string> resources = new List<string>();
-                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.1.0.0.sql"));
-                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Uninstall.sql"));
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.1.0.0.sql"));
+                    resources.Add(Utilities.PathCombine("Modules", moduleDefinition.Owner + "." + moduleDefinition.Name, "Scripts", moduleDefinition.Owner + "." + moduleDefinition.Name + "s.Uninstall.sql"));
                     EmbedResourceFiles(Utilities.PathCombine(rootPath, "Oqtane.Server", "Oqtane.Server.csproj"), resources);
                 }
 

From f8ab8867504c5f7eef077c2ee3f8f17dd6c56204 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sat, 16 May 2020 22:11:58 -0400
Subject: [PATCH 4/7] Fixed issue with loading resources

---
 Oqtane.Client/Themes/BlazorTheme/Default.razor |  6 ------
 Oqtane.Client/Themes/OqtaneTheme/Default.razor | 10 +---------
 Oqtane.Server/wwwroot/js/interop.js            | 12 ++++++++----
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index 4fa2a01d..2ed0d1fb 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -37,10 +37,4 @@
             return resources;
         }
     }
-
-    protected override async Task OnParametersSetAsync()
-    {
-        //await IncludeCSS("Theme.css");
-    }
-
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index f6238a17..67d53081 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -25,16 +25,8 @@
         {
             List<Resource> resources = new List<Resource>();
             resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" });
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css" });
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css", Integrity = "", CrossOrigin = "" });
             return resources;
         }
     }
-
-    protected override async Task OnParametersSetAsync()
-    {
-        // go to https://www.bootstrapcdn.com/bootswatch/ and take your favorite theme
-        //<link href="https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css" rel="stylesheet" integrity="sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM" crossorigin="anonymous">
-        //await LoadBootstrapTheme("https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css","sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM");
-        //await IncludeCSS("Theme.css");
-    }
 }
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 36b6c4f3..3f42cd11 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -62,10 +62,10 @@ window.interop = {
                 link.id = id;
             }
             link.rel = rel;
-            link.href = url;
             if (type !== "") {
                 link.type = type;
             }
+            link.href = url;
             if (integrity !== "") {
                 link.integrity = integrity;
             }
@@ -78,9 +78,6 @@ window.interop = {
             if (link.rel !== rel) {
                 link.setAttribute('rel', rel);
             }
-            if (link.href !== url) {
-                link.setAttribute('href', url);
-            }
             if (type !== "") {
                 if (link.type !== type) {
                     link.setAttribute('type', type);
@@ -88,6 +85,11 @@ window.interop = {
             } else {
                 link.removeAttribute('type');
             }
+            if (link.href !== url) {
+                link.removeAttribute('integrity');
+                link.removeAttribute('crossorigin');
+                link.setAttribute('href', url);
+            }
             if (integrity !== "") {
                 if (link.integrity !== integrity) {
                     link.setAttribute('integrity', integrity);
@@ -136,6 +138,8 @@ window.interop = {
         else {
             if (src !== "") {
                 if (script.src !== src) {
+                    script.removeAttribute('integrity');
+                    script.removeAttribute('crossorigin');
                     script.src = src;
                 }
                 if (integrity !== "") {

From 9b74262c763a2b274ae6eb99954102575c0b264a Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Mon, 18 May 2020 09:47:37 -0400
Subject: [PATCH 5/7] Added support for module resource management

---
 Oqtane.Client/Modules/HtmlText/Edit.razor     |  24 ++-
 Oqtane.Client/Modules/HtmlText/Index.razor    |  10 ++
 Oqtane.Client/Modules/ModuleBase.cs           |   4 +
 .../Themes/BlazorTheme/Default.razor          |   2 +-
 .../Themes/Controls/ControlPanel.razor        |   4 +-
 .../Themes/Controls/ModuleActionsBase.cs      |   2 +-
 .../Themes/OqtaneTheme/Default.razor          |   2 +-
 Oqtane.Client/UI/SiteRouter.razor             | 137 ++++++++++--------
 Oqtane.Client/UI/ThemeBuilder.razor           |  14 +-
 Oqtane.Server/Pages/_Host.cshtml              |   5 -
 .../Oqtane.Modules.HtmlText/Module.css        |   1 +
 Oqtane.Server/wwwroot/js/interop.js           |  48 ------
 Oqtane.Server/wwwroot/js/quill-interop.js     |  50 +++++++
 Oqtane.Server/wwwroot/js/site.js              |   1 -
 Oqtane.Shared/Interfaces/IModuleControl.cs    |   5 +-
 Oqtane.Shared/Models/Page.cs                  |   2 +-
 16 files changed, 183 insertions(+), 128 deletions(-)
 create mode 100644 Oqtane.Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css
 create mode 100644 Oqtane.Server/wwwroot/js/quill-interop.js
 delete mode 100644 Oqtane.Server/wwwroot/js/site.js

diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index c9c94bc7..442aee36 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -20,6 +20,26 @@
 }
 
 @code {
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+
+    public override string Title => "Edit Html/Text";
+
+    public override List<Resource> Resources
+    {
+        get
+        {
+            List<Resource> resources = new List<Resource>();
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" });
+            // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js", Integrity = "", CrossOrigin = "" });
+            return resources;
+        }
+    }
+
     private RichTextEditor RichTextEditorHtml;
     private string _content = null;
     private string _createdby;
@@ -27,10 +47,6 @@
     private string _modifiedby;
     private DateTime _modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-
-    public override string Title => "Edit Html/Text";
-
     protected override async Task OnInitializedAsync()
     {
         try
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 6821c425..5d18e498 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -11,6 +11,16 @@
 }
 
 @code {
+    public override List<Resource> Resources
+    {
+        get
+        {
+            List<Resource> resources = new List<Resource>();
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" });
+            return resources;
+        }
+    }
+
     private string content = "";
 
     protected override async Task OnParametersSetAsync()
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 188da769..9da4a090 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -6,6 +6,7 @@ using Oqtane.Services;
 using System;
 using Oqtane.Enums;
 using Oqtane.UI;
+using System.Collections.Generic;
 
 namespace Oqtane.Modules
 {
@@ -37,6 +38,9 @@ namespace Oqtane.Modules
 
         public virtual bool UseAdminContainer { get { return true; } }
 
+        public virtual List<Resource> Resources { get; set; }
+
+
         // path method
 
         public string ModulePath()
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index 2ed0d1fb..a51a130c 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -33,7 +33,7 @@
         get
         {
             List<Resource> resources = new List<Resource>();
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" });
             return resources;
         }
     }
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index ec463657..e80ca085 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -149,7 +149,7 @@
                         <label for="Pane" class="control-label">Pane: </label>
                         <select class="form-control" @bind="@_pane">
                             <option value="">&lt;Select Pane&gt;</option>
-                            @foreach (string pane in PageState.Page.Panes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                            @foreach (string pane in PageState.Page.Panes)
                             {
                                 <option value="@pane">@pane Pane</option>
                             }
@@ -275,7 +275,7 @@
                 }
             }
 
-            var panes = PageState.Page.Panes.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+            var panes = PageState.Page.Panes;
             _pane = panes.Count() == 1 ? panes.SingleOrDefault() : "";
             var themes = await ThemeService.GetThemesAsync();
             _containers = ThemeService.GetContainerTypes(themes);
diff --git a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
index c5254428..23b98814 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
@@ -60,7 +60,7 @@ namespace Oqtane.Themes.Controls
                     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))
+                foreach (string pane in PageState.Page.Panes)
                 {
                     if (pane != ModuleState.Pane)
                     {
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index 67d53081..05d90852 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -25,7 +25,7 @@
         {
             List<Resource> resources = new List<Resource>();
             resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" });
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "Themes/" + GetType().Namespace + "/Theme.css", Integrity = "", CrossOrigin = "" });
+            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" });
             return resources;
         }
     }
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 37676dff..cc32f84f 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -238,21 +238,7 @@
                 {
                     page = await ProcessPage(page, site, user);
 
-                    _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 != moduleid || PageState.Action != action))
                     {
                         reload = Reload.Page;
                     }
@@ -260,15 +246,29 @@
                     if (PageState == null || reload >= Reload.Page)
                     {
                         modules = await ModuleService.GetModulesAsync(site.SiteId);
-                        modules = ProcessModules(modules, page.PageId, _pagestate.ModuleId, _pagestate.Action, page.Panes, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
+                        (page, modules) = ProcessModules(page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
                     }
                     else
                     {
                         modules = PageState.Modules;
                     }
-                    _pagestate.Modules = modules;
-                    _pagestate.EditMode = editmode;
-                    _pagestate.LastSyncDate = lastsyncdate;
+
+                    _pagestate = new PageState
+                    {
+                        Alias = alias,
+                        Site = site,
+                        Pages = pages,
+                        Page = page,
+                        User = user,
+                        Modules = modules,
+                        Uri = new Uri(_absoluteUri, UriKind.Absolute),
+                        QueryString = querystring,
+                        ModuleId = moduleid,
+                        Action = action,
+                        EditMode = editmode,
+                        LastSyncDate = lastsyncdate,
+                        Runtime = runtime
+                    };
 
                     OnStateChange?.Invoke(_pagestate);
                 }
@@ -356,18 +356,17 @@
                 page.LayoutType = site.DefaultLayoutType;
             }
 
+            page.Panes = new List<string>();
             page.Resources = new List<Resource>();
 
+            string panes = "";
             Type themetype = Type.GetType(page.ThemeType);
             var themeobject = Activator.CreateInstance(themetype);
             if (themeobject != null)
             {
-                page.Panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
+                panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
                 var resources = (List<Resource>)themetype.GetProperty("Resources").GetValue(themeobject, null);
-                if (resources != null)
-                {
-                    page.Resources.AddRange(resources);
-                }
+                page.Resources = ManagePageResources(page.Resources, resources);
             }
 
             if (!string.IsNullOrEmpty(page.LayoutType))
@@ -376,9 +375,11 @@
                 themeobject = Activator.CreateInstance(themetype);
                 if (themeobject != null)
                 {
-                    page.Panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
+                    panes = (string)themetype.GetProperty("Panes").GetValue(themeobject, null);
                 }
             }
+
+            page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
         }
         catch
         {
@@ -388,12 +389,12 @@
         return page;
     }
 
-    private List<Module> ProcessModules(List<Module> modules, int pageid, int moduleid, string control, string panes, string defaultcontainertype)
+    private (Page Page, List<Module> Modules) ProcessModules(Page page, List<Module> modules, int moduleid, string control, string defaultcontainertype)
     {
         var paneindex = new Dictionary<string, int>();
         foreach (Module module in modules)
         {
-            if (module.PageId == pageid || module.ModuleId == moduleid)
+            if (module.PageId == page.PageId || module.ModuleId == moduleid)
             {
                 var typename = string.Empty;
                 if (module.ModuleDefinition != null)
@@ -419,49 +420,53 @@
                         }
                     }
                     module.ModuleType = typename.Replace(Constants.ActionToken, control);
-
-                    // admin controls need to load additional metadata from the IModuleControl interface
-                    if (moduleid == module.ModuleId)
-                    {
-                        typename = module.ModuleType;
-                        // check for core module actions component
-                        if (Constants.DefaultModuleActions.Contains(control))
-                        {
-                            typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, control);
-                        }
-                        Type moduletype = Type.GetType(typename);
-                        if (moduletype != null)
-                        {
-                            var moduleobject = Activator.CreateInstance(moduletype);
-                            module.SecurityAccessLevel = (SecurityAccessLevel)moduletype.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null);
-                            module.ControlTitle = (string)moduletype.GetProperty("Title").GetValue(moduleobject);
-                            module.Actions = (string)moduletype.GetProperty("Actions").GetValue(moduleobject);
-                            module.UseAdminContainer = (bool)moduletype.GetProperty("UseAdminContainer").GetValue(moduleobject);
-                        }
-                    }
                 }
                 else
                 {
                     module.ModuleType = typename.Replace(Constants.ActionToken, Constants.DefaultAction);
                 }
 
+                // get additional metadata from IModuleControl interface
+                typename = module.ModuleType;
+                if (Constants.DefaultModuleActions.Contains(control))
+                {
+                    // core framework module action components
+                    typename = Constants.DefaultModuleActionsTemplate.Replace(Constants.ActionToken, control);
+                }
+                Type moduletype = Type.GetType(typename);
+                if (moduletype != null)
+                {
+                    var moduleobject = Activator.CreateInstance(moduletype);
+                    var resources = (List<Resource>)moduletype.GetProperty("Resources").GetValue(moduleobject, null);
+                    page.Resources = ManagePageResources(page.Resources, resources);
+
+                    // additional metadata needed for admin components
+                    if (module.ModuleId == moduleid && control != "")
+                    {
+                        module.SecurityAccessLevel = (SecurityAccessLevel)moduletype.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null);
+                        module.ControlTitle = (string)moduletype.GetProperty("Title").GetValue(moduleobject);
+                        module.Actions = (string)moduletype.GetProperty("Actions").GetValue(moduleobject);
+                        module.UseAdminContainer = (bool)moduletype.GetProperty("UseAdminContainer").GetValue(moduleobject);
+                    }
+                }
+
                 // ensure module's pane exists in current page and if not, assign it to the Admin pane
-                if (panes == null || !panes.ToLower().Contains(module.Pane.ToLower()))
+                if (page.Panes == null || page.Panes.FindIndex(item => item.Equals(module.Pane, StringComparison.OrdinalIgnoreCase)) == -1)
                 {
                     module.Pane = Constants.AdminPane;
                 }
 
                 // calculate module position within pane
-                if (paneindex.ContainsKey(module.Pane))
+                if (paneindex.ContainsKey(module.Pane.ToLower()))
                 {
-                    paneindex[module.Pane] += 1;
+                    paneindex[module.Pane.ToLower()] += 1;
                 }
                 else
                 {
-                    paneindex.Add(module.Pane, 0);
+                    paneindex.Add(module.Pane.ToLower(), 0);
                 }
 
-                module.PaneModuleIndex = paneindex[module.Pane];
+                module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
 
                 if (string.IsNullOrEmpty(module.ContainerType))
                 {
@@ -470,16 +475,32 @@
             }
         }
 
-        foreach (Module module in modules.Where(item => item.PageId == pageid))
+        foreach (Module module in modules.Where(item => item.PageId == page.PageId))
         {
-            module.PaneModuleCount = paneindex[module.Pane] + 1;
+            module.PaneModuleCount = paneindex[module.Pane.ToLower()] + 1;
         }
 
-        return modules;
+        return (page, modules);
+    }
+
+    private List<Resource> ManagePageResources(List<Resource> pageresources, List<Resource> resources)
+    {
+        if (resources != null)
+        {
+            foreach (var resource in resources)
+            {
+                // ensure resource does not exist already
+                if (pageresources.Find(item => item.Url == resource.Url) == null)
+                {
+                    pageresources.Add(resource);
+                }
+            }
+        }
+        return pageresources;
     }
 
     private Runtime GetRuntime()
-        => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
-                ? Runtime.WebAssembly
-                : Runtime.Server;
+=> RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
+        ? Runtime.WebAssembly
+        : Runtime.Server;
 }
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 9289fbfd..ffe91273 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -23,22 +23,26 @@
             await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
         }
 
-        // manage page resources- they cannot be removed first and then added because the browser will "flash" and result in a poor user experience - they need to be updated
-        int index = 0;
+        // update page resources
+        int stylesheet = 0;
+        int script = 0;
         foreach (Resource resource in PageState.Page.Resources)
         {
-            index += 1;
             switch (resource.ResourceType)
             {
                 case ResourceType.Stylesheet:
-                    await interop.IncludeLink("app-resource" + index.ToString("00"), "stylesheet", resource.Url, "text/css", resource.Integrity, resource.CrossOrigin);
+                    stylesheet += 1;
+                    await interop.IncludeLink("app-stylesheet" + stylesheet.ToString("00"), "stylesheet", resource.Url, "text/css", resource.Integrity ?? "", resource.CrossOrigin ?? "");
                     break;
                 case ResourceType.Script:
+                    script += 1;
+                    await interop.IncludeScript("app-script" + script.ToString("00"), resource.Url, "", "body", resource.Integrity ?? "", resource.CrossOrigin ?? "");
                     break;
             }
         }
         // remove any page resources references which are no longer required for this page
-        await interop.RemoveElementsById("app-resource", "app-resource" + (index + 1).ToString("00"), "");
+        await interop.RemoveElementsById("app-stylesheet", "app-stylesheet" + (stylesheet + 1).ToString("00"), "");
+        await interop.RemoveElementsById("app-script", "app-script" + (script + 1).ToString("00"), "");
 
         // add favicon
         if (PageState.Site.FaviconFileId != null)
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index c6758960..a3ed9580 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -14,8 +14,6 @@
     <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">
     <link href="css/app.css" rel="stylesheet" />
 </head>
@@ -25,10 +23,7 @@
         <component type="typeof(Oqtane.App)" render-mode="Server" />
     </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>
diff --git a/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css b/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css
new file mode 100644
index 00000000..5a93c043
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css
@@ -0,0 +1 @@
+/* HtmlText Module Custom Styles */
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 3f42cd11..8d6749aa 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -264,53 +264,5 @@ window.interop = {
                 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.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
new file mode 100644
index 00000000..4d34231d
--- /dev/null
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -0,0 +1,50 @@
+window.interop = {
+    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.Server/wwwroot/js/site.js b/Oqtane.Server/wwwroot/js/site.js
deleted file mode 100644
index 8b137891..00000000
--- a/Oqtane.Server/wwwroot/js/site.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Oqtane.Shared/Interfaces/IModuleControl.cs b/Oqtane.Shared/Interfaces/IModuleControl.cs
index ee5120ba..1002bd2d 100644
--- a/Oqtane.Shared/Interfaces/IModuleControl.cs
+++ b/Oqtane.Shared/Interfaces/IModuleControl.cs
@@ -1,4 +1,6 @@
-using Oqtane.Shared;
+using Oqtane.Models;
+using Oqtane.Shared;
+using System.Collections.Generic;
 
 namespace Oqtane.Modules
 {
@@ -8,5 +10,6 @@ namespace Oqtane.Modules
         string Title { get; } // title to display for this control - defaults to module title
         string Actions { get; } // allows for routing by configuration rather than by convention ( comma delimited ) - defaults to using component file name
         bool UseAdminContainer { get; } // container for embedding module control - defaults to true. false will suppress the default modal UI popup behavior and render the component in the page.
+        List<Resource> Resources { get; } // identifies all resources in a module
     }
 }
diff --git a/Oqtane.Shared/Models/Page.cs b/Oqtane.Shared/Models/Page.cs
index 6512580f..461d20fd 100644
--- a/Oqtane.Shared/Models/Page.cs
+++ b/Oqtane.Shared/Models/Page.cs
@@ -32,7 +32,7 @@ namespace Oqtane.Models
         public bool IsDeleted { get; set; }
 
         [NotMapped]
-        public string Panes { get; set; }
+        public List<string> Panes { get; set; }
         [NotMapped]
         public List<Resource> Resources { get; set; }
         [NotMapped]

From 6ae019336dc3080a4b9606cf8094ac6cb9686bc5 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Mon, 18 May 2020 10:44:54 -0400
Subject: [PATCH 6/7] changing default theme to Oqtane theme

---
 .../Modules/Controls/FileManager.razor        |   3 ---
 Oqtane.Client/Themes/ContainerBase.cs         |   1 -
 Oqtane.Client/Themes/IContainerControl.cs     |   1 -
 .../Themes/OqtaneTheme/NoTitle.razor          |   9 ++++++++
 Oqtane.Client/Themes/ThemeBase.cs             |  21 +++++-------------
 Oqtane.Client/UI/Installer.razor              |   2 +-
 .../Tenants/1/Sites/1/logo-white.png}         | Bin
 .../SiteTemplates/DefaultSiteTemplate.cs      |  10 ++++-----
 Oqtane.Server/app_offline.bak                 |   2 +-
 Oqtane.Server/wwwroot/images/logo-black.png   | Bin 0 -> 8093 bytes
 Oqtane.Server/wwwroot/images/logo-white.png   | Bin 0 -> 7963 bytes
 Oqtane.Server/wwwroot/oqtane-black.png        | Bin 0 -> 11565 bytes
 Oqtane.Server/wwwroot/oqtane-white.png        | Bin 0 -> 11567 bytes
 Oqtane.Server/wwwroot/oqtane.png              | Bin 14299 -> 0 bytes
 Oqtane.Shared/Shared/Constants.cs             |   6 ++---
 15 files changed, 24 insertions(+), 31 deletions(-)
 create mode 100644 Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor
 rename Oqtane.Server/{wwwroot/images/logo.png => Content/Tenants/1/Sites/1/logo-white.png} (100%)
 create mode 100644 Oqtane.Server/wwwroot/images/logo-black.png
 create mode 100644 Oqtane.Server/wwwroot/images/logo-white.png
 create mode 100644 Oqtane.Server/wwwroot/oqtane-black.png
 create mode 100644 Oqtane.Server/wwwroot/oqtane-white.png
 delete mode 100644 Oqtane.Server/wwwroot/oqtane.png

diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 35f04706..96196b06 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -98,9 +98,6 @@
     private string _message = string.Empty;
     private string _image = string.Empty;
     private string _guid;
-    private int _folderId = -1;
-    private bool _uploadMultiple;
-    private int _fileId;
 
     [Parameter]
     public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs
index d55b718f..af4ff355 100644
--- a/Oqtane.Client/Themes/ContainerBase.cs
+++ b/Oqtane.Client/Themes/ContainerBase.cs
@@ -17,7 +17,6 @@ namespace Oqtane.Themes
         [CascadingParameter]
         protected Module ModuleState { get; set; }
 
-        public virtual string Name { get; set; }
 
         public string ThemePath()
         {
diff --git a/Oqtane.Client/Themes/IContainerControl.cs b/Oqtane.Client/Themes/IContainerControl.cs
index e50f6859..a76959ff 100644
--- a/Oqtane.Client/Themes/IContainerControl.cs
+++ b/Oqtane.Client/Themes/IContainerControl.cs
@@ -2,6 +2,5 @@
 {
     public interface IContainerControl
     {
-        string Name { get; }
     }
 }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor
new file mode 100644
index 00000000..0d48bc64
--- /dev/null
+++ b/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor
@@ -0,0 +1,9 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+<div class="container">
+    @if (PageState.EditMode)
+    {
+        <ModuleActions />
+    }
+    <ModuleInstance />
+</div>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 3e3136f5..af05f94a 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -13,32 +13,21 @@ namespace Oqtane.Themes
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
+        // optional interface properties
+
         [CascadingParameter]
         protected PageState PageState { get; set; }
         public virtual string Panes { get; set; }
         public virtual List<Resource> Resources { get; set; }
 
+        // path method
+
         public string ThemePath()
         {
             return "Themes/" + GetType().Namespace + "/";
         }
 
-        public async Task IncludeCSS(string Url)
-        {
-            if (!Url.StartsWith("http"))
-            {
-                Url = ThemePath() + Url;
-            }
-            var interop = new Interop(JSRuntime);
-            await interop.IncludeCSS("Theme", Url);
-        }
-
-        public async Task LoadBootstrapTheme(string url, string integrity = null)
-        {
-            var interop = new Interop(JSRuntime);
-            string crossorigin = string.IsNullOrEmpty(integrity) ? string.Empty : "anonymous";
-            await interop.IncludeLink("bootstrap", "stylesheet", url, "text/css", integrity, crossorigin);
-        }
+        // url methods
 
         public string NavigateUrl()
         {
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index c3afd00d..155a5576 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -7,7 +7,7 @@
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
-            <img src="oqtane.png" />
+            <img src="oqtane-black.png" />
         </div>
     </div>
     <hr class="app-rule" />
diff --git a/Oqtane.Server/wwwroot/images/logo.png b/Oqtane.Server/Content/Tenants/1/Sites/1/logo-white.png
similarity index 100%
rename from Oqtane.Server/wwwroot/images/logo.png
rename to Oqtane.Server/Content/Tenants/1/Sites/1/logo-white.png
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index 346e481f..c9a3a036 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -56,7 +56,7 @@ namespace Oqtane.SiteTemplates
                             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 align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-white.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>"
                     },
@@ -132,16 +132,16 @@ namespace Oqtane.SiteTemplates
                 }
             });
 
-            if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png")))
+            if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo-white.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")))
+                if (!System.IO.File.Exists(Path.Combine(folderpath, "logo-white.png")))
                 {
-                    System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo.png"), Path.Combine(folderpath, "logo.png"));
+                    System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo-white.png"), Path.Combine(folderpath, "logo-white.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 });
+                Oqtane.Models.File file = _fileRepository.AddFile(new Oqtane.Models.File { FolderId = folder.FolderId, Name = "logo-white.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 });
                 site.LogoFileId = file.FileId;
                 _siteRepository.UpdateSite(site);
             }
diff --git a/Oqtane.Server/app_offline.bak b/Oqtane.Server/app_offline.bak
index 94be8d84..d26d5e2b 100644
--- a/Oqtane.Server/app_offline.bak
+++ b/Oqtane.Server/app_offline.bak
@@ -10,7 +10,7 @@
 <body>
     <div>
 	<br /><br /><h1 align="center">Please Wait... Upgrade In Progress....</h1>
-        <img src="https://www.oqtane.org/Portals/0/oqtane.png" style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%);" />
+        <img src="https://www.oqtane.org/Portals/0/oqtane-black.png" style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%);" />
     </div>
 </body>
 </html>
diff --git a/Oqtane.Server/wwwroot/images/logo-black.png b/Oqtane.Server/wwwroot/images/logo-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..9463cbf0671235087ffed4bb15f2bc9e5d26eeda
GIT binary patch
literal 8093
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
Ax&QzG

literal 0
HcmV?d00001

diff --git a/Oqtane.Server/wwwroot/images/logo-white.png b/Oqtane.Server/wwwroot/images/logo-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..94454bf601612d061901f9d33121d19f5996d8bf
GIT binary patch
literal 7963
zcmcJUWmHsAyT@s1hDJg{TDlpehL-Mb>4qVchM`M9kcI&fBvlxsTR^E9N@+$wN*V-_
zxJTc2t^4JEy=$E_XJ+=EHT&$dpa1jwKRZcJM~#G#o)7~AgG57J*#Nj+0jC~59`GvU
z;feq*I4+9XiWnI0Gl;J3ae>bSzUt-y7#I}3e@{%-!aR52OBSe#8C1#N$sX$F<89>T
z<%A(3BrFXU5&?^du?S0mMWn&v!bh&wP@wPqzkLmToT0(?{!SRa_HN!#0dFTLi<p3r
zfUxw;+=r(a7!N!(logFaZ1#%@LX2k-!y2}wR~8<n`yPLGo9gGf-S2sD)gurlmgI<*
za20;)Ix_ONGnYwJFBGe_?D2V(qJ(fDiR^R~A|MKp=zJx7)&TYX9EB)i_7@5`tQvQF
z?f%`N6Z02Z7li)HJ%^UelA(u9lWn1gcMBee0SERYy}eOlZc|uGu%xNi8bo}QoKLbj
z`QK^facdVe_lnq;|7{%oe`{3b%v2W;WV0^F7ebA&Q+(c3d95i*$w{9tpO}_*1M%|O
zZ#_CXirivPQg$HE6d2dabA5VS28Y{&cj>wL`NOla*<a<odGkglgGolBuA#x(Oi{7#
z-H#tXWKxoo8`eEP57X(&T8P`1Xa0_*<kERr(SS+Z?5dMx<zQi9@!>5Q-p=76a}@G!
zWIiiHcw1nRQ%g+5RzpkcdgW6Jt^RDU0vSFjX>QYqQyBtb%mHQN;!-2LA;hqDT7)I3
z{&*zt$^&y(U&?o_SG0(u4OaB{nE}@slT460+!nK}*0T_}sW8l@i&<-H>tVeNh^3_^
zsf(rnYXT`#4O&1iF(oA%(u1X7Ixq2efc>{Oe@YdYc;znFV!QM5@?=^QHz-g`OIE|y
zWf*Yz!GA;K{WnBrd~n2dh}<qRTJdA@sJa08a5~d8LHNbNa<G5Ph9hzNmlgubv@sq!
zWqIZ$*!0xmVkoDG$VrOT*#}{dxjF_mHns=JX=%lJdU`^?d!w<lo0^)qd{#Q2X{oD^
zFpc!Yr`Q}fx3uiSN?yKXkBh*KYWU#Qulz9JOXfp03cpTMD}k@_ZQC49sB)E$R5Uab
zwQt`_Lr*q7%e9Zcj++|MU_FttwYDy%VP?Mj2_vAqjjcVBnS6XYCXPa(GB$tw5U8oE
zTe2}WHckon%EnfsA~V;0u@ZU~Y_6uJ#)(rnKQ)#0?D7ab20U4<jp0%$KZj{lg_>l&
z+57L7R-2%i(~O~^AyD185<NXVL<jTsIiZ<_7pyD&Dt2#gFZK~HZwxRM3`MVA(OMZ8
zh|mWT5BCfh8W<d)-TAS(e)D{*LIkabUxZ&Jag|(3QW0Fedp$@D&GGuX@F;}}SJM%#
zHi{3<&d#8!Dk|0=EWLa>kB1~RH8np51qGc@n^iS7W-v~Fo|&29nUuflTrD{WJsp?y
z;TI6FxrZw0@I_;lj!UD_=$?(5gtgFisd<v{dsS;4F8&Cc=tOyH8k(TUh=|*)_V#ux
zseB!&vgm^Y@7+Dj6H(tf?EU?HZ1ux|t!ZB?Cg3nLf%awwu03XIJ-D%K@ziG={gU&j
zQO&y2%gal~&x)`JIHpY|OoStEuYI^UIpva$CHL0)Vw={4Tq-LowH2Aj?%lf=nUrGf
zS4Q-2K^8^Lb37O>h`H}Z&wQd!@v^AsS_IEbuyjtCoyIDF18384q$A|``{coVlM4qP
z;&AsDi<p=ZIT#0;mA#zEMqA6mcEk%En=q}cs>)EySK68^-Fg_dzW;GG;$<zfNa(Mh
zmWZ#U?=Sp+y-1?uilDiX!JVl5akewvf2iT+OF;{Q|AbLK%Og9dRfMKVOG{I}J4+b|
zG-4tAsrGV)Y)j=XNdGLc6RIWVGx+J#&9g5rd2F{F`J)@{{)U`0?ZTRH;Wz;WN%uAL
z<+}`=vF=hHUf$%s^CR<5->5O2D+2Ic)Q;Ue-v{k4Fx$nuAE|_}Rm+mMM`q|Mb^MHw
z!DLGhX)sZF`gFrbIG{Z&iAGsro9u`ueymvLVz{U-Drtl2Lrja;q6BGa#-j9HTfmm<
z=MM~C=V@e<Ys5w>Tg>J_5JP{A-5+&K{KEQTN2ysqYJ2_uBXTy<roSQ5M6loN@?FXh
zsd#uK%uImKA&;$=weJPet0wkYOx9VAc@YMNbjmw;U8$Rx%uOFnz_)w(#*%3}16jZy
z$%b!YbzPEx*#Dzn<y~L*DT%V|FbQ;C7{>d2W7Y>U>`C`|mXrc^C`Tz;9Z5Y=cEEi6
zES}G{+lmW{Us>DP`FQcwCh3qHm-7WYjNa07p?Sw8ukultwKqx*#0I}u6N;ELCQ{V@
zry(*_R8)_hKXo{a&yhCXP|J-SBAs<LG(MAN+EoXzeCLIpl*W@V1c@`VZOoe5-Z-eL
z4(+L>Gwz@VjFAhJ@NcJ9OE0Rct3!nqCXe8}cwLY2COcdQr0LWn<39E<VBa1rEiHAB
z7szG3d@08GRfKWE^>U>vlv(ZDogDK)Jf60?dLr9dVq&7qTT&6J_n~?{?nVZ`zkU1W
zBD=Tz(P!1SdE8f7(b1Qw?^1?NR9EQM#Mumlqt-gZ{iM9zubb>BT!)2zMD>r815-&-
zU=SyciSIU&^}_k#l>2JrUAVEz3=JJaG7{wthW{aQS4#AxEB!*Xkf31M6~BJ{Lpf<>
zWd*Z2Qi?zJ(uh}Y@Sj}ry23m_Qxa=*N+aZUG)$ip+8D^no5e*7qN8Oq@Cs?h6ljBf
zeme#iXQx;=0Agv|C+?iQ`&uYseJD*HT@Ep6w7D@R{$(PkjEkqu45N~8nJ8-X^V38+
z)0m>;8R;0a*`WNO5_e2(NU@N8|DA7(6SAf8Ii)nCt$cYkv9iEJ*Zr{sx|lup?*q#(
zkmUK?kOYu+oX)VGyj||<dylUTuh5L~-YcEIBdmsfrM}>vpP%RWa$8xD6iwzE*P7(Z
z^~MPYP+z&Fp!jswD{5;!Fh=tQq*~pTAx?=_)|X3ae`w2-TtHJQ=H}*E>OV(X{;gO-
z=NLC`AHvR7_byX&^WP%kpzaMH>Caqqb>^o^VlCe6Z1ur^e(itZ%&;Dje(K^PNK4`m
z^{hl$5UuiSFMd9g%q2~DKXJoD+oS|ygz<vQ_MW5TXgdjtztjp8&D8*t)5HO_+7m>j
zx4%g1)^v1qT)sNrJ6tc%RSXBi6XN4}A(LZcVpL!P{7kjSjFsquLJ4$rmx{x{xB9AK
zL|Zj!GKd`Qc|lV@6*3^s{t)uq|7;u8z8t>r$fDI3oe_MnBu%Zalk-tqvxXU!6_n3D
zQ<?ua{SjVbNwQvp;y;%3t_SxiMdpw(WR;XeoUZvD{Y;~x_RV!%lQLN5IxXwy=#ZC_
zyVbQC<PuV<n<b_3H)=i|Q!!#8zUiuVL^Bp3e@prbTOzY!y$zp1wnBE_R>2^{3SBg@
z`hh4a0lC}D_1rj}SSE*t9|P1OoKN0^V?Fv(tLP<XT11`4^kC`czgZ`y6ekGx<zA%}
z#2la7g3jf<?oh!B>T*dbJ5iT3$>q}i4WN*r4^E@r>*a5duxR`vzgMGyMjKG1;EnH-
z8f|y>#lMtb&Vt_rCHz7Uu_eUrKYit)$j{F&U9|rOKq84PX@{Mu%GJ1PWA9fJg*iE!
zAJx1+pMIU4&G9=YZ2dJ*ZqAhM!c42*3q}y3ziV3!N<c~S;B75rtZ0Lf&niZ#jM69I
z_R@WVeZjna{gAAztdq{5cZQ1&WryVncCC3{+;y9~OE0!LwF{t+T*#7AQbJRkjF4@@
zqwxX4qh)E`srg-TwfbeDmtv>>!g1T%+X>b6&1JHJcK1ceRTyP2mHx=*EeEbAy1Kj9
zoO&9v|Kpzg=#-n35m7gI0@Ec(64V>8u)YSLWCdRe)4nGG+ni^cVR@`)Z(H@q<zZ*u
z7I?o6fvhlj9IyJ4OZs%3&yh99!sbFi<5B|O@hRGWDN43KDBy2RBz)PU6WRrx%x~h4
z#($klW*jAzZr5uwsltfq(ntYDOrC6x<_uRD8XCqy63jA^VQ#p}1R45bYXs7CujTtx
zmR_vKZ<G3y;}&QE^HB2LAw6F{@|G68o$iky+|ZM4#MNlg24GaxZafq_Zk^j@1W1=1
zS=re+LYZ>wQufuWb8{x?n0v1A)s2mfYwlDl;TOxFiuO%GSTsjGRLRN7xxOt73-C?8
zI3)lFk2%$AS^V297Q@)Be9p5fD(<gRCgV#jz6{)(yD<uVOh7UEZn!PcQ3$gdrlSd>
zz;KxkxDSSBa|^SEkRa+=lD|B8@<bw_r4R;#2`_NR-^QOF^PHT)aQH12jE#)AKb9U>
z{lgnfMKjxd<@-ufoqrgZ*N6CK)VRjb<+*Te(AY}5V(j^}wbfuF5ahZus_edEzl-+q
zBDn%`Apov06z$VdfQz`kUb33ShEjvS*j5$yt?BU-F*y{DC-AIwF#Y0q%KW;k%X-!Y
zT1++P{|l6;%LTn^0J!^Fgw_uyHz2$DCZW1AxoO$R)O0V``ei&{k6e}R*5)p?5Npx>
zpSss>|FD__wz6Ii`)QVO@Lg#MSuftS&VnTR^y!oQmJ(lPUf!kb{#wG(WCp$X7Zhja
zeK;IW<{rEzd?_QnNP-u)D{NFiGS^_eclw3}uNPr~4uV2MsKMhe78W6S8vI0EH8s4&
zWQN>)d{%?=a+s(Zm`>)v>fLRy$~K(~7+z7F;oIU!!*3yGv=|Bc`loqE{r7a0?p;9;
zcJ>!FRaLp~4ZRsGyG3tiand&Li#mrTocwoY@yDL54#!oi6=1yFQM{~q-te)rGb|6)
zHKK?dIgCq4h%6x!-Q4(`{iS0EukUJj3lmM!ey_eulIWOw(r(%_VMHZZbMF(aZD)Rp
zRQxWI)Sv*~MR1d2YSX5@C}GB6Ndw05%_9p?f{R|MB1!_Wl+T}8_=iA333TOen%T}e
zJ3IA@Dx=PSKbQ#8^7TDRi@9a!6>pOiBQME7CQokqBZ$FRkue(U54<7`7<x`8WDY)Z
zuIv6o0scY>uPZ)hvSpt_gx*7Y)zD}%LrlzuO^0|p)i<FBx&5yJN45CY?{VKTqG&&O
zD1-TKbs;(?u#pX#%+5V{2E!A+Vb4jC!n5BSw{S@cC|1pVSHFhgJ>5cb^)9waJNli`
z!;%TvXD3fL+n!gwD8ns;-GHVMR!>JtWJ8Dia<Le7@myqnv~87i=!2-wNmiu$o+(M2
z!<(C-g@5euZjRCbBOtpGLeIc((fgjO*W9zObuq?c34kdgv3I!Z;kb+*+*6QDn&f6Z
zWnNagrn}zb#<G?C1z8XqE33Uo@jYg*zh11lx3*rjo#*mHhrX56(e~C`y1W{52#!pO
z%Wom2xq8dso*=^tI6NBfP7NzbZ7=S)*ckG4W$z71GvIr8C&{IpCW@pbJzQLyt4z^T
z;WqV1^h*mMNGsH483tx19+}kX4Q^8rq7c~EGj9!Pr53gI^)q$0>+9<+r51(7Dm;dX
zinJtMrj>O30My)epmFI?bPZ2vA&ta>cU%M<q5feAWgSNZoN0+osH`J+f5GWe2!C#^
z=e?OJZ8`pQ8g0R5^T#4rRlsD{P4-hnBNjw0j(atkw>$|o8~ZH`#P<zwga9WO3Wx>E
zQsMp>l0m|=RhuEcywwRlV1J^|42dnw#Rg(|0XjWVV;1uk)*X2lQH&Ipx#ELL?J^+N
z$tHBk!Op8*MRj_XmNErR%Sg+_x>WnBpG$40C-^s)$Ln$GqA<J}faXfqm53G9n^MU{
zaabn|<OV^?3^k!T?09tnxBc@Gxam)5=K+)Cx#cNI$H!5$8Na|OE4y43x{bqFs<VBD
zb#G#hoR+qV5)9EAg{T?LjwQ6gU9re#d?$j4y(rw{rsn3}P=E(3feuckaou)(F$@TO
z@`-wUrma~5Ce){tqWvF;uQnZDzeHpk3YoY2tfMRbs@yzFNAO{{t&Ewn!ppZ|i9F3K
z!>RS5Af-`2qeE#0Z9KuXjtaXrwkk41Mf;N52!qR#8nx+auMbU4wrDnQKuYI)Td*32
z{r`kKl#uvkxzOEvg{(!Qe@2w?XPBctAkn?h3~E{`s>?9J{0FHhLfq`6C)>WcVEDuS
zBlB&*VYlh;@%eeHY~xQ?NSm`tN(OVdbifmFZhqgH1!qK4=EeI)(hsePS*?m`IZO+w
zI_JK6mB7kR>}Kz)XYcw;XhVf%L9_SjF=i>Hs}~uU(%qZ&KQs^P={A!EN1YkHgw}kN
zSVn>-UFPdwl$PE-g2lXffJ5SVMI>1i+T3#LYMqMr=RWN*k(-;_G@`%n1Deg5d$ZUJ
zM|P{B>j58^09)9d9IfA=C6GTg8+0&Z2WpW!NwNZOqHde{pnUVrC-#JNOXo%Vd2bD?
zc7KtkKaj1V0K-Ibny7>pfmO1L?Zy0kDH(|#;q*B5TX{Uu{d#TYUpB-Uw*#dfX|yO-
z4<LEc`=vu#;;hn4*N&50TTM&Cf6Y&#qPCQ%*0jkSw11rbASb7$4t&(066`^~7chH@
zg|q)|Kxwapad0Z$W_;rko^rnTbq|()?j-KA*DDUZo8M!*Iw!Ik1YK?B{36A!pLTR`
z2)iO<ah@y*?_d$pA5^tVy9K-Oh)GB^Y<dp!nSa<20PYXsv*r2RblC@?Q{B~d)8Fhi
zEte(B{Lt6^pZH<fk9A#o;?ISpA9}?DGX2-8dRgVX5OtY2(=HI(2?$Fx4FV9;d{I#>
zkCajB#gD!E`giZ%HL_m&`vEL~&B}=m-4J4!m?L#2GzEadc9X4TzCEy3XPb$MiMpuX
zaUh<g2MFz(w90H_IG(-4w5$l>y=CP|RKWd37U)-k;)5Z81z=rZ_<%;7e~Y6@y#=u3
zC+e5dndBp`5%{IXJvikamD}+tm(=Z=>-!o?MGJqGB2^*pmxvrg%>4D_K|g6<-m~ml
z3P@T}c6LSQHIjkdnfMEKSRNM1PXIO;$9|?iD28z#__kTKGqWHA?ZaE*Q+9fP-%@&r
zFW2c@WB}z6o9_-SQQ1g>E(Bt>7U@UQ&iobR8zF2pNVPCC<6VRbR)c0GUd55^=8=<=
z!zsb#963nxv>jM_^|%WhsNC$qNL}7OKPYc)l}ZMd3Oumz=GQU--C_VL*W7h<^x``~
zSX<@gPin$FSA`BDnWvK_vNn;ykJZi1=jjBzM*#Lc=<PMV6QD$vl_Pk%lBRdpUay+F
zI6F@$f8*@Tz~VAf(qs@2VCUi4aYNmhv?E~m9h#PHqcR89d8vf{09jskJdOi)kVLGk
zAMQ$2D|n6Hf5QHX%($$04}iG(86B$$5ds1NFx;{3EsRt@1rl5uS5j0|_jj@>!2K78
zh75i!Se&V0k&iFM@MW<fAF16$`VE|_TD*&<{>^xADpl;HO*E~^oP-YiqQS!_*mdXN
zpyez=0!tLBS7#ZgD~cR5vbD8E0B$X*nMd^U+d9kHshU)Z?FLZxQmkHSAPKz}JuRhm
z(G29Alhe}*L~McG)^xl_zV~^c!TtO9%g3b}AzVUH68`$sd7maYIXR~oytFTf0e2Zr
zG*}ke#(^L!uXf*9TsRvH?k=v?>jj&0K&6C=ksj{uVKiV)8Wg?t1v|%3ud`PV>f)0p
z^A_2A$09i`eJs=c2V`e#WLnCvZZEc5K}zt4t0$xlk}R!)`LbcYKfk>vuv(&6Z1D=E
z!k*vbWE1CAc?i-F#50mDj|#sG!!KQ)P+-@JnL=Zb#>dA;6zVz=j$fV0iTmipMw#{`
z>LJ>jo5kWGCd97ovZ9otKeV1}JWP-DM)${+KH}q>Az%`1fg^XkYN~XKDI!>d!l)Ak
zIHxlLZJzH`HirBW26^?OnDFF`aGm9!Yl-EoynrxNge4|dYQDN<7ZmhS^z{5`eP-bz
zXN0*A5PbIq?}UMZ%q1Tb|7WmOF&3v-F;WQvX;53-wJ}n>Nz4zQTxtvO>Iu&1^|Mv!
zX&9o=`I;+b+vEa+vHvITNkB=HHhmc3tJcVS$fNeqE{ioizRB%aWmVN%e3GxOCLfK}
zsq&bnA4fiMqo$CVvnSAD{!rG3t9xe%>l~2Qz(i@%mkvG3`_!Mh5Ph=!2PIg=vJi3R
zAzzM&kotCuOGLvhf1$0Z`A2kOOZ>Wggg9Jfq5{*aG%k^YJcb{5SYWk`&Z&!D1aaIn
zlK-o(K+Zr+ljX2EVPIgOoKK?HYWK}uD;W1O54)(|0dUd5_WhvlKH9ILU>TXvf}BlS
z=}Dk`at~cSXKx@axJ#s5zlFvzK3q}y@HYqENBg(Ypqosq*M&l_pgwfi_F|@6)Uck1
zt*!iTwDM1$jj`E_Ir<y7z;*hfyoOnrQ+SzH>9G~79SH-)Oug<?fcCGeUcY|)S%VPt
z`YqB;BL*LB-Jz3l6+ByGyt?VW)Ej+^nVGR8v#X*P{`T!#rT02>1WYl!Ylf|gPb(<F
zLlwJy>|C#_ssP<S&iphF-rmdtYMcGGo(7?iBU<#gEd4_VWvhp4Bk|dvhKF@4@nH*0
z>s5=c&laYqmF`TVyqO8j|C3Y%P8tD$hM12E?oj$&UmlA!Ji#X+4KXQ=5LP*SIk4a^
zOMlHb>w>$WJfH<-=i+kVbvD$zD6Wt4Xv1y#LqjYuN~USZuCRBx+!6dYpH#j@5`-mq
zyvJK|ZqYh{EfB(cyz?P<_8dd1@vappeEOfw2{HM4Tu>>693-ndD)pcV`TiGhcU!-B
zp;!(*2?vM(zaA{EDWZD<VO9+D{~2ZH6u&crlbJ{Jz~~~W3qj(xcT@B|Md<InkG;^t
zS96(Wx&i~>J?oI~l-s@D&v7WQYdcz6S}<dID$C03=CU|64^D>*jXD*3ln3~Z=-CP&
zR!V|hgD6YO?6U1R{8oWtBzcep#T5%^!B)ufplUJ9S@f~><n`~<t^+k?HMP6<A3pdC
zF84Q4@V^+a_~^Z?CuI%%grgdkE`cIo3jfiBL|uU4>r3$vuC*iYsEV=o>)dH&&yg3n
zXAz2WaimoL>X#3<O{gHe(|1LfP0z7%0-2wZU$s5ll?Y#9Dz^Jwa+pKdl@mCWdjDgi
zRohAQ;Najr(3NZy=5LJ0H`QZfWBT|6YABsUU?U?CqBdi%xgBe_e^Z>AntE(T;{~f;
zQIwSiIJVc1isghS>NH^SwMO=sjkfmP{2EiD#2e<vAwtyYAE@`vQZ`z*O<~m+Y(r|&
z-IJVB`TEVam|I66X*}I6g{{r2CA(Yz05e}qLWUP?n^h&L!IV^#l%iP=u!GuHA%9qA
zXJ;#`6G}M6tq99o|3id%JGV(aByiG!H8Tg}pOzoJf$ELoMFAVXksw|h`cC&;Bc_CF
z?TvoaJ4S+=3Y<)&xZ_ajZ>)S^K9&`~bv`>KLyttzQB$9LDC1>>+y-mmFs=xKj?+}`
zGU8$xh@#U!flUy$YdBIUTl*M|Xl&lt-cg~<GV{^gfEEt!{=q=`<jv7V-*hJEy@YaR
zeIq4OczyjowsHm{aU_>T<lQxM@S5*mVfvs5%8g{Q9h`Ci1liFXV7MCQ5LdXRa&d9-
z8=o3hq=G<4CWIx{T>s)V+g!+=w55N(!pte4ziMm{!l4sEI?akTzzwdEFi51DcRfF!
zlwFN;xd(0h=l{9J$H(J!N1g#&LW>FW&lx(GS6h5mZ$(4a3xVQAq;|%%0k^C82J2xW
z=+Lbjhd?288%Dat8~32BEcBm;daURg7_O^3>G#@J1Z1;$w8N3Q{qY{Yd?gZ_>c9U%
zGd7lS<uQy(1rQ2a$d4(Pq%Z@9OG-#Qf#2iaw)v;N<iO@nW0C~p_2*}LR#w+Ca+QPF
zb$8CbqC7LRvl{=~&qqvLod3fWGRazfgRWJsYlh{8q7fpm@CoL`*R5B=>T)Ij9an1a
z+Vf37@za?fQKP1(18M;GO;-wG!`N@2e6FdPvVS-9#NR3E0P(lxDOyooy?xNo&_Mt4
zoWO$6?%jcoy1MW6DnX=yRLD`8&bGiSO+r}(#fyc1H8)l%smtAhf&v2I5wrwvXsiK3
zmczlpA=d@}k*)0Hv|0K*G}P37XG5ZSbuRqRFX^kkjE!}&rw;$NEE3F{oUK)2D%E&c
zuYxLET7;!mmD&(M36|^#O_8LG!S494>OsZGKt(~}Z)k6ijx`I&=uMT!(y_zoTA4q+
z>&aDTA959U`vmNO{O^XTeu0=<v{S#b+th2^Tms5Ujcgh-POX=m+7@>CLjOmjx`fb%
ZEyo$1+#R*=J79AfLqkPJxdCDq^FMa;ML_@n

literal 0
HcmV?d00001

diff --git a/Oqtane.Server/wwwroot/oqtane-black.png b/Oqtane.Server/wwwroot/oqtane-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3c92bf04de6975ed448635d4f34a4d66b703327
GIT binary patch
literal 11565
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
JT5)jD{{UV$;R^r&

literal 0
HcmV?d00001

diff --git a/Oqtane.Server/wwwroot/oqtane-white.png b/Oqtane.Server/wwwroot/oqtane-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d75a0120fb6ebc7c82864fadff224a83c46c5d3
GIT binary patch
literal 11567
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
Q<O~4FNGOO`ib4GU7X)6B!2kdN

literal 0
HcmV?d00001

diff --git a/Oqtane.Server/wwwroot/oqtane.png b/Oqtane.Server/wwwroot/oqtane.png
deleted file mode 100644
index 8d18cc15222db6ce7ad3fb6a2ae2556a92ed5e1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14299
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
bpC}~tE;hefuIK+16ai!;6veAVjlTa6lCEs&

diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 5b91ada2..4a1c1ce4 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -11,9 +11,9 @@ namespace Oqtane.Shared
         public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
         public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";
 
-        public const string DefaultTheme = "Oqtane.Themes.BlazorTheme.Default, Oqtane.Client";
-        public const string DefaultLayout = "";
-        public const string DefaultContainer = "Oqtane.Themes.BlazorTheme.Container, Oqtane.Client";
+        public const string DefaultTheme = "Oqtane.Themes.OqtaneTheme.Default, Oqtane.Client";
+        public const string DefaultLayout = "Oqtane.Themes.OqtaneTheme.SinglePane, Oqtane.Client";
+        public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
         public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
 
         public const string ActionToken = "{Action}";

From 5e234486187036dde127369030038ea81fe03ffa Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Mon, 18 May 2020 13:34:53 -0400
Subject: [PATCH 7/7] use lambas for setting resources

---
 Oqtane.Client/Modules/HtmlText/Edit.razor     | 23 ++++++++-----------
 Oqtane.Client/Modules/HtmlText/Index.razor    | 11 +++------
 .../Themes/BlazorTheme/Default.razor          | 11 +++------
 .../Themes/OqtaneTheme/Default.razor          | 14 ++++-------
 4 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 442aee36..292706e2 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -24,21 +24,16 @@
 
     public override string Title => "Edit Html/Text";
 
-    public override List<Resource> Resources
+    public override List<Resource> Resources => new List<Resource>()
     {
-        get
-        {
-            List<Resource> resources = new List<Resource>();
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" });
-            // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css", Integrity = "", CrossOrigin = "" });
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css", Integrity = "", CrossOrigin = "" });
-            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js", Integrity = "", CrossOrigin = "" });
-            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js", Integrity = "", CrossOrigin = "" });
-            resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js", Integrity = "", CrossOrigin = "" });
-            return resources;
-        }
-    }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
+        // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" },
+        new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
+    };
 
     private RichTextEditor RichTextEditorHtml;
     private string _content = null;
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 5d18e498..8160c19a 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -11,15 +11,10 @@
 }
 
 @code {
-    public override List<Resource> Resources
+    public override List<Resource> Resources => new List<Resource>()
     {
-        get
-        {
-            List<Resource> resources = new List<Resource>();
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" });
-            return resources;
-        }
-    }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+    };
 
     private string content = "";
 
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index a51a130c..14b7df03 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -28,13 +28,8 @@
 @code {
     public override string Panes => "Content";
 
-    public override List<Resource> Resources
+    public override List<Resource> Resources => new List<Resource>()
     {
-        get
-        {
-            List<Resource> resources = new List<Resource>();
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" });
-            return resources;
-        }
-    }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
+    };
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index 05d90852..a2c9263b 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -19,14 +19,10 @@
 @code {
     public override string Panes => string.Empty;
 
-    public override List<Resource> Resources
+    public override List<Resource> Resources => new List<Resource>()
     {
-        get
-        {
-            List<Resource> resources = new List<Resource>();
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" });
-            resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" });
-            return resources;
-        }
-    }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
+    };
+
 }