diff --git a/15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/plugins.md b/15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/plugins.md
index 892834970d3..5f0a1c664c5 100644
--- a/15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/plugins.md
+++ b/15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/plugins.md
@@ -1,5 +1,5 @@
 ---
-description: Information on how to work with Tiptap plugins in the rich text editor.
+description: Information on how to work with TinyMCE plugins in the rich text editor.
 ---
 
 # Plugins
diff --git a/15/umbraco-forms/SUMMARY.md b/15/umbraco-forms/SUMMARY.md
index bc49db69108..711c3dfbb64 100644
--- a/15/umbraco-forms/SUMMARY.md
+++ b/15/umbraco-forms/SUMMARY.md
@@ -1,6 +1,7 @@
 # Table of contents
 
 * [Umbraco Forms Documentation](README.md)
+* [Legacy Documentation](legacy-documentation.md)
 * [Release Notes](release-notes.md)
 
 ## Installation
@@ -11,18 +12,62 @@
 ## Upgrading
 
 * [Upgrading Umbraco Forms](upgrading/manualupgrade.md)
-* [Version Specific Upgrade Notes](upgrading/version-specific/README.md)
-  * [Migration IDs](upgrading/version-specific/migration-ids.md)
+* [Version Specific Upgrade Notes](upgrading/version-specific.md)
+* [Migration IDs](upgrading/migration-ids.md)
 
 ## Editor
 
 * [Creating a Form - The basics](editor/creating-a-form/README.md)
+  * [Form Settings](editor/creating-a-form/form-settings.md)
+  * [Form Information](editor/creating-a-form/form-info.md)
+  * [Overview Of The Field Types](editor/creating-a-form/fieldtypes/README.md)
+    * [Date](editor/creating-a-form/fieldtypes/date.md)
+    * [File Upload](editor/creating-a-form/fieldtypes/fileupload.md)
+    * [reCAPTCHA V2](editor/creating-a-form/fieldtypes/recaptcha2.md)
+    * [reCAPTCHA V3](editor/creating-a-form/fieldtypes/recaptcha3.md)
+  * [Setting-up Conditional Logic on Fields](editor/creating-a-form/conditional-logic.md)
+* [Attaching Workflows](editor/attaching-workflows/README.md)
+  * [Workflow Types](editor/attaching-workflows/workflow-types.md)
+* [Viewing And Exporting Entries](editor/viewing-and-exporting-entries.md)
+* [Defining And Attaching Prevalue Sources](editor/defining-and-attaching-prevaluesources/README.md)
+  * [Prevalue Source Types Overview](editor/defining-and-attaching-prevaluesources/prevalue-source-types.md)
 
 ## Developer
 
 * [Property Editors](developer/property-editors.md)
 * [Preparing Your Frontend](developer/prepping-frontend.md)
+* [Rendering Forms](developer/rendering-forms.md)
+* [Rendering Forms Scripts](developer/rendering-scripts.md)
+* [Themes](developer/themes.md)
+* [Custom Markup](developer/custom-markup.md)
+* [Email Templates](developer/email-templates.md)
+* [Working With Record Data](developer/working-with-data.md)
+* [Umbraco Forms in the Database](developer/forms-in-the-database.md)
+* [Extending](developer/extending/README.md)
+  * [Adding A Type To The Provider Model](developer/extending/adding-a-type.md)
+    * [Setting Types](developer/extending/setting-types.md)
+  * [Adding A Field Type To Umbraco Forms](developer/extending/adding-a-fieldtype.md)
+    * [Excluding a built-in field](developer/extending/excluding-a-built-in-field.md)
+  * [Adding A Prevalue Source Type To Umbraco Forms](developer/extending/adding-a-prevaluesourcetype.md)
+  * [Adding A Workflow Type To Umbraco Forms](developer/extending/adding-a-workflowtype.md)
+  * [Adding An Export Type To Umbraco Forms](developer/extending/adding-a-exporttype.md)
+  * [Adding a Magic String Format Function](developer/extending/adding-a-magic-string-format-function.md)
+  * [Adding A Server-Side Notification Handler To Umbraco Forms](developer/extending/adding-an-event-handler.md)
+  * [Adding a Validation Pattern](developer/extending/adding-a-validation-pattern.md)
+  * [Customize Default Fields and Workflows For a Form](developer/extending/customize-default-workflows.md)
 * [Configuration](developer/configuration/README.md)
+  * [Forms Provider Type Details](developer/configuration/type-details.md)
+* [Webhooks](developer/webhooks.md)
+* [Security](developer/security.md)
+* [Magic Strings](developer/magic-strings.md)
+* [Health Checks](developer/healthchecks/README.md)
+  * [Apply keys and indexes](developer/healthchecks/apply-keys.md)
+  * [Apply keys and indexes for forms in the database](developer/healthchecks/forms-in-the-database-apply-keys.md)
+* [Localization](developer/localization.md)
+* [Headless/AJAX Forms](developer/ajaxforms.md)
+* [Block List Labels](developer/blocklistfilters.md)
+* [Field Types](developer/field-types.md)
+* [Storing Prevalue Text Files With IPreValueTextFileStorage](developer/iprevaluetextfilestorage.md)
 
 ## Tutorials
 
diff --git a/15/umbraco-forms/upgrading/version-specific/migration-ids.md b/15/umbraco-forms/upgrading/migration-ids.md
similarity index 100%
rename from 15/umbraco-forms/upgrading/version-specific/migration-ids.md
rename to 15/umbraco-forms/upgrading/migration-ids.md
diff --git a/15/umbraco-forms/upgrading/version-specific/README.md b/15/umbraco-forms/upgrading/version-specific.md
similarity index 100%
rename from 15/umbraco-forms/upgrading/version-specific/README.md
rename to 15/umbraco-forms/upgrading/version-specific.md