fix(nodes-base): fix and harmonize all primaryDocumentation links (#4191)

* fix(nodes-base): fix and harmonize all primaryDocumentation links

* feat(workflow, cli): expose documentation links to UI via node codex

* fix(editor-ui): link to correct node and credential documentation URLs

* config(nodes-base): update 'format' script to also format node descriptor json

* chore: fix outdated links to node reference documentation

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
 

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",

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
 

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",

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)
+	 * Retrieves `categories`, `subcategories`, partial `resources` and
-	 * from the codex data for the node at the given file path.
+	 * 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 }),
 		};
 	}

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 { BUILTIN_CREDENTIALS_DOCS_URL, EnterpriseEditionFeature } from '@/constants';
-import {IPermissions} from "@/permissions";
+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');

packages/editor-ui/src/components/NodeSettingsTabs.vue

@@ -1,15 +1,10 @@
 <template>
-	<n8n-tabs
+	<n8n-tabs :options="options" :value="value" @input="onTabSelect" @tooltipClick="onTooltipClick" />
-		: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'))) {
+			const utmTags = '?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link' +
-				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;
+				'&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;

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,
 						});

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';

packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.actionNetwork",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales", "Marketing & Content"],
-		"Sales",
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.actionNetwork/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.actionnetwork/"
 			}
 		]
 	}

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": [
+	"categories": ["Marketing & Content"],
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +12,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.activeCampaign/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.activecampaign/"
 			}
 		]
 	}

packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.activeCampaignTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content"],
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.activeCampaignTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.activecampaigntrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.acuitySchedulingTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.acuitySchedulingTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.acuityschedulingtrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Adalo/Adalo.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.adalo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"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/"
 			}
 		]
 	}

packages/nodes-base/nodes/Affinity/Affinity.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.affinity",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.affinity/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.affinity/"
 			}
 		]
 	}

packages/nodes-base/nodes/Affinity/AffinityTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.affinityTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.affinityTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.affinitytrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/AgileCrm/AgileCrm.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.agileCrm",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Sales"],
-		"Marketing & Content",
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.agileCrm/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.agilecrm/"
 			}
 		]
 	}

packages/nodes-base/nodes/Airtable/Airtable.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.airtable",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"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": [

packages/nodes-base/nodes/Airtable/AirtableTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.airtableTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.airtableTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.airtabletrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Amqp/Amqp.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.amqp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Communication"],
-		"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": [

packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.amqpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Communication"],
-		"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": [

packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.apiTemplateIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content"],
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.apiTemplateIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.apitemplateio/"
 			}
 		]
 	}

packages/nodes-base/nodes/Asana/Asana.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.asana",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"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": [

packages/nodes-base/nodes/Asana/AsanaTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.asanaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.asanaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.asanatrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Automizy/Automizy.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.automizy",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Marketing & Content"],
-		"Communication",
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.automizy/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.automizy/"
 			}
 		]
 	}

packages/nodes-base/nodes/Autopilot/Autopilot.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.autopilot",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content"],
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.autopilot/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.autopilot/"
 			}
 		]
 	}

packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.autopilotTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content"],
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.autopilotTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.autopilottrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Aws/AwsLambda.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.awsLambda",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development"],
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsLambda/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awslambda/"
 			}
 		]
 	}

packages/nodes-base/nodes/Aws/AwsSns.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSns",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Communication"],
-		"Development",
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSns/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awssns/"
 			}
 		]
 	}

packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.awsSnsTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Communication"],
-		"Development",
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSnsTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.awssnstrigger/"
 			}
 		]
 	}

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": [
+	"categories": ["Development"],
-		"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": [

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": [
+	"categories": ["Data & Storage", "Development"],
-		"Data & Storage",
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsDynamoDb/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awsdynamodb/"
 			}
 		]
 	}

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": [
+	"categories": ["Development"],
-		"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": [

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": [
+	"categories": ["Development", "Data & Storage"],
-		"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": [

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": [
+	"categories": ["Communication", "Development"],
-		"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": [

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": [
+	"categories": ["Development", "Communication"],
-		"Development",
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSqs/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awssqs/"
 			}
 		]
 	}

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": [
+	"categories": ["Utility"],
-		"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": [

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": [
+	"categories": ["Development"],
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsTranscribe/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.awstranscribe/"
 			}
 		]
 	}

packages/nodes-base/nodes/BambooHr/BambooHr.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bambooHr",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Miscellaneous"],
-		"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/"
 			}
 		]
 	}

packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bannerbear",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content"],
-		"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": [

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": []

packages/nodes-base/nodes/Beeminder/Beeminder.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.beeminder",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.beeminder/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.beeminder/"
 			}
 		]
 	}

packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.bitbucketTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Productivity"],
-		"Development",
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitbucketTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.bitbuckettrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Bitly/Bitly.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bitly",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Utility"],
-		"Utility"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitly/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bitly/"
 			}
 		]
 	}

packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bitwarden",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitwarden/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bitwarden/"
 			}
 		]
 	}

packages/nodes-base/nodes/Box/Box.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.box",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.box/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.box/"
 			}
 		]
 	}

packages/nodes-base/nodes/Box/BoxTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.boxTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.boxTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.boxtrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Brandfetch/Brandfetch.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.Brandfetch",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Utility", "Sales"],
-		"Utility",
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.Brandfetch/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.brandfetch/"
 			}
 		]
 	}

packages/nodes-base/nodes/Bubble/Bubble.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.bubble",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development"],
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bubble/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.bubble/"
 			}
 		]
 	}

packages/nodes-base/nodes/Cal/CalTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.calTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity", "Utility"],
-		"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/"
 			}
 		]
 	}

packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.calendlyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity", "Utility"],
-		"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": [

packages/nodes-base/nodes/Chargebee/Chargebee.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.chargebee",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Finance & Accounting"],
-		"Finance & Accounting"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.chargebee/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.chargebee/"
 			}
 		]
 	}

packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.chargebeeTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Finance & Accounting"],
-		"Finance & Accounting"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.chargebeeTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.chargebeetrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/CircleCi/CircleCi.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.circleCi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development"],
-		"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": [

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": [
+	"categories": ["Communication"],
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ciscoWebex/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.ciscowebex/"
 			}
 		]
 	}

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": [
+	"categories": ["Communication"],
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.ciscoWebexTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.ciscowebextrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Clearbit/Clearbit.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.clearbit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clearbit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.clearbit/"
 			}
 		]
 	}

packages/nodes-base/nodes/ClickUp/ClickUp.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clickUp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity", "Communication"],
-		"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": [

packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clickUpTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity", "Communication"],
-		"Productivity",
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clickUpTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.clickuptrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Clockify/Clockify.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.clockify",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clockify/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.clockify/"
 			}
 		]
 	}

packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.clockifyTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Utility", "Productivity"],
-		"Utility",
-		"Productivity"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clockifyTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.clockifytrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Cockpit/Cockpit.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.cockpit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Development"],
-		"Marketing & Content",
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.cockpit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cockpit/"
 			}
 		]
 	}

packages/nodes-base/nodes/Coda/Coda.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.coda",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity"],
-		"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": [

packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json

@@ -2,14 +2,11 @@
 	"node": "n8n-nodes-base.coinGecko",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Productivity", "Finance & Accounting"],
-		"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": [

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": [
+	"categories": ["Core Nodes", "Data & Storage"],
-		"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": [
+	"alias": ["Zip", "Gzip", "uncompress"],
-		"Zip",
-		"Gzip",
-		"uncompress"
-	],
 	"subcategories": {
-		"Core Nodes": [
+		"Core Nodes": ["Files"]
-			"Files"
-		]
 	}
 }

packages/nodes-base/nodes/Contentful/Contentful.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.contentful",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Development"],
-		"Marketing & Content",
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.contentful/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.contentful/"
 			}
 		]
 	}

packages/nodes-base/nodes/ConvertKit/ConvertKit.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.convertKit",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Sales"],
-		"Marketing & Content",
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.convertKit/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.convertkit/"
 			}
 		]
 	}

packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.convertKitTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Sales"],
-		"Marketing & Content",
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.convertKitTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.convertkittrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Copper/Copper.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.copper",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Marketing & Content", "Sales"],
-		"Marketing & Content",
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.copper/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.copper/"
 			}
 		]
 	}

packages/nodes-base/nodes/Copper/CopperTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.copperTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.copperTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.coppertrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/Cortex/Cortex.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.cortex",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Analytics"],
-		"Development",
-		"Analytics"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.cortex/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.cortex/"
 			}
 		]
 	}

packages/nodes-base/nodes/CrateDb/CrateDb.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.crateDb",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Development", "Data & Storage"],
-		"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": [

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',

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": [
+	"categories": ["Core Nodes"],
-		"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": [
+	"alias": ["Time", "Scheduler", "Polling"],
-		"Time",
-		"Scheduler",
-		"Polling"
-	],
 	"subcategories": {
-		"Core Nodes": [
+		"Core Nodes": ["Flow"]
-			"Flow"
-		]
 	}
 }

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": [
+	"categories": ["Development", "Core Nodes"],
-		"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": [
+	"alias": ["Encrypt", "SHA", "Hash"],
-		"Encrypt",
-		"SHA",
-		"Hash"
-	],
 	"subcategories": {
-		"Core Nodes": [
+		"Core Nodes": ["Helpers"]
-			"Helpers"
-		]
 	}
 }

