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.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/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"
 }