diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index 3022c49f..026a2986 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 
 @if (_text != string.Empty)
@@ -14,13 +14,13 @@
     public string CreatedBy { get; set; }
 
     [Parameter]
-    public DateTime CreatedOn { get; set; }
+    public DateTime? CreatedOn { get; set; }
 
     [Parameter]
     public string ModifiedBy { get; set; }
 
     [Parameter]
-    public DateTime ModifiedOn { get; set; }
+    public DateTime? ModifiedOn { get; set; }
 
     [Parameter]
     public string DeletedBy { get; set; }
@@ -37,7 +37,7 @@
     protected override void OnParametersSet()
     {
         _text = string.Empty;
-        if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null)
+        if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn.HasValue)
         {
             _text += "<p style=\"" + Style + "\">Created ";
 
@@ -48,13 +48,13 @@
 
             if (CreatedOn != null)
             {
-                _text += " on <b>" + CreatedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
+                _text += " on <b>" + CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
             }
 
             _text += "</p>";
         }
 
-        if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn != null)
+        if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn.HasValue)
         {
             _text += "<p style=\"" + Style + "\">Last modified ";
 
@@ -65,7 +65,7 @@
 
             if (ModifiedOn != null)
             {
-                _text += " on <b>" + ModifiedOn.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
+                _text += " on <b>" + ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
             }
 
             _text += "</p>";
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 680f45c0..ee846b13 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @inject NavigationManager NavigationManager
 
@@ -6,7 +6,7 @@
 {
     <div class="@_classname" role="alert">
         @_message
-        @if (Type == MessageType.Error && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             @((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink>
         }
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 12513215..d4c20b37 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.UI
+@namespace Oqtane.UI
 @inject IJSRuntime JsRuntime
 @inject NavigationManager NavigationManager
 
@@ -79,7 +79,7 @@
                 "\"sizes\": \"512x512\", " +
                 "\"type\": \"image/png\" " +
             "}] " +
-            "} " +
+            "}; " +
             "const serialized = JSON.stringify(manifest); " +
             "const blob = new Blob([serialized], {type: 'application/javascript'}); " +
             "const url = URL.createObjectURL(blob); " +
diff --git a/Oqtane.sln b/Oqtane.sln
index 0caeb4f6..2755bdb2 100644
--- a/Oqtane.sln
+++ b/Oqtane.sln
@@ -13,6 +13,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Upgrade", "Oqtane.Up
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Test", "Oqtane.Test\Oqtane.Test.csproj", "{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EECA8C-B58E-469E-B8C5-D543AFC9A654}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU