diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a0f13f1c3c..ced8f384bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -173,17 +173,17 @@ tests of all packages.
 
 > **IMPORTANT**: Avoid use of external libraries to ensure your custom nodes can be reviewed and merged quickly.
 
-Learn about [using the node dev CLI](https://docs.n8n.io/nodes/creating-nodes/node-dev-cli.html) to create custom nodes for n8n.
+Learn about [using the node dev CLI](https://docs.n8n.io/integrations/creating-nodes/archive/node-developer-cli/) to create custom nodes for n8n.
 
 More information can be found in the documentation of [n8n-node-dev](https://github.com/n8n-io/n8n/tree/master/packages/node-dev), a small CLI which helps with n8n-node-development.
 
 ## Create a new node to contribute to n8n
 
-Follow this tutorial on [creating your first node](https://docs.n8n.io/nodes/creating-nodes/create-node.html) for n8n.
+Follow this tutorial on [creating your first node](https://docs.n8n.io/integrations/creating-nodes/build/) for n8n.
 
 ## Checklist before submitting a new node
 
-There are several things to keep in mind when creating a node. To help you, we prepared a [checklist](https://docs.n8n.io/nodes/creating-nodes/node-review-checklist.html) that covers the requirements for creating nodes, from preparation to submission. This will help us be quicker to review and merge your PR.
+There are several things to keep in mind when creating a node. To help you, we prepared a [checklist](https://docs.n8n.io/integrations/creating-nodes/build/reference/) that covers the requirements for creating nodes, from preparation to submission. This will help us be quicker to review and merge your PR.
 
 ## Extend documentation
 
diff --git a/package-lock.json b/package-lock.json
index eb76f1bcbe..8b3bf13646 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7745,6 +7745,15 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@types/lodash.pick": {
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.7.tgz",
+      "integrity": "sha512-HgdyKz7/1+oeoVzbpu1XiX/Bti9AUksHtOILH38T07aKvqoirzcdOsrO2+Yg3L51Hv/8m1MetvHZEUGeABiTiQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/lodash.set": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.7.tgz",
@@ -27700,6 +27709,11 @@
       "resolved": "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz",
       "integrity": "sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="
     },
+    "node_modules/lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="
+    },
     "node_modules/lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
@@ -46352,6 +46366,7 @@
         "lodash.intersection": "^4.4.0",
         "lodash.merge": "^4.6.2",
         "lodash.omit": "^4.5.0",
+        "lodash.pick": "^4.4.0",
         "lodash.set": "^4.3.2",
         "lodash.split": "^4.4.2",
         "lodash.unset": "^4.5.2",
@@ -46407,6 +46422,7 @@
         "@types/lodash.intersection": "^4.4.7",
         "@types/lodash.merge": "^4.6.6",
         "@types/lodash.omit": "^4.5.7",
+        "@types/lodash.pick": "^4.4.7",
         "@types/lodash.set": "^4.3.6",
         "@types/lodash.split": "^4.4.7",
         "@types/lodash.unset": "^4.5.7",
@@ -54198,6 +54214,15 @@
         "@types/lodash": "*"
       }
     },
+    "@types/lodash.pick": {
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.7.tgz",
+      "integrity": "sha512-HgdyKz7/1+oeoVzbpu1XiX/Bti9AUksHtOILH38T07aKvqoirzcdOsrO2+Yg3L51Hv/8m1MetvHZEUGeABiTiQ==",
+      "dev": true,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
     "@types/lodash.set": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.7.tgz",
@@ -69989,6 +70014,11 @@
       "resolved": "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz",
       "integrity": "sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="
     },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="
+    },
     "lodash.set": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
@@ -71530,6 +71560,7 @@
         "@types/lodash.intersection": "^4.4.7",
         "@types/lodash.merge": "^4.6.6",
         "@types/lodash.omit": "^4.5.7",
+        "@types/lodash.pick": "*",
         "@types/lodash.set": "^4.3.6",
         "@types/lodash.split": "^4.4.7",
         "@types/lodash.unset": "^4.5.7",
@@ -71582,6 +71613,7 @@
         "lodash.intersection": "^4.4.0",
         "lodash.merge": "^4.6.2",
         "lodash.omit": "^4.5.0",
+        "lodash.pick": "^4.4.0",
         "lodash.set": "^4.3.2",
         "lodash.split": "^4.4.2",
         "lodash.unset": "^4.5.2",
diff --git a/packages/cli/README.md b/packages/cli/README.md
index b4ef420e47..8c4b1db014 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -113,7 +113,7 @@ You can find additional information and example workflows on the [n8n.io](https:
 
 ## Create Custom Nodes
 
-You can create custom nodes for n8n. Follow the instructions mentioned in the documentation to create your node: [Creating nodes](https://docs.n8n.io/nodes/creating-nodes/create-node.html)
+You can create custom nodes for n8n. Follow the instructions mentioned in the documentation to create your node: [Creating nodes](https://docs.n8n.io/integrations/creating-nodes/build/)
 
 ## Contributing
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index b393035cab..4d9761a565 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -78,6 +78,7 @@
     "@types/lodash.intersection": "^4.4.7",
     "@types/lodash.merge": "^4.6.6",
     "@types/lodash.omit": "^4.5.7",
+    "@types/lodash.pick": "^4.4.7",
     "@types/lodash.set": "^4.3.6",
     "@types/lodash.split": "^4.4.7",
     "@types/lodash.unset": "^4.5.7",
@@ -142,6 +143,7 @@
     "lodash.intersection": "^4.4.0",
     "lodash.merge": "^4.6.2",
     "lodash.omit": "^4.5.0",
+    "lodash.pick": "^4.4.0",
     "lodash.set": "^4.3.2",
     "lodash.split": "^4.4.2",
     "lodash.unset": "^4.5.2",
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index f75f289d99..379f21b8d7 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -31,6 +31,7 @@ import {
 } from 'fs/promises';
 import glob from 'fast-glob';
 import path from 'path';
+import pick from 'lodash.pick';
 import { IN8nNodePackageJson } from './Interfaces';
 import { getLogger } from './Logger';
 import config from '../config';
@@ -428,19 +429,23 @@ class LoadNodesAndCredentialsClass {
 	}
 
 	/**
-	 * Retrieves `categories`, `subcategories` and alias (if defined)
-	 * from the codex data for the node at the given file path.
+	 * Retrieves `categories`, `subcategories`, partial `resources` and
+	 * alias (if defined) from the codex data for the node at the given file path.
 	 *
 	 * @param {string} filePath The file path to a `*.node.js` file
 	 * @returns {CodexData}
 	 */
 	getCodex(filePath: string): CodexData {
 		// eslint-disable-next-line global-require, import/no-dynamic-require, @typescript-eslint/no-var-requires
-		const { categories, subcategories, alias } = require(`${filePath}on`); // .js to .json
+		const { categories, subcategories, resources: allResources, alias } = require(`${filePath}on`); // .js to .json
+
+		const resources = pick(allResources, ['primaryDocumentation', 'credentialDocumentation']);
+
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 		return {
 			...(categories && { categories }),
 			...(subcategories && { subcategories }),
+			...(resources && { resources }),
 			...(alias && { alias }),
 		};
 	}
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index ac160d6a34..61880466d6 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -100,8 +100,8 @@ import OauthButton from './OauthButton.vue';
 import { restApi } from '@/components/mixins/restApi';
 import { addCredentialTranslation } from '@/plugins/i18n';
 import mixins from 'vue-typed-mixins';
-import {EnterpriseEditionFeature} from '@/constants';
-import {IPermissions} from "@/permissions";
+import { BUILTIN_CREDENTIALS_DOCS_URL, EnterpriseEditionFeature } from '@/constants';
+import { IPermissions } from "@/permissions";
 
 export default mixins(restApi).extend({
 	name: 'CredentialConfig',
@@ -206,9 +206,9 @@ export default mixins(restApi).extend({
 				return type.documentationUrl;
 			}
 
-			return  isCommunityNode ?
+			return isCommunityNode ?
 				'' : // Don't show documentation link for community nodes if the URL is not an absolute path
-				`https://docs.n8n.io/credentials/${type.documentationUrl}/?utm_source=n8n_app&utm_medium=left_nav_menu&utm_campaign=create_new_credentials_modal`;
+				`${BUILTIN_CREDENTIALS_DOCS_URL}${type.documentationUrl}/?utm_source=n8n_app&utm_medium=left_nav_menu&utm_campaign=create_new_credentials_modal`;
 		},
 		isGoogleOAuthType(): boolean {
 			return this.credentialTypeName === 'googleOAuth2Api' || this.parentTypes.includes('googleOAuth2Api');
diff --git a/packages/editor-ui/src/components/NodeSettingsTabs.vue b/packages/editor-ui/src/components/NodeSettingsTabs.vue
index 41c6ad84cd..df824ea7df 100644
--- a/packages/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/editor-ui/src/components/NodeSettingsTabs.vue
@@ -1,15 +1,10 @@
 <template>
-	<n8n-tabs
-		:options="options"
-		:value="value"
-		@input="onTabSelect"
-		@tooltipClick="onTooltipClick"
-	/>
+	<n8n-tabs :options="options" :value="value" @input="onTabSelect" @tooltipClick="onTooltipClick" />
 </template>
 
 <script lang="ts">
 import { externalHooks } from '@/components/mixins/externalHooks';
-import { COMMUNITY_NODES_INSTALLATION_DOCS_URL, NPM_PACKAGE_DOCS_BASE_URL } from '@/constants';
+import { BUILTIN_NODES_DOCS_URL, COMMUNITY_NODES_INSTALLATION_DOCS_URL, NPM_PACKAGE_DOCS_BASE_URL } from '@/constants';
 import { INodeUi, ITab } from '@/Interface';
 import { INodeTypeDescription } from 'n8n-workflow';
 
@@ -45,11 +40,21 @@ export default mixins(
 				return nodeType.documentationUrl;
 			}
 
-			if (nodeType.documentationUrl || (nodeType.name && nodeType.name.startsWith('n8n-nodes-base'))) {
-				return 'https://docs.n8n.io/nodes/' + (nodeType.documentationUrl || nodeType.name) + '?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=' + nodeType.name;
+			const utmTags = '?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link' +
+				'&utm_campaign=' + nodeType.name;
+
+			// Built-in node documentation available via its codex entry
+			const primaryDocUrl = nodeType.codex?.resources?.primaryDocumentation?.[0]?.url;
+			if (primaryDocUrl) {
+				return primaryDocUrl + utmTags;
 			}
 
-			return this.isCommunityNode ? `${NPM_PACKAGE_DOCS_BASE_URL}${nodeType.name.split('.')[0]}` : '';
+			if (this.isCommunityNode) {
+				return `${NPM_PACKAGE_DOCS_BASE_URL}${nodeType.name.split('.')[0]}`;
+			}
+
+			// Fallback to the root of the node documentation
+			return BUILTIN_NODES_DOCS_URL + utmTags;
 		},
 		isCommunityNode(): boolean {
 			const nodeType = this.nodeType as INodeTypeDescription | null;
diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
index ac4c7dad89..3b70edd24b 100644
--- a/packages/editor-ui/src/components/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -248,7 +248,7 @@ export const pushConnection = mixins(
 						this.$titleSet(workflow.name as string, 'IDLE');
 						this.$showToast({
 							title: 'Workflow started waiting',
-							message: `${action} <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait/" target="_blank">More info</a>`,
+							message: `${action} <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a>`,
 							type: 'success',
 							duration: 0,
 						});
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index a6ea3f21c1..3569541e8e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -55,6 +55,8 @@ export const BREAKPOINT_LG = 1200;
 export const BREAKPOINT_XL = 1920;
 
 export const N8N_IO_BASE_URL = `https://api.n8n.io/api/`;
+export const BUILTIN_NODES_DOCS_URL = `https://docs.n8n.io/integrations/builtin/`;
+export const BUILTIN_CREDENTIALS_DOCS_URL = `https://docs.n8n.io/integrations/builtin/credentials/`;
 export const DATA_PINNING_DOCS_URL = 'https://docs.n8n.io/data/data-pinning/';
 export const DATA_EDITING_DOCS_URL = 'https://docs.n8n.io/data/data-editing/';
 export const NPM_COMMUNITY_NODE_SEARCH_API_URL = `https://api.npms.io/v2/`;
@@ -67,6 +69,7 @@ export const COMMUNITY_NODES_RISKS_DOCS_URL = `https://docs.n8n.io/integrations/
 export const COMMUNITY_NODES_BLOCKLIST_DOCS_URL = `https://docs.n8n.io/integrations/community-nodes/blocklist/`;
 export const CUSTOM_NODES_DOCS_URL = `https://docs.n8n.io/integrations/creating-nodes/code/create-n8n-nodes-module/`;
 
+
 // node types
 export const BAMBOO_HR_NODE_TYPE = 'n8n-nodes-base.bambooHr';
 export const CALENDLY_TRIGGER_NODE_TYPE = 'n8n-nodes-base.calendlyTrigger';
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 34d85399ba..a34d3671d1 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1,147 +1,66 @@
 <template>
-	<div
-		class="node-view-root"
-	 	@dragover="onDragOver"
-	 	@drop="onDrop"
-	>
-		<div
-			class="node-view-wrapper"
-			:class="workflowClasses"
-			@touchstart="mouseDown"
-			@touchend="mouseUp"
-			@touchmove="mouseMoveNodeWorkflow"
-			@mousedown="mouseDown"
-			v-touch:tap="touchTap"
-			@mouseup="mouseUp"
-			@wheel="wheelScroll"
-		>
+	<div class="node-view-root" @dragover="onDragOver" @drop="onDrop">
+		<div class="node-view-wrapper" :class="workflowClasses" @touchstart="mouseDown" @touchend="mouseUp"
+			@touchmove="mouseMoveNodeWorkflow" @mousedown="mouseDown" v-touch:tap="touchTap" @mouseup="mouseUp"
+			@wheel="wheelScroll">
 			<div id="node-view-background" class="node-view-background" :style="backgroundStyle" />
-			<div
-				id="node-view"
-				class="node-view"
-				:style="workflowStyle"
-			>
+			<div id="node-view" class="node-view" :style="workflowStyle">
 				<div v-for="nodeData in nodes" :key="nodeData.id">
-					<node
-						v-if="nodeData.type !== STICKY_NODE_TYPE"
-						@duplicateNode="duplicateNode"
-						@deselectAllNodes="deselectAllNodes"
-						@deselectNode="nodeDeselectedByName"
-						@nodeSelected="nodeSelectedByName"
-						@removeNode="removeNode"
-						@runWorkflow="onRunNode"
-						@moved="onNodeMoved"
-						@run="onNodeRun"
-						:key="nodeData.id"
-						:name="nodeData.name"
-						:isReadOnly="isReadOnly"
-						:instance="instance"
-						:isActive="!!activeNode && activeNode.name === nodeData.name"
-						:hideActions="pullConnActive"
-					/>
-					<Sticky
-						v-else
-						@deselectAllNodes="deselectAllNodes"
-						@deselectNode="nodeDeselectedByName"
-						@nodeSelected="nodeSelectedByName"
-						@removeNode="removeNode"
-						:key="nodeData.id"
-						:name="nodeData.name"
-						:isReadOnly="isReadOnly"
-						:instance="instance"
-						:isActive="!!activeNode && activeNode.name === nodeData.name"
-						:nodeViewScale="nodeViewScale"
-						:gridSize="GRID_SIZE"
-						:hideActions="pullConnActive"
-					/>
+					<node v-if="nodeData.type !== STICKY_NODE_TYPE" @duplicateNode="duplicateNode"
+						@deselectAllNodes="deselectAllNodes" @deselectNode="nodeDeselectedByName" @nodeSelected="nodeSelectedByName"
+						@removeNode="removeNode" @runWorkflow="onRunNode" @moved="onNodeMoved" @run="onNodeRun" :key="nodeData.id"
+						:name="nodeData.name" :isReadOnly="isReadOnly" :instance="instance"
+						:isActive="!!activeNode && activeNode.name === nodeData.name" :hideActions="pullConnActive" />
+					<Sticky v-else @deselectAllNodes="deselectAllNodes" @deselectNode="nodeDeselectedByName"
+						@nodeSelected="nodeSelectedByName" @removeNode="removeNode" :key="nodeData.id" :name="nodeData.name"
+						:isReadOnly="isReadOnly" :instance="instance" :isActive="!!activeNode && activeNode.name === nodeData.name"
+						:nodeViewScale="nodeViewScale" :gridSize="GRID_SIZE" :hideActions="pullConnActive" />
 				</div>
 			</div>
 		</div>
-		<NodeDetailsView :readOnly="isReadOnly" :renaming="renamingActive" @valueChanged="valueChanged"/>
-		<div
-			:class="['node-buttons-wrapper', showStickyButton ? 'no-events' : '']"
-			v-if="!createNodeActive && !isReadOnly"
-			@mouseenter="onCreateMenuHoverIn"
-		>
+		<NodeDetailsView :readOnly="isReadOnly" :renaming="renamingActive" @valueChanged="valueChanged" />
+		<div :class="['node-buttons-wrapper', showStickyButton ? 'no-events' : '']" v-if="!createNodeActive && !isReadOnly"
+			@mouseenter="onCreateMenuHoverIn">
 			<div class="node-creator-button">
-				<n8n-icon-button
-					size="xlarge"
-					icon="plus"
-					@click="() => openNodeCreator('add_node_button')" :title="$locale.baseText('nodeView.addNode')"
-				/>
-				<div
-					:class="['add-sticky-button', showStickyButton ? 'visible-button' : '']"
-					@click="addStickyNote"
-				>
-					<n8n-icon-button
-						size="medium"
-						type="secondary"
-						:icon="['far', 'note-sticky']"
-						:title="$locale.baseText('nodeView.addSticky')"
-					/>
+				<n8n-icon-button size="xlarge" icon="plus" @click="() => openNodeCreator('add_node_button')"
+					:title="$locale.baseText('nodeView.addNode')" />
+				<div :class="['add-sticky-button', showStickyButton ? 'visible-button' : '']" @click="addStickyNote">
+					<n8n-icon-button size="medium" type="secondary" :icon="['far', 'note-sticky']"
+						:title="$locale.baseText('nodeView.addSticky')" />
 				</div>
 			</div>
 		</div>
-		<node-creator
-			:active="createNodeActive"
-			@nodeTypeSelected="nodeTypeSelected"
-			@closeNodeCreator="closeNodeCreator"
-		/>
-		<div :class="{ 'zoom-menu': true, 'regular-zoom-menu': !isDemo, 'demo-zoom-menu': isDemo, expanded: !sidebarMenuCollapsed }">
-			<n8n-icon-button @click="zoomToFit" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomToFit')" icon="expand" />
-			<n8n-icon-button @click="zoomIn" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomIn')" icon="search-plus" />
-			<n8n-icon-button @click="zoomOut" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomOut')" icon="search-minus" />
-			<n8n-icon-button
-				v-if="nodeViewScale !== 1 && !isDemo"
-				@click="resetZoom"
-				type="tertiary"
-				size="large"
-				:title="$locale.baseText('nodeView.resetZoom')"
-				icon="undo"
-			/>
+		<node-creator :active="createNodeActive" @nodeTypeSelected="nodeTypeSelected"
+			@closeNodeCreator="closeNodeCreator" />
+		<div
+			:class="{ 'zoom-menu': true, 'regular-zoom-menu': !isDemo, 'demo-zoom-menu': isDemo, expanded: !sidebarMenuCollapsed }">
+			<n8n-icon-button @click="zoomToFit" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomToFit')"
+				icon="expand" />
+			<n8n-icon-button @click="zoomIn" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomIn')"
+				icon="search-plus" />
+			<n8n-icon-button @click="zoomOut" type="tertiary" size="large" :title="$locale.baseText('nodeView.zoomOut')"
+				icon="search-minus" />
+			<n8n-icon-button v-if="nodeViewScale !== 1 && !isDemo" @click="resetZoom" type="tertiary" size="large"
+				:title="$locale.baseText('nodeView.resetZoom')" icon="undo" />
 		</div>
 		<div class="workflow-execute-wrapper" v-if="!isReadOnly">
-			<n8n-button
-				@click.stop="onRunWorkflow"
-				:loading="workflowRunning"
-				:label="runButtonText"
-				:title="$locale.baseText('nodeView.executesTheWorkflowFromTheStartOrWebhookNode')"
-				size="large"
-				icon="play-circle"
-				type="primary"
-			/>
+			<n8n-button @click.stop="onRunWorkflow" :loading="workflowRunning" :label="runButtonText"
+				:title="$locale.baseText('nodeView.executesTheWorkflowFromTheStartOrWebhookNode')" size="large"
+				icon="play-circle" type="primary" />
 
-			<n8n-icon-button
-				v-if="workflowRunning === true && !executionWaitingForWebhook"
-				icon="stop"
-				size="large"
-				class="stop-execution"
-				type="secondary"
-				:title="stopExecutionInProgress
+			<n8n-icon-button v-if="workflowRunning === true && !executionWaitingForWebhook" icon="stop" size="large"
+				class="stop-execution" type="secondary" :title="stopExecutionInProgress
 					? $locale.baseText('nodeView.stoppingCurrentExecution')
 					: $locale.baseText('nodeView.stopCurrentExecution')
-				"
-				:loading="stopExecutionInProgress"
-				@click.stop="stopExecution()"
-			/>
+				" :loading="stopExecutionInProgress" @click.stop="stopExecution()" />
 
-			<n8n-icon-button
-				v-if="workflowRunning === true && executionWaitingForWebhook === true"
-				class="stop-execution"
-				icon="stop"
-				size="large"
-				:title="$locale.baseText('nodeView.stopWaitingForWebhookCall')"
-				type="secondary"
-				@click.stop="stopWaitingForWebhook()"
-			/>
+			<n8n-icon-button v-if="workflowRunning === true && executionWaitingForWebhook === true" class="stop-execution"
+				icon="stop" size="large" :title="$locale.baseText('nodeView.stopWaitingForWebhookCall')" type="secondary"
+				@click.stop="stopWaitingForWebhook()" />
 
-			<n8n-icon-button
-				v-if="!isReadOnly && workflowExecution && !workflowRunning"
-				:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
-				icon="trash"
-				size="large"
-				@click.stop="clearExecutionData()"
-			/>
+			<n8n-icon-button v-if="!isReadOnly && workflowExecution && !workflowRunning"
+				:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')" icon="trash" size="large"
+				@click.stop="clearExecutionData()" />
 		</div>
 	</div>
 </template>
@@ -238,7 +157,7 @@ import '../plugins/N8nCustomConnectorType';
 import '../plugins/PlusEndpointType';
 import { getAccountAge } from '@/modules/userHelpers';
 import { IUser } from 'n8n-design-system';
-import {dataPinningEventBus} from "@/event-bus/data-pinning-event-bus";
+import { dataPinningEventBus } from "@/event-bus/data-pinning-event-bus";
 import { debounceHelper } from '@/components/mixins/debounce';
 
 interface AddNodeOptions {
@@ -277,12 +196,12 @@ export default mixins(
 		watch: {
 			// Listen to route changes and load the workflow accordingly
 			'$route': 'initView',
-			activeNode () {
+			activeNode() {
 				// When a node gets set as active deactivate the create-menu
 				this.createNodeActive = false;
 			},
 			nodes: {
-				async handler (value, oldValue) {
+				async handler(value, oldValue) {
 					// Load a workflow
 					let workflowId = null as string | null;
 					if (this.$route && this.$route.params.name) {
@@ -292,7 +211,7 @@ export default mixins(
 				deep: true,
 			},
 			connections: {
-				async handler (value, oldValue) {
+				async handler(value, oldValue) {
 					// Load a workflow
 					let workflowId = null as string | null;
 					if (this.$route && this.$route.params.name) {
@@ -305,7 +224,7 @@ export default mixins(
 		},
 		async beforeRouteLeave(to, from, next) {
 			const result = this.$store.getters.getStateIsDirty;
-			if(result) {
+			if (result) {
 				const confirmModal = await this.confirmModal(
 					this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
 					this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
@@ -341,29 +260,29 @@ export default mixins(
 			...mapGetters('settings', [
 				'isOnboardingCallPromptFeatureEnabled',
 			]),
-			defaultLocale (): string {
+			defaultLocale(): string {
 				return this.$store.getters.defaultLocale;
 			},
 			isEnglishLocale(): boolean {
 				return this.defaultLocale === 'en';
 			},
 			...mapGetters(['nativelyNumberSuffixedDefaults']),
-			activeNode (): INodeUi | null {
+			activeNode(): INodeUi | null {
 				return this.$store.getters.activeNode;
 			},
-			executionWaitingForWebhook (): boolean {
+			executionWaitingForWebhook(): boolean {
 				return this.$store.getters.executionWaitingForWebhook;
 			},
-			isDemo (): boolean {
+			isDemo(): boolean {
 				return this.$route.name === VIEWS.DEMO;
 			},
-			lastSelectedNode (): INodeUi | null {
+			lastSelectedNode(): INodeUi | null {
 				return this.$store.getters.lastSelectedNode;
 			},
-			nodes (): INodeUi[] {
+			nodes(): INodeUi[] {
 				return this.$store.getters.allNodes;
 			},
-			runButtonText (): string {
+			runButtonText(): string {
 				if (this.workflowRunning === false) {
 					return this.$locale.baseText('nodeView.runButtonText.executeWorkflow');
 				}
@@ -374,17 +293,17 @@ export default mixins(
 
 				return this.$locale.baseText('nodeView.runButtonText.executingWorkflow');
 			},
-			workflowStyle (): object {
+			workflowStyle(): object {
 				const offsetPosition = this.$store.getters.getNodeViewOffsetPosition;
 				return {
 					left: offsetPosition[0] + 'px',
 					top: offsetPosition[1] + 'px',
 				};
 			},
-			backgroundStyle (): object {
+			backgroundStyle(): object {
 				return CanvasHelpers.getBackgroundStyles(this.nodeViewScale, this.$store.getters.getNodeViewOffsetPosition);
 			},
-			workflowClasses () {
+			workflowClasses() {
 				const returnClasses = [];
 				if (this.ctrlKeyPressed === true) {
 					if (this.$store.getters.isNodeViewMoveInProgress === true) {
@@ -399,14 +318,14 @@ export default mixins(
 				}
 				return returnClasses;
 			},
-			workflowExecution (): IExecutionResponse | null {
+			workflowExecution(): IExecutionResponse | null {
 				return this.$store.getters.getWorkflowExecution;
 			},
-			workflowRunning (): boolean {
+			workflowRunning(): boolean {
 				return this.$store.getters.isActionActive('workflowRunning');
 			},
 		},
-		data () {
+		data() {
 			return {
 				GRID_SIZE: CanvasHelpers.GRID_SIZE,
 				STICKY_NODE_TYPE,
@@ -427,7 +346,7 @@ export default mixins(
 				showStickyButton: false,
 			};
 		},
-		beforeDestroy () {
+		beforeDestroy() {
 			this.resetWorkspace();
 			// Make sure the event listeners get removed again else we
 			// could add up with them registred multiple times
@@ -464,7 +383,7 @@ export default mixins(
 				// Once the popup menu is hovered, it's pointer events are disabled so it's not interfering with element underneath it.
 				this.showStickyButton = true;
 				const moveCallback = (mousemoveEvent: MouseEvent) => {
-					if(buttonsWrapper) {
+					if (buttonsWrapper) {
 						const wrapperBounds = buttonsWrapper.getBoundingClientRect();
 						const wrapperH = wrapperBounds.height;
 						const wrapperW = wrapperBounds.width;
@@ -473,7 +392,7 @@ export default mixins(
 						const wrapperTopNear = wrapperBounds.top;
 						const wrapperTopFar = wrapperTopNear + wrapperH;
 						const inside = ((mousemoveEvent.pageX > wrapperLeftNear && mousemoveEvent.pageX < wrapperLeftFar) && (mousemoveEvent.pageY > wrapperTopNear && mousemoveEvent.pageY < wrapperTopFar));
-						if(!inside) {
+						if (!inside) {
 							this.showStickyButton = false;
 							document.removeEventListener('mousemove', moveCallback, false);
 						}
@@ -481,7 +400,7 @@ export default mixins(
 				};
 				document.addEventListener('mousemove', moveCallback, false);
 			},
-			clearExecutionData () {
+			clearExecutionData() {
 				this.$store.commit('setWorkflowExecutionData', null);
 				this.updateNodesExecutionIssues();
 			},
@@ -495,7 +414,7 @@ export default mixins(
 				originalName,
 				additionalUsedNames = [],
 				type = '',
-			} : {
+			}: {
 				originalName: string,
 				additionalUsedNames?: string[],
 				type?: string,
@@ -555,16 +474,16 @@ export default mixins(
 
 				return uniqueName;
 			},
-			async onSaveKeyboardShortcut () {
+			async onSaveKeyboardShortcut() {
 				const saved = await this.saveCurrentWorkflow();
 				if (saved) this.$store.dispatch('settings/fetchPromptsData');
 			},
-			openNodeCreator (source: string) {
+			openNodeCreator(source: string) {
 				this.createNodeActive = true;
 				this.$externalHooks().run('nodeView.createNodeActiveChanged', { source, createNodeActive: this.createNodeActive });
 				this.$telemetry.trackNodesPanel('nodeView.createNodeActiveChanged', { source, workflow_id: this.$store.getters.workflowId, createNodeActive: this.createNodeActive });
 			},
-			async openExecution (executionId: string) {
+			async openExecution(executionId: string) {
 				this.resetWorkspace();
 
 				let data: IExecutionResponse | undefined;
@@ -582,7 +501,7 @@ export default mixins(
 					throw new Error(`Execution with id "${executionId}" could not be found!`);
 				}
 
-				this.$store.commit('setWorkflowName', {newName: data.workflowData.name, setStateDirty: false});
+				this.$store.commit('setWorkflowName', { newName: data.workflowData.name, setStateDirty: false });
 				this.$store.commit('setWorkflowId', PLACEHOLDER_EMPTY_WORKFLOW_ID);
 
 				this.$store.commit('setWorkflowExecutionData', data);
@@ -636,13 +555,13 @@ export default mixins(
 				if ((data as IExecutionsSummary).waitTill) {
 					this.$showMessage({
 						title: this.$locale.baseText('nodeView.thisExecutionHasntFinishedYet'),
-						message: `<a data-action="reload">${this.$locale.baseText('nodeView.refresh')}</a> ${this.$locale.baseText('nodeView.toSeeTheLatestStatus')}.<br/> <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait/" target="_blank">${this.$locale.baseText('nodeView.moreInfo')}</a>`,
+						message: `<a data-action="reload">${this.$locale.baseText('nodeView.refresh')}</a> ${this.$locale.baseText('nodeView.toSeeTheLatestStatus')}.<br/> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">${this.$locale.baseText('nodeView.moreInfo')}</a>`,
 						type: 'warning',
 						duration: 0,
 					});
 				}
 			},
-			async importWorkflowExact(data: {workflow: IWorkflowDataUpdate}) {
+			async importWorkflowExact(data: { workflow: IWorkflowDataUpdate }) {
 				if (!data.workflow.nodes || !data.workflow.connections) {
 					throw new Error('Invalid workflow object');
 				}
@@ -659,7 +578,7 @@ export default mixins(
 					this.zoomToFit();
 				});
 			},
-			async openWorkflowTemplate (templateId: string) {
+			async openWorkflowTemplate(templateId: string) {
 				this.setLoadingText(this.$locale.baseText('nodeView.loadingTemplate'));
 				this.resetWorkspace();
 
@@ -696,7 +615,7 @@ export default mixins(
 
 				this.$externalHooks().run('template.open', { templateId, templateName: data.name, workflow: data.workflow });
 			},
-			async openWorkflow (workflowId: string) {
+			async openWorkflow(workflowId: string) {
 				this.resetWorkspace();
 
 				let data: IWorkflowDb | undefined;
@@ -721,7 +640,7 @@ export default mixins(
 
 				this.$store.commit('setActive', data.active || false);
 				this.$store.commit('setWorkflowId', workflowId);
-				this.$store.commit('setWorkflowName', {newName: data.name, setStateDirty: false});
+				this.$store.commit('setWorkflowName', { newName: data.name, setStateDirty: false });
 				this.$store.commit('setWorkflowSettings', data.settings || {});
 				this.$store.commit('setWorkflowPinData', data.pinData || {});
 
@@ -742,12 +661,12 @@ export default mixins(
 
 				return data;
 			},
-			touchTap (e: MouseEvent | TouchEvent) {
+			touchTap(e: MouseEvent | TouchEvent) {
 				if (this.isTouchDevice) {
 					this.mouseDown(e);
 				}
 			},
-			mouseDown (e: MouseEvent | TouchEvent) {
+			mouseDown(e: MouseEvent | TouchEvent) {
 				// Save the location of the mouse click
 				this.lastClickPosition = this.getMousePositionWithinNodeView(e);
 
@@ -757,11 +676,11 @@ export default mixins(
 				// Hide the node-creator
 				this.createNodeActive = false;
 			},
-			mouseUp (e: MouseEvent) {
+			mouseUp(e: MouseEvent) {
 				this.mouseUpMouseSelect(e);
 				this.mouseUpMoveWorkflow(e);
 			},
-			wheelScroll (e: WheelEvent) {
+			wheelScroll(e: WheelEvent) {
 				//* Control + scroll zoom
 				if (e.ctrlKey) {
 					if (e.deltaY > 0) {
@@ -775,12 +694,12 @@ export default mixins(
 				}
 				this.wheelMoveWorkflow(e);
 			},
-			keyUp (e: KeyboardEvent) {
+			keyUp(e: KeyboardEvent) {
 				if (e.key === this.controlKeyCode) {
 					this.ctrlKeyPressed = false;
 				}
 			},
-			async keyDown (e: KeyboardEvent) {
+			async keyDown(e: KeyboardEvent) {
 				// @ts-ignore
 				const path = e.path || (e.composedPath && e.composedPath());
 
@@ -1012,14 +931,14 @@ export default mixins(
 				}
 			},
 
-			deactivateSelectedNode () {
+			deactivateSelectedNode() {
 				if (this.editAllowedCheck() === false) {
 					return;
 				}
 				this.disableNodes(this.$store.getters.getSelectedNodes);
 			},
 
-			deleteSelectedNodes () {
+			deleteSelectedNodes() {
 				// Copy "selectedNodes" as the nodes get deleted out of selection
 				// when they get deleted and if we would use original it would mess
 				// with the index and would so not delete all nodes
@@ -1031,13 +950,13 @@ export default mixins(
 				});
 			},
 
-			selectAllNodes () {
+			selectAllNodes() {
 				this.nodes.forEach((node) => {
 					this.nodeSelectedByName(node.name);
 				});
 			},
 
-			selectUpstreamNodes () {
+			selectUpstreamNodes() {
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode === null) {
 					return;
@@ -1054,7 +973,7 @@ export default mixins(
 				// At the end select the previously selected node again
 				this.nodeSelectedByName(lastSelectedNode.name);
 			},
-			selectDownstreamNodes () {
+			selectDownstreamNodes() {
 				const lastSelectedNode = this.lastSelectedNode;
 				if (lastSelectedNode === null) {
 					return;
@@ -1072,7 +991,7 @@ export default mixins(
 				this.nodeSelectedByName(lastSelectedNode.name);
 			},
 
-			pushDownstreamNodes (sourceNodeName: string, margin: number) {
+			pushDownstreamNodes(sourceNodeName: string, margin: number) {
 				const sourceNode = this.$store.getters.nodesByName[sourceNodeName];
 				const workflow = this.getCurrentWorkflow();
 				const childNodes = workflow.getChildNodes(sourceNodeName);
@@ -1094,7 +1013,7 @@ export default mixins(
 				}
 			},
 
-			cutSelectedNodes () {
+			cutSelectedNodes() {
 				const deleteCopiedNodes = !this.isReadOnly;
 				this.copySelectedNodes(deleteCopiedNodes);
 				if (deleteCopiedNodes) {
@@ -1102,7 +1021,7 @@ export default mixins(
 				}
 			},
 
-			copySelectedNodes (isCut: boolean) {
+			copySelectedNodes(isCut: boolean) {
 				this.getSelectedNodesToSave().then((data) => {
 					const workflowToCopy: IWorkflowToShare = {
 						meta: {
@@ -1114,7 +1033,7 @@ export default mixins(
 					const nodeData = JSON.stringify(workflowToCopy, null, 2);
 					this.copyToClipboard(nodeData);
 					if (data.nodes.length > 0) {
-						if(!isCut){
+						if (!isCut) {
 							this.$showMessage({
 								title: 'Copied!',
 								message: '',
@@ -1129,28 +1048,28 @@ export default mixins(
 				});
 			},
 
-			resetZoom () {
-				const { scale, offset } = CanvasHelpers.scaleReset({scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition});
+			resetZoom() {
+				const { scale, offset } = CanvasHelpers.scaleReset({ scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition });
 
 				this.setZoomLevel(scale);
-				this.$store.commit('setNodeViewOffsetPosition', {newOffset: offset});
+				this.$store.commit('setNodeViewOffsetPosition', { newOffset: offset });
 			},
 
 			zoomIn() {
-				const { scale, offset: [xOffset, yOffset] } = CanvasHelpers.scaleBigger({scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition});
+				const { scale, offset: [xOffset, yOffset] } = CanvasHelpers.scaleBigger({ scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition });
 
 				this.setZoomLevel(scale);
-				this.$store.commit('setNodeViewOffsetPosition', {newOffset: [xOffset, yOffset]});
+				this.$store.commit('setNodeViewOffsetPosition', { newOffset: [xOffset, yOffset] });
 			},
 
 			zoomOut() {
-				const { scale, offset: [xOffset, yOffset] } = CanvasHelpers.scaleSmaller({scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition});
+				const { scale, offset: [xOffset, yOffset] } = CanvasHelpers.scaleSmaller({ scale: this.nodeViewScale, offset: this.$store.getters.getNodeViewOffsetPosition });
 
 				this.setZoomLevel(scale);
-				this.$store.commit('setNodeViewOffsetPosition', {newOffset: [xOffset, yOffset]});
+				this.$store.commit('setNodeViewOffsetPosition', { newOffset: [xOffset, yOffset] });
 			},
 
-			setZoomLevel (zoomLevel: number) {
+			setZoomLevel(zoomLevel: number) {
 				this.nodeViewScale = zoomLevel; // important for background
 				const element = this.instance.getContainer() as HTMLElement;
 				if (!element) {
@@ -1171,20 +1090,20 @@ export default mixins(
 				this.instance.setZoom(zoomLevel);
 			},
 
-			zoomToFit () {
+			zoomToFit() {
 				const nodes = this.$store.getters.allNodes as INodeUi[];
 
 				if (nodes.length === 0) { // some unknown workflow executions
 					return;
 				}
 
-				const {zoomLevel, offset} = CanvasHelpers.getZoomToFit(nodes, !this.isDemo);
+				const { zoomLevel, offset } = CanvasHelpers.getZoomToFit(nodes, !this.isDemo);
 
 				this.setZoomLevel(zoomLevel);
-				this.$store.commit('setNodeViewOffsetPosition', {newOffset: offset});
+				this.$store.commit('setNodeViewOffsetPosition', { newOffset: offset });
 			},
 
-			async stopExecution () {
+			async stopExecution() {
 				const executionId = this.$store.getters.activeExecutionId;
 				if (executionId === null) {
 					return;
@@ -1242,7 +1161,7 @@ export default mixins(
 				});
 			},
 
-			async stopWaitingForWebhook () {
+			async stopWaitingForWebhook() {
 				try {
 					await this.restApi().removeTestWebhook(this.$store.getters.workflowId);
 				} catch (error) {
@@ -1257,7 +1176,7 @@ export default mixins(
 			/**
 			 * This method gets called when data got pasted into the window
 			 */
-			async receivedCopyPasteData (plainTextData: string): Promise<void> {
+			async receivedCopyPasteData(plainTextData: string): Promise<void> {
 				let workflowData: IWorkflowDataUpdate | undefined;
 
 				// Check if it is an URL which could contain workflow data
@@ -1307,7 +1226,7 @@ export default mixins(
 
 			// Returns the workflow data from a given URL. If no data gets found or
 			// data is invalid it returns undefined and displays an error message by itself.
-			async getWorkflowDataFromUrl (url: string): Promise<IWorkflowDataUpdate | undefined> {
+			async getWorkflowDataFromUrl(url: string): Promise<IWorkflowDataUpdate | undefined> {
 				let workflowData: IWorkflowDataUpdate;
 
 				this.startLoading();
@@ -1327,7 +1246,7 @@ export default mixins(
 			},
 
 			// Imports the given workflow data into the current workflow
-			async importWorkflowData (workflowData: IWorkflowToShare, importTags = true, source: string): Promise<void> { // eslint-disable-line @typescript-eslint/default-param-last
+			async importWorkflowData(workflowData: IWorkflowToShare, importTags = true, source: string): Promise<void> { // eslint-disable-line @typescript-eslint/default-param-last
 				// If it is JSON check if it looks on the first look like data we can use
 				if (
 					!workflowData.hasOwnProperty('nodes') ||
@@ -1337,7 +1256,7 @@ export default mixins(
 				}
 
 				try {
-					const nodeIdMap: {[prev: string]: string} = {};
+					const nodeIdMap: { [prev: string]: string } = {};
 					if (workflowData.nodes) {
 						// set all new ids when pasting/importing workflows
 						workflowData.nodes.forEach((node: INode) => {
@@ -1359,7 +1278,7 @@ export default mixins(
 							this.getNodeTypes(),
 							{
 								nodeIdMap,
-								sourceInstanceId: workflowData.meta && workflowData.meta.instanceId !== currInstanceId? workflowData.meta.instanceId: '',
+								sourceInstanceId: workflowData.meta && workflowData.meta.instanceId !== currInstanceId ? workflowData.meta.instanceId : '',
 							}).nodeGraph,
 					);
 					if (source === 'paste') {
@@ -1433,7 +1352,7 @@ export default mixins(
 				}
 			},
 
-			closeNodeCreator () {
+			closeNodeCreator() {
 				this.createNodeActive = false;
 			},
 
@@ -1453,7 +1372,7 @@ export default mixins(
 				});
 			},
 
-			nodeTypeSelected (nodeTypeName: string) {
+			nodeTypeSelected(nodeTypeName: string) {
 				this.addNodeButton(nodeTypeName);
 				this.createNodeActive = false;
 			},
@@ -1483,14 +1402,14 @@ export default mixins(
 				}
 			},
 
-			nodeDeselectedByName (nodeName: string) {
+			nodeDeselectedByName(nodeName: string) {
 				const node = this.$store.getters.getNodeByName(nodeName);
 				if (node) {
 					this.nodeDeselected(node);
 				}
 			},
 
-			nodeSelectedByName (nodeName: string, setActive = false, deselectAllOthers?: boolean) {
+			nodeSelectedByName(nodeName: string, setActive = false, deselectAllOthers?: boolean) {
 				if (deselectAllOthers === true) {
 					this.deselectAllNodes();
 				}
@@ -1509,7 +1428,7 @@ export default mixins(
 					this.$store.commit('setActiveNode', node.name);
 				}
 			},
-			showMaxNodeTypeError (nodeTypeData: INodeTypeDescription) {
+			showMaxNodeTypeError(nodeTypeData: INodeTypeDescription) {
 				const maxNodes = nodeTypeData.maxNodes;
 				this.$showMessage({
 					title: this.$locale.baseText('nodeView.showMessage.showMaxNodeTypeError.title'),
@@ -1523,7 +1442,7 @@ export default mixins(
 					duration: 0,
 				});
 			},
-			async injectNode (nodeTypeName: string, options: AddNodeOptions = {}) {
+			async injectNode(nodeTypeName: string, options: AddNodeOptions = {}) {
 				const nodeTypeData: INodeTypeDescription | null = this.$store.getters['nodeTypes/getNodeType'](nodeTypeName);
 
 				if (nodeTypeData === null) {
@@ -1642,7 +1561,7 @@ export default mixins(
 
 				return newNodeData;
 			},
-			getConnection (sourceNodeName: string, sourceNodeOutputIndex: number, targetNodeName: string, targetNodeOuputIndex: number): IConnection | undefined {
+			getConnection(sourceNodeName: string, sourceNodeOutputIndex: number, targetNodeName: string, targetNodeOuputIndex: number): IConnection | undefined {
 				const nodeConnections = (this.$store.getters.outgoingConnectionsByNodeName(sourceNodeName) as INodeConnections).main;
 				if (nodeConnections) {
 					const connections: IConnection[] | null = nodeConnections[sourceNodeOutputIndex];
@@ -1654,7 +1573,7 @@ export default mixins(
 
 				return undefined;
 			},
-			connectTwoNodes (sourceNodeName: string, sourceNodeOutputIndex: number, targetNodeName: string, targetNodeOuputIndex: number) {
+			connectTwoNodes(sourceNodeName: string, sourceNodeOutputIndex: number, targetNodeName: string, targetNodeOuputIndex: number) {
 				if (this.getConnection(sourceNodeName, sourceNodeOutputIndex, targetNodeName, targetNodeOuputIndex)) {
 					return;
 				}
@@ -1674,7 +1593,7 @@ export default mixins(
 
 				this.__addConnection(connectionData, true);
 			},
-			async addNodeButton (nodeTypeName: string, options: AddNodeOptions = {}) {
+			async addNodeButton(nodeTypeName: string, options: AddNodeOptions = {}) {
 				if (this.editAllowedCheck() === false) {
 					return;
 				}
@@ -1706,7 +1625,7 @@ export default mixins(
 					this.connectTwoNodes(lastSelectedNode.name, outputIndex, newNodeData.name, 0);
 				}
 			},
-			initNodeView () {
+			initNodeView() {
 				this.instance.importDefaults({
 					Connector: CanvasHelpers.CONNECTOR_FLOWCHART_TYPE,
 					Endpoint: ['Dot', { radius: 5 }],
@@ -1717,7 +1636,7 @@ export default mixins(
 					Container: '#node-view',
 				});
 
-				const insertNodeAfterSelected = (info: {sourceId: string, index: number, eventSource: string, connection?: Connection}) => {
+				const insertNodeAfterSelected = (info: { sourceId: string, index: number, eventSource: string, connection?: Connection }) => {
 					// Get the node and set it as active that new nodes
 					// which get created get automatically connected
 					// to it.
@@ -1982,7 +1901,7 @@ export default mixins(
 
 							const inputMargin = 24;
 							const intersecting = nodes.find((element: Element) => {
-								const {top, left, right, bottom} = element.getBoundingClientRect();
+								const { top, left, right, bottom } = element.getBoundingClientRect();
 								const [x, y] = CanvasHelpers.getMousePosition(e);
 								if (top <= y && bottom >= y && (left - inputMargin) <= x && right >= x) {
 									const nodeName = (element as HTMLElement).dataset['name'] as string;
@@ -2040,7 +1959,7 @@ export default mixins(
 					}
 				});
 			},
-			async newWorkflow (): Promise<void> {
+			async newWorkflow(): Promise<void> {
 				await this.resetWorkspace();
 				const newWorkflow = await this.$store.dispatch('workflows/getNewWorkflowData');
 
@@ -2061,7 +1980,7 @@ export default mixins(
 
 				if (flagAvailable && window.posthog.getFeatureFlag('welcome-note') === 'test') {
 					setTimeout(() => {
-						this.$store.commit('setNodeViewOffsetPosition', {newOffset: [0, 0]});
+						this.$store.commit('setNodeViewOffsetPosition', { newOffset: [0, 0] });
 						// For novice users (onboardingFlowEnabled == true)
 						// Inject welcome sticky note and zoom to fit
 						if (newWorkflow.onboardingFlowEnabled && !this.isReadOnly) {
@@ -2084,7 +2003,7 @@ export default mixins(
 					}, 0);
 				}
 			},
-			async initView (): Promise<void> {
+			async initView(): Promise<void> {
 				if (this.$route.params.action === 'workflowSave') {
 					// In case the workflow got saved we do not have to run init
 					// as only the route changed but all the needed data is already loaded
@@ -2106,7 +2025,7 @@ export default mixins(
 				} else {
 
 					const result = this.$store.getters.getStateIsDirty;
-					if(result) {
+					if (result) {
 						const confirmModal = await this.confirmModal(
 							this.$locale.baseText('nodeView.confirmMessage.initView.message'),
 							this.$locale.baseText('nodeView.confirmMessage.initView.headline'),
@@ -2154,11 +2073,11 @@ export default mixins(
 				document.addEventListener('keydown', this.keyDown);
 				document.addEventListener('keyup', this.keyUp);
 
-				window.addEventListener("beforeunload",  (e) => {
-					if(this.isDemo){
+				window.addEventListener("beforeunload", (e) => {
+					if (this.isDemo) {
 						return;
 					}
-					else if(this.$store.getters.getStateIsDirty === true) {
+					else if (this.$store.getters.getStateIsDirty === true) {
 						const confirmationMessage = this.$locale.baseText('nodeView.itLooksLikeYouHaveBeenEditingSomething');
 						(e || window.event).returnValue = confirmationMessage; //Gecko + IE
 						return confirmationMessage; //Gecko + Webkit, Safari, Chrome etc.
@@ -2187,7 +2106,7 @@ export default mixins(
 
 				return CanvasHelpers.getInputEndpointUUID(node.id, index);
 			},
-			__addConnection (connection: [IConnection, IConnection], addVisualConnection = false) {
+			__addConnection(connection: [IConnection, IConnection], addVisualConnection = false) {
 				if (addVisualConnection === true) {
 					const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
 					const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
@@ -2207,7 +2126,7 @@ export default mixins(
 						detachable: !this.isReadOnly,
 					});
 				} else {
-					const connectionProperties = {connection, setStateDirty: false};
+					const connectionProperties = { connection, setStateDirty: false };
 					// When nodes get connected it gets saved automatically to the storage
 					// so if we do not connect we have to save the connection manually
 					this.$store.commit('addConnection', connectionProperties);
@@ -2217,7 +2136,7 @@ export default mixins(
 					this.addPinDataConnections(this.$store.getters.pinData);
 				});
 			},
-			__removeConnection (connection: [IConnection, IConnection], removeVisualConnection = false) {
+			__removeConnection(connection: [IConnection, IConnection], removeVisualConnection = false) {
 				if (removeVisualConnection === true) {
 					const sourceId = this.$store.getters.getNodeByName(connection[0].node);
 					const targetId = this.$store.getters.getNodeByName(connection[1].node);
@@ -2248,7 +2167,7 @@ export default mixins(
 					endpoints.forEach((endpoint: Endpoint) => endpoint.repaint()); // repaint both circle and plus endpoint
 				}
 			},
-			__removeConnectionByConnectionInfo (info: OnConnectionBindInfo, removeVisualConnection = false) {
+			__removeConnectionByConnectionInfo(info: OnConnectionBindInfo, removeVisualConnection = false) {
 				// @ts-ignore
 				const sourceInfo = info.sourceEndpoint.getParameters();
 				const sourceNode = this.$store.getters.getNodeById(sourceInfo.nodeId);
@@ -2277,14 +2196,14 @@ export default mixins(
 					this.$store.commit('removeConnection', { connection: connectionInfo });
 				}
 			},
-			async duplicateNode (nodeName: string) {
+			async duplicateNode(nodeName: string) {
 				if (this.editAllowedCheck() === false) {
 					return;
 				}
 
 				const node = this.$store.getters.getNodeByName(nodeName);
 
-				const nodeTypeData: INodeTypeDescription | null= this.$store.getters['nodeTypes/getNodeType'](node.type, node.typeVersion);
+				const nodeTypeData: INodeTypeDescription | null = this.$store.getters['nodeTypes/getNodeType'](node.type, node.typeVersion);
 				if (nodeTypeData && nodeTypeData.maxNodes !== undefined && this.getNodeTypeCount(node.type) >= nodeTypeData.maxNodes) {
 					this.showMaxNodeTypeError(nodeTypeData);
 					return;
@@ -2333,7 +2252,7 @@ export default mixins(
 
 				this.$telemetry.track('User duplicated node', { node_type: node.type, workflow_id: this.$store.getters.workflowId });
 			},
-			getJSPlumbConnection (sourceNodeName: string, sourceOutputIndex: number, targetNodeName: string, targetInputIndex: number): Connection | undefined {
+			getJSPlumbConnection(sourceNodeName: string, sourceOutputIndex: number, targetNodeName: string, targetInputIndex: number): Connection | undefined {
 				const sourceNode = this.$store.getters.getNodeByName(sourceNodeName) as INodeUi;
 				const targetNode = this.$store.getters.getNodeByName(targetNodeName) as INodeUi;
 				if (!sourceNode || !targetNode) {
@@ -2357,16 +2276,16 @@ export default mixins(
 					return uuids[0] === sourceEndpoint && uuids[1] === targetEndpoint;
 				});
 			},
-			getJSPlumbEndpoints (nodeName: string): Endpoint[] {
+			getJSPlumbEndpoints(nodeName: string): Endpoint[] {
 				const node = this.$store.getters.getNodeByName(nodeName);
 				return this.instance.getEndpoints(node.id);
 			},
-			getPlusEndpoint (nodeName: string, outputIndex: number): Endpoint | undefined {
+			getPlusEndpoint(nodeName: string, outputIndex: number): Endpoint | undefined {
 				const endpoints = this.getJSPlumbEndpoints(nodeName);
 				// @ts-ignore
 				return endpoints.find((endpoint: Endpoint) => endpoint.type === 'N8nPlus' && endpoint.__meta && endpoint.__meta.index === outputIndex);
 			},
-			getIncomingOutgoingConnections(nodeName: string): {incoming: Connection[], outgoing: Connection[]} {
+			getIncomingOutgoingConnections(nodeName: string): { incoming: Connection[], outgoing: Connection[] } {
 				const node = this.$store.getters.getNodeByName(nodeName);
 				// @ts-ignore
 				const outgoing = this.instance.getConnections({
@@ -2383,15 +2302,15 @@ export default mixins(
 					outgoing,
 				};
 			},
-			onNodeMoved (node: INodeUi) {
-				const {incoming, outgoing} = this.getIncomingOutgoingConnections(node.name);
+			onNodeMoved(node: INodeUi) {
+				const { incoming, outgoing } = this.getIncomingOutgoingConnections(node.name);
 
 				[...incoming, ...outgoing].forEach((connection: Connection) => {
 					CanvasHelpers.showOrHideMidpointArrow(connection);
 					CanvasHelpers.showOrHideItemsLabel(connection);
 				});
 			},
-			onNodeRun ({name, data, waiting}: {name: string, data: ITaskData[] | null, waiting: boolean}) {
+			onNodeRun({ name, data, waiting }: { name: string, data: ITaskData[] | null, waiting: boolean }) {
 				const sourceNodeName = name;
 				const sourceNode = this.$store.getters.getNodeByName(sourceNodeName);
 				const sourceId = sourceNode.id;
@@ -2451,7 +2370,7 @@ export default mixins(
 					});
 				});
 			},
-			removeNode (nodeName: string) {
+			removeNode(nodeName: string) {
 				if (this.editAllowedCheck() === false) {
 					return;
 				}
@@ -2462,7 +2381,7 @@ export default mixins(
 				}
 
 				// "requiredNodeTypes" are also defined in cli/commands/run.ts
-				const requiredNodeTypes = [ START_NODE_TYPE ];
+				const requiredNodeTypes = [START_NODE_TYPE];
 
 				if (requiredNodeTypes.includes(node.type)) {
 					// The node is of the required type so check first
@@ -2484,7 +2403,7 @@ export default mixins(
 					}
 				}
 
-				if(node.type === STICKY_NODE_TYPE) {
+				if (node.type === STICKY_NODE_TYPE) {
 					this.$telemetry.track(
 						'User deleted workflow note',
 						{
@@ -2502,7 +2421,7 @@ export default mixins(
 				const nodeType: INodeTypeDescription | null = this.$store.getters['nodeTypes/getNodeType'](node.type, node.typeVersion);
 				if (nodeType && nodeType.outputs.length === 1
 					&& nodeType.inputs.length === 1) {
-					const {incoming, outgoing} = this.getIncomingOutgoingConnections(node.name);
+					const { incoming, outgoing } = this.getIncomingOutgoingConnections(node.name);
 					if (incoming.length === 1 && outgoing.length === 1) {
 						const conn1 = incoming[0];
 						const conn2 = outgoing[0];
@@ -2552,14 +2471,14 @@ export default mixins(
 
 				}, 0); // allow other events to finish like drag stop
 			},
-			valueChanged (parameterData: IUpdateInformation) {
+			valueChanged(parameterData: IUpdateInformation) {
 				if (parameterData.name === 'name' && parameterData.oldValue) {
 					// The name changed so we have to take care that
 					// the connections get changed.
 					this.renameNode(parameterData.oldValue as string, parameterData.value as string);
 				}
 			},
-			async renameNodePrompt (currentName: string) {
+			async renameNodePrompt(currentName: string) {
 				try {
 					const promptResponsePromise = this.$prompt(
 						this.$locale.baseText('nodeView.prompt.newName') + ':',
@@ -2586,9 +2505,9 @@ export default mixins(
 					const promptResponse = await promptResponsePromise as MessageBoxInputData;
 
 					this.renameNode(currentName, promptResponse.value);
-				} catch (e) {}
+				} catch (e) { }
 			},
-			async renameNode (currentName: string, newName: string) {
+			async renameNode(currentName: string, newName: string) {
 				if (currentName === newName) {
 					return;
 				}
@@ -2615,7 +2534,7 @@ export default mixins(
 				this.deleteEveryEndpoint();
 
 				this.$store.commit('removeAllConnections');
-				this.$store.commit('removeAllNodes', {setStateDirty: true});
+				this.$store.commit('removeAllNodes', { setStateDirty: true });
 
 				// Wait a tick that the old nodes had time to get removed
 				await Vue.nextTick();
@@ -2632,7 +2551,7 @@ export default mixins(
 					this.renamingActive = false;
 				}
 			},
-			deleteEveryEndpoint () {
+			deleteEveryEndpoint() {
 				// Check as it does not exist on first load
 				if (this.instance) {
 					try {
@@ -2641,7 +2560,7 @@ export default mixins(
 						nodes.forEach((node: INodeUi) => this.instance.destroyDraggable(node.id));
 
 						this.instance.deleteEveryEndpoint();
-					} catch (e) {}
+					} catch (e) { }
 				}
 			},
 			matchCredentials(node: INodeUi) {
@@ -2688,7 +2607,7 @@ export default mixins(
 					}
 				});
 			},
-			async addNodes (nodes: INodeUi[], connections?: IConnections) {
+			async addNodes(nodes: INodeUi[], connections?: IConnections) {
 				if (!nodes || !nodes.length) {
 					return;
 				}
@@ -2696,7 +2615,7 @@ export default mixins(
 				// Before proceeding we must check if all nodes contain the `properties` attribute.
 				// Nodes are loaded without this information so we must make sure that all nodes
 				// being added have this information.
-				await this.loadNodesProperties(nodes.map(node => ({name: node.type, version: node.typeVersion})));
+				await this.loadNodesProperties(nodes.map(node => ({ name: node.type, version: node.typeVersion })));
 
 				// Add the node to the node-list
 				let nodeType: INodeTypeDescription | null;
@@ -2789,7 +2708,7 @@ export default mixins(
 				// Now it can draw again
 				this.instance.setSuspendDrawing(false, true);
 			},
-			async addNodesToWorkflow (data: IWorkflowDataUpdate): Promise<IWorkflowDataUpdate> {
+			async addNodesToWorkflow(data: IWorkflowDataUpdate): Promise<IWorkflowDataUpdate> {
 				// Because nodes with the same name maybe already exist, it could
 				// be needed that they have to be renamed. Also could it be possible
 				// that nodes are not allowd to be created because they have a create
@@ -2816,7 +2735,7 @@ export default mixins(
 				let newName: string;
 				const createNodes: INode[] = [];
 
-				await this.loadNodesProperties(data.nodes.map(node => ({name: node.type, version: node.typeVersion})));
+				await this.loadNodesProperties(data.nodes.map(node => ({ name: node.type, version: node.typeVersion })));
 
 				data.nodes.forEach(node => {
 					if (nodeTypesCount[node.type] !== undefined) {
@@ -2907,7 +2826,7 @@ export default mixins(
 					connections: tempWorkflow.connectionsBySourceNode,
 				};
 			},
-			getSelectedNodesToSave (): Promise<IWorkflowData> {
+			getSelectedNodesToSave(): Promise<IWorkflowData> {
 				const data: IWorkflowData = {
 					nodes: [],
 					connections: {},
@@ -2972,7 +2891,7 @@ export default mixins(
 
 				return Promise.resolve(data);
 			},
-			resetWorkspace () {
+			resetWorkspace() {
 				// Reset nodes
 				this.deleteEveryEndpoint();
 
@@ -2985,7 +2904,7 @@ export default mixins(
 						});
 				}
 
-				this.$store.commit('removeAllConnections', {setStateDirty: false});
+				this.$store.commit('removeAllConnections', { setStateDirty: false });
 				this.$store.commit('removeAllNodes', { setStateDirty: false, removePinData: true });
 
 				// Reset workflow execution data
@@ -2995,7 +2914,7 @@ export default mixins(
 
 				this.$store.commit('setActive', false);
 				this.$store.commit('setWorkflowId', PLACEHOLDER_EMPTY_WORKFLOW_ID);
-				this.$store.commit('setWorkflowName', {newName: '', setStateDirty: false});
+				this.$store.commit('setWorkflowName', { newName: '', setStateDirty: false });
 				this.$store.commit('setWorkflowSettings', {});
 				this.$store.commit('setWorkflowTagIds', []);
 
@@ -3006,30 +2925,30 @@ export default mixins(
 
 				this.$store.commit('resetSelectedNodes');
 
-				this.$store.commit('setNodeViewOffsetPosition', {newOffset: [0, 0], setStateDirty: false});
+				this.$store.commit('setNodeViewOffsetPosition', { newOffset: [0, 0], setStateDirty: false });
 
 				return Promise.resolve();
 			},
-			async loadActiveWorkflows (): Promise<void> {
+			async loadActiveWorkflows(): Promise<void> {
 				const activeWorkflows = await this.restApi().getActiveWorkflows();
 				this.$store.commit('setActiveWorkflows', activeWorkflows);
 			},
-			async loadNodeTypes (): Promise<void> {
+			async loadNodeTypes(): Promise<void> {
 				this.$store.dispatch('nodeTypes/getNodeTypes');
 			},
-			async loadCredentialTypes (): Promise<void> {
+			async loadCredentialTypes(): Promise<void> {
 				await this.$store.dispatch('credentials/fetchCredentialTypes', true);
 			},
-			async loadCredentials (): Promise<void> {
+			async loadCredentials(): Promise<void> {
 				await this.$store.dispatch('credentials/fetchAllCredentials');
 			},
 			async loadNodesProperties(nodeInfos: INodeTypeNameVersion[]): Promise<void> {
-				const allNodes:INodeTypeDescription[] = this.$store.getters['nodeTypes/allNodeTypes'];
+				const allNodes: INodeTypeDescription[] = this.$store.getters['nodeTypes/allNodeTypes'];
 
-				const nodesToBeFetched:INodeTypeNameVersion[] = [];
+				const nodesToBeFetched: INodeTypeNameVersion[] = [];
 				allNodes.forEach(node => {
 					const nodeVersions = Array.isArray(node.version) ? node.version : [node.version];
-					if(!!nodeInfos.find(n => n.name === node.name && nodeVersions.includes(n.version)) && !node.hasOwnProperty('properties')) {
+					if (!!nodeInfos.find(n => n.name === node.name && nodeVersions.includes(n.version)) && !node.hasOwnProperty('properties')) {
 						nodesToBeFetched.push({
 							name: node.name,
 							version: Array.isArray(node.version)
@@ -3112,7 +3031,7 @@ export default mixins(
 			},
 		},
 
-		async mounted () {
+		async mounted() {
 			this.$titleReset();
 			window.addEventListener('message', this.onPostMessageReceived);
 			this.$root.$on('importWorkflowData', this.onImportWorkflowDataEvent);
@@ -3144,7 +3063,7 @@ export default mixins(
 					this.initNodeView();
 					await this.initView();
 					if (window.top) {
-						window.top.postMessage(JSON.stringify({command: 'n8nReady',version:this.$store.getters.versionCli}), '*');
+						window.top.postMessage(JSON.stringify({ command: 'n8nReady', version: this.$store.getters.versionCli }), '*');
 					}
 				} catch (error) {
 					this.$showError(
@@ -3187,7 +3106,7 @@ export default mixins(
 									title: onboardingResponse.title,
 									description: onboardingResponse.description,
 								});
-								this.$store.commit('ui/openModal', ONBOARDING_CALL_SIGNUP_MODAL_KEY, {root: true});
+								this.$store.commit('ui/openModal', ONBOARDING_CALL_SIGNUP_MODAL_KEY, { root: true });
 							},
 						});
 					}, promptTimeout);
@@ -3197,7 +3116,7 @@ export default mixins(
 			dataPinningEventBus.$on('unpin-data', this.removePinDataConnections);
 		},
 
-		destroyed () {
+		destroyed() {
 			this.resetWorkspace();
 			this.$store.commit('setStateDirty', false);
 			window.removeEventListener('message', this.onPostMessageReceived);
@@ -3212,7 +3131,6 @@ export default mixins(
 </script>
 
 <style scoped lang="scss">
-
 .zoom-menu {
 	$--zoom-menu-margin: 15;
 
@@ -3232,8 +3150,8 @@ export default mixins(
 		border: var(--border-base);
 	}
 
-	> * {
-		+ * {
+	>* {
+		+* {
 			margin-left: var(--spacing-3xs);
 		}
 
@@ -3340,7 +3258,7 @@ export default mixins(
 	width: 300px;
 	text-align: center;
 
-	> * {
+	>* {
 		margin-inline-end: 0.625rem;
 	}
 }
@@ -3355,15 +3273,13 @@ export default mixins(
 	-ms-user-select: none;
 	user-select: none;
 }
-
 </style>
 
 <style lang="scss">
-
 .connection-run-items-label {
 	span {
 		border-radius: 7px;
-		background-color: hsla(var(--color-canvas-background-h),var( --color-canvas-background-s), var(--color-canvas-background-l), .85);
+		background-color: hsla(var(--color-canvas-background-h), var(--color-canvas-background-s), var(--color-canvas-background-l), .85);
 		line-height: 1.3em;
 		padding: 0px 3px;
 		white-space: nowrap;
@@ -3399,7 +3315,7 @@ export default mixins(
 
 .node-input-endpoint-label,
 .node-output-endpoint-label {
-	background-color: hsla(var(--color-canvas-background-h),var( --color-canvas-background-s), var(--color-canvas-background-l), .85);
+	background-color: hsla(var(--color-canvas-background-h), var(--color-canvas-background-s), var(--color-canvas-background-l), .85);
 	border-radius: 7px;
 	font-size: 0.7em;
 	padding: 2px;
@@ -3415,7 +3331,7 @@ export default mixins(
 		display: block !important;
 	}
 
-	> div {
+	>div {
 		color: var(--color-foreground-xdark);
 		border: 2px solid var(--color-foreground-xdark);
 		background-color: var(--color-background-xlight);
@@ -3450,5 +3366,4 @@ export default mixins(
 		}
 	}
 }
-
 </style>
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
index f48280b500..b377551d6f 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.actionNetwork",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Marketing & Content"
-	],
+	"categories": ["Sales", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.actionNetwork/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.actionnetwork/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
index 0b2f95d015..8f4c445fc9 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
@@ -3,9 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "ActiveCampaign is a cloud software platform that allows customer experience automation, which combines email marketing, marketing automation, sales automation, and CRM categories. Use this node when you want to interact with your ActiveCampaign account.",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +12,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.activeCampaign/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.activecampaign/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
index 9b8c87c0f3..f8e91a5066 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.activeCampaignTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.activeCampaignTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.activecampaigntrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.json b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.json
index 993be53716..72d9c7331e 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.json
+++ b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.acuitySchedulingTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.acuitySchedulingTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.acuityschedulingtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Adalo/Adalo.node.json b/packages/nodes-base/nodes/Adalo/Adalo.node.json
index 10b6ee6ffd..3df6644271 100644
--- a/packages/nodes-base/nodes/Adalo/Adalo.node.json
+++ b/packages/nodes-base/nodes/Adalo/Adalo.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.adalo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.adalo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.adalo/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.json b/packages/nodes-base/nodes/Affinity/Affinity.node.json
index c3f8ee2e22..836f9234c2 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.json
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.affinity",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.affinity/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.affinity/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.json b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.json
index 68b35c3986..32c2bbf6e7 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.json
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.affinityTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.affinityTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.affinitytrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
index fa00450494..3953495541 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.agileCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.agileCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.agilecrm/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.json b/packages/nodes-base/nodes/Airtable/Airtable.node.json
index c1389b3493..48f7fdf130 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.json
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.airtable",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.airtable/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.airtable/"
 			}
 		],
 		"generic": [
@@ -83,4 +81,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.json b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.json
index 484fa2f223..4ee423ba24 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.json
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.airtableTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.airtableTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.airtabletrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.json b/packages/nodes-base/nodes/Amqp/Amqp.node.json
index fe42a4d7e4..8d05bdeceb 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.json
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.amqp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.amqp/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.amqp/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
index 1c0a6c50a4..a61ee1149e 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.amqpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.amqpTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.amqptrigger/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
index e6bbbf926e..9b52f2b395 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.apiTemplateIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.apiTemplateIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.apitemplateio/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.json b/packages/nodes-base/nodes/Asana/Asana.node.json
index e5d65a9091..4ee1119919 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.json
+++ b/packages/nodes-base/nodes/Asana/Asana.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.asana",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.asana/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.asana/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.json b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.json
index e44708f0d0..b799feef8a 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.json
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.asanaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.asanaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.asanatrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.json b/packages/nodes-base/nodes/Automizy/Automizy.node.json
index 73fba32e52..ff7f1046ed 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.json
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.automizy",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.automizy/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.automizy/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.json b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
index 46741ea669..ebc53d0fa0 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.autopilot",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.autopilot/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.autopilot/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
index 83efbc78f7..c9b17dd32d 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.autopilotTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.autopilotTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.autopilottrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.json b/packages/nodes-base/nodes/Aws/AwsLambda.node.json
index c98d68e593..68b97577ec 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.json
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsLambda",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsLambda/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awslambda/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.json b/packages/nodes-base/nodes/Aws/AwsSns.node.json
index fc25d8806f..4cf1b6d29f 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.json
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSns",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSns/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awssns/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.json b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.json
index f903f4e3fa..501da3a09c 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.json
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSnsTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSnsTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.awssnstrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json
index 8a7306569a..ca26e41d03 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json
+++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsComprehend",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsComprehend/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awscomprehend/"
 			}
 		],
 		"generic": [
@@ -23,4 +21,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.json b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.json
index 8c86a9e881..3f787d6830 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.json
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsDynamoDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development"
-	],
+	"categories": ["Data & Storage", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsDynamoDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awsdynamodb/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.json b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.json
index e6f81e099a..a8097c04d8 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.json
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsRekognition",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsRekognition/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awsrekognition/"
 			}
 		],
 		"generic": [
@@ -23,4 +21,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
index d6a345a0d9..7e8252e950 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsS3",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsS3/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awss3/"
 			}
 		],
 		"generic": [
@@ -29,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
index c900b11c15..97d4ba9e15 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSes",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSes/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awsses/"
 			}
 		],
 		"generic": [
@@ -29,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.json b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.json
index ec0fa1cc0b..95e115fdf2 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.json
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSqs",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSqs/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awssqs/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.json b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.json
index 8a960972ba..c4455e0d2d 100644
--- a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.json
+++ b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsTextract",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsTextract/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awstextract/"
 			}
 		],
 		"generic": [
@@ -23,4 +21,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.json b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.json
index 314e6f04da..8545b52642 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.json
+++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsTranscribe",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsTranscribe/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awstranscribe/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/BambooHr/BambooHr.node.json b/packages/nodes-base/nodes/BambooHr/BambooHr.node.json
index 8afc370c6f..5f0f33ae2b 100644
--- a/packages/nodes-base/nodes/BambooHr/BambooHr.node.json
+++ b/packages/nodes-base/nodes/BambooHr/BambooHr.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bambooHr",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bambooHr/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bamboohr/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
index d4c0e553a7..8f6c754d19 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bannerbear",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bannerbear/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bannerbear/"
 			}
 		],
 		"generic": [
@@ -34,4 +32,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.json b/packages/nodes-base/nodes/Baserow/Baserow.node.json
index 3ab9005110..02f5504e50 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.json
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.baserow/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.baserow/"
 			}
 		],
 		"generic": []
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.json b/packages/nodes-base/nodes/Beeminder/Beeminder.node.json
index 5185b23066..c183df0b1b 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.json
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.beeminder",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.beeminder/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.beeminder/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.json b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.json
index b9a8a6508b..4b4f71fb4b 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.json
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.bitbucketTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Productivity"
-	],
+	"categories": ["Development", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitbucketTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.bitbuckettrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.json b/packages/nodes-base/nodes/Bitly/Bitly.node.json
index 1b25968bf6..aa51a3b5cc 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.json
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bitly",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitly/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bitly/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
index a5edf7be80..e73d9f8a59 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bitwarden",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitwarden/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bitwarden/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Box/Box.node.json b/packages/nodes-base/nodes/Box/Box.node.json
index eb681772df..8921f18819 100644
--- a/packages/nodes-base/nodes/Box/Box.node.json
+++ b/packages/nodes-base/nodes/Box/Box.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.box",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.box/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.box/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.json b/packages/nodes-base/nodes/Box/BoxTrigger.node.json
index dc4ef2e21b..d4485ff160 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.json
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.boxTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.boxTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.boxtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.json b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.json
index b4d56cb47d..99e0935e32 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.json
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.Brandfetch",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility",
-		"Sales"
-	],
+	"categories": ["Utility", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.Brandfetch/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.brandfetch/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.json b/packages/nodes-base/nodes/Bubble/Bubble.node.json
index 2d343845d1..1fe0a6f865 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.json
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bubble",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bubble/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bubble/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Cal/CalTrigger.node.json b/packages/nodes-base/nodes/Cal/CalTrigger.node.json
index cd3f13cfd5..5bc36c3536 100644
--- a/packages/nodes-base/nodes/Cal/CalTrigger.node.json
+++ b/packages/nodes-base/nodes/Cal/CalTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.calTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Utility"
-	],
+	"categories": ["Productivity", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.calTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.caltrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.json b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.json
index 936ff92d64..afe035b15c 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.json
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.calendlyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Utility"
-	],
+	"categories": ["Productivity", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.calendlyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.calendlytrigger/"
 			}
 		],
 		"generic": [
@@ -30,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.json b/packages/nodes-base/nodes/Chargebee/Chargebee.node.json
index e86f4be399..f216b1a670 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.json
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.chargebee",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.chargebee/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.chargebee/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.json b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.json
index cd6c4a8966..c316c9d3da 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.json
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.chargebeeTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.chargebeeTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.chargebeetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.json b/packages/nodes-base/nodes/CircleCi/CircleCi.node.json
index 5a8b5ebe1b..66b14535ba 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.json
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.circleCi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.circleCi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.circleci/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.json b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.json
index f357d84766..2fa661687a 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.json
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.ciscoWebex",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ciscoWebex/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.ciscowebex/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.json b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.json
index da0c127f6a..aa2a5e3065 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.json
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.ciscoWebexTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ciscoWebexTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.ciscowebextrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.json b/packages/nodes-base/nodes/Clearbit/Clearbit.node.json
index 30b4553701..3584b4f020 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.json
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.clearbit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clearbit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.clearbit/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.json b/packages/nodes-base/nodes/ClickUp/ClickUp.node.json
index fd7fbeeb5d..30eac37e36 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.json
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clickUp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Communication"
-	],
+	"categories": ["Productivity", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clickUp/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.clickup/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.json b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.json
index 9215546ad8..32933a2747 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.json
+++ b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clickUpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Communication"
-	],
+	"categories": ["Productivity", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clickUpTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.clickuptrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.json b/packages/nodes-base/nodes/Clockify/Clockify.node.json
index 989127778f..877d778132 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.json
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.clockify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clockify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.clockify/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.json b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.json
index 0565e96b0c..b13cb9d276 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.json
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clockifyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility",
-		"Productivity"
-	],
+	"categories": ["Utility", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clockifyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.clockifytrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.json b/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
index 8dcb7a55f6..a8da4a322c 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.cockpit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Development"
-	],
+	"categories": ["Marketing & Content", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.cockpit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cockpit/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.json b/packages/nodes-base/nodes/Coda/Coda.node.json
index 4f6b7b93f3..c53c48a978 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.json
+++ b/packages/nodes-base/nodes/Coda/Coda.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.coda",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.coda/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.coda/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json
index a18adec94e..f0ea11806c 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.coinGecko",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Finance & Accounting"
-	],
+	"categories": ["Productivity", "Finance & Accounting"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.coinGecko/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.coingecko/"
 			}
 		],
 		"generic": [
@@ -20,4 +17,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.json b/packages/nodes-base/nodes/Compression/Compression.node.json
index d571cb76d0..5661d44760 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.json
+++ b/packages/nodes-base/nodes/Compression/Compression.node.json
@@ -3,25 +3,16 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Compression node is useful when you want to compress files to either gzip or zip format. You can even use this node to decompress your gzip and zip files.",
-	"categories": [
-		"Core Nodes",
-		"Data & Storage"
-	],
+	"categories": ["Core Nodes", "Data & Storage"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.compression/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.compression/"
 			}
 		]
 	},
-	"alias": [
-		"Zip",
-		"Gzip",
-		"uncompress"
-	],
+	"alias": ["Zip", "Gzip", "uncompress"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.json b/packages/nodes-base/nodes/Contentful/Contentful.node.json
index 3d49dbf00a..6b2d37595b 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.json
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.contentful",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Development"
-	],
+	"categories": ["Marketing & Content", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.contentful/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.contentful/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
index 5c66102728..d5f0f61c2c 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.convertKit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.convertKit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.convertkit/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
index 1ebc105739..730e6a866d 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.convertKitTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.convertKitTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.convertkittrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.json b/packages/nodes-base/nodes/Copper/Copper.node.json
index 08b57bd1a1..10ca71a4a6 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.json
+++ b/packages/nodes-base/nodes/Copper/Copper.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.copper",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.copper/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.copper/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Copper/CopperTrigger.node.json b/packages/nodes-base/nodes/Copper/CopperTrigger.node.json
index a0a668f05c..6ceb07d5a8 100644
--- a/packages/nodes-base/nodes/Copper/CopperTrigger.node.json
+++ b/packages/nodes-base/nodes/Copper/CopperTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.copperTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.copperTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.coppertrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.json b/packages/nodes-base/nodes/Cortex/Cortex.node.json
index fd35a5262d..e20e26f73a 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.json
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.cortex",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Analytics"
-	],
+	"categories": ["Development", "Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.cortex/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cortex/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.json b/packages/nodes-base/nodes/CrateDb/CrateDb.node.json
index 5eba7d7249..bc9717a21b 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.json
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.crateDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.crateDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cratedb/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index 8848300c24..1e78f7df3c 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -235,7 +235,7 @@ export class CrateDb implements INodeType {
 						],
 						default: 'multiple',
 						description:
-							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/nodes/n8n-nodes-base.crateDb/">the docs</a> for more examples.',
+							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cratedb/">the docs</a> for more examples.',
 					},
 					{
 						displayName: 'Query Parameters',
diff --git a/packages/nodes-base/nodes/Cron/Cron.node.json b/packages/nodes-base/nodes/Cron/Cron.node.json
index 96487b083a..f6ef185226 100644
--- a/packages/nodes-base/nodes/Cron/Cron.node.json
+++ b/packages/nodes-base/nodes/Cron/Cron.node.json
@@ -3,13 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Cron node uses Cron under the hood - a time-based job scheduler in Unix-like computer operating systems. Use this node when you want to trigger workflows periodically, especially in more complex scenarios like \"every Tuesday at 9 am\" or \"Weekdays\".",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.cron/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.cron/"
 			}
 		],
 		"generic": [
@@ -130,14 +128,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Time",
-		"Scheduler",
-		"Polling"
-	],
+	"alias": ["Time", "Scheduler", "Polling"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.json b/packages/nodes-base/nodes/Crypto/Crypto.node.json
index 1890d65691..16a9b7ea5d 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.json
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.json
@@ -3,14 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Crypto node allows you to hash and Hmac string in a specified format and sign a string using a private key. Use this node when you want to encrypt your data.",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.crypto/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.crypto/"
 			}
 		],
 		"generic": [
@@ -21,14 +18,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Encrypt",
-		"SHA",
-		"Hash"
-	],
+	"alias": ["Encrypt", "SHA", "Hash"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.json b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.json
index 5934c367b3..f523bbc6c2 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.json
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.customerIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.customerIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.customerio/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.json b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.json
index 55779dc2b1..63d8ea8eeb 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.json
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.customerIoTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.customerIoTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.customeriotrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.json b/packages/nodes-base/nodes/DateTime/DateTime.node.json
index 537e1fcc78..16f90adfc1 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.json
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.dateTime",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dateTime/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.datetime/"
 			}
 		],
 		"generic": [
@@ -25,8 +23,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.ts b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
index bb3d7d5a89..052dfc5ae7 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
@@ -335,7 +335,7 @@ export class DateTime implements INodeType {
 						type: 'string',
 						default: '',
 						description:
-							'Format for parsing the value as a date. If unrecognized, specify the <a href="https://docs.n8n.io/nodes/n8n-nodes-base.dateTime/#faqs">format</a> for the value.',
+							'Format for parsing the value as a date. If unrecognized, specify the <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.datetime/#faqs">format</a> for the value.',
 					},
 				],
 			},
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.json b/packages/nodes-base/nodes/DeepL/DeepL.node.json
index 2984afc46d..8bcbecc30d 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.json
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.deepL",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,12 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.deepL/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.deepl/"
 			}
 		]
 	},
-	"alias": [
-		"Translate",
-		"Translator"
-	]
+	"alias": ["Translate", "Translator"]
 }
diff --git a/packages/nodes-base/nodes/Demio/Demio.node.json b/packages/nodes-base/nodes/Demio/Demio.node.json
index 8259450ed4..e91ca0aacd 100644
--- a/packages/nodes-base/nodes/Demio/Demio.node.json
+++ b/packages/nodes-base/nodes/Demio/Demio.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.demio",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.demio/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.demio/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Dhl/Dhl.node.json b/packages/nodes-base/nodes/Dhl/Dhl.node.json
index 60fb7d2aa5..3ba5efb1f2 100644
--- a/packages/nodes-base/nodes/Dhl/Dhl.node.json
+++ b/packages/nodes-base/nodes/Dhl/Dhl.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dhl",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dhl/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.dhl/"
 			}
 		]
 	},
-	"alias": [
-		"Shipping"
-	]
+	"alias": ["Shipping"]
 }
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.json b/packages/nodes-base/nodes/Discord/Discord.node.json
index a0003e4c01..8fb7286d4f 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.json
+++ b/packages/nodes-base/nodes/Discord/Discord.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.discord/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.discord/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.json b/packages/nodes-base/nodes/Discourse/Discourse.node.json
index 1ad6d7b1b0..42ca0eeb1a 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.json
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.discourse",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.discourse/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.discourse/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.json b/packages/nodes-base/nodes/Disqus/Disqus.node.json
index eab6c9c780..287e3e8932 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.json
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.disqus",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.disqus/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.disqus/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.json b/packages/nodes-base/nodes/Drift/Drift.node.json
index b4203b3223..c40fdd3a8d 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.json
+++ b/packages/nodes-base/nodes/Drift/Drift.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.drift",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.drift/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.drift/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.json b/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
index 0fd9bf090f..46662574b1 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dropbox",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dropbox/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.dropbox/"
 			}
 		],
 		"generic": [
@@ -28,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.json b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.json
index 4b47e8e54e..61ad0c7603 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.json
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dropcontact",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dropcontact/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.dropcontact/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.json b/packages/nodes-base/nodes/ERPNext/ERPNext.node.json
index f0874ef95e..72eab86905 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.json
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.erpNext",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting",
-		"Data & Storage"
-	],
+	"categories": ["Finance & Accounting", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.erpNext/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.erpnext/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.json b/packages/nodes-base/nodes/EditImage/EditImage.node.json
index 585416b42b..ae77de2401 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.json
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.json
@@ -3,20 +3,15 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Edit Image node allows you to manipulate and edit images. Use this node when you want to:\n\n- Blur an image\n- Add a border to an image\n- Create a new image\n- Crop an image\n- Composite an image on top of another\n- Draw on an image\n- Get information about the image\n- Rotate an image\n- Change the size of an image\n- Shear an image along the X or Y axis\n- Add text to the image",
-	"categories": [
-		"Marketing & Content",
-		"Core Nodes"
-	],
+	"categories": ["Marketing & Content", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.editImage/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.editimage/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.json b/packages/nodes-base/nodes/Egoi/Egoi.node.json
index 29a052675f..fa25029bc4 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.json
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.egoi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.egoi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.egoi/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.json b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.json
index 7c03a486be..77d165c2fb 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.json
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.elasticSecurity",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.elasticSecurity/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.elasticsecurity/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.json b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.json
index 8fbac02f06..54fe90bbf0 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.json
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.elasticsearch",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.elasticsearch/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.elasticsearch/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
index 5f657a0550..38d68e4bfb 100644
--- a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
+++ b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emailReadImap",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Core Nodes"
-	],
+	"categories": ["Communication", "Core Nodes"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emailReadImap/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.imapemail/"
 			}
 		],
 		"generic": [
@@ -26,8 +23,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
index 1bf8072765..b82091851c 100644
--- a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
+++ b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emailSend",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Core Nodes"
-	],
+	"categories": ["Communication", "Core Nodes"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emailSend/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.sendemail/"
 			}
 		],
 		"generic": [
@@ -31,8 +28,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.json b/packages/nodes-base/nodes/Emelia/Emelia.node.json
index 1180fc092e..83a48c978f 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.json
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emelia",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emelia/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.emelia/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
index 7e1a137300..843c0c97e9 100644
--- a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
+++ b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emeliaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emeliaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.emeliatrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
index c21f92d8dd..efee540ee1 100644
--- a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
+++ b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.json
@@ -3,14 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "In n8n, when a workflow execution fails, it can start another workflow. This second workflow can be any arbitrary workflow on your n8n instance. Use the Error Trigger node as your Trigger in the Error workflow.",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.errorTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.errortrigger/"
 			}
 		],
 		"generic": [
@@ -22,8 +19,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json
index 626eec3c78..b022044df5 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.eventbriteTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.eventbriteTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.eventbritetrigger/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.json b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.json
index 7713811689..1a6e1100f4 100644
--- a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.json
+++ b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.json
@@ -3,14 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "Execute command allows you to run terminal commands on the computer/server hosting your n8n instance. Useful for executing a shell script or interacting with your n8n instance programmatically via the CLI.",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.executeCommand/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executecommand/"
 			}
 		],
 		"generic": [
@@ -26,15 +23,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Shell",
-		"Command",
-		"OS",
-		"Bash"
-	],
+	"alias": ["Shell", "Command", "OS", "Bash"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
index 9de1ec5645..9bb4ffae1e 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
@@ -3,22 +3,16 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Execute Workflow node can be used when you want your workflow to treat another workflow as a step in your flow. It allows you to modularize your workflows and have a single source of truth for series of actions you perform often. ",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.executeWorkflow/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/"
 			}
 		]
 	},
-	"alias": [
-		"n8n"
-	],
+	"alias": ["n8n"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 7cc30ff279..e77d170d73 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -132,7 +132,7 @@ export class ExecuteWorkflow implements INodeType {
 			},
 			{
 				displayName:
-					'Any data you pass into this node will be output by the start node of the workflow to be executed. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.executeworkflow/" target="_blank">More info</a>',
+					'Any data you pass into this node will be output by the start node of the workflow to be executed. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/" target="_blank">More info</a>',
 				name: 'executeWorkflowNotice',
 				type: 'notice',
 				default: '',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.json b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.json
index ccfd434478..dd57013296 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.json
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.facebookGraphApi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.facebookGraphApi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.facebookgraphapi/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
index 5415c961ac..96ada90eef 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.facebookTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.facebookTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.facebooktrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.json b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.json
index 86557a9bc1..f349ac18b3 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.json
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.figmaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.figmaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.figmatrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.json b/packages/nodes-base/nodes/FileMaker/FileMaker.node.json
index 2ee5a0818d..fcb642672b 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.json
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.filemaker",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.filemaker/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.filemaker/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.json b/packages/nodes-base/nodes/Flow/Flow.node.json
index 6b2880b033..592348f898 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.json
+++ b/packages/nodes-base/nodes/Flow/Flow.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.flow",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.flow/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.flow/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.json b/packages/nodes-base/nodes/Flow/FlowTrigger.node.json
index 96cf9088e9..85e979f808 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.json
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.flowTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.flowTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.flowtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.json b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.json
index f9aab9036b..81ea12cfed 100644
--- a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.json
+++ b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.formIoTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.formIoTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.formiotrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.json b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.json
index 2933e5daf7..a5d8bb738d 100644
--- a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.json
+++ b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.formstackTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.formstackTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.formstacktrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.json b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.json
index 4a1466daa3..c6e8de58cb 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.json
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.freshdesk",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.freshdesk/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.freshdesk/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.json b/packages/nodes-base/nodes/Freshservice/Freshservice.node.json
index d2affe9996..f6b1e89cf8 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.json
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.freshservice",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.freshservice/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.freshservice/"
 			}
 		]
 	},
-	"alias": [
-		"Freshdesk"
-	]
-}
\ No newline at end of file
+	"alias": ["Freshdesk"]
+}
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
index 927bff85e4..9b5157ab6e 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.freshworksCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.freshworksCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.freshworkscrm/"
 			}
 		]
 	},
-	"alias": [
-		"Freshdesk"
-	]
-}
\ No newline at end of file
+	"alias": ["Freshdesk"]
+}
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.json b/packages/nodes-base/nodes/Ftp/Ftp.node.json
index 2d4cdd3512..5cdab1620a 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.json
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.json
@@ -2,11 +2,7 @@
 	"node": "n8n-nodes-base.ftp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development",
-		"Utility"
-	],
+	"categories": ["Data & Storage", "Development", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -15,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ftp/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ftp/"
 			}
 		]
 	},
-	"alias": [
-		"SFTP"
-	]
+	"alias": ["SFTP"]
 }
diff --git a/packages/nodes-base/nodes/Function/Function.node.json b/packages/nodes-base/nodes/Function/Function.node.json
index eba32139c5..0a92eb2363 100644
--- a/packages/nodes-base/nodes/Function/Function.node.json
+++ b/packages/nodes-base/nodes/Function/Function.node.json
@@ -3,14 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The Function node allows you to execute JavaScript in your workflow. Unlike the Function Item node, this node does not operate on incoming node data per-item. Instead, you must iterate over multiple items of incoming data yourself. This can be useful if you're performing data transformation where you want to manipulate the number of items being outputted by the node (i.e. 1 item is inputted in with nested object, 10 items are outputted without any nested objects)",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.function/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/"
 			}
 		],
 		"generic": [
@@ -125,16 +122,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Code",
-		"Javascript",
-		"Custom Code",
-		"Script",
-		"cpde"
-	],
+	"alias": ["Code", "Javascript", "Custom Code", "Script", "cpde"],
 	"subcategories": {
-		"Core Nodes": [
-			"Data Transformation"
-		]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 2b595fe363..61a77a5388 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -37,7 +37,7 @@ export class Function implements INodeType {
 				},
 				type: 'string',
 				default: `// Code here will run only once, no matter how many input items there are.
-// More info and help: https://docs.n8n.io/nodes/n8n-nodes-base.function
+// More info and help:https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/
 // Tip: You can use luxon for dates and $jmespath for querying JSON structures
 
 // Loop over inputs and add a new field called 'myNewField' to the JSON of each one
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.json b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.json
index d782ed2a34..600f85c794 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.json
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.functionItem",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.functionItem/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.functionitem/"
 			}
 		],
 		"generic": [
@@ -24,15 +21,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Javascript",
-		"Code",
-		"Custom Code",
-		"JS"
-	],
+	"alias": ["Javascript", "Code", "Custom Code", "JS"],
 	"subcategories": {
-		"Core Nodes": [
-			"Data Transformation"
-		]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 184378870a..21bff58383 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -36,7 +36,7 @@ export class FunctionItem implements INodeType {
 				},
 				type: 'string',
 				default: `// Code here will run once per input item.
-// More info and help: https://docs.n8n.io/nodes/n8n-nodes-base.functionItem
+// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.functionitem/
 // Tip: You can use luxon for dates and $jmespath for querying JSON structures
 
 // Add a new field called 'myNewField' to the JSON of the item
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.json b/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
index 19bd0fb6fb..e4853d405b 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.getResponse",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.getResponse/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.getresponse/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
index 52c74af1e5..7b9dfc6a75 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.getResponseTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.getResponseTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.getresponsetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.json b/packages/nodes-base/nodes/Ghost/Ghost.node.json
index 5db28f3843..919b10268a 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.json
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.ghost",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ghost/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.ghost/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Git/Git.node.json b/packages/nodes-base/nodes/Git/Git.node.json
index 4a6f88488e..ef57934c29 100644
--- a/packages/nodes-base/nodes/Git/Git.node.json
+++ b/packages/nodes-base/nodes/Git/Git.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.git",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes",
-		"Development"
-	],
+	"categories": ["Core Nodes", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.git/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.git/"
 			}
 		]
 	},
-	"subcategories": [
-		"Helpers"
-	]
-}
\ No newline at end of file
+	"subcategories": ["Helpers"]
+}
diff --git a/packages/nodes-base/nodes/Github/Github.node.json b/packages/nodes-base/nodes/Github/Github.node.json
index 92dba24329..5041025a87 100644
--- a/packages/nodes-base/nodes/Github/Github.node.json
+++ b/packages/nodes-base/nodes/Github/Github.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.github",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.github/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.github/"
 			}
 		],
 		"generic": [
@@ -39,4 +37,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.json b/packages/nodes-base/nodes/Github/GithubTrigger.node.json
index 778219bf74..cb2b8474de 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.json
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.githubTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.githubTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.githubtrigger/"
 			}
 		],
 		"generic": [
@@ -34,4 +32,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.json b/packages/nodes-base/nodes/Gitlab/Gitlab.node.json
index efc8af94f4..35a5a33431 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.json
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.gitlab",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gitlab/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.gitlab/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.json b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.json
index e740b4d251..10fac8bfac 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.json
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.gitlabTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gitlabTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.gitlabtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
index ae4d297509..6e2602c1f3 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.goToWebinar",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.goToWebinar/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.gotowebinar/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.json b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.json
index 7775bb04da..5ba31b8802 100644
--- a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.json
+++ b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.json
@@ -2,15 +2,18 @@
 	"node": "n8n-nodes-base.googleAds",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
 				"url": "https://docs.n8n.io/credentials/google"
 			}
 		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googleads/"
+			}
+		],
 		"generic": [
 			{
 				"label": "15 Google apps you can combine and automate to increase productivity",
diff --git a/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.json b/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.json
index 6101c723fb..a33a48b39e 100644
--- a/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.json
+++ b/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleAnalytics",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleAnalytics/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googleanalytics/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json
index 920fe82e79..ca01b69ba7 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.googleBigQuery",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development"
-	],
+	"categories": ["Data & Storage", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleBigQuery/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlebigquery/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json
index bff85e57fd..9b617e946f 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleBooks",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleBooks/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlebooks/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
index 28f1cadbc9..d4a84d2b01 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleCalendar",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleCalendar/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecalendar/"
 			}
 		],
 		"generic": [
@@ -49,4 +47,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.json b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.json
index b5ea5bb2bf..6747405d83 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleCalendarTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleCalendarTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.googlecalendartrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
index a67701cba9..ca9e0c8b4a 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleChat",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleChat/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlechat/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.json b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.json
index 145936ef6b..b6e728b21e 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.json
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleCloudNaturalLanguage",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleCloudNaturalLanguage/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecloudnaturallanguage/"
 			}
 		],
 		"generic": [
@@ -34,4 +32,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.json b/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.json
index dec877db9c..12344a4df2 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.json
+++ b/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.json
@@ -2,16 +2,18 @@
 	"node": "n8n-nodes-base.googleCloudStorage",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
 				"url": "https://docs.n8n.io/credentials/google"
 			}
 		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecloudstorage/"
+			}
+		],
 		"generic": [
 			{
 				"label": "15 Google apps you can combine and automate to increase productivity",
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.json b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.json
index 17c012062f..a0c563603c 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.json
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleContacts",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous "
-	],
+	"categories": ["Miscellaneous "],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleContacts/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecontacts/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.json b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.json
index 6d36a6a944..303ab8ee84 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.json
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleDocs",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleDocs/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googledocs/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
index 978d1194ad..7f5cbe139f 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleDrive",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleDrive/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googledrive/"
 			}
 		],
 		"generic": [
@@ -33,4 +31,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.json b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.json
index 462ccc3e3b..f1e32dc055 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.json
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleDriveTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleDriveTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.googledrivetrigger/"
 			}
 		],
 		"generic": [
@@ -23,4 +21,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.json
index d5d7c75ebf..b808839e35 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.json
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleFirebaseCloudFirestore",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/nodes/n8n-nodes-base.googlecloudfirestore/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecloudfirestore/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.json b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.json
index 367dd9aeb1..91388447e9 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.json
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleFirebaseRealtimeDatabase",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/nodes/n8n-nodes-base.googlecloudrealtimedatabase/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlecloudrealtimedatabase/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.json b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.json
index 52626dce47..e2156aa92a 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.json
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.gSuiteAdmin",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gSuiteAdmin/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.gsuiteadmin/"
 			}
 		],
 		"generic": [
@@ -24,7 +22,5 @@
 			}
 		]
 	},
-	"alias": [
-		"Workspaces"
-	]
-}
\ No newline at end of file
+	"alias": ["Workspaces"]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index 055cd7161f..5697e2fd4d 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gmail/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.gmail/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.json b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.json
index 9bdd8e99fe..9203ba06e5 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gmailTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.gmailtrigger/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.json b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.json
index dc3a287b67..36c90ba7b6 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.json
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.googlePerspective",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics",
-		"Utility"
-	],
+	"categories": ["Analytics", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googlePerspective/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googleperspective/"
 			}
 		],
 		"generic": [
@@ -25,7 +22,5 @@
 			}
 		]
 	},
-	"alias": [
-		"Moderation"
-	]
-}
\ No newline at end of file
+	"alias": ["Moderation"]
+}
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
index 400390f2dd..4fe8f6efed 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.googleSheets",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Productivity"
-	],
+	"categories": ["Data & Storage", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleSheets/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlesheets/"
 			}
 		],
 		"generic": [
@@ -94,9 +91,5 @@
 			}
 		]
 	},
-	"alias": [
-		"CSV",
-		"Spreadsheet",
-		"GS"
-	]
-}
\ No newline at end of file
+	"alias": ["CSV", "Spreadsheet", "GS"]
+}
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
index 81568455d1..70d37a5d51 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleSlides",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleSlides/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googleslides/"
 			}
 		],
 		"generic": [
@@ -29,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.json b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.json
index 3aae6c8412..399fdddbcb 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.json
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleTasks",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleTasks/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googletasks/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.json b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.json
index d655025f26..d5f76e7747 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.json
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.googleTranslate",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleTranslate/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googletranslate/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
index 4fc682dfc2..8523661c36 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.youTube",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.youTube/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.youtube/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.json b/packages/nodes-base/nodes/Gotify/Gotify.node.json
index b980ce56a2..02cc119ed7 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.json
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.gotify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gotify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.gotify/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.json b/packages/nodes-base/nodes/Grafana/Grafana.node.json
index 2ca269f90e..ae39d64c16 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.json
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.grafana",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Analytics"
-	],
+	"categories": ["Development", "Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.grafana/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.grafana/"
 			}
 		]
 	},
-	"alias": [
-		"Prometheus"
-	]
+	"alias": ["Prometheus"]
 }
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.json b/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
index dbbc9fcb5e..fad9395605 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.graphql",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development"
-	],
+	"categories": ["Data & Storage", "Development"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.graphql/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.graphql/"
 			}
 		],
 		"generic": [
@@ -30,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.json b/packages/nodes-base/nodes/Grist/Grist.node.json
index ec29bd838f..c189c7ba1d 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.json
+++ b/packages/nodes-base/nodes/Grist/Grist.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.grist",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.grist/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.grist/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.json b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.json
index 10d7b63d91..7dab996b22 100644
--- a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.json
+++ b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.gumroadTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.gumroadTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.gumroadtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
index e0d7dbff7c..6a9fb7c977 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.hackerNews",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hackerNews/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.hackernews/"
 			}
 		],
 		"generic": [
@@ -20,4 +17,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.json b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.json
index 5344b7906e..8694e232b2 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.json
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.haloPSA",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.haloPSA/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.halopsa/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.json b/packages/nodes-base/nodes/Harvest/Harvest.node.json
index d250d580d0..3dd350929c 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.json
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.harvest",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.harvest/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.harvest/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.json b/packages/nodes-base/nodes/HelpScout/HelpScout.node.json
index dce19f1e6b..2d91e510e4 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.json
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.helpScout",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.helpScout/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.helpscout/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.json b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.json
index ff94646d4a..a7452ce508 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.json
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.helpScoutTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.helpScoutTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.helpscouttrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HighLevel/HighLevel.node.json b/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
index dff68c3b19..a7370f857c 100644
--- a/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
+++ b/packages/nodes-base/nodes/HighLevel/HighLevel.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.highLevel/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.highlevel/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/HighLevel/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/description/ContactDescription.ts
index 566b391371..bd78b9babf 100644
--- a/packages/nodes-base/nodes/HighLevel/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/description/ContactDescription.ts
@@ -180,7 +180,7 @@ const customFields: INodeProperties = {
 					required: true,
 					default: '',
 					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
+						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
 					typeOptions: {
 						loadOptions: {
 							routing: {
diff --git a/packages/nodes-base/nodes/HighLevel/description/OpportunityDescription.ts b/packages/nodes-base/nodes/HighLevel/description/OpportunityDescription.ts
index 3a311c52b9..b7056da376 100644
--- a/packages/nodes-base/nodes/HighLevel/description/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/description/OpportunityDescription.ts
@@ -109,7 +109,7 @@ const pipelineId: INodeProperties = {
 		},
 	},
 	description:
-		'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
+		'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
 	typeOptions: {
 		loadOptions: {
 			routing: {
@@ -561,7 +561,7 @@ const updateProperties: INodeProperties[] = [
 		name: 'opportunityId',
 		type: 'string',
 		required: true,
-		hint: 'You cannot update an opportunity\'s pipeline ID.',
+		hint: "You cannot update an opportunity's pipeline ID.",
 		displayOptions: {
 			show: {
 				resource: ['opportunity'],
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
index d5b99fa9af..67759bb5b8 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.homeAssistant",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.homeAssistant/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.homeassistant/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
index 65818f52b9..81f71dc05c 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.htmlExtract",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.htmlExtract/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.htmlextract/"
 			}
 		],
 		"generic": [
@@ -35,8 +33,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
index c97b66cdbb..c4e75519bd 100644
--- a/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
+++ b/packages/nodes-base/nodes/HttpRequest/HttpRequest.node.json
@@ -1,16 +1,12 @@
-
 {
 	"node": "n8n-nodes-base.httpRequest",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.httpRequest/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/"
 			}
 		],
 		"generic": [
@@ -130,15 +126,8 @@
 			}
 		]
 	},
-	"alias": [
-		"API",
-		"Request",
-		"URL",
-		"Build"
-	],
+	"alias": ["API", "Request", "URL", "Build"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
index 4c07f5fe7a..2503c381bb 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.hubspot",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hubspot/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.hubspot/"
 			}
 		],
 		"generic": [
@@ -44,4 +42,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json
index a4d4796a77..eaedd67075 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.hubspotTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hubspotTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.hubspottrigger/"
 			}
 		],
 		"generic": [
@@ -29,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.json b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.json
index 4897b8f756..ea4add60fc 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.json
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.humanticAi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.humanticAi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.humanticai/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.json b/packages/nodes-base/nodes/Hunter/Hunter.node.json
index a604e036a5..4ad049edf0 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.json
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.hunter",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hunter/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.hunter/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ICalendar/ICalendar.node.json b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
index e0f9038e8a..305df5af63 100644
--- a/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
+++ b/packages/nodes-base/nodes/ICalendar/ICalendar.node.json
@@ -2,20 +2,15 @@
 	"node": "n8n-nodes-base.iCal",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes",
-		"Productivity"
-	],
+	"categories": ["Core Nodes", "Productivity"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.iCal/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ical/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/If/If.node.json b/packages/nodes-base/nodes/If/If.node.json
index e9a162fb9d..95b0968219 100644
--- a/packages/nodes-base/nodes/If/If.node.json
+++ b/packages/nodes-base/nodes/If/If.node.json
@@ -3,13 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "The IF node can be used to implement binary conditional logic in your workflow. You can set up one-to-many conditions to evaluate each item of data being inputted into the node. That data will either evaluate to TRUE or FALSE and route out of the node accordingly.\n\nThis node has multiple types of conditions: Bool, String, Number, and Date & Time.",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.if/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.if/"
 			}
 		],
 		"generic": [
@@ -104,17 +102,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Router",
-		"Filter",
-		"Condition",
-		"Logic",
-		"Boolean",
-		"Branch"
-	],
+	"alias": ["Router", "Filter", "Condition", "Logic", "Boolean", "Branch"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.json b/packages/nodes-base/nodes/Intercom/Intercom.node.json
index db816cf125..6209356b27 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.json
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.intercom",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Sales"
-	],
+	"categories": ["Communication", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.intercom/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.intercom/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Interval/Interval.node.json b/packages/nodes-base/nodes/Interval/Interval.node.json
index 6783e82d44..ade522bf61 100644
--- a/packages/nodes-base/nodes/Interval/Interval.node.json
+++ b/packages/nodes-base/nodes/Interval/Interval.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.interval",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.interval/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.interval/"
 			}
 		],
 		"generic": [
@@ -24,14 +22,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Time",
-		"Scheduler",
-		"Polling"
-	],
+	"alias": ["Time", "Scheduler", "Polling"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.json b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.json
index 8c8571701d..c143be77f6 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.json
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.invoiceNinja",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.invoiceNinja/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.invoiceninja/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.json b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.json
index ceab8a351e..f50a67a1e9 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.json
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.invoiceNinjaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.invoiceNinjaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.invoiceninjatrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ItemLists/ItemLists.node.json b/packages/nodes-base/nodes/ItemLists/ItemLists.node.json
index 3697db977e..dfbb165f05 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.json
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.json
@@ -3,13 +3,11 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"details": "",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.itemLists/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.itemlists/"
 			}
 		],
 		"generic": []
@@ -37,8 +35,6 @@
 		"Iterate"
 	],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.json b/packages/nodes-base/nodes/Iterable/Iterable.node.json
index 2aef65b27c..8c759c8017 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.json
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.iterable",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.iterable/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.iterable/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Jenkins/Jenkins.node.json b/packages/nodes-base/nodes/Jenkins/Jenkins.node.json
index 8848a7cf2b..6f28938f67 100644
--- a/packages/nodes-base/nodes/Jenkins/Jenkins.node.json
+++ b/packages/nodes-base/nodes/Jenkins/Jenkins.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.jenkins",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.jenkins/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.jenkins/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.json b/packages/nodes-base/nodes/Jira/Jira.node.json
index 3845ffa91d..dce5f98aa1 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.json
+++ b/packages/nodes-base/nodes/Jira/Jira.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.jira",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Productivity"
-	],
+	"categories": ["Development", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.jira/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.jira/"
 			}
 		],
 		"generic": [
@@ -29,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.json b/packages/nodes-base/nodes/Jira/JiraTrigger.node.json
index e6fb728816..4077e9f703 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.json
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.jiraTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Productivity"
-	],
+	"categories": ["Development", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.jiraTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.jiratrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.json b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.json
index 917dd1e232..6c7408b20e 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.json
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.jotFormTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.jotFormTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.jotformtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.json b/packages/nodes-base/nodes/Kafka/Kafka.node.json
index a8c27ae5f6..fb595734af 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.json
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.kafka",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.kafka/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.kafka/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.json b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.json
index fb13088c5c..c035d277bf 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.json
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.kafkaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.kafkaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.kafkatrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.json b/packages/nodes-base/nodes/Keap/Keap.node.json
index 6370d6d32d..d926b7f082 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.json
+++ b/packages/nodes-base/nodes/Keap/Keap.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.keap",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Communication"
-	],
+	"categories": ["Sales", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.keap/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.keap/"
 			}
 		]
 	},
-	"alias": [
-		"Infusionsoft"
-	]
-}
\ No newline at end of file
+	"alias": ["Infusionsoft"]
+}
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.json b/packages/nodes-base/nodes/Keap/KeapTrigger.node.json
index a82ea85788..2351396cba 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.json
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.keapTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Communication"
-	],
+	"categories": ["Sales", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.keapTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.keaptrigger/"
 			}
 		]
 	},
-	"alias": [
-		"Infusionsoft"
-	]
-}
\ No newline at end of file
+	"alias": ["Infusionsoft"]
+}
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
index 9f8e68083d..d4bf9d70fc 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.kitemaker",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.kitemaker/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.kitemaker/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.json b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.json
index 8400be7c4c..a24b69c51e 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.json
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.koBoToolbox",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Data & Storage"
-	],
+	"categories": ["Communication", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/nodes/n8n-nodes-base.kobotoolbox/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.kobotoolbox/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.json b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.json
index 63cc180465..b18a2b93ee 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.json
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.koBoToolboxTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Data & Storage"
-	],
+	"categories": ["Communication", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.kobotoolboxtrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.kobotoolboxtrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.json b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
index a0be715b8d..ea5db73535 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.lemlist",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.lemlist/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.lemlist/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
index c186b35b2e..e6940412d6 100644
--- a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.lemlistTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.lemlistTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.lemlisttrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Line/Line.node.json b/packages/nodes-base/nodes/Line/Line.node.json
index 2c7001221e..16065ab5cf 100644
--- a/packages/nodes-base/nodes/Line/Line.node.json
+++ b/packages/nodes-base/nodes/Line/Line.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.line",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.line/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.line/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.json b/packages/nodes-base/nodes/Linear/Linear.node.json
index cc917e993b..47e5494258 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.json
+++ b/packages/nodes-base/nodes/Linear/Linear.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.linear",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/nodes/n8n-nodes-base.linear/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.linear/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.json b/packages/nodes-base/nodes/Linear/LinearTrigger.node.json
index 8963945577..15e509889e 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.json
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.linearTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.linearTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.lineartrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
index 6ac2b29cb0..d62c9d15bb 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.lingvaNex",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.lingvaNex/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.lingvanex/"
 			}
 		],
 		"generic": [
@@ -29,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
index 535d103879..a3db83c26b 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.linkedIn",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.linkedIn/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.linkedin/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.json b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.json
index 3ca3c38063..522009d54e 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.json
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.json
@@ -2,23 +2,16 @@
 	"node": "n8n-nodes-base.localFileTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.localFileTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.localfiletrigger/"
 			}
 		]
 	},
-	"alias": [
-		"Watch",
-		"Monitor"
-	],
+	"alias": ["Watch", "Monitor"],
 	"subcategories": {
-		"Core Nodes":[
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
 }
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.json b/packages/nodes-base/nodes/MQTT/Mqtt.node.json
index 87bc383a6e..c5ffe97609 100644
--- a/packages/nodes-base/nodes/MQTT/Mqtt.node.json
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mqtt",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Communication"
-	],
+	"categories": ["Development", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mqtt/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mqtt/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.json b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.json
index bda3f2b3f2..265919ff61 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.json
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mqttTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mqttTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.mqtttrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.json b/packages/nodes-base/nodes/Magento/Magento2.node.json
index 47c0b5dc1f..8c08d91ee9 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.json
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.magento2",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.magento2/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.magento2/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
index 663ce32994..e813ecc09b 100644
--- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailcheck",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility",
-		"Marketing & Content"
-	],
+	"categories": ["Utility", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailcheck/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mailcheck/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
index eb3c43a08b..25660115fc 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailchimp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailchimp/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mailchimp/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
index 376d7b483c..8974b1eb2a 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailchimpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailchimpTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.mailchimptrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.json b/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
index 6da124da79..a95b8072dc 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailerLite",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailerLite/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mailerlite/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
index a6d8dc3884..e5b80786cf 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailerLiteTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailerLiteTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.mailerlitetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.json b/packages/nodes-base/nodes/Mailgun/Mailgun.node.json
index 00329e4163..f02842cfd5 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.json
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailgun",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailgun/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mailgun/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.json b/packages/nodes-base/nodes/Mailjet/Mailjet.node.json
index 28e3488c16..52be2a0d51 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.json
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailjet",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailjet/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mailjet/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.json b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.json
index def19aafad..be043f3598 100644
--- a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.json
+++ b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mailjetTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailjetTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.mailjettrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.json b/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
index 94af89eb30..3fb079f9e3 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mandrill",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mandrill/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mandrill/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.json b/packages/nodes-base/nodes/Markdown/Markdown.node.json
index 04d038180f..75bf5b1d41 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.json
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.json
@@ -2,14 +2,12 @@
 	"node": "n8n-nodes-base.markdown",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.markdown/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.markdown/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.json b/packages/nodes-base/nodes/Marketstack/Marketstack.node.json
index 6fd5c09e28..34ca65c3c6 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.json
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.marketstack",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics",
-		"Finance & Accounting"
-	],
+	"categories": ["Analytics", "Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.marketstack/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.marketstack/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.json b/packages/nodes-base/nodes/Matrix/Matrix.node.json
index 50507cd3b3..4e06553157 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.json
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.matrix",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.matrix/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.matrix/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
index bea3318f08..be0a6aa892 100644
--- a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
+++ b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.mattermost",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mattermost/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mattermost/"
 			}
 		],
 		"generic": [
@@ -72,4 +70,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.json b/packages/nodes-base/nodes/Mautic/Mautic.node.json
index 97412dc2ce..c05d7f16cb 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.json
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mautic",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mautic/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mautic/"
 			}
 		],
 		"generic": [
@@ -30,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
index 2045c6cb6f..eff930493c 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mauticTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mauticTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.mautictrigger/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.json b/packages/nodes-base/nodes/Medium/Medium.node.json
index 1ebaac9bf7..f3a299c3a2 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.json
+++ b/packages/nodes-base/nodes/Medium/Medium.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.medium",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.medium/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.medium/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Merge/Merge.node.json b/packages/nodes-base/nodes/Merge/Merge.node.json
index a4f862c9ad..90e758befd 100644
--- a/packages/nodes-base/nodes/Merge/Merge.node.json
+++ b/packages/nodes-base/nodes/Merge/Merge.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.merge/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.merge/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.json b/packages/nodes-base/nodes/MessageBird/MessageBird.node.json
index 1411359d30..9b6e7942b2 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.json
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.messageBird",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.messageBird/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.messagebird/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Metabase/Metabase.node.json b/packages/nodes-base/nodes/Metabase/Metabase.node.json
index da32bf963c..38dc83ff4c 100644
--- a/packages/nodes-base/nodes/Metabase/Metabase.node.json
+++ b/packages/nodes-base/nodes/Metabase/Metabase.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.metabse/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.metabase/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
index 4773de0577..7709b0d0bc 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.microsoftDynamicsCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Sales"
-	],
+	"categories": ["Marketing & Content", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftDynamicsCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftdynamicscrm/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
index f7f404cca9..b915e85f90 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.microsoftExcel",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Productivity"
-	],
+	"categories": ["Data & Storage", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,12 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftExcel/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftexcel/"
 			}
 		]
 	},
-	"alias": [
-		"CSV",
-		"Spreadsheet"
-	]
+	"alias": ["CSV", "Spreadsheet"]
 }
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.json b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.json
index 17cf8f3d7d..36e445898a 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.json
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.microsoftGraphSecurity",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftGraphSecurity/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftgraphsecurity/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
index 3e90220118..e596232b66 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.microsoftOneDrive",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftOneDrive/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftonedrive/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
index f0ffd65a72..4d2d75972f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.microsoftOutlook",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftOutlook/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftoutlook/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.json b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.json
index 4d57d97c1e..887483e6a0 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.microsoftSql",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftSql/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftsql/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
index 729a6fee9f..569b5b8df7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.microsoftTeams",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftTeams/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftteams/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json
index 8ebdf1294e..4cb5033368 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.microsoftToDo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftToDo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsofttodo/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.json b/packages/nodes-base/nodes/Mindee/Mindee.node.json
index 7beefd70e0..768717cb23 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.json
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.json
@@ -11,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mindee/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mindee/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.json b/packages/nodes-base/nodes/Misp/Misp.node.json
index 4d71050369..16b91eadfc 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.json
+++ b/packages/nodes-base/nodes/Misp/Misp.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.misp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.misp/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.misp/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.json b/packages/nodes-base/nodes/Mocean/Mocean.node.json
index 15225f919d..d969c2159f 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.json
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.mocean",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mocean/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mocean/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.json b/packages/nodes-base/nodes/MondayCom/MondayCom.node.json
index 222c0e0656..125d473a40 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.json
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.mondayCom",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mondayCom/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mondaycom/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.json b/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
index c7efbc0705..21242c01b9 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mongoDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mongoDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mongodb/"
 			}
 		],
 		"generic": [
@@ -40,4 +37,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.json b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.json
index 4909761a2b..4a0e148251 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.json
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.monicaCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.monicaCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.monicacrm/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
index 1cd16b4c16..0693d5b238 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.json
@@ -2,19 +2,15 @@
 	"node": "n8n-nodes-base.moveBinaryData",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.moveBinaryData/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.movebinarydata/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.json b/packages/nodes-base/nodes/Msg91/Msg91.node.json
index 96b57c98cc..a027d82015 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.json
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.msg91",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.msg91/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.msg91/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.json b/packages/nodes-base/nodes/MySql/MySql.node.json
index 276973bf3a..71be902059 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.json
+++ b/packages/nodes-base/nodes/MySql/MySql.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.mySql",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mySql/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.mysql/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
index 562fb8f807..55a3760bfb 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
@@ -2,19 +2,15 @@
 	"node": "n8n-nodes-base.n8nTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.n8nTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.n8ntrigger/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.json b/packages/nodes-base/nodes/Nasa/Nasa.node.json
index 95a8b23853..ba40379333 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.json
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.nasa",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.nasa/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.nasa/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.json b/packages/nodes-base/nodes/Netlify/Netlify.node.json
index 65c102a720..5108033718 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.json
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.netlify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.netlify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.netlify/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.json b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.json
index a5f88c0297..790a8e4f5e 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.json
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.netlifyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.netlifyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.netlifytrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.json b/packages/nodes-base/nodes/NextCloud/NextCloud.node.json
index dc3025d87d..eac0530d66 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.json
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.nextCloud",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.nextCloud/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.nextcloud/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/NoOp/NoOp.node.json b/packages/nodes-base/nodes/NoOp/NoOp.node.json
index 9f6d89e211..6aa6646bc0 100644
--- a/packages/nodes-base/nodes/NoOp/NoOp.node.json
+++ b/packages/nodes-base/nodes/NoOp/NoOp.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.noOp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.noOp/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.noop/"
 			}
 		],
 		"generic": [
@@ -73,12 +71,8 @@
 			}
 		]
 	},
-	"alias": [
-		"nothing"
-	],
+	"alias": ["nothing"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.json b/packages/nodes-base/nodes/NocoDB/NocoDB.node.json
index 0e9c652a98..8e3898877c 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.json
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.nocoDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,10 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.nocoDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.nocodb/"
 			}
 		],
-		"generic": [
-		]
+		"generic": []
 	}
 }
diff --git a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
index b62a583b9b..895e08c1cd 100644
--- a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
+++ b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
@@ -29,7 +29,7 @@ export const operationFields: INodeProperties[] = [
 		},
 		required: true,
 		description:
-			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
 		typeOptions: {
 			loadOptionsMethod: 'getProjects',
 		},
@@ -46,7 +46,7 @@ export const operationFields: INodeProperties[] = [
 		},
 		required: true,
 		description:
-			'The table to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			'The table to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
 		typeOptions: {
 			loadOptionsDependsOn: ['projectId'],
 			loadOptionsMethod: 'getTables',
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.json b/packages/nodes-base/nodes/Notion/Notion.node.json
index 3a56fed77f..d92fd7ed38 100644
--- a/packages/nodes-base/nodes/Notion/Notion.node.json
+++ b/packages/nodes-base/nodes/Notion/Notion.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.notion",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.notion/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.notion/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.json b/packages/nodes-base/nodes/Notion/NotionTrigger.node.json
index 225994d2b4..5b4c343f2c 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.json
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.notionTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.notionTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.notiontrigger/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.json b/packages/nodes-base/nodes/Odoo/Odoo.node.json
index 5d747fa081..bbe953ee18 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.json
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.odoo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.odoo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.odoo/"
 			}
 		]
 	},
-	"alias": [
-		"ERP"
-	]
-}
\ No newline at end of file
+	"alias": ["ERP"]
+}
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.json b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.json
index ac863a7e88..1de79188c3 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.json
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.oneSimpleApi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.oneSimpleApi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.onesimpleapi/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.json b/packages/nodes-base/nodes/Onfleet/Onfleet.node.json
index ca3ab08354..d6ca8f4fed 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.json
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.onfleet",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.onfleet/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.onfleet/"
 			}
 		]
-	},
-}
\ No newline at end of file
+	}
+}
diff --git a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.json b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.json
index 531cc339f1..f0d6fd3e1f 100644
--- a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.json
+++ b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.onfleetTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.onfleetTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.onfleettrigger/"
 			}
 		]
-	},
-}
\ No newline at end of file
+	}
+}
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.json b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.json
index 07d59d16db..9586b396d7 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.json
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.json
@@ -2,14 +2,12 @@
 	"node": "n8n-nodes-base.openThesaurus",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.openThesaurus/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.openthesaurus/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.json b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.json
index af49f98885..abe36d2585 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.json
+++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.openWeatherMap",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous",
-		"Utility"
-	],
+	"categories": ["Miscellaneous", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.openWeatherMap/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.openweathermap/"
 			}
 		],
 		"generic": [
@@ -30,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.json b/packages/nodes-base/nodes/Orbit/Orbit.node.json
index e0720e8c51..143d6c436e 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.json
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.orbit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.orbit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.orbit/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.json b/packages/nodes-base/nodes/Oura/Oura.node.json
index e362cedd39..898da47498 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.json
+++ b/packages/nodes-base/nodes/Oura/Oura.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.oura",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.oura/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.oura/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.json b/packages/nodes-base/nodes/Paddle/Paddle.node.json
index d85e386617..4109b04f20 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.json
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.paddle",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.paddle/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.paddle/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
index b4f98d32c4..b058736842 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.pagerDuty",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pagerDuty/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.pagerduty/"
 			}
 		],
 		"generic": [
@@ -29,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.json b/packages/nodes-base/nodes/PayPal/PayPal.node.json
index 5d0967e5db..3f5e7c084e 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.json
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.payPal",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting",
-		"Sales"
-	],
+	"categories": ["Finance & Accounting", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.payPal/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.paypal/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.json b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.json
index 6ae1e78be0..cbb227bcde 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.json
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.payPalTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting",
-		"Sales"
-	],
+	"categories": ["Finance & Accounting", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.payPalTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.paypaltrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Peekalink/Peekalink.node.json b/packages/nodes-base/nodes/Peekalink/Peekalink.node.json
index 00f4b0836a..0af7638751 100644
--- a/packages/nodes-base/nodes/Peekalink/Peekalink.node.json
+++ b/packages/nodes-base/nodes/Peekalink/Peekalink.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.peekalink",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.peekalink/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.peekalink/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
index 9304753544..1b5407627f 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.phantombuster",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Marketing & Content"
-	],
+	"categories": ["Sales", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.phantombuster/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.phantombuster/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json
index 23c6e736fb..fddb858963 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.philipsHue",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.philipsHue/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.philipshue/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.json b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.json
index 3910be7335..1aec4204d9 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.json
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.pipedrive",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pipedrive/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.pipedrive/"
 			}
 		],
 		"generic": [
@@ -29,4 +27,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.json b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.json
index 72cbd9af36..fdaf29933f 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.json
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.pipedriveTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pipedriveTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.pipedrivetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.json b/packages/nodes-base/nodes/Plivo/Plivo.node.json
index 64e49874aa..b067921073 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.json
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.plivo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.plivo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.plivo/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/PostBin/PostBin.node.json b/packages/nodes-base/nodes/PostBin/PostBin.node.json
index 1e46a63e04..eb3da81042 100644
--- a/packages/nodes-base/nodes/PostBin/PostBin.node.json
+++ b/packages/nodes-base/nodes/PostBin/PostBin.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.postbin",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.postbin/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postbin/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.json b/packages/nodes-base/nodes/PostHog/PostHog.node.json
index c2dde1fcb0..c7bf696b17 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.json
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.postHog",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics",
-		"Development"
-	],
+	"categories": ["Analytics", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.postHog/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.posthog/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.json b/packages/nodes-base/nodes/Postgres/Postgres.node.json
index 2626ccf41c..dcf357b422 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.json
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.postgres",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.postgres/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres/"
 			}
 		],
 		"generic": [
@@ -50,4 +47,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 7f69650c17..1ecd8c0581 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -238,7 +238,7 @@ export class Postgres implements INodeType {
 						],
 						default: 'multiple',
 						description:
-							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/nodes/n8n-nodes-base.postgres/">the docs</a> for more examples',
+							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.postgres/">the docs</a> for more examples',
 					},
 					{
 						displayName: 'Output Large-Format Numbers As',
@@ -368,26 +368,14 @@ export class Postgres implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQueryV2.call(
-				this,
-				pgp,
-				db,
-				items,
-				this.continueOnFail(),
-			);
+			const queryResult = await pgQueryV2.call(this, pgp, db, items, this.continueOnFail());
 			returnItems = queryResult as INodeExecutionData[];
 		} else if (operation === 'insert') {
 			// ----------------------------------
 			//         insert
 			// ----------------------------------
 
-			const insertData = await pgInsertV2.call(
-				this,
-				pgp,
-				db,
-				items,
-				this.continueOnFail(),
-			);
+			const insertData = await pgInsertV2.call(this, pgp, db, items, this.continueOnFail());
 
 			// returnItems = this.helpers.returnJsonArray(insertData);
 			returnItems = insertData as INodeExecutionData[];
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.json b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.json
index a154729b41..0b97c07095 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.json
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.postmarkTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.postmarkTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.postmarktrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.json b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.json
index f1144bd97e..fed13d60f6 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.json
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.profitWell",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.profitWell/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.profitwell/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.json b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.json
index 08b8a32fb1..32604edfb5 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.json
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.pushbullet",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pushbullet/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.pushbullet/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pushcut/Pushcut.node.json b/packages/nodes-base/nodes/Pushcut/Pushcut.node.json
index b84add3ab4..52f6eaaf0e 100644
--- a/packages/nodes-base/nodes/Pushcut/Pushcut.node.json
+++ b/packages/nodes-base/nodes/Pushcut/Pushcut.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.pushcut",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Productivity"
-	],
+	"categories": ["Communication", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pushcut/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.pushcut/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.json b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.json
index 488731a4e6..d7e75da64c 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.json
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.pushcutTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pushcutTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.pushcuttrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.json b/packages/nodes-base/nodes/Pushover/Pushover.node.json
index edff2253b7..024c4e6e1b 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.json
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.pushover",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.pushover/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.pushover/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.json b/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
index 892b587e39..e4308777b2 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.questDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development"
-	],
+	"categories": ["Data & Storage", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.questDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.questdb/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 3435d34351..2281d90f4a 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -163,7 +163,7 @@ export class QuestDb implements INodeType {
 						],
 						default: 'independently',
 						description:
-							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/nodes/n8n-nodes-base.questDb/">the docs</a> for more examples.',
+							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.questdb/">the docs</a> for more examples.',
 					},
 					{
 						displayName: 'Query Parameters',
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.json b/packages/nodes-base/nodes/QuickBase/QuickBase.node.json
index 49be7c50ed..7ec1c64309 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.json
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.quickbase",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.quickbase/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.quickbase/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.json b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.json
index 859beeb312..7d281c94c4 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.json
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.quickbooks",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.quickbooks/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.quickbooks/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.json b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.json
index 011221f52e..2c8a46de71 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.json
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.rabbitmq",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.rabbitmq/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.rabbitmq/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.json b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.json
index 6f819e0d9e..f2c58e7efe 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.json
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.rabbitmqTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.rabbitmqTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.rabbitmqtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.json b/packages/nodes-base/nodes/Raindrop/Raindrop.node.json
index 4ff1b1f6dd..2843487ad2 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.json
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.raindrop",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.raindrop/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.raindrop/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
index 0ac19cca14..74ce2121fb 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.readBinaryFile",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.readBinaryFile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfile/"
 			}
 		],
 		"generic": [
@@ -29,14 +27,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Text",
-		"Open",
-		"Import"
-	],
+	"alias": ["Text", "Open", "Import"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
 }
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
index 0097bb3ed6..467151be71 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
@@ -2,24 +2,16 @@
 	"node": "n8n-nodes-base.readBinaryFiles",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.readBinaryFiles/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfiles/"
 			}
 		]
 	},
-	"alias": [
-		"Text",
-		"Open",
-		"Import"
-	],
+	"alias": ["Text", "Open", "Import"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
index c495bfb330..e3c4a8723b 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.json
@@ -2,19 +2,15 @@
 	"node": "n8n-nodes-base.readPDF",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.readPDF/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readpdf/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.json b/packages/nodes-base/nodes/Reddit/Reddit.node.json
index c0b6e172a0..85969e575a 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.json
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.reddit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.reddit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.reddit/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.json b/packages/nodes-base/nodes/Redis/Redis.node.json
index d435dbffda..4a68a1ed18 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.json
+++ b/packages/nodes-base/nodes/Redis/Redis.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.redis",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.redis/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.redis/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.json b/packages/nodes-base/nodes/Redis/RedisTrigger.node.json
index 611cbccf5b..6861d631a8 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.json
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.json
@@ -2,11 +2,7 @@
 	"node": "n8n-nodes-base.redisTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Communication", "Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -15,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.redisTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.redistrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.json b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.json
index 5c8db5c150..1ced46b808 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.json
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.json
@@ -2,19 +2,15 @@
 	"node": "n8n-nodes-base.renameKeys",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.renameKeys/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.renamekeys/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Data Transformation"
-		]
+		"Core Nodes": ["Data Transformation"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
index 99bf635add..0df99d6aba 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.json
@@ -2,18 +2,15 @@
 	"node": "n8n-nodes-base.respondToWebhook",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes",
-		"Utility"
-	],
+	"categories": ["Core Nodes", "Utility"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.respondToWebhook/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/"
 			}
 		]
 	},
 	"subcategories": {
-			"Core Nodes":["Flow"]
-		}
+		"Core Nodes": ["Flow"]
+	}
 }
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
index 96b8884855..f3a7b697e4 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.rocketchat",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.rocketchat/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.rocketchat/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
index 9c277c2c7e..234ca92da9 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.rssFeedRead",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.rssFeedRead/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.rssfeedread/"
 			}
 		],
 		"generic": [
@@ -25,8 +23,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.json b/packages/nodes-base/nodes/Rundeck/Rundeck.node.json
index ff6817eb08..ce0b7efc4e 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.json
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.rundeck",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.rundeck/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.rundeck/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/S3/S3.node.json b/packages/nodes-base/nodes/S3/S3.node.json
index cf313d409a..c681e5163e 100644
--- a/packages/nodes-base/nodes/S3/S3.node.json
+++ b/packages/nodes-base/nodes/S3/S3.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.s3",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Data & Storage"
-	],
+	"categories": ["Development", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.s3/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.s3/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.json b/packages/nodes-base/nodes/Salesforce/Salesforce.node.json
index 003f202366..e449f57358 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.json
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.salesforce",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Communication"
-	],
+	"categories": ["Sales", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.salesforce/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.salesforce/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.json b/packages/nodes-base/nodes/Salesmate/Salesmate.node.json
index 81124d9444..b2cb2e8677 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.json
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.salesmate",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.salesmate/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.salesmate/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.json b/packages/nodes-base/nodes/SeaTable/SeaTable.node.json
index b7e9b1d12f..47685f82cd 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.json
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.seaTable",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.seaTable/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.seatable/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.json b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.json
index bfdc519b62..9676b9e9c0 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.json
+++ b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.seaTableTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.seaTableTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.seatabletrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
index 90a626f06b..c01fdc930f 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.securityScorecard",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics"
-	],
+	"categories": ["Analytics"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.securityScorecard/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.securityscorecard/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.json b/packages/nodes-base/nodes/Segment/Segment.node.json
index c02793fd54..5fbd15a890 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.json
+++ b/packages/nodes-base/nodes/Segment/Segment.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.segment",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Analytics",
-		"Development"
-	],
+	"categories": ["Analytics", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.segment/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.segment/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.json b/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
index 553e85a7c2..3e5fdccc37 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.sendGrid",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sendGrid/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sendgrid/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json b/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json
index b63fbbbb85..abf2d926f1 100644
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json
+++ b/packages/nodes-base/nodes/SendInBlue/SendInBlue.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.sendInBlue",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sendInBlue/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sendinblue/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json
index c3636e7870..f553e8d39f 100644
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json
+++ b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.sendInBlueTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sendInBlueTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.sendinbluetrigger/"
 			}
 		],
 		"generic": []
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.json b/packages/nodes-base/nodes/Sendy/Sendy.node.json
index 0dbe9c5034..f3c54f179f 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.json
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.sendy",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Marketing & Content"
-	],
+	"categories": ["Communication", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sendy/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sendy/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.json b/packages/nodes-base/nodes/SentryIo/SentryIo.node.json
index e82a86bd3b..2104c73ca4 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.json
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.sentryIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sentryIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sentryio/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.json b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.json
index 84e6b75a81..88eb7d6aef 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.json
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.serviceNow",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Communication"
-	],
+	"categories": ["Productivity", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.serviceNow/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.servicenow/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Set/Set.node.json b/packages/nodes-base/nodes/Set/Set.node.json
index 1fdfa65445..6710d8cd86 100644
--- a/packages/nodes-base/nodes/Set/Set.node.json
+++ b/packages/nodes-base/nodes/Set/Set.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.set",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.set/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.set/"
 			}
 		],
 		"generic": [
@@ -123,15 +121,8 @@
 			}
 		]
 	},
-	"alias": [
-		"JSON",
-		"Filter",
-		"Transform",
-		"Map"
-	],
+	"alias": ["JSON", "Filter", "Transform", "Map"],
 	"subcategories": {
-		"Core Nodes": [
-			"Data Transformation"
-		]
+		"Core Nodes": ["Data Transformation"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.json b/packages/nodes-base/nodes/Shopify/Shopify.node.json
index adf081cbd7..3d2304ca21 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.json
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.shopify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.shopify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.shopify/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.json b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.json
index acb2099324..0ccad56700 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.json
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.shopifyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.shopifyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.shopifytrigger/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.json b/packages/nodes-base/nodes/Signl4/Signl4.node.json
index e6e06e864f..6768d9fd84 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.json
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.signl4",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.signl4/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.signl4/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.json b/packages/nodes-base/nodes/Slack/Slack.node.json
index 69c0532498..a238774011 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.json
+++ b/packages/nodes-base/nodes/Slack/Slack.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.slack",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.slack/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.slack/"
 			}
 		],
 		"generic": [
@@ -54,4 +52,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.json b/packages/nodes-base/nodes/Sms77/Sms77.node.json
index 63a1fef2a9..2495b864ee 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.json
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.sms77",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sms77/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.sms77/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.json b/packages/nodes-base/nodes/Snowflake/Snowflake.node.json
index 1a0db7a1b7..aa3b50bbe0 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.json
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.snowflake",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.snowflake/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.snowflake/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
index 8405557f32..33cd361076 100644
--- a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
+++ b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.splitInBatches",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.splitInBatches/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.splitinbatches/"
 			}
 		],
 		"generic": [
@@ -24,12 +22,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Loop"
-	],
+	"alias": ["Loop"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Splunk/Splunk.node.json b/packages/nodes-base/nodes/Splunk/Splunk.node.json
index e23f0d6c5d..e63b03233d 100644
--- a/packages/nodes-base/nodes/Splunk/Splunk.node.json
+++ b/packages/nodes-base/nodes/Splunk/Splunk.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.splunk",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.splunk/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.splunk/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.json b/packages/nodes-base/nodes/Spontit/Spontit.node.json
index 5d5e098c94..48fc74c8c0 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.json
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.spontit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.spontit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.spontit/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.json b/packages/nodes-base/nodes/Spotify/Spotify.node.json
index 2fead61907..2aaa3003ab 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.json
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.spotify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,12 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.spotify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.spotify/"
 			}
 		]
 	},
-	"alias": [
-		"Music",
-		"Song"
-	]
+	"alias": ["Music", "Song"]
 }
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
index 44dff1b7f3..97c34100ce 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.spreadsheetFile",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Core Nodes"
-	],
+	"categories": ["Data & Storage", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.spreadsheetFile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.spreadsheetfile/"
 			}
 		],
 		"generic": [
@@ -20,13 +17,8 @@
 			}
 		]
 	},
-	"alias": [
-		"CSV",
-		"Spreadsheet"
-	],
+	"alias": ["CSV", "Spreadsheet"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
index f5d40e4d5a..f1036f3f1c 100644
--- a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
+++ b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.sseTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.sseTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ssetrigger/"
 			}
 		],
 		"generic": [
@@ -21,8 +18,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.json b/packages/nodes-base/nodes/Ssh/Ssh.node.json
index 09b7b88ec0..9d7ccfee40 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.json
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.json
@@ -2,21 +2,14 @@
 	"node": "n8n-nodes-base.ssh",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes",
-		"Development"
-	],
+	"categories": ["Core Nodes", "Development"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ssh/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.ssh/"
 			}
 		]
 	},
-	"alias": [
-		"remote"
-	],
-	"subcategories": [
-		"Helpers"
-	]
-}
\ No newline at end of file
+	"alias": ["remote"],
+	"subcategories": ["Helpers"]
+}
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.json b/packages/nodes-base/nodes/Stackby/Stackby.node.json
index 0802db76e6..442d6e7d61 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.json
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.stackby",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.stackby/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.stackby/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Start/Start.node.json b/packages/nodes-base/nodes/Start/Start.node.json
index 15e47651a9..90f8f439c3 100644
--- a/packages/nodes-base/nodes/Start/Start.node.json
+++ b/packages/nodes-base/nodes/Start/Start.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.start",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.start/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.start/"
 			}
 		],
 		"generic": [
@@ -44,4 +42,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/StickyNote/StickyNote.node.json b/packages/nodes-base/nodes/StickyNote/StickyNote.node.json
index 403008e7e6..177757ef90 100644
--- a/packages/nodes-base/nodes/StickyNote/StickyNote.node.json
+++ b/packages/nodes-base/nodes/StickyNote/StickyNote.node.json
@@ -2,17 +2,9 @@
 	"node": "n8n-nodes-base.stickyNote",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
-	"alias": [
-		"Comments",
-		"Notes",
-		"Sticky"
-	],
+	"categories": ["Core Nodes"],
+	"alias": ["Comments", "Notes", "Sticky"],
 	"subcategories": {
-		"Core Nodes": [
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/StopAndError/StopAndError.node.json b/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
index 35acb883d9..29e19dc814 100644
--- a/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
+++ b/packages/nodes-base/nodes/StopAndError/StopAndError.node.json
@@ -2,25 +2,16 @@
 	"node": "n8n-nodes-base.stopAndError",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes",
-		"Utility"
-	],
+	"categories": ["Core Nodes", "Utility"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.stopAndError/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.stopanderror/"
 			}
 		]
 	},
-	"alias": [
-		"Throw error",
-		"Error",
-		"Exception"
-	],
+	"alias": ["Throw error", "Error", "Exception"],
 	"subcategories": {
-		"Core Nodes":[
-			"Helpers"
-		]
+		"Core Nodes": ["Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.json b/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
index 0fa460edc7..2ce9f0153f 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.storyblok",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Marketing & Content"
-	],
+	"categories": ["Data & Storage", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.storyblok/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.storyblok/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.json b/packages/nodes-base/nodes/Strapi/Strapi.node.json
index f40c062d99..a41614a40b 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.json
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.strapi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Marketing & Content"
-	],
+	"categories": ["Data & Storage", "Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.strapi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.strapi/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.json b/packages/nodes-base/nodes/Strava/Strava.node.json
index f2df6f8747..0617bf3a99 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.json
+++ b/packages/nodes-base/nodes/Strava/Strava.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.strava",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.strava/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.strava/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.json b/packages/nodes-base/nodes/Strava/StravaTrigger.node.json
index 199102c47c..db46bfaa7c 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.json
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.stravaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.stravaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.stravatrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.json b/packages/nodes-base/nodes/Stripe/Stripe.node.json
index a8129f5a09..64a7746d43 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.json
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.stripe",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting",
-		"Sales"
-	],
+	"categories": ["Finance & Accounting", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.stripe/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.stripe/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json
index a1b7c45612..6eca34002f 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.stripeTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting",
-		"Sales"
-	],
+	"categories": ["Finance & Accounting", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.stripeTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.stripetrigger/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.json b/packages/nodes-base/nodes/Supabase/Supabase.node.json
index 54ccaa6aaf..f89fd6dad3 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.json
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.supabase",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.supabase/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.supabase/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
index 4346656498..357d2ae3e8 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.surveyMonkeyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content",
-		"Communication"
-	],
+	"categories": ["Marketing & Content", "Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.surveyMonkeyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.surveymonkeytrigger/"
 			}
 		]
 	},
-	"alias": [
-		"Form"
-	]
-}
\ No newline at end of file
+	"alias": ["Form"]
+}
diff --git a/packages/nodes-base/nodes/Switch/Switch.node.json b/packages/nodes-base/nodes/Switch/Switch.node.json
index da60277eca..63b00d0e44 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.json
+++ b/packages/nodes-base/nodes/Switch/Switch.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.switch",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.switch/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.switch/"
 			}
 		],
 		"generic": [
@@ -34,19 +32,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Router",
-		"If",
-		"Path",
-		"Filter",
-		"Condition",
-		"Logic",
-		"Branch",
-		"Case"
-	],
+	"alias": ["Router", "If", "Path", "Filter", "Condition", "Logic", "Branch", "Case"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/SyncroMsp.node.json b/packages/nodes-base/nodes/SyncroMSP/SyncroMsp.node.json
index 2747004097..1366aa7969 100644
--- a/packages/nodes-base/nodes/SyncroMSP/SyncroMsp.node.json
+++ b/packages/nodes-base/nodes/SyncroMSP/SyncroMsp.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.syncroMsp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.syncroMsp/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.syncromsp/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.json b/packages/nodes-base/nodes/Taiga/Taiga.node.json
index 5ed38b7bef..ef6d915d60 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.json
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.taiga",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Productivity"
-	],
+	"categories": ["Development", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.taiga/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.taiga/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
index 2ff5e5ab94..b3833f1ebd 100644
--- a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
+++ b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.taigaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Productivity"
-	],
+	"categories": ["Development", "Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.taigaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.taigatrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.json b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.json
index 4a29b2b539..0383a9cfa2 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.json
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.tapfiliate",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.tapfiliate/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.tapfiliate/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.json b/packages/nodes-base/nodes/Telegram/Telegram.node.json
index 33b14dad90..709d77c6c0 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.json
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.telegram",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.telegram/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.telegram/"
 			}
 		],
 		"generic": [
@@ -68,4 +66,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
index 6895915b6f..64b991570e 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.telegramTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.telegramTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.telegramtrigger/"
 			}
 		],
 		"generic": [
@@ -43,4 +41,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.json b/packages/nodes-base/nodes/TheHive/TheHive.node.json
index 97530a2b09..b59545df9c 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.json
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.theHive",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.theHive/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.thehive/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.json b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.json
index 6b78f24d49..794e4ff114 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.json
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.json
@@ -2,14 +2,12 @@
 	"node": "n8n-nodes-base.theHiveTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.theHiveTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.thehivetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.json b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.json
index a58dc6e209..58acd0642e 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.json
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.timescaleDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage",
-		"Development"
-	],
+	"categories": ["Data & Storage", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.timescaleDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.timescaledb/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 0ea2949fee..8d288e5197 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -232,7 +232,7 @@ export class TimescaleDb implements INodeType {
 						],
 						default: 'multiple',
 						description:
-							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/nodes/n8n-nodes-base.timescaleDb/">the docs</a> for more examples',
+							'The way queries should be sent to database. Can be used in conjunction with <b>Continue on Fail</b>. See <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.timescaledb/">the docs</a> for more examples',
 					},
 					{
 						displayName: 'Query Parameters',
diff --git a/packages/nodes-base/nodes/Todoist/Todoist.node.json b/packages/nodes-base/nodes/Todoist/Todoist.node.json
index bb0a6c1e26..cbeb1481c6 100644
--- a/packages/nodes-base/nodes/Todoist/Todoist.node.json
+++ b/packages/nodes-base/nodes/Todoist/Todoist.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.todoist",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.todoist/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.todoist/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.json b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.json
index be20082f91..0673524d44 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.json
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.togglTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity",
-		"Utility"
-	],
+	"categories": ["Productivity", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.togglTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.toggltrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.json b/packages/nodes-base/nodes/TravisCi/TravisCi.node.json
index 3d921879e1..bfc6ca3722 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.json
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.travisCi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.travisCi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.travisci/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Trello/ChecklistDescription.ts b/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
index cb6fb52c5f..5e3a76b42f 100644
--- a/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
+++ b/packages/nodes-base/nodes/Trello/ChecklistDescription.ts
@@ -138,7 +138,7 @@ export const checklistFields: INodeProperties[] = [
 					'deleteCheckItem',
 					'getCheckItem',
 					'updateCheckItem',
-					'completedCheckItems',
+					'completeCheckItems',
 				],
 				resource: ['checklist'],
 			},
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.json b/packages/nodes-base/nodes/Trello/Trello.node.json
index 55176333a8..14889487a9 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.json
+++ b/packages/nodes-base/nodes/Trello/Trello.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.trello",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.trello/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.trello/"
 			}
 		],
 		"generic": [
@@ -44,4 +42,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
index 8c9c974224..0e35babfe6 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.trelloTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.trelloTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.trellotrigger/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Twake/Twake.node.json b/packages/nodes-base/nodes/Twake/Twake.node.json
index d287fffec9..d34b312cfe 100644
--- a/packages/nodes-base/nodes/Twake/Twake.node.json
+++ b/packages/nodes-base/nodes/Twake/Twake.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.twake",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.twake/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twake/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.json b/packages/nodes-base/nodes/Twilio/Twilio.node.json
index 9874070754..45b0d15c60 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.json
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.twilio",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Development"
-	],
+	"categories": ["Communication", "Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.twilio/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twilio/"
 			}
 		],
 		"generic": [
@@ -60,9 +57,5 @@
 			}
 		]
 	},
-	"alias": [
-		"SMS",
-		"Phone",
-		"Voice"
-	]
+	"alias": ["SMS", "Phone", "Voice"]
 }
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.json b/packages/nodes-base/nodes/Twist/Twist.node.json
index c641db85cc..7887f86f20 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.json
+++ b/packages/nodes-base/nodes/Twist/Twist.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.twist",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.twist/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twist/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.json b/packages/nodes-base/nodes/Twitter/Twitter.node.json
index 717abef322..7282e9b2ce 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.json
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.twitter",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.twitter/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.twitter/"
 			}
 		],
 		"generic": [
@@ -34,4 +32,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
index 9988529580..4d908b3208 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.typeformTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.typeformTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.typeformtrigger/"
 			}
 		],
 		"generic": [
@@ -68,7 +66,5 @@
 			}
 		]
 	},
-	"alias": [
-		"Form"
-	]
-}
\ No newline at end of file
+	"alias": ["Form"]
+}
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.json b/packages/nodes-base/nodes/UProc/UProc.node.json
index 6821d4fc82..7b39066b0b 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.json
+++ b/packages/nodes-base/nodes/UProc/UProc.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.uproc",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Data & Storage"
-	],
+	"categories": ["Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.uproc/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.uproc/"
 			}
 		],
 		"generic": [
@@ -28,4 +26,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.json b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.json
index c21b348860..ccb66460bb 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.json
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.unleashedSoftware",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales",
-		"Data & Storage"
-	],
+	"categories": ["Sales", "Data & Storage"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.unleashedSoftware/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.unleashedsoftware/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.json b/packages/nodes-base/nodes/Uplead/Uplead.node.json
index 2d13b359d5..d8088a8c2b 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.json
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.uplead",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.uplead/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.uplead/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.json b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.json
index c292e92fbb..a6e89324bd 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.json
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.uptimeRobot",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development"
-	],
+	"categories": ["Development"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.uptimeRobot/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.uptimerobot/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.json b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.json
index 96fcac2242..d064f62986 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.json
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.urlScanIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Utility"
-	],
+	"categories": ["Development", "Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.urlScanIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.urlscanio/"
 			}
 		]
 	},
-	"alias": [
-		"Scrape"
-	]
-}
\ No newline at end of file
+	"alias": ["Scrape"]
+}
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.json b/packages/nodes-base/nodes/Vero/Vero.node.json
index edb4fe904e..81ab07de63 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.json
+++ b/packages/nodes-base/nodes/Vero/Vero.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.vero",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.vero/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.vero/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Vonage/Vonage.node.json b/packages/nodes-base/nodes/Vonage/Vonage.node.json
index 06f7079cfc..796c7d9eb2 100644
--- a/packages/nodes-base/nodes/Vonage/Vonage.node.json
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.vonage",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.vonage/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.vonage/"
 			}
 		],
 		"generic": [
@@ -24,7 +22,5 @@
 			}
 		]
 	},
-	"alias": [
-		"SMS"
-	]
-}
\ No newline at end of file
+	"alias": ["SMS"]
+}
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.json b/packages/nodes-base/nodes/Wait/Wait.node.json
index f99ef924a5..6e8098d3ef 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.json
+++ b/packages/nodes-base/nodes/Wait/Wait.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.wait",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wait/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/"
 			}
 		],
 		"generic": [
@@ -23,15 +21,8 @@
 			}
 		]
 	},
-	"alias": [
-		"pause",
-		"sleep",
-		"delay",
-		"timeout"
-	],
+	"alias": ["pause", "sleep", "delay", "timeout"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 9753b2abca..0853fe387f 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -212,7 +212,7 @@ export class Wait implements INodeType {
 			// ----------------------------------
 			{
 				displayName:
-					'The webhook URL will be generated at run time. It can be referenced with the <strong>$resumeWebhookUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
+					'The webhook URL will be generated at run time. It can be referenced with the <strong>$resumeWebhookUrl</strong> variable. Send it somewhere before getting to this node. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.wait" target="_blank">More info</a>',
 				name: 'webhookNotice',
 				type: 'notice',
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.json b/packages/nodes-base/nodes/Webflow/Webflow.node.json
index 0fd6bce62c..c3291e7e73 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.json
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.webflow",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.webflow/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.webflow/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
index 20bbdae744..f812473110 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.webflowTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.webflowTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.webflowtrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.json b/packages/nodes-base/nodes/Webhook/Webhook.node.json
index 5388097521..2050230429 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.json
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.json
@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.webhook",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Development",
-		"Core Nodes"
-	],
+	"categories": ["Development", "Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.webhook/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/"
 			}
 		],
 		"generic": [
@@ -84,15 +81,8 @@
 			}
 		]
 	},
-	"alias": [
-		"HTTP",
-		"API",
-		"Build",
-		"WH"
-	],
+	"alias": ["HTTP", "API", "Build", "WH"],
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index d25a1997a6..d1769449fc 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -190,7 +190,7 @@ export class Webhook implements INodeType {
 			},
 			{
 				displayName:
-					'Insert a \'Respond to Webhook\' node to control when and how you respond. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.respondToWebhook" target="_blank">More details</a>',
+					'Insert a \'Respond to Webhook\' node to control when and how you respond. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.respondtowebhook/" target="_blank">More details</a>',
 				name: 'webhookNotice',
 				type: 'notice',
 				displayOptions: {
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.json b/packages/nodes-base/nodes/Wekan/Wekan.node.json
index 5b418baae4..e9dbc882d6 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.json
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wekan",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Productivity"
-	],
+	"categories": ["Productivity"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wekan/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.wekan/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.json b/packages/nodes-base/nodes/Wise/Wise.node.json
index 0c404e3ac5..39ec4b0a18 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.json
+++ b/packages/nodes-base/nodes/Wise/Wise.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wise",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wise/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.wise/"
 			}
 		]
 	},
-	"alias": [
-		"Currency"
-	]
+	"alias": ["Currency"]
 }
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.json b/packages/nodes-base/nodes/Wise/WiseTrigger.node.json
index 457e7d2706..d1f69e6602 100644
--- a/packages/nodes-base/nodes/Wise/WiseTrigger.node.json
+++ b/packages/nodes-base/nodes/Wise/WiseTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wiseTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wiseTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.wisetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.json b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.json
index abc3f19785..ae1aacd975 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.json
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wooCommerce",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wooCommerce/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.woocommerce/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.json b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.json
index 922c55a8b8..07955a1f5a 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.json
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wooCommerceTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Sales"
-	],
+	"categories": ["Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wooCommerceTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.woocommercetrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.json b/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
index 333e82c2fb..a150bd81e4 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wordpress",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Marketing & Content"
-	],
+	"categories": ["Marketing & Content"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wordpress/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.wordpress/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.json b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.json
index 6687985540..5cbc7bb227 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.json
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.workableTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Miscellaneous"
-	],
+	"categories": ["Miscellaneous"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.workableTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.workabletrigger/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.json b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.json
index f4559e0b81..e6377d6270 100644
--- a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.json
+++ b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.json
@@ -2,19 +2,15 @@
 	"node": "n8n-nodes-base.WorkflowTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/core-nodes/n8n-nodes-base.workflowtrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.workflowtrigger/"
 			}
 		]
 	},
 	"subcategories": {
-		"Core Nodes": [
-			"Flow"
-		]
+		"Core Nodes": ["Flow"]
 	}
 }
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
index 326c5e9f83..ddd9e65848 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.writeBinaryFile",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.writeBinaryFile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.writebinaryfile/"
 			}
 		],
 		"generic": [
@@ -19,14 +17,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Text",
-		"Save",
-		"Export"
-	],
+	"alias": ["Text", "Save", "Export"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
 }
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.json b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.json
index 54af84e418..b6f75a545d 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.json
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.wufooTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,11 +11,9 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wufooTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.wufootrigger/"
 			}
 		]
 	},