packages/nodes-base/nodes/CustomerIo/CustomerIo.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.customerIo",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Development"],
-		"Communication",
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.customerIo/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.customerio/"
 			}
 		]
 	}

packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.customerIoTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Development"],
-		"Communication",
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.customerIoTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.customeriotrigger/"
 			}
 		]
 	}

packages/nodes-base/nodes/DateTime/DateTime.node.json

@@ -2,13 +2,11 @@
 	"node": "n8n-nodes-base.dateTime",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Core Nodes"],
-		"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": [
+		"Core Nodes": ["Helpers"]
-			"Helpers"
-		]
 	}
 }

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.',
 					},
 				],
 			},

packages/nodes-base/nodes/DeepL/DeepL.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.deepL",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Utility"],
-		"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": [
+	"alias": ["Translate", "Translator"]
-		"Translate",
-		"Translator"
-	]
 }

packages/nodes-base/nodes/Demio/Demio.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.demio",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication"],
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.demio/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.demio/"
 			}
 		]
 	}

packages/nodes-base/nodes/Dhl/Dhl.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dhl",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Miscellaneous"],
-		"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": [
+	"alias": ["Shipping"]
-		"Shipping"
-	]
 }

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/"
 			}
 		]
 	}

packages/nodes-base/nodes/Discourse/Discourse.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.discourse",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication"],
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.discourse/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.discourse/"
 			}
 		]
 	}

packages/nodes-base/nodes/Disqus/Disqus.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.disqus",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication"],
-		"Communication"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.disqus/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.disqus/"
 			}
 		]
 	}

packages/nodes-base/nodes/Drift/Drift.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.drift",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"Sales"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.drift/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.drift/"
 			}
 		]
 	}

packages/nodes-base/nodes/Dropbox/Dropbox.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dropbox",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Data & Storage"],
-		"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": [

packages/nodes-base/nodes/Dropcontact/Dropcontact.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.dropcontact",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"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/"
 			}
 		]
 	}

packages/nodes-base/nodes/ERPNext/ERPNext.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.erpNext",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Finance & Accounting", "Data & Storage"],
-		"Finance & Accounting",
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.erpNext/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.erpnext/"
 			}
 		]
 	}

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": [
+	"categories": ["Marketing & Content", "Core Nodes"],
-		"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": [
+		"Core Nodes": ["Files"]
-			"Files"
-		]
 	}
 }

packages/nodes-base/nodes/Egoi/Egoi.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.egoi",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Marketing & Content"],
-		"Communication",
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.egoi/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.egoi/"
 			}
 		]
 	}

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": [
+	"categories": ["Development"],
-		"Development"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -13,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.elasticSecurity/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.elasticsecurity/"
 			}
 		]
 	}

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": [
+	"categories": ["Development", "Data & Storage"],
-		"Development",
-		"Data & Storage"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.elasticsearch/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.elasticsearch/"
 			}
 		]
 	}

packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emailReadImap",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Core Nodes"],
-		"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": [
+		"Core Nodes": ["Helpers"]
-			"Helpers"
-		]
 	}
 }

packages/nodes-base/nodes/EmailSend/EmailSend.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emailSend",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Core Nodes"],
-		"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": [
+		"Core Nodes": ["Helpers"]
-			"Helpers"
-		]
 	}
 }

packages/nodes-base/nodes/Emelia/Emelia.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emelia",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Marketing & Content"],
-		"Communication",
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emelia/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.emelia/"
 			}
 		]
 	}

packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json

@@ -2,10 +2,7 @@
 	"node": "n8n-nodes-base.emeliaTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Communication", "Marketing & Content"],
-		"Communication",
-		"Marketing & Content"
-	],
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,7 +11,7 @@
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emeliaTrigger/"
+				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.emeliatrigger/"
 			}
 		]
 	}

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": [
+	"categories": ["Development", "Core Nodes"],
-		"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": [
+		"Core Nodes": ["Helpers"]
-			"Helpers"
-		]
 	}
 }

packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json

@@ -2,9 +2,7 @@
 	"node": "n8n-nodes-base.eventbriteTrigger",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": [
+	"categories": ["Sales"],
-		"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": [