diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml
index da36da348..00bed8b85 100644
--- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml
+++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml
@@ -6,6 +6,7 @@
     var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
     var contentId = Model.Id;
     if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
+    var preview = Context.Request.Query["preview"];
 }
 @section Styles {
     <partial name="EditStylesPartial" model="@Model" />
@@ -102,8 +103,8 @@
             }
 
             <button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
+            <button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
             <button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>
-
         </div>
 
 
@@ -196,5 +197,12 @@
     </div>
 </div>
 @section Scripts {
+    @if (preview == "true")
+    {
+        <script>
+            window.open("https://localhost:44314" + "@Model.CurrentPostUrl" + "?showdraft=true");
+        </script>
+    }
+
     <partial name="EditScriptsPartial" model="@Model" />
 }
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml
index 247264ead..0cbca78b4 100644
--- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml
+++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml
@@ -11,8 +11,8 @@
     if (Model.Template != null)
     {
         legend = string.Format(legendFormat, Model.Template.Title);
-
     }
+    var preview = Context.Request.Query["preview"];
 }
 @section Styles {
     <partial name="EditWithTemplateStylesPartial" model="@Model" />
@@ -94,8 +94,8 @@
             }
 
             <button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
+            <button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
             <button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>
-
         </div>
 
 
@@ -188,5 +188,11 @@
     </div>
 </div>
 @section Scripts {
+    @if (preview == "true")
+    {
+        <script>
+            window.open("https://localhost:44314" + "@Model.CurrentPostUrl" + "?showdraft=true");
+        </script>
+    }
     <partial name="EditWithTemplateScriptsPartial" model="@Model" />
-}
+}
\ No newline at end of file
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml
index 0f08313bb..2d108604a 100644
--- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml
+++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml
@@ -9,7 +9,7 @@
     if (string.IsNullOrEmpty(Model.Id)) { showDev = false; }
     var cancelSlug = Model.Slug;
     if (Model.Slug == Model.ProjectDefaultSlug || Model.DidRestoreDeleted) { cancelSlug = string.Empty; }
-
+    var preview = Context.Request.Query["preview"];
 }
 @section Styles {
     <partial name="EditStylesPartial" model="@Model" />
@@ -142,7 +142,7 @@
             }
 
             <button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
-
+            <button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
             <button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>
 
         </div>
@@ -241,5 +241,11 @@
 </div>
 
 @section Scripts {
+    @if (preview == "true")
+    {
+        <script>
+            window.open("https://localhost:44314/" + "@Model.Slug" + "?showdraft=true");
+        </script>
+    }
     <partial name="EditScriptsPartial" model="@Model" />
 }
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml
index 8925190f8..fc4c335fa 100644
--- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml
+++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml
@@ -16,7 +16,7 @@
     }
     var cancelSlug = Model.Slug;
     if (Model.Slug == Model.ProjectDefaultSlug || Model.DidRestoreDeleted) { cancelSlug = string.Empty; }
-
+    var preview = Context.Request.Query["preview"];
 }
 @section Styles {
     <partial name="EditWithTemplateStylesPartial" model="@Model" />
@@ -128,6 +128,7 @@
             }
 
             <button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
+            <button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
             <button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>
 
         </div>
@@ -228,6 +229,12 @@
 </div>
 
 @section Scripts {
+    @if (preview == "true")
+    {
+        <script>
+            window.open("https://localhost:44314/" + "@Model.Slug" + "?showdraft=true");
+        </script>
+    }
     <partial name="EditWithTemplateScriptsPartial" model="@Model" />
 }
 
diff --git a/src/cloudscribe.SimpleContent.Models/Versioning/SaveMode.cs b/src/cloudscribe.SimpleContent.Models/Versioning/SaveMode.cs
index d4143f114..986539c8c 100644
--- a/src/cloudscribe.SimpleContent.Models/Versioning/SaveMode.cs
+++ b/src/cloudscribe.SimpleContent.Models/Versioning/SaveMode.cs
@@ -7,5 +7,6 @@ public static class SaveMode
         public const string PublishNow         = "PublishNow";
         public const string UnPublish          = "UnPublish";
         public const string DeleteCurrentDraft = "DeleteCurrentDraft";
