diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor
index 950ccfdd..1ced68d1 100644
--- a/Oqtane.Client/Installer/Installer.razor
+++ b/Oqtane.Client/Installer/Installer.razor
@@ -158,8 +158,8 @@
         if (firstRender)
         {
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", "text/css", "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", "anonymous", "");
-            await interop.IncludeScript("", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", "anonymous", "", "head", "");
+            await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/css/bootstrap.min.css", "text/css", "sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==", "anonymous", "");
+            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/js/bootstrap.min.js", "sha512-a6ctI6w1kg3J4dSjknHj3aWLEbjitAXAjLDRUxo2wyYmDFRcz2RJuQr5M3Kt8O/TtUSp8n2rAyaXYy1sjoKmrQ==", "anonymous", "", "head", "");
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index 6cbd78fa..27f32ea7 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -91,22 +91,25 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    protected override void OnInitialized()
+    {
+        _moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
+        if (string.IsNullOrEmpty(_moduledefinitionname))
+        {
+            AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
+        }
+        else
+        {
+            AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
+        }
+    }
+
     protected override async Task OnParametersSetAsync()
     {
         try
         {
-            _moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
             _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-
-            if (string.IsNullOrEmpty(_moduledefinitionname))
-            {
-                AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
-            }
         }
         catch (Exception ex)
         {
@@ -130,7 +133,6 @@ else
                 await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 
                 GetLocation();
-
                 AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
             }
             catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
index 6adc392a..dda4087c 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
@@ -87,13 +87,17 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+    }
+
     protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Client/Modules/Admin/Themes/Create.razor b/Oqtane.Client/Modules/Admin/Themes/Create.razor
index f563c1ff..d472047c 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Create.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Create.razor
@@ -11,55 +11,56 @@
 
 @if (_templates != null)
 {
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
-        <div class="col-sm-9">
-            <input id="owner" class="form-control" @bind="@_owner" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
-        <div class="col-sm-9">
-            <input id="module" class="form-control" @bind="@_theme" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
-        <div class="col-sm-9">
-            <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
-                <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
-                @foreach (Template template in _templates)
-                {
-                    <option value="@template.Name">@template.Title</option>
-                }
-            </select>
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
-        <div class="col-sm-9">
-            <select id="reference" class="form-select" @bind="@_reference">
-                @foreach (string version in _versions)
-                {
-                    if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
-                    {
-                        <option value="@(version)">@(version)</option>
-                    }
-                }
-                <option value="local">@SharedLocalizer["LocalVersion"]</option>
-            </select>
-        </div>
-    </div>
-    @if (!string.IsNullOrEmpty(_location)) {
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
-            <div class="col-sm-9">
-                <input id="module" class="form-control" @bind="@_location" readonly />
-            </div>
-        </div>
-    }
-</div>
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+			<div class="col-sm-9">
+				<input id="owner" class="form-control" @bind="@_owner" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
+			<div class="col-sm-9">
+				<input id="module" class="form-control" @bind="@_theme" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+					<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+					@foreach (Template template in _templates)
+					{
+						<option value="@template.Name">@template.Title</option>
+					}
+				</select>
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+			<div class="col-sm-9">
+				<select id="reference" class="form-select" @bind="@_reference">
+					@foreach (string version in _versions)
+					{
+						if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+						{
+							<option value="@(version)">@(version)</option>
+						}
+					}
+					<option value="local">@SharedLocalizer["LocalVersion"]</option>
+				</select>
+			</div>
+		</div>
+		@if (!string.IsNullOrEmpty(_location)) 
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_location" readonly />
+				</div>
+			</div>
+		}
+	</div>
     <br />
     <button type="button" class="btn btn-success" @onclick="CreateTheme">@Localizer["Theme.Create"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
@@ -77,13 +78,17 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+    }
+	
+	protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ThemeService.GetThemeTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
         }
         catch (Exception ex)
         {
diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index bc60e72f..fd580f3a 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -30,9 +30,10 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", Integrity = "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", CrossOrigin = "anonymous" },
+		// obtained from https://cdnjs.com/libraries
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/css/bootstrap.min.css", Integrity = "sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/js/bootstrap.min.js", Integrity = "sha512-a6ctI6w1kg3J4dSjknHj3aWLEbjitAXAjLDRUxo2wyYmDFRcz2RJuQr5M3Kt8O/TtUSp8n2rAyaXYy1sjoKmrQ==", CrossOrigin = "anonymous" }
     };
 
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index d6e76bd8..da391360 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -12,183 +12,6 @@
 @inject IStringLocalizer<ControlPanel> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
-{
-    <div class="@ContainerClass" tabindex="-1" data-bs-scroll="true" data-bs-backdrop="true" id="offcanvasControlPanel" aria-labelledby="offcanvasScrollingLabel">
-        <div class="@HeaderClass">
-            <h5 id="offcanvasScrollingLabel">@Localizer["ControlPanel"]</h5>
-            <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-        </div>
-        <div class="@BodyClass">
-            @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
-            {
-                <div class="row d-flex">
-                    <div class="col">
-                        <button data-bs-dismiss="offcanvas" type="button" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
-                    </div>
-                </div>
-
-                <hr class="app-rule" />
-
-                <div class="row">
-                    <div class="col text-center">
-                        <label class="control-label">@Localizer["Page.Manage"] </label>
-                    </div>
-                </div>
-                <div class="row d-flex">
-                    <div class="col d-flex justify-content-between">
-                        <button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
-                        <button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
-                        <button type="button" class="btn btn-danger col-3" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
-                    </div>
-                </div>
-                <br />
-                <div class="row d-flex">
-                    <div class="col">
-                        @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
-                        {
-                            <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
-                        }
-                        else
-                        {
-                            <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
-                        }
-                    </div>
-                </div>
-            }
-
-            @if (_deleteConfirmation)
-            {
-                <div class="app-admin-modal">
-                    <div class="modal" tabindex="-1" role="dialog">
-                        <div class="modal-dialog">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <h5 class="modal-title">@Localizer["Page.Delete"]</h5>
-                                    <button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
-                                </div>
-                                <div class="modal-body">
-                                    <p>Are You Sure You Want To Delete This Page?</p>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
-                                    <button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-            <hr class="app-rule" />
-            <div class="row">
-                <div class="col text-center">
-                    <label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
-                    <select class="form-select" @bind="@ModuleType">
-                        <option value="new">@Localizer["Module.AddNew"]</option>
-                        <option value="existing">@Localizer["Module.AddExisting"]</option>
-                    </select>
-                    @if (ModuleType == "new")
-                    {
-                        @if (_moduleDefinitions != null)
-                        {
-                            <select class="form-select" @onchange="(e => CategoryChanged(e))">
-                                @foreach (var category in _categories)
-                                {
-                                    if (category == Category)
-                                    {
-                                        <option value="@category" selected>@category @Localizer["Modules"]</option>
-                                    }
-                                    else
-                                    {
-                                        <option value="@category">@category @Localizer["Modules"]</option>
-                                    }
-                                }
-                            </select>
-                            <select class="form-select" @onchange="(e => ModuleChanged(e))">
-                                @if (ModuleDefinitionName == "-")
-                                {
-                                    <option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
-                                }
-                                else
-                                {
-                                    <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-                                }
-                                @foreach (var moduledefinition in _moduleDefinitions)
-                                {
-                                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
-                                    {
-                                        if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
-                                        {
-                                            <option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
-                                        }
-                                    }
-                                }
-                            </select>
-                            @((MarkupString) Description)
-                        }
-                    }
-                    else
-                    {
-                        <select class="form-select" @onchange="(e => PageChanged(e))">
-                            <option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
-                            @foreach (Page p in _pages)
-                            {
-                                <option value="@p.PageId">@p.Name</option>
-                            }
-                        </select>
-                        <select class="form-select" @bind="@ModuleId">
-                            <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-                            @foreach (Module module in _modules)
-                            {
-                                <option value="@module.ModuleId">@module.Title</option>
-                            }
-                        </select>
-                    }
-                </div>
-            </div>
-            <div class="row">
-                <div class="col text-center">
-                    <label for="Title" class="control-label">@Localizer["Title"] </label>
-                    <input type="text" name="Title" class="form-control" @bind="@Title" />
-                </div>
-            </div>
-            @if (_pane.Length > 1)
-            {
-                <div class="row">
-                    <div class="col text-center">
-                        <label for="Pane" class="control-label">@Localizer["Pane"] </label>
-                        <select class="form-select" @bind="@Pane">
-                            @foreach (string pane in PageState.Page.Panes)
-                            {
-                                <option value="@pane">@pane Pane</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-            }
-            <div class="row">
-                <div class="col text-center">
-                    <label for="Container" class="control-label">@Localizer["Container"] </label>
-                    <select class="form-select" @bind="@ContainerType">
-                        @foreach (var container in _containers)
-                        {
-                            <option value="@container.TypeName">@container.Name</option>
-                        }
-                    </select>
-                </div>
-            </div>
-            <br />
-            <button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
-            @((MarkupString) Message)
-            @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-            {
-                <hr class="app-rule" />
-                <NavLink class="btn btn-info col-12" data-bs-dismiss="offcanvas" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
-            }
-        </div>
-    </div>
-}
-
 @if (ShowLanguageSwitcher)
 {
     <LanguageSwitcher />
@@ -212,10 +35,185 @@
 
 @if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
-
     <button class="btn @ButtonClass" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
         <span class="oi oi-cog"></span>
     </button>
+
+	<div class="@ContainerClass" tabindex="-1" data-bs-scroll="true" data-bs-backdrop="true" id="offcanvasControlPanel" aria-labelledby="offcanvasScrollingLabel">
+		<div class="@HeaderClass">
+			<h5 id="offcanvasScrollingLabel" class="offcanvas-title">@Localizer["ControlPanel"]</h5>
+			<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+		</div>
+		<div class="@BodyClass">
+			<div class="container-fluid">
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			{
+				<div class="row d-flex">
+					<div class="col">
+						<button data-bs-dismiss="offcanvas" type="button" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
+					</div>
+				</div>
+
+				<hr class="app-rule" />
+
+				<div class="row">
+					<div class="col text-center">
+						<label class="control-label">@Localizer["Page.Manage"] </label>
+					</div>
+				</div>
+				<div class="row d-flex">
+					<div class="col d-flex justify-content-between">
+						<button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
+						<button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
+						<button type="button" class="btn btn-danger col-3" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
+					</div>
+				</div>
+				<br />
+				<div class="row d-flex">
+					<div class="col">
+						@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
+						{
+							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
+						}
+						else
+						{
+							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
+						}
+					</div>
+				</div>
+			}
+
+			@if (_deleteConfirmation)
+			{
+				<div class="app-admin-modal">
+					<div class="modal" tabindex="-1" role="dialog">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<h5 class="modal-title">@Localizer["Page.Delete"]</h5>
+									<button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
+								</div>
+								<div class="modal-body">
+									<p>Are You Sure You Want To Delete This Page?</p>
+								</div>
+								<div class="modal-footer">
+									<button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
+									<button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			}
+			<hr class="app-rule" />
+			<div class="row">
+				<div class="col text-center">
+					<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
+					<select class="form-select" @bind="@ModuleType">
+						<option value="new">@Localizer["Module.AddNew"]</option>
+						<option value="existing">@Localizer["Module.AddExisting"]</option>
+					</select>
+					@if (ModuleType == "new")
+					{
+						@if (_moduleDefinitions != null)
+						{
+							<select class="form-select" @onchange="(e => CategoryChanged(e))">
+								@foreach (var category in _categories)
+								{
+									if (category == Category)
+									{
+										<option value="@category" selected>@category @Localizer["Modules"]</option>
+									}
+									else
+									{
+										<option value="@category">@category @Localizer["Modules"]</option>
+									}
+								}
+							</select>
+							<select class="form-select" @onchange="(e => ModuleChanged(e))">
+								@if (ModuleDefinitionName == "-")
+								{
+									<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
+								}
+								else
+								{
+									<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
+								}
+								@foreach (var moduledefinition in _moduleDefinitions)
+								{
+									if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
+									{
+										if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
+										{
+											<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
+										}
+									}
+								}
+							</select>
+							@((MarkupString) Description)
+						}
+					}
+					else
+					{
+						<select class="form-select" @onchange="(e => PageChanged(e))">
+							<option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
+							@foreach (Page p in _pages)
+							{
+								<option value="@p.PageId">@p.Name</option>
+							}
+						</select>
+						<select class="form-select" @bind="@ModuleId">
+							<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
+							@foreach (Module module in _modules)
+							{
+								<option value="@module.ModuleId">@module.Title</option>
+							}
+						</select>
+					}
+				</div>
+			</div>
+			<div class="row">
+				<div class="col text-center">
+					<label for="Title" class="control-label">@Localizer["Title"] </label>
+					<input type="text" name="Title" class="form-control" @bind="@Title" />
+				</div>
+			</div>
+			@if (_pane.Length > 1)
+			{
+				<div class="row">
+					<div class="col text-center">
+						<label for="Pane" class="control-label">@Localizer["Pane"] </label>
+						<select class="form-select" @bind="@Pane">
+							@foreach (string pane in PageState.Page.Panes)
+							{
+								<option value="@pane">@pane Pane</option>
+							}
+						</select>
+					</div>
+				</div>
+			}
+			<div class="row">
+				<div class="col text-center">
+					<label for="Container" class="control-label">@Localizer["Container"] </label>
+					<select class="form-select" @bind="@ContainerType">
+						@foreach (var container in _containers)
+						{
+							<option value="@container.TypeName">@container.Name</option>
+						}
+					</select>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
+			@((MarkupString) Message)
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+				<hr class="app-rule" />
+				<NavLink class="btn btn-info col-12" data-bs-dismiss="offcanvas" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
+			}
+			</div>
+		</div>
+	</div>
 }
 
 @code{
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index 9036dcad..59be7e97 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -112,10 +112,11 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
+		    // obtained from https://cdnjs.com/libraries
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.1.3/cyborg/bootstrap.min.css", Integrity = "sha512-/in5IWTUhb7wOUd6iHotlyrLrZ7+2utJJR8ySzSxeeOMJ9fanjCr4fmyWzDW/ziw56shUNTVClBMWZaA677VhA==", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", CrossOrigin = "anonymous" }
-    };
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.min.js", Integrity = "sha512-OvBgP9A2JBgiRad/mM36mkzXSXaJE9BEIENnVEmeZdITvwT09xnxLtT4twkCa8m/loMbPHsvPl0T8lRGVBwjlQ==", CrossOrigin = "anonymous" }
+	  };
 
     private bool _login = true;
     private bool _register = true;
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index 5ae4e833..5e7e39bc 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -38,6 +38,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "Home",
                 Parent = "",
+                Order = 1,
                 Path = "",
                 Icon = "oi oi-home",
                 IsNavigation = true,
@@ -84,6 +85,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "Private",
                 Parent = "",
+                Order = 3,
                 Path = "private",
                 Icon = "oi oi-lock-locked",
                 IsNavigation = true,
@@ -108,6 +110,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "My Page",
                 Parent = "",
+                Order = 5,
                 Path = "mypage",
                 Icon = "oi oi-target",
                 IsNavigation = true,
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/release.cmd b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/release.cmd
index db29e036..dd5c95db 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/release.cmd
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/release.cmd
@@ -1,3 +1,3 @@
 "..\..\[RootFolder]\oqtane.package\nuget.exe" pack [Owner].[Module].nuspec 
-XCOPY "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\" /Y
+XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\Packages\" /Y
 
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
index b381a536..7b77591c 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "2.2.0"
+  "Version": "3.0.0"
 }
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
index f8551aa1..d142303d 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
   "Title": "Default Theme Template",
   "Type": "External",
-  "Version": "2.2.0"
+  "Version": "3.0.0"
 }
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index b944a691..d13f54e3 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -20,9 +20,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="bunit.web" Version="1.3.35-preview" />
-    <PackageReference Include="bunit.xunit" Version="1.0.0-preview-02" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
+    <PackageReference Include="bunit.web" Version="1.3.42" />
+    <PackageReference Include="bunit.web.testcomponents" Version="1.3.42" />
     <PackageReference Include="xunit.core" Version="2.4.2-pre.12" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>