-	"alias": [
-		"Form"
-	]
-}
\ No newline at end of file
+	"alias": ["Form"]
+}
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.json b/packages/nodes-base/nodes/Xero/Xero.node.json
index 5140f5c451..27a01da272 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.json
+++ b/packages/nodes-base/nodes/Xero/Xero.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.xero",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Finance & Accounting"
-	],
+	"categories": ["Finance & Accounting"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.xero/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.xero/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.json b/packages/nodes-base/nodes/Xml/Xml.node.json
index bd38f79282..3dc047009c 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.json
+++ b/packages/nodes-base/nodes/Xml/Xml.node.json
@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.xml",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Core Nodes"
-	],
+	"categories": ["Core Nodes"],
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.xml/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.xml/"
 			}
 		],
 		"generic": [
@@ -19,12 +17,8 @@
 			}
 		]
 	},
-	"alias": [
-		"Parse"
-	],
+	"alias": ["Parse"],
 	"subcategories": {
-		"Core Nodes": [
-			"Files"
-		]
+		"Core Nodes": ["Files"]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Yourls/Yourls.node.json b/packages/nodes-base/nodes/Yourls/Yourls.node.json
index e17ca844a0..58f8814e32 100644
--- a/packages/nodes-base/nodes/Yourls/Yourls.node.json
+++ b/packages/nodes-base/nodes/Yourls/Yourls.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.yourls",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Utility"
-	],
+	"categories": ["Utility"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.yourls/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.yourls/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.json b/packages/nodes-base/nodes/Zammad/Zammad.node.json
index 14ccb3c3eb..c29085c955 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.json
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.zammad",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zammad/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.zammad/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.json b/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
index 87307add31..3fbaedd76f 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.zendesk",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zendesk/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.zendesk/"
 			}
 		],
 		"generic": [
@@ -24,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.json b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.json
index 738493547f..3ff440af7b 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.json
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.zendeskTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zendeskTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.zendesktrigger/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.json b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.json
index 4214b81f99..f1dc8fc639 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.json
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.json
@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.zohoCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication",
-		"Sales"
-	],
+	"categories": ["Communication", "Sales"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zohoCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.zohocrm/"
 			}
 		],
 		"generic": [
@@ -25,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.json b/packages/nodes-base/nodes/Zoom/Zoom.node.json
index 8251d9025d..758432d162 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.json
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.zoom",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zoom/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.zoom/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.json b/packages/nodes-base/nodes/Zulip/Zulip.node.json
index 0913478f37..6dac0902dd 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.json
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.json
@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.zulip",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
-		"Communication"
-	],
+	"categories": ["Communication"],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,8 +11,8 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zulip/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.zulip/"
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index fee3c0a749..5b87486f16 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -18,7 +18,7 @@
     "dev": "npm run watch",
     "build": "tsc && gulp build:icons && gulp build:translations",
     "build:translations": "gulp build:translations",