+        public const string SaveDraftAndPreview = "Preview";
     }
 }
diff --git a/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs b/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs
index 8b9bea78e..1e8f3e7c4 100644
--- a/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs
+++ b/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs
@@ -682,7 +682,7 @@ public virtual async Task<IActionResult> EditWithTemplate(
                 DidReplaceDraft = didReplaceDraft,
                 DidRestoreDeleted = didRestoreDeleted,
                 HasDraft = postResult.Post.HasDraftVersion()
-        };
+            };
             
             if (history != null)
             {
@@ -779,11 +779,22 @@ public virtual async Task<IActionResult> EditWithTemplate(PostEditWithTemplateVi
             if (response.Succeeded)
             {
                 if (model.SaveMode == SaveMode.DeleteCurrentDraft)
+                {
                     this.AlertSuccess(StringLocalizer["The current draft of this post has been deleted."], true);
+                }
                 else
+                {
                     this.AlertSuccess(StringLocalizer["The post was updated successfully."], true);
+                }
 
-                return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName, new { slug = response.Value.Slug });
+                if (model.SaveMode == SaveMode.SaveDraftAndPreview)
+                {
+                    return RedirectToRoute(BlogRoutes.PostEditWithTemplateRouteName, new { slug = response.Value.Slug, preview = "true" });
+                }
+                else
+                {
+                    return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName, new { slug = response.Value.Slug });
+                }
             }
             else
             {
@@ -794,8 +805,6 @@ public virtual async Task<IActionResult> EditWithTemplate(PostEditWithTemplateVi
 
         }
 
-
-
         [HttpGet]
         [AllowAnonymous]
         public virtual async Task<IActionResult> Edit(
@@ -955,7 +964,7 @@ public virtual async Task<IActionResult> Edit(
                     model.DraftPubDate = TimeZoneHelper.ConvertToLocalTime(postResult.Post.DraftPubDate.Value, tzId);
                 }
             }
-            
+                
             return View(model);
         }
 
@@ -1048,7 +1057,13 @@ public virtual async Task<IActionResult> Edit(PostEditViewModel model)
                     pubDate = DateTime.UtcNow;
                 }
 
-                return RedirectToRoute(BlogRoutes.PostWithDateRouteName,
+                if (model.SaveMode == SaveMode.SaveDraftAndPreview)
+                {
+                    return RedirectToRoute(BlogRoutes.PostEditRouteName, new { slug = response.Value.Slug, preview = "true" });
+                }
+                else
+                {
+                    return RedirectToRoute(BlogRoutes.PostWithDateRouteName,
                     new
                     {
                         year = pubDate.Value.Year,
@@ -1056,14 +1071,20 @@ public virtual async Task<IActionResult> Edit(PostEditViewModel model)
                         day = pubDate.Value.Day.ToString("00"),
                         slug = response.Value.Slug
                     });
+                }
             }
             else
             {
-                return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName,
+                if (model.SaveMode == SaveMode.SaveDraftAndPreview)
+                {
+                    return RedirectToRoute(BlogRoutes.PostEditRouteName, new { slug = response.Value.Slug, preview = "true" });
+                }
+                else
+                {
+                    return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName,
                     new { slug = response.Value.Slug });
+                }
             }
-
-
         }
         
         [HttpPost]
