diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
index ed8f9f7f56..4d7f9b1cee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
@@ -132,298 +132,6 @@ const coreExtensions: Array<ManifestTiptapExtension> = [
 ];
 
 const toolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Blockquote',
-		name: 'Blockquote Tiptap Extension',
-		api: () => import('./toolbar/blockquote.extension.js'),
-		weight: 995,
-		meta: {
-			alias: 'blockquote',
-			icon: 'icon-blockquote',
-			label: 'Blockquote',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Bold',
-		name: 'Bold Tiptap Extension',
-		api: () => import('./toolbar/bold.extension.js'),
-		weight: 999,
-		meta: {
-			alias: 'bold',
-			icon: 'icon-bold',
-			label: 'Bold',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.CodeBlock',
-		name: 'Code Block Tiptap Extension',
-		api: () => import('./toolbar/code-block.extension.js'),
-		weight: 994,
-		meta: {
-			alias: 'codeBlock',
-			icon: 'icon-code',
-			label: 'Code Block',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.BulletList',
-		name: 'Bullet List Tiptap Extension',
-		api: () => import('./toolbar/bullet-list.extension.js'),
-		weight: 993,
-		meta: {
-			alias: 'bulletList',
-			icon: 'icon-bulleted-list',
-			label: 'Bullet List',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.OrderedList',
-		name: 'Ordered List Tiptap Extension',
-		api: () => import('./toolbar/ordered-list.extension.js'),
-		weight: 992,
-		meta: {
-			alias: 'orderedList',
-			icon: 'icon-ordered-list',
-			label: 'Ordered List',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Redo',
-		name: 'Redo Tiptap Extension',
-		api: () => import('./toolbar/redo.extension.js'),
-		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
-		weight: 994,
-		meta: {
-			alias: 'redo',
-			icon: 'icon-redo',
-			label: 'Redo',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Strike',
-		name: 'Strike Tiptap Extension',
-		api: () => import('./toolbar/strike.extension.js'),
-		weight: 996,
-		meta: {
-			alias: 'strike',
-			icon: 'icon-strikethrough',
-			label: 'Strike',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Subscript',
-		name: 'Subscript Tiptap Extension',
-		api: () => import('./toolbar/subscript.extension.js'),
-		weight: 1010,
-		meta: {
-			alias: 'subscript',
-			icon: 'icon-subscript',
-			label: 'Subscript',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Superscript',
-		name: 'Superscript Tiptap Extension',
-		api: () => import('./toolbar/superscript.extension.js'),
-		weight: 1011,
-		meta: {
-			alias: 'superscript',
-			icon: 'icon-superscript',
-			label: 'Superscript',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Table',
-		name: 'Table Tiptap Extension',
-		api: () => import('./toolbar/table.extension.js'),
-		weight: 909,
-		meta: {
-			alias: 'table',
-			icon: 'icon-table',
-			label: 'Table',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Heading1',
-		name: 'Heading 1 Tiptap Extension',
-		api: () => import('./toolbar/heading1.extension.js'),
-		weight: 949,
-		meta: {
-			alias: 'heading1',
-			icon: 'icon-heading-1',
-			label: 'Heading 1',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Heading2',
-		name: 'Heading 2 Tiptap Extension',
-		api: () => import('./toolbar/heading2.extension.js'),
-		weight: 948,
-		meta: {
-			alias: 'heading2',
-			icon: 'icon-heading-2',
-			label: 'Heading 2',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Heading3',
-		name: 'Heading 3 Tiptap Extension',
-		api: () => import('./toolbar/heading3.extension.js'),
-		weight: 947,
-		meta: {
-			alias: 'heading3',
-			icon: 'icon-heading-3',
-			label: 'Heading 3',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.HorizontalRule',
-		name: 'Horizontal Rule Tiptap Extension',
-		api: () => import('./toolbar/horizontal-rule.extension.js'),
-		weight: 991,
-		meta: {
-			alias: 'horizontalRule',
-			icon: 'icon-horizontal-rule',
-			label: 'Horizontal Rule',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Italic',
-		name: 'Italic Tiptap Extension',
-		api: () => import('./toolbar/italic.extension.js'),
-		weight: 998,
-		meta: {
-			alias: 'italic',
-			icon: 'icon-italic',
-			label: 'Italic',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.TextAlignCenter',
-		name: 'Text Align Center Tiptap Extension',
-		api: () => import('./toolbar/text-align-center.extension.js'),
-		weight: 918,
-		meta: {
-			alias: 'text-align-center',
-			icon: 'icon-text-align-center',
-			label: 'Text Align Center',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.TextAlignJustify',
-		name: 'Text Align Justify Tiptap Extension',
-		api: () => import('./toolbar/text-align-justify.extension.js'),
-		weight: 916,
-		meta: {
-			alias: 'text-align-justify',
-			icon: 'icon-text-align-justify',
-			label: 'Text Align Justify',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.TextAlignLeft',
-		name: 'Text Align Left Tiptap Extension',
-		api: () => import('./toolbar/text-align-left.extension.js'),
-		weight: 919,
-		meta: {
-			alias: 'text-align-left',
-			icon: 'icon-text-align-left',
-			label: 'Text Align Left',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.TextAlignRight',
-		name: 'Text Align Right Tiptap Extension',
-		api: () => import('./toolbar/text-align-right.extension.js'),
-		weight: 917,
-		meta: {
-			alias: 'text-align-right',
-			icon: 'icon-text-align-right',
-			label: 'Text Align Right',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Underline',
-		name: 'Underline Tiptap Extension',
-		api: () => import('./toolbar/underline.extension.js'),
-		weight: 997,
-		meta: {
-			alias: 'underline',
-			icon: 'icon-underline',
-			label: 'Underline',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Undo',
-		name: 'Undo Tiptap Extension',
-		api: () => import('./toolbar/undo.extension.js'),
-		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
-		weight: 994,
-		meta: {
-			alias: 'undo',
-			icon: 'icon-undo',
-			label: 'Undo',
-		},
-	},
-	{
-		type: 'tiptapToolbarExtension',
-		kind: 'button',
-		alias: 'Umb.Tiptap.Toolbar.Unlink',
-		name: 'Unlink Tiptap Extension',
-		api: () => import('./toolbar/unlink.extension.js'),
-		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
-		weight: 101,
-		meta: {
-			alias: 'unlink',
-			icon: 'icon-unlink',
-			label: 'Unlink',
-		},
-	},
-];
-
-const umbToolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
 	{
 		type: 'tiptapToolbarExtension',
 		kind: 'button',
@@ -436,6 +144,174 @@ const umbToolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
 			label: '#general_viewSourceCode',
 		},
 	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Bold',
+		name: 'Bold Tiptap Extension',
+		api: () => import('./toolbar/bold.extension.js'),
+		meta: {
+			alias: 'bold',
+			icon: 'icon-bold',
+			label: 'Bold',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Italic',
+		name: 'Italic Tiptap Extension',
+		api: () => import('./toolbar/italic.extension.js'),
+		meta: {
+			alias: 'italic',
+			icon: 'icon-italic',
+			label: 'Italic',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Underline',
+		name: 'Underline Tiptap Extension',
+		api: () => import('./toolbar/underline.extension.js'),
+		meta: {
+			alias: 'underline',
+			icon: 'icon-underline',
+			label: 'Underline',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Strike',
+		name: 'Strike Tiptap Extension',
+		api: () => import('./toolbar/strike.extension.js'),
+		meta: {
+			alias: 'strike',
+			icon: 'icon-strikethrough',
+			label: 'Strike',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.TextAlignLeft',
+		name: 'Text Align Left Tiptap Extension',
+		api: () => import('./toolbar/text-align-left.extension.js'),
+		meta: {
+			alias: 'text-align-left',
+			icon: 'icon-text-align-left',
+			label: 'Text Align Left',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.TextAlignCenter',
+		name: 'Text Align Center Tiptap Extension',
+		api: () => import('./toolbar/text-align-center.extension.js'),
+		meta: {
+			alias: 'text-align-center',
+			icon: 'icon-text-align-center',
+			label: 'Text Align Center',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.TextAlignRight',
+		name: 'Text Align Right Tiptap Extension',
+		api: () => import('./toolbar/text-align-right.extension.js'),
+		meta: {
+			alias: 'text-align-right',
+			icon: 'icon-text-align-right',
+			label: 'Text Align Right',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.TextAlignJustify',
+		name: 'Text Align Justify Tiptap Extension',
+		api: () => import('./toolbar/text-align-justify.extension.js'),
+		meta: {
+			alias: 'text-align-justify',
+			icon: 'icon-text-align-justify',
+			label: 'Text Align Justify',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Heading1',
+		name: 'Heading 1 Tiptap Extension',
+		api: () => import('./toolbar/heading1.extension.js'),
+		meta: {
+			alias: 'heading1',
+			icon: 'icon-heading-1',
+			label: 'Heading 1',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Heading2',
+		name: 'Heading 2 Tiptap Extension',
+		api: () => import('./toolbar/heading2.extension.js'),
+		meta: {
+			alias: 'heading2',
+			icon: 'icon-heading-2',
+			label: 'Heading 2',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Heading3',
+		name: 'Heading 3 Tiptap Extension',
+		api: () => import('./toolbar/heading3.extension.js'),
+		meta: {
+			alias: 'heading3',
+			icon: 'icon-heading-3',
+			label: 'Heading 3',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.BulletList',
+		name: 'Bullet List Tiptap Extension',
+		api: () => import('./toolbar/bullet-list.extension.js'),
+		meta: {
+			alias: 'bulletList',
+			icon: 'icon-bulleted-list',
+			label: 'Bullet List',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.OrderedList',
+		name: 'Ordered List Tiptap Extension',
+		api: () => import('./toolbar/ordered-list.extension.js'),
+		meta: {
+			alias: 'orderedList',
+			icon: 'icon-ordered-list',
+			label: 'Ordered List',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Blockquote',
+		name: 'Blockquote Tiptap Extension',
+		api: () => import('./toolbar/blockquote.extension.js'),
+		meta: {
+			alias: 'blockquote',
+			icon: 'icon-blockquote',
+			label: 'Blockquote',
+		},
+	},
 	{
 		type: 'tiptapToolbarExtension',
 		kind: 'button',
@@ -448,6 +324,93 @@ const umbToolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
 			label: '#defaultdialogs_urlLinkPicker',
 		},
 	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Unlink',
+		name: 'Unlink Tiptap Extension',
+		api: () => import('./toolbar/unlink.extension.js'),
+		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
+		meta: {
+			alias: 'unlink',
+			icon: 'icon-unlink',
+			label: 'Unlink',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.CodeBlock',
+		name: 'Code Block Tiptap Extension',
+		api: () => import('./toolbar/code-block.extension.js'),
+		meta: {
+			alias: 'codeBlock',
+			icon: 'icon-code',
+			label: 'Code Block',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Subscript',
+		name: 'Subscript Tiptap Extension',
+		api: () => import('./toolbar/subscript.extension.js'),
+		meta: {
+			alias: 'subscript',
+			icon: 'icon-subscript',
+			label: 'Subscript',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Superscript',
+		name: 'Superscript Tiptap Extension',
+		api: () => import('./toolbar/superscript.extension.js'),
+		meta: {
+			alias: 'superscript',
+			icon: 'icon-superscript',
+			label: 'Superscript',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.HorizontalRule',
+		name: 'Horizontal Rule Tiptap Extension',
+		api: () => import('./toolbar/horizontal-rule.extension.js'),
+		meta: {
+			alias: 'horizontalRule',
+			icon: 'icon-horizontal-rule',
+			label: 'Horizontal Rule',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Undo',
+		name: 'Undo Tiptap Extension',
+		api: () => import('./toolbar/undo.extension.js'),
+		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
+		meta: {
+			alias: 'undo',
+			icon: 'icon-undo',
+			label: 'Undo',
+		},
+	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Redo',
+		name: 'Redo Tiptap Extension',
+		api: () => import('./toolbar/redo.extension.js'),
+		element: () => import('../components/toolbar/tiptap-toolbar-button-disabled.element.js'),
+		meta: {
+			alias: 'redo',
+			icon: 'icon-redo',
+			label: 'Redo',
+		},
+	},
 	{
 		type: 'tiptapToolbarExtension',
 		kind: 'button',
@@ -472,8 +435,20 @@ const umbToolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
 			label: '#general_embed',
 		},
 	},
+	{
+		type: 'tiptapToolbarExtension',
+		kind: 'button',
+		alias: 'Umb.Tiptap.Toolbar.Table',
+		name: 'Table Tiptap Extension',
+		api: () => import('./toolbar/table.extension.js'),
+		meta: {
+			alias: 'table',
+			icon: 'icon-table',
+			label: 'Table',
+		},
+	},
 ];
 
-const extensions = [...coreExtensions, ...toolbarExtensions, ...umbToolbarExtensions];
+const extensions = [...coreExtensions, ...toolbarExtensions];
 
 export const manifests = [...kinds, ...extensions];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts
index aafd570b89..ed1effb3cb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts
@@ -19,7 +19,6 @@ export const manifests: Array<ManifestTiptapExtension | ManifestTiptapToolbarExt
 		alias: 'Umb.Tiptap.Toolbar.BlockPicker',
 		name: 'Block Picker Tiptap Extension Button',
 		api: () => import('./block-picker-toolbar.extension.js'),
-		weight: 90,
 		meta: {
 			alias: 'umbblockpicker',
 			icon: 'icon-plugin',