-    "format": "cd ../.. && node_modules/prettier/bin-prettier.js --write \"packages/nodes-base/**/*.ts\"",
+    "format": "cd ../.. && node_modules/prettier/bin-prettier.js --write \"packages/nodes-base/**/*.{ts,json}\"",
     "lint": "tslint -p tsconfig.json -c tslint.json && eslint nodes credentials src",
     "lintfix": "tslint --fix -p tsconfig.json -c tslint.json && eslint nodes credentials src --fix",
     "watch": "tsc --watch",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 3c26712a6c..9346865a2b 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1618,9 +1618,17 @@ export interface IStatusCodeMessages {
 	[key: string]: string;
 }
 
+export type DocumentationLink = {
+	url: string;
+};
+
 export type CodexData = {
 	categories?: string[];
 	subcategories?: { [category: string]: string[] };
+	resources?: {
+		credentialDocumentation?: DocumentationLink[];
+		primaryDocumentation?: DocumentationLink[];
+	};
 	alias?: string[];
 };
 
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index d014ee5cf2..2a9cfadbd1 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -16,7 +16,7 @@ describe('WorkflowDataProxy', () => {
 			{
 				parameters: {
 					functionCode:
-						'// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/nodes/n8n-nodes-base.function\nconst { DateTime, Duration, Interval } = require("luxon");\n\nconst data = [\n  {\n  "length": 105\n  },\n  {\n  "length": 160\n  },\n  {\n  "length": 121\n  },\n  {\n  "length": 275\n  },\n  {\n  "length": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));',
+						'// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/\nconst { DateTime, Duration, Interval } = require("luxon");\n\nconst data = [\n  {\n  "length": 105\n  },\n  {\n  "length": 160\n  },\n  {\n  "length": 121\n  },\n  {\n  "length": 275\n  },\n  {\n  "length": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));',
 				},
 				name: 'Function',
 				type: 'test.set',