diff --git a/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs b/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs
index 533df83a3..340fc270a 100644
--- a/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs
+++ b/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs
@@ -535,7 +535,15 @@ public virtual async Task<IActionResult> EditWithTemplate(PageEditWithTemplateVi
                 {
                     return RedirectToRoute(PageRoutes.PageRouteName, new { slug = "" });
                 }
-                return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
+
+                if (model.SaveMode == SaveMode.SaveDraftAndPreview)
+                {
+                    return RedirectToRoute(PageRoutes.PageEditRouteName, new { slug = response.Value.Slug, preview = "true" });
+                }
+                else
+                {
+                    return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
+                }
             }
             else
             {
@@ -790,8 +798,15 @@ public virtual async Task<IActionResult> Edit(PageEditViewModel model)
                 {
                     return RedirectToRoute(PageRoutes.PageRouteName, new { slug = "" });
                 }
-                
-                return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
+
+                if (model.SaveMode == SaveMode.SaveDraftAndPreview)
+                {
+                    return RedirectToRoute(PageRoutes.PageEditRouteName, new { slug = response.Value.Slug, preview = "true" });
+                }
+                else
+                {
+                    return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
+                }
             }
             else
             {
diff --git a/src/cloudscribe.SimpleContent.Web/Services/Blog/CreateOrUpdatePostHandler.cs b/src/cloudscribe.SimpleContent.Web/Services/Blog/CreateOrUpdatePostHandler.cs
index b0386d726..f4cd4cf26 100644
--- a/src/cloudscribe.SimpleContent.Web/Services/Blog/CreateOrUpdatePostHandler.cs
+++ b/src/cloudscribe.SimpleContent.Web/Services/Blog/CreateOrUpdatePostHandler.cs
@@ -167,6 +167,7 @@ ILogger<CreateOrUpdatePostHandler> logger
                     switch (saveMode)
                     {
                         case SaveMode.SaveDraft:
+                        case SaveMode.SaveDraftAndPreview:
 
                             post.DraftContent = request.ViewModel.Content;
                             post.DraftAuthor = request.ViewModel.Author;
diff --git a/src/cloudscribe.SimpleContent.Web/Services/Blog/UpdateTemplatedPostHandler.cs b/src/cloudscribe.SimpleContent.Web/Services/Blog/UpdateTemplatedPostHandler.cs
index e1ad46aff..8edf61c88 100644
--- a/src/cloudscribe.SimpleContent.Web/Services/Blog/UpdateTemplatedPostHandler.cs
+++ b/src/cloudscribe.SimpleContent.Web/Services/Blog/UpdateTemplatedPostHandler.cs
@@ -240,6 +240,7 @@ private IValidateTemplateModel GetValidator(string name)
                     switch (saveMode)
                     {
                         case SaveMode.SaveDraft:
+                        case SaveMode.SaveDraftAndPreview:
 
                             post.DraftSerializedModel = modelString;
                             post.DraftContent = renderedModel;
diff --git a/src/cloudscribe.SimpleContent.Web/Services/Page/CreateOrUpdatePageHandler.cs b/src/cloudscribe.SimpleContent.Web/Services/Page/CreateOrUpdatePageHandler.cs
index 1fca5d9d4..dc91e09cf 100644
--- a/src/cloudscribe.SimpleContent.Web/Services/Page/CreateOrUpdatePageHandler.cs
+++ b/src/cloudscribe.SimpleContent.Web/Services/Page/CreateOrUpdatePageHandler.cs
@@ -178,7 +178,7 @@ ILogger<CreateOrUpdatePageHandler> logger
                         //    break;
 
                         case SaveMode.SaveDraft:
-                            
+                        case SaveMode.SaveDraftAndPreview:
                             page.DraftContent = request.ViewModel.Content;
                             page.DraftAuthor = request.ViewModel.Author;
                             // should we clear the draft pub date if save draft clicked?
diff --git a/src/cloudscribe.SimpleContent.Web/Services/Page/UpdateTemplatedPageHandler.cs b/src/cloudscribe.SimpleContent.Web/Services/Page/UpdateTemplatedPageHandler.cs
index 4ec94a18c..9f9d53022 100644
--- a/src/cloudscribe.SimpleContent.Web/Services/Page/UpdateTemplatedPageHandler.cs
+++ b/src/cloudscribe.SimpleContent.Web/Services/Page/UpdateTemplatedPageHandler.cs
@@ -240,7 +240,7 @@ private IValidateTemplateModel GetValidator(string name)
                     switch (saveMode)
                     {   
                         case SaveMode.SaveDraft:
-
+                        case SaveMode.SaveDraftAndPreview:
                             page.DraftSerializedModel = modelString;
                             page.DraftContent = renderedModel;
                             page.DraftAuthor = request.ViewModel.Author;
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/links.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/links.json
index d44eb6911..faac87e11 100644
--- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/links.json
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/links.json
@@ -1 +1 @@
-{"Id":"links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"ac4051c3-064a-4e7b-a2a3-c34f4c6ca7a6","ParentSlug":"more-docs","PageOrder":14,"Title":"Links","Author":"Admin","Slug":"links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<div class=\"content-top\">\r\n    \r\n</div>\r\n<div class=\"links-wrap\">\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/more-docs\">Docs</a></h2>\r\n            <a class=\"\" href=\"/more-docs\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/blog\">Blog</a></h2>\r\n            <a class=\"\" href=\"/blog\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/contact\">Contact</a></h2>\r\n            <a class=\"\" href=\"/contact\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"https://www.cloudscribe.com\" target=\"_blank\">cloudscribe</a></h2>\r\n            <a class=\"\" target=\"_blank\" href=\"https://www.cloudscribe.com\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n</div>\r\n<div class=\"mt-3 content-bottom\">\r\n    \r\n</div>\r\n\r\n","PubDate":"2019-01-08T16:14:51.303396Z","LastModified":"2019-01-08T16:14:51.3363236Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2019-01-04T11:11:17.5409433Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/more-docs\",\"Title\":\"Docs\",\"Description\":null,\"Sort\":1,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/blog\",\"Title\":\"Blog\",\"Description\":null,\"Sort\":3,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/contact\",\"Title\":\"Contact\",\"Description\":null,\"Sort\":5,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.cloudscribe.com\",\"Title\":\"cloudscribe\",\"Description\":null,\"Sort\":7,\"OpensInNewWindow\":true}]}","DraftSerializedModel":null,"Serializer":"Json"}
\ No newline at end of file
+{"Id":"links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"ac4051c3-064a-4e7b-a2a3-c34f4c6ca7a6","ParentSlug":"more-docs","PageOrder":14,"Title":"Links","Author":"Admin","Slug":"links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<div class=\"content-top\">\r\n    \r\n</div>\r\n<div class=\"links-wrap\">\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/more-docs\">Docs</a></h2>\r\n            <a class=\"\" href=\"/more-docs\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/blog\">Blog</a></h2>\r\n            <a class=\"\" href=\"/blog\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"/contact\">Contact</a></h2>\r\n            <a class=\"\" href=\"/contact\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n        <div class=\"clearfix linklist-item\">\r\n            <h2 class=\"h4\"><a href=\"https://www.cloudscribe.com\" target=\"_blank\">cloudscribe</a></h2>\r\n            <a class=\"\" target=\"_blank\" href=\"https://www.cloudscribe.com\">\r\n            </a>\r\n            <p class=\"\"></p>\r\n        </div>\r\n</div>\r\n<div class=\"mt-3 content-bottom\">\r\n    \r\n</div>\r\n\r\n","PubDate":"2019-01-08T16:14:51.303396Z","LastModified":"2025-02-24T09:56:34.939081Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2019-01-04T11:11:17.5409433Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/more-docs\",\"Title\":\"Docs\",\"Description\":null,\"Sort\":1,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/blog\",\"Title\":\"Blog\",\"Description\":null,\"Sort\":3,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/contact\",\"Title\":\"Contact\",\"Description\":null,\"Sort\":5,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.cloudscribe.com\",\"Title\":\"cloudscribe\",\"Description\":null,\"Sort\":7,\"OpensInNewWindow\":true}]}","DraftSerializedModel":null,"Serializer":"Json","ShowCreatedBy":null,"ShowCreatedDate":null,"ShowLastModifiedBy":null,"ShowLastModifiedDate":null}
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/new-page-test.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/new-page-test.json
index 9c061e2f4..ba5972e86 100644
--- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/new-page-test.json
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/new-page-test.json
@@ -1 +1 @@
-{"Id":"new-page-test","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"0","ParentSlug":"","PageOrder":20,"Title":"New Page Test","Author":"Admin","Slug":"new-page-test","ExternalUrl":null,"CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<p>Some text<img alt=\" \" src=\"/media/images/test_2023-10-04t15-08-30-2.png\" /></p>\r\n","PubDate":"2023-10-04T15:08:33.2153344Z","LastModified":"2023-10-04T15:08:33.2373168Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2023-10-04T15:08:33.2137228Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":null,"SerializedModel":null,"DraftSerializedModel":null,"Serializer":null}
\ No newline at end of file
+{"Id":"new-page-test","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"0","ParentSlug":"","PageOrder":20,"Title":"New Page Test","Author":"Admin","Slug":"new-page-test","ExternalUrl":null,"CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<p>Some text</p>\r\n","PubDate":"2023-10-04T15:08:33.2153344Z","LastModified":"2025-02-24T09:47:19.7345309Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2023-10-04T15:08:33.2137228Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":null,"SerializedModel":null,"DraftSerializedModel":null,"Serializer":null,"ShowCreatedBy":null,"ShowCreatedDate":null,"ShowLastModifiedBy":null,"ShowLastModifiedDate":null}
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2016/03/19a9ee38-3f62-4096-8250-c0eeb7b51e07.xml b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2016/03/19a9ee38-3f62-4096-8250-c0eeb7b51e07.xml
index 3fda12506..2a49605cc 100644
--- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2016/03/19a9ee38-3f62-4096-8250-c0eeb7b51e07.xml
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2016/03/19a9ee38-3f62-4096-8250-c0eeb7b51e07.xml
@@ -6,13 +6,15 @@
   <correlationkey />
   <author />
   <pubDate>2016-03-13T22:23:00.0000000Z</pubDate>
-  <lastModified>2018-08-20T15:11:16</lastModified>
+  <lastModified>2025-02-21T14:31:21</lastModified>
   <excerpt>Starsky and Hutch</excerpt>
   <content>&lt;p&gt;Starsky and Hutcherson&lt;br /&gt;
 &lt;img alt="dudes" src="/media/images/dudes1-550x412.jpeg" style="height:412px; width:550px" /&gt;&lt;br /&gt;
 cool dudes man!&lt;/p&gt;
 
 &lt;p&gt;ride on!&lt;/p&gt;
+
+&lt;p&gt;CHiPS was right there!&lt;/p&gt;
 </content>
   <contentType />
   <imageUrl />
@@ -45,7 +47,7 @@ cool dudes man!&lt;/p&gt;
       <website></website>
       <ip>127.0.0.1</ip>
       <userAgent>Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36</userAgent>
-      <date>2016-09-08T11:52:04.4968035-04:00</date>
+      <date>2016-09-08T16:52:04.4968035+01:00</date>
       <content>foo was here</content>
     </comment>
     <comment isAdmin="false" isApproved="true" id="4a196ac8-60c5-4135-b860-c2bf39a2dac4">
@@ -54,8 +56,9 @@ cool dudes man!&lt;/p&gt;
       <website></website>
       <ip>127.0.0.1</ip>
       <userAgent>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.62 Safari/537.36</userAgent>
-      <date>2017-10-24T10:53:53.5406034-04:00</date>
+      <date>2017-10-24T15:53:53.5406034+01:00</date>
       <content>more foo for you</content>
     </comment>
   </comments>
+  <showcomments>true</showcomments>
 </post>
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2020/07/mike-test.xml b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2020/07/mike-test.xml
index d6715aec9..e20239e7e 100644
--- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2020/07/mike-test.xml
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2020/07/mike-test.xml
@@ -6,7 +6,7 @@
   <correlationkey />
   <author>Admin</author>
   <pubDate>2020-07-21T22:55:01.5259933Z</pubDate>
-  <lastModified>2020-07-21T22:55:01</lastModified>
+  <lastModified>2025-02-24T08:30:23</lastModified>
   <excerpt />
   <content>&lt;p&gt;This is a Mike Test&lt;/p&gt;
 </content>
@@ -19,16 +19,17 @@
   <draftAuthor />
   <draftContent />
   <draftPubDate />
-  <templateKey />
-  <serializedModel />
+  <templateKey></templateKey>
+  <serializedModel></serializedModel>
   <draftSerializedModel />
-  <serializer />
+  <serializer></serializer>
   <blogId>f83067b4-919d-4910-acd1-4b3b1c210ecf</blogId>
   <ispublished>true</ispublished>
   <isFeatured>false</isFeatured>
-  <autoTeaser />
+  <autoTeaser></autoTeaser>
   <teaserOverride />
   <suppressTeaser>false</suppressTeaser>
   <categories></categories>
   <comments></comments>
+  <showcomments>true</showcomments>
 </post>
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/image-test-template.xml b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/image-test-template.xml
new file mode 100644
index 000000000..f2e2bc01d
--- /dev/null
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/image-test-template.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-16"?>
+<post>
+  <id>image-test-template</id>
+  <title>Image Test Template</title>
+  <slug>image-test-template</slug>
+  <correlationkey />
+  <author></author>
+  <pubDate />
+  <lastModified>2025-02-24T09:11:09</lastModified>
+  <excerpt />
+  <content></content>
+  <contentType>html</contentType>
+  <imageUrl />
+  <thumbnailUrl />
+  <createdUtc>2025-02-24T08:45:48</createdUtc>
+  <createdByUser>admin</createdByUser>
+  <lastModifiedByUser>admin</lastModifiedByUser>
+  <draftAuthor>Admin</draftAuthor>
+  <draftContent>&lt;p&gt;Image template test thing.&lt;/p&gt;
+
+
+</draftContent>
+  <draftPubDate />
+  <templateKey>sct-ImageWithContent</templateKey>
+  <serializedModel></serializedModel>
+  <draftSerializedModel>{"Content":"&lt;p&gt;Image template test thing.&lt;/p&gt;\r\n","ResizedUrl":null,"FullSizeUrl":null,"AltText":null,"Layout":"ImageOnLeft"}</draftSerializedModel>
+  <serializer>Json</serializer>
+  <blogId>f83067b4-919d-4910-acd1-4b3b1c210ecf</blogId>
+  <ispublished>false</ispublished>
+  <isFeatured>false</isFeatured>
+  <autoTeaser></autoTeaser>
+  <teaserOverride />
+  <suppressTeaser>false</suppressTeaser>
+  <categories></categories>
+  <comments></comments>
+  <showcomments>true</showcomments>
+</post>
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/testy-test-test.xml b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/testy-test-test.xml
new file mode 100644
index 000000000..fd4747393
--- /dev/null
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/post/2025/02/testy-test-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-16"?>
+<post>
+  <id>testy-test-test</id>
+  <title>Testy Test Test</title>
+  <slug>testy-test-test</slug>
+  <correlationkey />
+  <author>Admin</author>
+  <pubDate>2025-02-24T08:31:31.1206606Z</pubDate>
+  <lastModified>2025-02-24T08:31:31</lastModified>
+  <excerpt />
+  <content>&lt;p&gt;This, unsurprisingly, is a test...&lt;/p&gt;
+</content>
+  <contentType>html</contentType>
+  <imageUrl />
+  <thumbnailUrl />
+  <createdUtc>2025-02-24T08:31:05</createdUtc>
+  <createdByUser>admin</createdByUser>
+  <lastModifiedByUser>admin</lastModifiedByUser>
+  <draftAuthor />
+  <draftContent />
+  <draftPubDate />
+  <templateKey></templateKey>
+  <serializedModel></serializedModel>
+  <draftSerializedModel></draftSerializedModel>
+  <serializer></serializer>
+  <blogId>f83067b4-919d-4910-acd1-4b3b1c210ecf</blogId>
+  <ispublished>true</ispublished>
+  <isFeatured>false</isFeatured>
+  <autoTeaser></autoTeaser>
+  <teaserOverride />
+  <suppressTeaser>false</suppressTeaser>
+  <categories></categories>
+  <comments></comments>
+  <showcomments>true</showcomments>
+</post>
\ No newline at end of file
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json
index 39ab9c801..0a4d1b660 100644
--- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json
+++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json
@@ -1 +1 @@
-{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"73126636-c1ad-47c8-8f1d-9f229911e67a","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-12-13T08:41:39.832239Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""}
\ No newline at end of file
+{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"fb4ead8f-7afd-4cd9-84b0-3718d71fa575","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-11-27T08:52:25.2785938Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""}
\ No newline at end of file