From 3c48b06884411ec4ae1d0d4421562d28db85e204 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 8 Apr 2021 23:34:10 +0200
Subject: [PATCH 001/231] :bug: Fix issue that RabbitMQ Trigger node did reuse
 same item

---
 .../nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index 446bd82352..f39cacf080 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -107,15 +107,15 @@ export class RabbitMQTrigger implements INodeType {
 
 		const self = this;
 
-		const item: INodeExecutionData = {
-			json: {},
-		};
-
 		const startConsumer = async () => {
 			await channel.consume(queue, async (message: IDataObject) => {
 				if (message !== null) {
 					let content: IDataObject | string = message!.content!.toString();
 
+					const item: INodeExecutionData = {
+						json: {},
+					};
+
 					if (options.contentIsBinary === true) {
 						item.binary = {
 							data: await this.helpers.prepareBinaryData(message.content),

From 2273a4cff2c65bc13754c822ba9206b8601aa1fc Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 9 Apr 2021 12:13:42 +0200
Subject: [PATCH 002/231] :zap: Make max payload size configurable #1447

---
 packages/cli/config/index.ts | 6 ++++++
 packages/cli/src/Server.ts   | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/cli/config/index.ts b/packages/cli/config/index.ts
index 0b136b52e4..9b2c6ea614 100644
--- a/packages/cli/config/index.ts
+++ b/packages/cli/config/index.ts
@@ -446,6 +446,12 @@ const config = convict({
 	},
 
 	endpoints: {
+		payloadSizeMax: {
+			format: Number,
+			default: 16,
+			env: 'N8N_PAYLOAD_SIZE_MAX',
+			doc: 'Maximum payload size in MB.',
+		},
 		metrics: {
 			enable: {
 				format: 'Boolean',
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 39fb76cc18..51e015d29c 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -132,6 +132,7 @@ class App {
 	protocol: string;
 	sslKey: string;
 	sslCert: string;
+	payloadSizeMax: number;
 
 	presetCredentialsLoaded: boolean;
 
@@ -145,6 +146,7 @@ class App {
 		this.saveManualExecutions = config.get('executions.saveDataManualExecutions') as boolean;
 		this.executionTimeout = config.get('executions.timeout') as number;
 		this.maxExecutionTimeout = config.get('executions.maxTimeout') as number;
+		this.payloadSizeMax = config.get('endpoints.payloadSizeMax') as number;
 		this.timezone = config.get('generic.timezone') as string;
 		this.restEndpoint = config.get('endpoints.rest') as string;
 
@@ -369,7 +371,7 @@ class App {
 
 		// Support application/json type post data
 		this.app.use(bodyParser.json({
-			limit: '16mb', verify: (req, res, buf) => {
+			limit: this.payloadSizeMax + 'mb', verify: (req, res, buf) => {
 				// @ts-ignore
 				req.rawBody = buf;
 			},
@@ -378,7 +380,7 @@ class App {
 		// Support application/xml type post data
 		// @ts-ignore
 		this.app.use(bodyParser.xml({
-			limit: '16mb', xmlParseOptions: {
+			limit: this.payloadSizeMax + 'mb', xmlParseOptions: {
 				normalize: true,     // Trim whitespace inside text nodes
 				normalizeTags: true, // Transform tags to lowercase
 				explicitArray: false, // Only put properties in array if length > 1
@@ -386,7 +388,7 @@ class App {
 		}));
 
 		this.app.use(bodyParser.text({
-			limit: '16mb', verify: (req, res, buf) => {
+			limit: this.payloadSizeMax + 'mb', verify: (req, res, buf) => {
 				// @ts-ignore
 				req.rawBody = buf;
 			},

From 75dd058ce216c5cd990057ffe71b923e5bfe72e0 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Fri, 9 Apr 2021 23:44:53 +0300
Subject: [PATCH 003/231] :sparkles: Add support to dynamically add menu items

* add menu items POC

* remove sidebar hook

* use getters

* update menu to add items

* add home icon for CLD-202

* center icon

* address comments

* :zap: Minor improvements

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/editor-ui/src/Interface.ts           | 17 +++++++
 .../editor-ui/src/components/MainSidebar.vue  | 44 +++++++++++++++++++
 packages/editor-ui/src/main.ts                |  2 +
 packages/editor-ui/src/store.ts               | 16 +++++--
 4 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 972ef0cbd8..745e0f11fb 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -428,3 +428,20 @@ export interface ITimeoutHMS {
 }
 
 export type WorkflowTitleStatus = 'EXECUTING' | 'IDLE' | 'ERROR';
+
+export type MenuItemType = 'link';
+export type MenuItemPosition = 'top' | 'bottom';
+
+export interface IMenuItem {
+	id: string;
+	type: MenuItemType;
+	position: MenuItemPosition;
+	properties: ILinkMenuItemProperties;
+}
+
+export interface ILinkMenuItemProperties {
+	title: string;
+	icon: string;
+	href: string;
+	newWindow?: boolean;
+}
\ No newline at end of file
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 2b6ae3e054..6de1de6c98 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -21,6 +21,22 @@
 					</a>
 				</el-menu-item>
 
+				<el-menu-item
+					v-for="item in sidebarMenuTopItems"
+					:key="item.id"
+					:index="item.id"
+				>
+					<a
+						v-if="item.type === 'link'"
+						:href="item.properties.href"
+						:target="item.properties.newWindow ? '_blank' : '_self'"
+						class="primary-item"
+					>
+						<font-awesome-icon :icon="item.properties.icon" />
+						<span slot="title" class="item-title-root">{{ item.properties.title }}</span>
+					</a>
+				</el-menu-item>
+
 				<el-submenu index="workflow" title="Workflow">
 					<template slot="title">
 						<font-awesome-icon icon="network-wired"/>&nbsp;
@@ -152,6 +168,22 @@
 					</el-menu-item>
 				</el-submenu>
 
+				<el-menu-item
+					v-for="item in sidebarMenuBottomItems"
+					:key="item.id"
+					:index="item.id"
+				>
+					<a
+						v-if="item.type === 'link'"
+						:href="item.properties.href"
+						:target="item.properties.newWindow ? '_blank' : '_self'"
+						class="primary-item"
+					>
+						<font-awesome-icon :icon="item.properties.icon" />
+						<span slot="title" class="item-title-root">{{ item.properties.title }}</span>
+					</a>
+				</el-menu-item>
+
 			</el-menu>
 
 		</div>
@@ -167,6 +199,7 @@ import {
 	IExecutionResponse,
 	IExecutionsStopData,
 	IWorkflowDataUpdate,
+	IMenuItem,
 } from '../Interface';
 
 import About from '@/components/About.vue';
@@ -266,6 +299,12 @@ export default mixins(
 			workflowRunning (): boolean {
 				return this.$store.getters.isActionActive('workflowRunning');
 			},
+			sidebarMenuTopItems(): IMenuItem[] {
+				return this.$store.getters.sidebarMenuItems.filter((item: IMenuItem) => item.position === 'top');
+			},
+			sidebarMenuBottomItems(): IMenuItem[] {
+				return this.$store.getters.sidebarMenuItems.filter((item: IMenuItem) => item.position === 'bottom');
+			},
 		},
 		methods: {
 			clearExecutionData () {
@@ -533,6 +572,11 @@ export default mixins(
 .el-menu-item {
 	a {
 		color: #666;
+
+		&.primary-item {
+			color: $--color-primary;
+			vertical-align: baseline;
+		}
 	}
 
 	&.logo-item {
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index f79cc1acef..af74cd0fcd 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -56,6 +56,7 @@ import {
 	faFilePdf,
 	faFolderOpen,
 	faHdd,
+	faHome,
 	faHourglass,
 	faImage,
 	faInbox,
@@ -136,6 +137,7 @@ library.add(faFileImport);
 library.add(faFilePdf);
 library.add(faFolderOpen);
 library.add(faHdd);
+library.add(faHome);
 library.add(faHourglass);
 library.add(faImage);
 library.add(faInbox);
diff --git a/packages/editor-ui/src/store.ts b/packages/editor-ui/src/store.ts
index 349b11f8a9..0309075d68 100644
--- a/packages/editor-ui/src/store.ts
+++ b/packages/editor-ui/src/store.ts
@@ -21,12 +21,13 @@ import {
 	ICredentialsResponse,
 	IExecutionResponse,
 	IExecutionsCurrentSummaryExtended,
-	IPushDataExecutionFinished,
-	IPushDataNodeExecuteAfter,
-	IWorkflowDb,
+	IMenuItem,
 	INodeUi,
 	INodeUpdatePropertiesInformation,
+	IPushDataExecutionFinished,
+	IPushDataNodeExecuteAfter,
 	IUpdateInformation,
+	IWorkflowDb,
 	XYPositon,
 } from './Interface';
 
@@ -79,6 +80,7 @@ export const store = new Vuex.Store({
 			nodes: [] as INodeUi[],
 			settings: {} as IWorkflowSettings,
 		} as IWorkflowDb,
+		sidebarMenuItems: [] as IMenuItem[],
 	},
 	mutations: {
 		// Active Actions
@@ -597,6 +599,11 @@ export const store = new Vuex.Store({
 			Vue.set(state, 'nodeTypes', updatedNodes);
 			state.nodeTypes = updatedNodes;
 		},
+
+		addSidebarMenuItems (state, menuItems: IMenuItem[]) {
+			const updated = state.sidebarMenuItems.concat(menuItems);
+			Vue.set(state, 'sidebarMenuItems', updated);
+		},
 	},
 	getters: {
 
@@ -834,6 +841,9 @@ export const store = new Vuex.Store({
 			return workflowRunData[nodeName];
 		},
 
+		sidebarMenuItems: (state): IMenuItem[] => {
+			return state.sidebarMenuItems;
+		},
 	},
 
 });

From 62959ec0174c40f89ec68709398153397b4a9ad3 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Sat, 10 Apr 2021 07:54:05 +0200
Subject: [PATCH 004/231] :sparkles: Add release operations on GitHub Node
 (#1617)

* Add get/getAll:release to Github node

* Add delete:release to Github node

* Add update:release to Github node

* Lint fixe
---
 .../nodes-base/nodes/Github/Github.node.ts    | 214 ++++++++++++++++++
 1 file changed, 214 insertions(+)

diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 39aae86ee6..18009b1f42 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -285,6 +285,26 @@ export class Github implements INodeType {
 						value: 'create',
 						description: 'Creates a new release.',
 					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Get a release.',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Get all repository releases.',
+					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a release.',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update a release.',
+					},
 				],
 				default: 'create',
 				description: 'The operation to perform.',
@@ -1037,6 +1057,143 @@ export class Github implements INodeType {
 				],
 			},
 
+			// ----------------------------------
+			//         release:get/delete/update
+			// ----------------------------------
+			{
+				displayName: 'Release ID',
+				name: 'release_id',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'release',
+						],
+						operation: [
+							'get',
+							'delete',
+							'update',
+						],
+					},
+				},
+				description: 'The release ID.',
+			},
+
+			// ----------------------------------
+			//         release:update
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				typeOptions: {
+					multipleValueButtonText: 'Add Field',
+				},
+				displayOptions: {
+					show: {
+						operation: [
+							'update',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'The name of the release.',
+					},
+					{
+						displayName: 'Body',
+						name: 'body',
+						type: 'string',
+						typeOptions: {
+							rows: 5,
+						},
+						default: '',
+						description: 'The body of the release.',
+					},
+					{
+						displayName: 'Draft',
+						name: 'draft',
+						type: 'boolean',
+						default: false,
+						description: 'Set "true" to create a draft (unpublished) release, "false" to create a published one.',
+					},
+					{
+						displayName: 'Prerelease',
+						name: 'prerelease',
+						type: 'boolean',
+						default: false,
+						description: 'If set to "true" it will point out that the release is non-production ready.',
+					},
+					{
+						displayName: 'Tag Name',
+						name: 'tag_name',
+						type: 'string',
+						default: '',
+						description: 'The name of the tag.',
+					},
+					{
+						displayName: 'Target Commitish',
+						name: 'target_commitish',
+						type: 'string',
+						default: '',
+						description: 'Specifies the commitish value that determines where the Git tag is created from. Can be any branch or commit SHA. Unused if the Git tag already exists. Default: the repository\'s default branch(usually master).',
+					},
+				],
+			},
+			// ----------------------------------
+			//         release:getAll
+			// ----------------------------------
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'release',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				default: false,
+				description: 'If all results should be returned or only up to a given limit.',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				displayOptions: {
+					show: {
+						resource: [
+							'release',
+						],
+						operation: [
+							'getAll',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 100,
+				},
+				default: 50,
+				description: 'How many results to return.',
+			},
 
 
 			// ----------------------------------
@@ -1560,6 +1717,9 @@ export class Github implements INodeType {
 			'issue:edit',
 			'issue:get',
 			'release:create',
+			'release:delete',
+			'release:get',
+			'release:update',
 			'repository:get',
 			'repository:getLicense',
 			'repository:getProfile',
@@ -1575,6 +1735,7 @@ export class Github implements INodeType {
 			'repository:listPopularPaths',
 			'repository:listReferrers',
 			'user:getRepositories',
+			'release:getAll',
 			'review:getAll',
 		];
 
@@ -1778,6 +1939,56 @@ export class Github implements INodeType {
 
 					endpoint = `/repos/${owner}/${repository}/releases`;
 				}
+				if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const releaseId = this.getNodeParameter('release_id', i) as string;
+
+					endpoint = `/repos/${owner}/${repository}/releases/${releaseId}`;
+				}
+				if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const releaseId = this.getNodeParameter('release_id', i) as string;
+
+					endpoint = `/repos/${owner}/${repository}/releases/${releaseId}`;
+				}
+				if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					endpoint = `/repos/${owner}/${repository}/releases`;
+
+					returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+
+					if (returnAll === false) {
+						qs.per_page = this.getNodeParameter('limit', 0) as number;
+					}
+				}
+				if (operation === 'update') {
+					// ----------------------------------
+					//         update
+					// ----------------------------------
+
+					requestMethod = 'PATCH';
+
+					const releaseId = this.getNodeParameter('release_id', i) as string;
+
+					body = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
+
+					endpoint = `/repos/${owner}/${repository}/releases/${releaseId}`;
+				}
 			} else if (resource === 'repository') {
 				if (operation === 'listPopularPaths') {
 					// ----------------------------------
@@ -1949,6 +2160,9 @@ export class Github implements INodeType {
 					return this.prepareOutputData(items);
 				}
 			}
+			if (fullOperation === 'release:delete') {
+				responseData = { success: true };
+			}
 
 			if (overwriteDataOperations.includes(fullOperation)) {
 				returnData.push(responseData);

From b6e89df6600ec95f2fd1eb0fd94794ac9118a97e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Apr 2021 07:54:27 +0200
Subject: [PATCH 005/231] :zap: Minor improvement on GitHub node

---
 packages/nodes-base/nodes/Github/Github.node.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 18009b1f42..77a5d5d24c 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1103,13 +1103,6 @@ export class Github implements INodeType {
 				},
 				default: {},
 				options: [
-					{
-						displayName: 'Name',
-						name: 'name',
-						type: 'string',
-						default: '',
-						description: 'The name of the release.',
-					},
 					{
 						displayName: 'Body',
 						name: 'body',
@@ -1127,6 +1120,13 @@ export class Github implements INodeType {
 						default: false,
 						description: 'Set "true" to create a draft (unpublished) release, "false" to create a published one.',
 					},
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'The name of the release.',
+					},
 					{
 						displayName: 'Prerelease',
 						name: 'prerelease',

From 5460b248ee5af3c1edf7871511221a32a035eeca Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 10 Apr 2021 02:05:21 -0400
Subject: [PATCH 006/231] :bug: Fix issue loading issue types with classic
 projects (#1627)

* :bug: Fix issue loading issue types with classic projects

* :zap: Minor improvements on Jira-Node

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes-base/nodes/Jira/IssueDescription.ts | 29 +++++++---------
 packages/nodes-base/nodes/Jira/Jira.node.ts   | 34 +++++--------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/packages/nodes-base/nodes/Jira/IssueDescription.ts b/packages/nodes-base/nodes/Jira/IssueDescription.ts
index 84ee2dae48..9ff54c8218 100644
--- a/packages/nodes-base/nodes/Jira/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueDescription.ts
@@ -15,15 +15,20 @@ export const issueOperations = [
 			},
 		},
 		options: [
+			{
+				name: 'Changelog',
+				value: 'changelog',
+				description: 'Get issue changelog',
+			},
 			{
 				name: 'Create',
 				value: 'create',
 				description: 'Create a new issue',
 			},
 			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update an issue',
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an issue',
 			},
 			{
 				name: 'Get',
@@ -35,11 +40,6 @@ export const issueOperations = [
 				value: 'getAll',
 				description: 'Get all issues',
 			},
-			{
-				name: 'Changelog',
-				value: 'changelog',
-				description: 'Get issue changelog',
-			},
 			{
 				name: 'Notify',
 				value: 'notify',
@@ -51,9 +51,9 @@ export const issueOperations = [
 				description: `Return either all transitions or a transition that can be performed by the user on an issue, based on the issue's status`,
 			},
 			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete an issue',
+				name: 'Update',
+				value: 'update',
+				description: 'Update an issue',
 			},
 		],
 		default: 'create',
@@ -370,10 +370,7 @@ export const issueFields = [
 			{
 				displayName: 'Issue Type',
 				name: 'issueType',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getIssueTypes',
-				},
+				type: 'string',
 				default: '',
 				description: 'Issue Types',
 			},
@@ -1135,4 +1132,4 @@ export const issueFields = [
 			},
 		],
 	},
-] as INodeProperties[];
\ No newline at end of file
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index eeb9d7c69d..f11e6abc9a 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -188,31 +188,14 @@ export class Jira implements INodeType {
 			async getIssueTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const projectId = this.getCurrentNodeParameter('project');
 				const returnData: INodePropertyOptions[] = [];
-
-				const issueTypes = await jiraSoftwareCloudApiRequest.call(this, '/api/2/issuetype', 'GET');
-				const jiraVersion = this.getCurrentNodeParameter('jiraVersion') as string;
-				if (jiraVersion === 'server') {
-					for (const issueType of issueTypes) {
-						const issueTypeName = issueType.name;
-						const issueTypeId = issueType.id;
-
-						returnData.push({
-							name: issueTypeName,
-							value: issueTypeId,
-						});
-					}
-				} else {
-					for (const issueType of issueTypes) {
-						if (issueType.scope !== undefined && issueType.scope.project.id === projectId) {
-							const issueTypeName = issueType.name;
-							const issueTypeId = issueType.id;
-
-							returnData.push({
-								name: issueTypeName,
-								value: issueTypeId,
-							});
-						}
-					}
+				const { issueTypes } = await jiraSoftwareCloudApiRequest.call(this, `/api/2/project/${projectId}`, 'GET');
+				for (const issueType of issueTypes) {
+					const issueTypeName = issueType.name;
+					const issueTypeId = issueType.id;
+					returnData.push({
+						name: issueTypeName,
+						value: issueTypeId,
+					});
 				}
 
 				returnData.sort((a, b) => {
@@ -382,7 +365,6 @@ export class Jira implements INodeType {
 					const { fields: { project: { id } } } = await jiraSoftwareCloudApiRequest.call(this, `/api/2/issue/${issueKey}`, 'GET', {}, {});
 					projectId = id;
 				}
-
 				const fields = await jiraSoftwareCloudApiRequest.call(this, `/api/2/field`, 'GET');
 				for (const field of fields) {
 					if (field.custom === true && field.scope && field.scope.project && field.scope.project.id === projectId) {

From 8113693e97241f3d3004b2526c1e0684ac496d72 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 10 Apr 2021 02:21:03 -0400
Subject: [PATCH 007/231] :zap: Add missing fields to folder:list response
 (#1626)

---
 packages/nodes-base/nodes/Dropbox/Dropbox.node.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 4421be2d4f..17be478c36 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -1032,6 +1032,10 @@ export class Dropbox implements INodeType {
 					'size': 'contentSize',
 					'.tag': 'type',
 					'content_hash': 'contentHash',
+					'path_lower': 'pathLower',
+					'path_display': 'pathDisplay',
+					'has_explicit_shared_members': 'hasExplicitSharedMembers',
+					'is_downloadable': 'isDownloadable',
 				};
 
 				if (returnAll === false) {

From a503c0e86bc1add0a744de5e354bd6254802d661 Mon Sep 17 00:00:00 2001
From: Harshil Agrawal <ghagrawal17@gmail.com>
Date: Sat, 10 Apr 2021 10:18:10 +0200
Subject: [PATCH 008/231] :zap: Add new codex files and fix previous files
 (#1608)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Add new codex files and fixed previous files

* 🔨 Minor fix

* 🔨 Minor fix
---
 .../nodes/ActivationTrigger.node.json         |  15 +++
 .../ActiveCampaign/ActiveCampaign.node.json   |   1 +
 .../nodes/Airtable/Airtable.node.json         |  43 +++++++-
 packages/nodes-base/nodes/Amqp/Amqp.node.json |   4 +-
 .../nodes/Amqp/AmqpTrigger.node.json          |   4 +-
 .../ApiTemplateIo/ApiTemplateIo.node.json     |   2 +-
 .../nodes-base/nodes/Asana/Asana.node.json    |   7 ++
 .../nodes/Autopilot/Autopilot.node.json       |  20 ++++
 .../Autopilot/AutopilotTrigger.node.json      |  20 ++++
 .../{ => Comprehend}/AwsComprehend.node.json  |   0
 .../nodes-base/nodes/Aws/S3/AwsS3.node.json   |   4 +-
 .../nodes-base/nodes/Aws/SES/AwsSes.node.json |   4 +-
 .../nodes/Bannerbear/Bannerbear.node.json     |  13 ++-
 .../nodes/Bitwarden/Bitwarden.node.json       |  20 ++++
 .../nodes-base/nodes/Bubble/Bubble.node.json  |  20 ++++
 .../nodes/ClickUp/ClickUp.node.json           |   7 ++
 packages/nodes-base/nodes/Coda/Coda.node.json |   7 ++
 .../nodes/CoinGecko/CoinGecko.node.json       |   7 ++
 .../nodes-base/nodes/Compression.node.json    |   8 +-
 .../nodes/CrateDb/CrateDb.node.json           |   4 +-
 packages/nodes-base/nodes/Cron.node.json      | 100 +++++++++++++++++-
 packages/nodes-base/nodes/Crypto.node.json    |   8 +-
 .../nodes-base/nodes/DeepL/DeepL.node.json    |  20 ++++
 packages/nodes-base/nodes/EditImage.node.json |   1 +
 .../nodes-base/nodes/EmailReadImap.node.json  |   4 +-
 packages/nodes-base/nodes/EmailSend.node.json |   9 +-
 .../nodes-base/nodes/Emelia/Emelia.node.json  |  21 ++++
 .../nodes/Emelia/EmeliaTrigger.node.json      |  21 ++++
 .../nodes-base/nodes/ErrorTrigger.node.json   |   3 +-
 .../nodes-base/nodes/ExecuteCommand.node.json |   5 +-
 .../nodes/ExecuteWorkflow.node.json           |   1 +
 packages/nodes-base/nodes/Function.node.json  |  78 +++++++++++++-
 .../nodes-base/nodes/Github/Github.node.json  |   4 +-
 .../nodes/GoToWebinar/GoToWebinar.node.json   |  20 ++++
 .../Google/Calendar/GoogleCalendar.node.json  |  12 ++-
 .../nodes/Google/Drive/GoogleDrive.node.json  |   4 +-
 ...ore.node.json => CloudFirestore.node.json} |   0
 ...e.node.json => RealtimeDatabase.node.json} |   0
 .../nodes/Google/Gmail/Gmail.node.json        |  12 ++-
 .../nodes/Google/Sheet/GoogleSheets.node.json |  47 +++++++-
 .../nodes/Google/YouTube/YouTube.node.json    |   2 +-
 .../nodes/GraphQL/GraphQL.node.json           |   9 +-
 .../nodes/HackerNews/HackerNews.node.json     |   7 ++
 .../nodes/HtmlExtract/HtmlExtract.node.json   |  10 +-
 .../nodes-base/nodes/HttpRequest.node.json    |  71 ++++++++++++-
 .../nodes/Hubspot/Hubspot.node.json           |  12 +++
 .../nodes/Hubspot/HubspotTrigger.node.json    |   7 ++
 packages/nodes-base/nodes/If.node.json        |  30 +++++-
 packages/nodes-base/nodes/Interval.node.json  |   9 +-
 packages/nodes-base/nodes/Jira/Jira.node.json |   2 +-
 .../nodes/Lemlist/Lemlist.node.json           |  21 ++++
 .../nodes/Lemlist/LemlistTrigger.node.json    |  21 ++++
 .../nodes/LingvaNex/LingvaNex.node.json       |  12 +++
 .../nodes/LinkedIn/LinkedIn.node.json         |   4 +-
 .../nodes/Mandrill/Mandrill.node.json         |   2 +-
 .../nodes/Mattermost/Mattermost.node.json     |  36 ++++++-
 .../nodes-base/nodes/Mautic/Mautic.node.json  |   7 ++
 .../nodes-base/nodes/Medium/Medium.node.json  |   7 ++
 packages/nodes-base/nodes/Merge.node.json     |  19 +++-
 .../nodes-base/nodes/Mindee/Mindee.node.json  |   5 +
 .../nodes/MongoDb/MongoDb.node.json           |   9 +-
 packages/nodes-base/nodes/NoOp.node.json      |  19 +++-
 .../nodes-base/nodes/OpenWeatherMap.node.json |   8 +-
 .../nodes-base/nodes/Orbit/Orbit.node.json    |   2 +-
 .../nodes/PagerDuty/PagerDuty.node.json       |   7 +-
 .../nodes/Postgres/Postgres.node.json         |  22 +++-
 .../nodes/QuestDb/QuestDb.node.json           |   7 ++
 .../nodes/Raindrop/Raindrop.node.json         |  20 ++++
 .../nodes-base/nodes/ReadBinaryFile.node.json |  10 +-
 .../nodes-base/nodes/Redis/Redis.node.json    |   4 +-
 .../nodes/Rocketchat/Rocketchat.node.json     |   3 +-
 .../nodes-base/nodes/RssFeedRead.node.json    |   9 +-
 .../SecurityScorecard.node.json               |   2 +-
 packages/nodes-base/nodes/Set.node.json       |  52 ++++++++-
 .../nodes-base/nodes/Signl4/Signl4.node.json  |   4 +-
 .../nodes-base/nodes/Slack/Slack.node.json    |   9 +-
 .../nodes-base/nodes/SplitInBatches.node.json |   7 ++
 .../nodes/SpreadsheetFile.node.json           |   4 +-
 packages/nodes-base/nodes/Start.node.json     |  28 ++++-
 .../nodes-base/nodes/Strava/Strava.node.json  |   7 ++
 .../nodes/Stripe/StripeTrigger.node.json      |   4 +-
 packages/nodes-base/nodes/Switch.node.json    |   9 +-
 .../nodes/Telegram/Telegram.node.json         |  28 ++++-
 .../nodes/Telegram/TelegramTrigger.node.json  |   8 +-
 .../nodes/TimescaleDb/TimescaleDB.node.json   |  21 ++++
 .../nodes/Todoist/Todoist.node.json           |   7 ++
 .../nodes-base/nodes/Trello/Trello.node.json  |   8 +-
 .../nodes-base/nodes/Twilio/Twilio.node.json  |  37 ++++++-
 .../nodes/Typeform/TypeformTrigger.node.json  |  18 +++-
 .../nodes-base/nodes/UProc/uProc.node.json    |   2 +-
 .../nodes-base/nodes/Vonage/Vonage.node.json  |   7 ++
 packages/nodes-base/nodes/Webhook.node.json   |  51 ++++++++-
 packages/nodes-base/nodes/Wise/Wise.node.json |  20 ++++
 .../nodes/Wise/WiseTrigger.node.json          |  20 ++++
 94 files changed, 1256 insertions(+), 90 deletions(-)
 create mode 100644 packages/nodes-base/nodes/ActivationTrigger.node.json
 create mode 100644 packages/nodes-base/nodes/Autopilot/Autopilot.node.json
 create mode 100644 packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
 rename packages/nodes-base/nodes/Aws/{ => Comprehend}/AwsComprehend.node.json (100%)
 create mode 100644 packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
 create mode 100644 packages/nodes-base/nodes/Bubble/Bubble.node.json
 create mode 100644 packages/nodes-base/nodes/DeepL/DeepL.node.json
 create mode 100644 packages/nodes-base/nodes/Emelia/Emelia.node.json
 create mode 100644 packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
 create mode 100644 packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
 rename packages/nodes-base/nodes/Google/Firebase/CloudFirestore/{GoogleCloudFirestore.node.json => CloudFirestore.node.json} (100%)
 rename packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/{GoogleCloudRealtimeDatabase.node.json => RealtimeDatabase.node.json} (100%)
 create mode 100644 packages/nodes-base/nodes/Lemlist/Lemlist.node.json
 create mode 100644 packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
 create mode 100644 packages/nodes-base/nodes/Raindrop/Raindrop.node.json
 create mode 100644 packages/nodes-base/nodes/TimescaleDb/TimescaleDB.node.json
 create mode 100644 packages/nodes-base/nodes/Wise/Wise.node.json
 create mode 100644 packages/nodes-base/nodes/Wise/WiseTrigger.node.json

diff --git a/packages/nodes-base/nodes/ActivationTrigger.node.json b/packages/nodes-base/nodes/ActivationTrigger.node.json
new file mode 100644
index 0000000000..84ec4f112b
--- /dev/null
+++ b/packages/nodes-base/nodes/ActivationTrigger.node.json
@@ -0,0 +1,15 @@
+{
+	"node": "n8n-nodes-base.activationTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Core Nodes"
+	],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.activationTrigger/"
+			}
+		]
+	}
+}
\ 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 3f8cf4820e..0b2f95d015 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.activeCampaign",
 	"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"
 	],
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.json b/packages/nodes-base/nodes/Airtable/Airtable.node.json
index b8df9796cf..6e5e35752c 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.json
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.json
@@ -17,9 +17,50 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Building an expense tracking app in 10 minutes",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
+			},
+			{
+				"label": "Why this Product Manager loves workflow automation with n8n",
+				"icon": "🧠",
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
+			},
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
+			},
+			{
+				"label": "Sending SMS the Low-Code Way with Airtable, Twilio Programmable SMS, and n8n",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/sending-sms-the-low-code-way-with-airtable-twilio-programmable-sms-and-n8n/"
+			},
 			{
 				"label": "Automating Conference Organization Processes with n8n",
-				"url": "https://medium.com/n8n-io/automating-conference-organization-processes-with-n8n-ab8f64a7a520"
+				"icon": "🙋‍♀️",
+				"url": "https://n8n.io/blog/automating-conference-organization-processes-with-n8n/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.json b/packages/nodes-base/nodes/Amqp/Amqp.node.json
index 93248ead22..fe42a4d7e4 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.json
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
index e4ed4e6043..1c0a6c50a4 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
index fdf3169be8..e6bbbf926e 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.json
@@ -17,4 +17,4 @@
 			}
 		]
 	}
-}
+}
\ 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 efca79ba0b..e5d65a9091 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.json
+++ b/packages/nodes-base/nodes/Asana/Asana.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.asana/"
 			}
+		],
+		"generic": [
+			{
+				"label": "How a digital strategist uses n8n for online marketing",
+				"icon": "💻",
+				"url": "https://n8n.io/blog/how-a-digital-strategist-uses-n8n-for-online-marketing/"
+			}
 		]
 	}
 }
\ 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
new file mode 100644
index 0000000000..46741ea669
--- /dev/null
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.autopilot",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/autopilot"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/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
new file mode 100644
index 0000000000..83efbc78f7
--- /dev/null
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.autopilotTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/autopilot"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.autopilotTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/AwsComprehend.node.json b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json
similarity index 100%
rename from packages/nodes-base/nodes/Aws/AwsComprehend.node.json
rename to packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.json
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
index ed47fd686a..55106d8bc9 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this CEO loves n8n",
+				"label": "Why business process automation with n8n can change your daily life",
 				"icon": "🧬",
-				"url": "https://medium.com/n8n-io/why-this-ceo-loves-n8n-ee7d102b0948"
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
index b77d331956..c636423fec 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this CEO loves n8n",
+				"label": "Why business process automation with n8n can change your daily life",
 				"icon": "🧬",
-				"url": "https://medium.com/n8n-io/why-this-ceo-loves-n8n-ee7d102b0948"
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
index bb41fd4d8d..d4c0e553a7 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.json
@@ -19,7 +19,18 @@
 		"generic": [
 			{
 				"label": "Automate Designs with Bannerbear and n8n",
-				"url": "https://medium.com/n8n-io/automate-designs-with-bannerbear-and-n8n-2b64c94b54db"
+				"icon": "🎨",
+				"url": "https://n8n.io/blog/automate-designs-with-bannerbear-and-n8n/"
+			},
+			{
+				"label": "Automating Conference Organization Processes with n8n",
+				"icon": "🙋‍♀️",
+				"url": "https://n8n.io/blog/automating-conference-organization-processes-with-n8n/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
new file mode 100644
index 0000000000..a5edf7be80
--- /dev/null
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.bitwarden",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Data & Storage"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/bitwarden"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bitwarden/"
+			}
+		]
+	}
+}
\ 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
new file mode 100644
index 0000000000..2d343845d1
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.bubble",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Development"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/bubble"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.bubble/"
+			}
+		]
+	}
+}
\ 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 b6ec13ee3d..fd7fbeeb5d 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.json
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.json
@@ -16,6 +16,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.clickUp/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			}
 		]
 	}
 }
\ 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 415e07a7b4..4f6b7b93f3 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.json
+++ b/packages/nodes-base/nodes/Coda/Coda.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.coda/"
 			}
+		],
+		"generic": [
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
+			}
 		]
 	}
 }
\ 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 399665121c..a18adec94e 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.json
@@ -11,6 +11,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.coinGecko/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Compression.node.json b/packages/nodes-base/nodes/Compression.node.json
index c7de9ba61b..23263b6151 100644
--- a/packages/nodes-base/nodes/Compression.node.json
+++ b/packages/nodes-base/nodes/Compression.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.compression",
 	"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"
@@ -12,5 +13,10 @@
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.compression/"
 			}
 		]
-	}
+	},
+	"alias": [
+		"Zip",
+		"Gzip",
+		"uncompress"
+	]
 }
\ 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 212fd982de..5eba7d7249 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.json
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Cron.node.json b/packages/nodes-base/nodes/Cron.node.json
index 3a33c7b8d6..805a72d1ef 100644
--- a/packages/nodes-base/nodes/Cron.node.json
+++ b/packages/nodes-base/nodes/Cron.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.cron",
 	"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"
 	],
@@ -12,11 +13,106 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			},
+			{
+				"label": "Love at first sight: Ricardo’s n8n journey",
+				"icon": "❤️",
+				"url": "https://n8n.io/blog/love-at-first-sight-ricardos-n8n-journey/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Why I chose n8n over Zapier in 2020",
+				"icon": "😍",
+				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
+			},
+			{
+				"label": "How to host virtual coffee breaks with n8n",
+				"icon": "☕️",
+				"url": "https://n8n.io/blog/how-to-host-virtual-coffee-breaks-with-n8n/"
+			},
+			{
+				"label": "Automatically pulling and visualizing data with n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
 			{
 				"label": "Database Monitoring and Alerting with n8n",
 				"icon": "📡",
-				"url": "https://medium.com/n8n-io/database-monitoring-and-alerting-with-n8n-f5082df7bdb2"
+				"url": "https://n8n.io/blog/database-monitoring-and-alerting-with-n8n/"
+			},
+			{
+				"label": "Celebrating World Poetry Day with a daily poem in Telegram",
+				"icon": "📜",
+				"url": "https://n8n.io/blog/world-poetry-day-workflow/"
+			},
+			{
+				"label": "Automate Designs with Bannerbear and n8n",
+				"icon": "🎨",
+				"url": "https://n8n.io/blog/automate-designs-with-bannerbear-and-n8n/"
+			},
+			{
+				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
+				"icon": "🗓",
+				"url": "https://n8n.io/blog/tracking-time-spent-in-meetings-with-google-calendar-twilio-and-n8n/"
+			},
+			{
+				"label": "Creating Error Workflows in n8n",
+				"icon": "🌪",
+				"url": "https://n8n.io/blog/creating-error-workflows-in-n8n/"
+			},
+			{
+				"label": "Using Automation to Boost Productivity in the Workplace",
+				"icon": "💪",
+				"url": "https://n8n.io/blog/using-automation-to-boost-productivity-in-the-workplace/"
+			},
+			{
+				"label": "Why this Product Manager loves workflow automation with n8n",
+				"icon": "🧠",
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
+			},
+			{
+				"label": "A low-code bitcoin ticker built with QuestDB and n8n.io",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/a-low-code-bitcoin-ticker-built-with-questdb-and-n8n-io/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			},
+			{
+				"label": "Creating scheduled text affirmations with n8n",
+				"icon": "🤟",
+				"url": "https://n8n.io/blog/creating-scheduled-text-affirmations-with-n8n/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
-	}
+	},
+	"alias": [
+		"Time",
+		"Scheduler",
+		"Poll"
+	]
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Crypto.node.json b/packages/nodes-base/nodes/Crypto.node.json
index b974d9a148..31aee5a840 100644
--- a/packages/nodes-base/nodes/Crypto.node.json
+++ b/packages/nodes-base/nodes/Crypto.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.crypto",
 	"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"
@@ -12,5 +13,10 @@
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.crypto/"
 			}
 		]
-	}
+	},
+	"alias": [
+		"Encrypt",
+		"SHA",
+		"Hash"
+	]
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.json b/packages/nodes-base/nodes/DeepL/DeepL.node.json
new file mode 100644
index 0000000000..73c3195585
--- /dev/null
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.deepL",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Utility"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/deepL"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.deepL/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/EditImage.node.json b/packages/nodes-base/nodes/EditImage.node.json
index 7c500dc475..d8cbc0ad5c 100644
--- a/packages/nodes-base/nodes/EditImage.node.json
+++ b/packages/nodes-base/nodes/EditImage.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.editImage",
 	"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"
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.json b/packages/nodes-base/nodes/EmailReadImap.node.json
index 4d7a8fdb93..fd7dd1fbea 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.json
+++ b/packages/nodes-base/nodes/EmailReadImap.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Nathan: Your n8n Virtual Assistant",
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
 				"icon": "👦",
-				"url": "https://medium.com/n8n-io/nathan-your-n8n-virtual-assistant-98ac611ee7a7"
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/EmailSend.node.json b/packages/nodes-base/nodes/EmailSend.node.json
index 4b4c38cedf..1815ca70d5 100644
--- a/packages/nodes-base/nodes/EmailSend.node.json
+++ b/packages/nodes-base/nodes/EmailSend.node.json
@@ -19,9 +19,14 @@
 		],
 		"generic": [
 			{
-				"label": "Nathan: Your n8n Virtual Assistant",
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
 				"icon": "👦",
-				"url": "https://medium.com/n8n-io/nathan-your-n8n-virtual-assistant-98ac611ee7a7"
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.json b/packages/nodes-base/nodes/Emelia/Emelia.node.json
new file mode 100644
index 0000000000..1180fc092e
--- /dev/null
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.emelia",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication",
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/emelia"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/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
new file mode 100644
index 0000000000..7e1a137300
--- /dev/null
+++ b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.emeliaTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication",
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/emelia"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.emeliaTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ErrorTrigger.node.json b/packages/nodes-base/nodes/ErrorTrigger.node.json
index 877468ddd5..5174db0538 100644
--- a/packages/nodes-base/nodes/ErrorTrigger.node.json
+++ b/packages/nodes-base/nodes/ErrorTrigger.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.errorTrigger",
 	"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"
@@ -16,7 +17,7 @@
 			{
 				"label": "Creating Error Workflows in n8n",
 				"icon": "🌪",
-				"url": "https://medium.com/n8n-io/creating-error-workflows-in-n8n-6e03c9ecbc0f"
+				"url": "https://n8n.io/blog/creating-error-workflows-in-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/ExecuteCommand.node.json b/packages/nodes-base/nodes/ExecuteCommand.node.json
index 7bd6e3c36c..4cf58c62dd 100644
--- a/packages/nodes-base/nodes/ExecuteCommand.node.json
+++ b/packages/nodes-base/nodes/ExecuteCommand.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.executeCommand",
 	"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"
@@ -14,9 +15,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this Product Manager loves n8n",
+				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",
-				"url": "https://medium.com/n8n-io/why-this-product-manager-loves-n8n-215dc273d86a"
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow.node.json
index f7200e7699..52f8c7c2d7 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow.node.json
+++ b/packages/nodes-base/nodes/ExecuteWorkflow.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.executeWorkflow",
 	"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"
 	],
diff --git a/packages/nodes-base/nodes/Function.node.json b/packages/nodes-base/nodes/Function.node.json
index 29570637f4..76a15f2bb8 100644
--- a/packages/nodes-base/nodes/Function.node.json
+++ b/packages/nodes-base/nodes/Function.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.function",
 	"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"
@@ -13,10 +14,85 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			},
+			{
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
+				"icon": "🏭",
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Why I chose n8n over Zapier in 2020",
+				"icon": "😍",
+				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
+			},
+			{
+				"label": "How to host virtual coffee breaks with n8n",
+				"icon": "☕️",
+				"url": "https://n8n.io/blog/how-to-host-virtual-coffee-breaks-with-n8n/"
+			},
+			{
+				"label": "Automatically pulling and visualizing data with n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
 			{
 				"label": "Database Monitoring and Alerting with n8n",
 				"icon": "📡",
-				"url": "https://medium.com/n8n-io/database-monitoring-and-alerting-with-n8n-f5082df7bdb2"
+				"url": "https://n8n.io/blog/database-monitoring-and-alerting-with-n8n/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
+			{
+				"label": "Creating triggers for n8n workflows using polling",
+				"icon": "⏲",
+				"url": "https://n8n.io/blog/creating-triggers-for-n8n-workflows-using-polling/"
+			},
+			{
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
+				"icon": "👦",
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
+			},
+			{
+				"label": "How to automatically give kudos to contributors with GitHub, Slack, and n8n",
+				"icon": "👏",
+				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
+			},
+			{
+				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
+				"icon": "🗓",
+				"url": "https://n8n.io/blog/tracking-time-spent-in-meetings-with-google-calendar-twilio-and-n8n/"
+			},
+			{
+				"label": "Creating Error Workflows in n8n",
+				"icon": "🌪",
+				"url": "https://n8n.io/blog/creating-error-workflows-in-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Github/Github.node.json b/packages/nodes-base/nodes/Github/Github.node.json
index 8960f3bc67..2c7175e832 100644
--- a/packages/nodes-base/nodes/Github/Github.node.json
+++ b/packages/nodes-base/nodes/Github/Github.node.json
@@ -18,9 +18,9 @@
 		],
 		"generic": [
 			{
-				"label": "Dashing Through The Data: Visualizing Metrics with n8n",
+				"label": "Automatically pulling and visualizing data with n8n",
 				"icon": "📈",
-				"url": "https://medium.com/n8n-io/dashing-through-the-data-visualizing-metrics-with-n8n-78f3f0309da5"
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
new file mode 100644
index 0000000000..ae4d297509
--- /dev/null
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.goToWebinar",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/goToWebinar"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.goToWebinar/"
+			}
+		]
+	}
+}
\ 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 5877b8394e..fd7f07fa50 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -17,10 +17,20 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "How to host virtual coffee breaks with n8n",
+				"icon": "☕️",
+				"url": "https://n8n.io/blog/how-to-host-virtual-coffee-breaks-with-n8n/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
 			{
 				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
 				"icon": "🗓",
-				"url": "https://medium.com/n8n-io/tracking-time-spent-in-meetings-with-google-calendar-twilio-and-n8n-a5d00f77da8c"
+				"url": "https://n8n.io/blog/tracking-time-spent-in-meetings-with-google-calendar-twilio-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
index 47abef2afe..99b6331324 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
@@ -18,9 +18,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this Product Manager loves n8n",
+				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",
-				"url": "https://medium.com/n8n-io/why-this-product-manager-loves-n8n-215dc273d86a"
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleCloudFirestore.node.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/CloudFirestore.node.json
similarity index 100%
rename from packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleCloudFirestore.node.json
rename to packages/nodes-base/nodes/Google/Firebase/CloudFirestore/CloudFirestore.node.json
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleCloudRealtimeDatabase.node.json b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.json
similarity index 100%
rename from packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleCloudRealtimeDatabase.node.json
rename to packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.json
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index feb488118a..9d3f7e8ce7 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -17,10 +17,20 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
 			{
 				"label": "Using Automation to Boost Productivity in the Workplace",
 				"icon": "💪",
-				"url": "https://medium.com/n8n-io/using-automation-to-boost-productivity-in-the-workplace-c5a4973cb097"
+				"url": "https://n8n.io/blog/using-automation-to-boost-productivity-in-the-workplace/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
index d2d1d876ae..355c2a2f15 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
@@ -18,10 +18,55 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Love at first sight: Ricardo’s n8n journey",
+				"icon": "❤️",
+				"url": "https://n8n.io/blog/love-at-first-sight-ricardos-n8n-journey/"
+			},
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
 			{
 				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
 				"icon": "🧾",
-				"url": "https://medium.com/n8n-io/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n-c47eb2f8d7a5"
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
+			{
+				"label": "Creating triggers for n8n workflows using polling",
+				"icon": "⏲",
+				"url": "https://n8n.io/blog/creating-triggers-for-n8n-workflows-using-polling/"
+			},
+			{
+				"label": "Migrating Community Metrics to Orbit using n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/migrating-community-metrics-to-orbit-using-n8n/"
+			},
+			{
+				"label": "How Honest Burgers Use Automation to Save $100k per year",
+				"icon": "🍔",
+				"url": "https://n8n.io/blog/how-honest-burgers-use-automation-to-save-100k-per-year/"
+			},
+			{
+				"label": "How a digital strategist uses n8n for online marketing",
+				"icon": "💻",
+				"url": "https://n8n.io/blog/how-a-digital-strategist-uses-n8n-for-online-marketing/"
+			},
+			{
+				"label": "Why this Product Manager loves workflow automation with n8n",
+				"icon": "🧠",
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
index eab0d5c8b4..4fc682dfc2 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.json
@@ -20,7 +20,7 @@
 			{
 				"label": "Using Automation to Boost Productivity in the Workplace",
 				"icon": "💪",
-				"url": "https://medium.com/n8n-io/using-automation-to-boost-productivity-in-the-workplace-c5a4973cb097"
+				"url": "https://n8n.io/blog/using-automation-to-boost-productivity-in-the-workplace/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.json b/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
index 76a47ca510..f86ef784e3 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.json
@@ -14,9 +14,14 @@
 		],
 		"generic": [
 			{
-				"label": "Giving kudos to contributors with GitHub, Slack, and n8n",
+				"label": "How to automatically give kudos to contributors with GitHub, Slack, and n8n",
 				"icon": "👏",
-				"url": "https://medium.com/n8n-io/giving-kudos-to-contributors-with-github-slack-and-n8n-b3f5f4a653a6"
+				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
index dfdf07259d..e0d7dbff7c 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.json
@@ -11,6 +11,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hackerNews/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
index bcbadd5194..89f9d24bfd 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
@@ -13,8 +13,14 @@
 		],
 		"generic": [
 			{
-				"label": "HTTP Request Node — The Swiss Army Knife",
-				"url": "https://medium.com/n8n-io/http-request-node-the-swiss-army-knife-b14e22283383"
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "How to use the HTTP Request Node - The Swiss Army Knife for Workflow Automation",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/how-to-use-the-http-request-node-the-swiss-army-knife-for-workflow-automation/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/HttpRequest.node.json b/packages/nodes-base/nodes/HttpRequest.node.json
index 0fe75f7fbf..d575d5102d 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.json
+++ b/packages/nodes-base/nodes/HttpRequest.node.json
@@ -14,9 +14,74 @@
 		],
 		"generic": [
 			{
-				"label": "Webhooks Fun with n8n and Mattermost",
-				"icon": "🍸",
-				"url": "https://medium.com/n8n-io/webhooks-fun-with-n8n-and-mattermost-4ebf7e2b4d2a"
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Automatically pulling and visualizing data with n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
+			{
+				"label": "Learn how to automatically cross-post your content with n8n",
+				"icon": "✍️",
+				"url": "https://n8n.io/blog/learn-how-to-automatically-cross-post-your-content-with-n8n/"
+			},
+			{
+				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
+				"icon": "🧾",
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
+			{
+				"label": "Running n8n on ships: An interview with Maranics",
+				"icon": "🛳",
+				"url": "https://n8n.io/blog/running-n8n-on-ships-an-interview-with-maranics/"
+			},
+			{
+				"label": "Celebrating World Poetry Day with a daily poem in Telegram",
+				"icon": "📜",
+				"url": "https://n8n.io/blog/world-poetry-day-workflow/"
+			},
+			{
+				"label": "Automate Designs with Bannerbear and n8n",
+				"icon": "🎨",
+				"url": "https://n8n.io/blog/automate-designs-with-bannerbear-and-n8n/"
+			},
+			{
+				"label": "Building an expense tracking app in 10 minutes",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
+			},
+			{
+				"label": "How to use the HTTP Request Node - The Swiss Army Knife for Workflow Automation",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/how-to-use-the-http-request-node-the-swiss-army-knife-for-workflow-automation/"
+			},
+			{
+				"label": "Learn how to use webhooks with Mattermost slash commands",
+				"icon": "🦄",
+				"url": "https://n8n.io/blog/learn-how-to-use-webhooks-with-mattermost-slash-commands/"
+			},
+			{
+				"label": "A low-code bitcoin ticker built with QuestDB and n8n.io",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/a-low-code-bitcoin-ticker-built-with-questdb-and-n8n-io/"
+			},
+			{
+				"label": "Creating scheduled text affirmations with n8n",
+				"icon": "🤟",
+				"url": "https://n8n.io/blog/creating-scheduled-text-affirmations-with-n8n/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
index f992b6b25e..b0ebe88f6f 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
@@ -15,6 +15,18 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hubspot/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
+			}
 		]
 	}
 }
\ 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 db72cdaf46..f9866f6c6b 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.hubspotTrigger/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/If.node.json b/packages/nodes-base/nodes/If.node.json
index 37d0578517..fc33709670 100644
--- a/packages/nodes-base/nodes/If.node.json
+++ b/packages/nodes-base/nodes/If.node.json
@@ -2,6 +2,7 @@
 	"node": "n8n-nodes-base.if",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
+	"details": "The IF node can be used to implement binary conditional logic in your workflow. You can setup one-to-many conditions to evalute 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"
 	],
@@ -13,9 +14,34 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Why this Product Manager loves workflow automation with n8n",
+				"icon": "🧠",
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Interval.node.json b/packages/nodes-base/nodes/Interval.node.json
index 0110ee5aa2..74f828d522 100644
--- a/packages/nodes-base/nodes/Interval.node.json
+++ b/packages/nodes-base/nodes/Interval.node.json
@@ -13,9 +13,14 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
+			{
+				"label": "Creating triggers for n8n workflows using polling",
+				"icon": "⏲",
+				"url": "https://n8n.io/blog/creating-triggers-for-n8n-workflows-using-polling/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.json b/packages/nodes-base/nodes/Jira/Jira.node.json
index c013208ee9..6eb4b9c47d 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.json
+++ b/packages/nodes-base/nodes/Jira/Jira.node.json
@@ -21,7 +21,7 @@
 			{
 				"label": "Creating Custom Incident Response Workflows with n8n",
 				"icon": "🚨",
-				"url": "https://medium.com/n8n-io/creating-custom-incident-response-workflows-with-n8n-9baef0bbedb9"
+				"url": "https://n8n.io/blog/creating-custom-incident-response-workflows-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.json b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
new file mode 100644
index 0000000000..a0be715b8d
--- /dev/null
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.lemlist",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication",
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/lemlist"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/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
new file mode 100644
index 0000000000..c186b35b2e
--- /dev/null
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.lemlistTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication",
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/lemlist"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.lemlistTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
index 554b6da936..18013d4b54 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
@@ -15,6 +15,18 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.lingvaNex/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			},
+			{
+				"label": "Celebrating World Poetry Day with a daily poem in Telegram",
+				"icon": "📜",
+				"url": "https://n8n.io/blog/world-poetry-day-workflow/"
+			}
 		]
 	}
 }
\ 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 4ffea4a702..535d103879 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this CEO loves n8n",
+				"label": "Why business process automation with n8n can change your daily life",
 				"icon": "🧬",
-				"url": "https://medium.com/n8n-io/why-this-ceo-loves-n8n-ee7d102b0948"
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.json b/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
index fd92f5875a..94af89eb30 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.json
@@ -21,7 +21,7 @@
 			{
 				"label": "Love at first sight: Ricardo’s n8n journey",
 				"icon": "❤️",
-				"url": "https://medium.com/n8n-io/love-at-first-sight-ricardos-n8n-journey-%EF%B8%8F-93b2c6d15f19"
+				"url": "https://n8n.io/blog/love-at-first-sight-ricardos-n8n-journey/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
index 4ff1d73afb..37b2b95007 100644
--- a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
+++ b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
@@ -18,9 +18,39 @@
 		],
 		"generic": [
 			{
-				"label": "Webhooks Fun with n8n and Mattermost",
-				"icon": "🍸",
-				"url": "https://medium.com/n8n-io/webhooks-fun-with-n8n-and-mattermost-4ebf7e2b4d2a"
+				"label": "How to host virtual coffee breaks with n8n",
+				"icon": "☕️",
+				"url": "https://n8n.io/blog/how-to-host-virtual-coffee-breaks-with-n8n/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
+			{
+				"label": "Creating triggers for n8n workflows using polling",
+				"icon": "⏲",
+				"url": "https://n8n.io/blog/creating-triggers-for-n8n-workflows-using-polling/"
+			},
+			{
+				"label": "The ultimate guide to automate your video collaboration with Whereby, Mattermost, and n8n",
+				"icon": "📹",
+				"url": "https://n8n.io/blog/the-ultimate-guide-to-automate-your-video-collaboration-with-whereby-mattermost-and-n8n/"
+			},
+			{
+				"label": "Creating Error Workflows in n8n",
+				"icon": "🌪",
+				"url": "https://n8n.io/blog/creating-error-workflows-in-n8n/"
+			},
+			{
+				"label": "Creating Custom Incident Response Workflows with n8n",
+				"icon": "🚨",
+				"url": "https://n8n.io/blog/creating-custom-incident-response-workflows-with-n8n/"
+			},
+			{
+				"label": "Learn how to use webhooks with Mattermost slash commands",
+				"icon": "🦄",
+				"url": "https://n8n.io/blog/learn-how-to-use-webhooks-with-mattermost-slash-commands/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.json b/packages/nodes-base/nodes/Mautic/Mautic.node.json
index 03a4f2b1e0..c084cd7390 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.json
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.json
@@ -16,6 +16,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mautic/"
 			}
+		],
+		"generic": [
+			{
+				"label": "How a digital strategist uses n8n for online marketing",
+				"icon": "💻",
+				"url": "https://n8n.io/blog/how-a-digital-strategist-uses-n8n-for-online-marketing/"
+			}
 		]
 	}
 }
\ 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 eba4050a22..1ebaac9bf7 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.json
+++ b/packages/nodes-base/nodes/Medium/Medium.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.medium/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Learn how to automatically cross-post your content with n8n",
+				"icon": "✍️",
+				"url": "https://n8n.io/blog/learn-how-to-automatically-cross-post-your-content-with-n8n/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Merge.node.json b/packages/nodes-base/nodes/Merge.node.json
index 8512f2be02..29e4267e70 100644
--- a/packages/nodes-base/nodes/Merge.node.json
+++ b/packages/nodes-base/nodes/Merge.node.json
@@ -13,9 +13,24 @@
 		],
 		"generic": [
 			{
-				"label": "Nathan: Your n8n Virtual Assistant",
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
+			{
+				"label": "Migrating Community Metrics to Orbit using n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/migrating-community-metrics-to-orbit-using-n8n/"
+			},
+			{
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
 				"icon": "👦",
-				"url": "https://medium.com/n8n-io/nathan-your-n8n-virtual-assistant-98ac611ee7a7"
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.json b/packages/nodes-base/nodes/Mindee/Mindee.node.json
index bde0c0be05..e90a8db695 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.json
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.json
@@ -21,6 +21,11 @@
 				"label": "Building an expense tracking app in 10 minutes",
 				"icon": "📱",
 				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
+			},
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.json b/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
index 7a9a56309d..72d3ac17b1 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.json
@@ -19,9 +19,14 @@
 		],
 		"generic": [
 			{
-				"label": "Mattias Larsson talks about running n8n on ships",
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Running n8n on ships: An interview with Maranics",
 				"icon": "🛳",
-				"url": "https://medium.com/n8n-io/mattias-larsson-talks-about-running-n8n-on-ships-d5d72f108461"
+				"url": "https://n8n.io/blog/running-n8n-on-ships-an-interview-with-maranics/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/NoOp.node.json b/packages/nodes-base/nodes/NoOp.node.json
index b67e834b4a..9b504583da 100644
--- a/packages/nodes-base/nodes/NoOp.node.json
+++ b/packages/nodes-base/nodes/NoOp.node.json
@@ -13,9 +13,24 @@
 		],
 		"generic": [
 			{
-				"label": "Smart Factory Automation using IoT and Sensor Data with n8n",
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
 				"icon": "🏭",
-				"url": "https://medium.com/n8n-io/smart-factory-automation-using-iot-and-sensor-data-with-n8n-27675de9943b"
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.json b/packages/nodes-base/nodes/OpenWeatherMap.node.json
index a1c9b1d090..15585aff44 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.json
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.json
@@ -18,9 +18,15 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
+			},
 			{
 				"label": "Creating Telegram Bots with n8n, a No-Code Platform",
-				"url": "https://medium.com/n8n-io/creating-telegram-bots-with-n8n-a-no-code-platform-fdf1f0928da7"
+				"icon": "💬",
+				"url": "https://n8n.io/blog/creating-telegram-bots-with-n8n-a-no-code-platform/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.json b/packages/nodes-base/nodes/Orbit/Orbit.node.json
index 6d5f3e06f8..e0720e8c51 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.json
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.json
@@ -20,7 +20,7 @@
 			{
 				"label": "Migrating Community Metrics to Orbit using n8n",
 				"icon": "📈",
-				"url": "https://medium.com/n8n-io/migrating-community-metrics-to-orbit-using-n8n-b293372e8daf"
+				"url": "https://n8n.io/blog/migrating-community-metrics-to-orbit-using-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
index edd35dfc0e..b108f93636 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.json
@@ -18,10 +18,15 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
+				"icon": "🏭",
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
 			{
 				"label": "Creating Custom Incident Response Workflows with n8n",
 				"icon": "🚨",
-				"url": "https://medium.com/n8n-io/creating-custom-incident-response-workflows-with-n8n-9baef0bbedb9"
+				"url": "https://n8n.io/blog/creating-custom-incident-response-workflows-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.json b/packages/nodes-base/nodes/Postgres/Postgres.node.json
index 7a6959fbf4..b63f855d94 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.json
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.json
@@ -18,10 +18,30 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Love at first sight: Ricardo’s n8n journey",
+				"icon": "❤️",
+				"url": "https://n8n.io/blog/love-at-first-sight-ricardos-n8n-journey/"
+			},
+			{
+				"label": "Why I chose n8n over Zapier in 2020",
+				"icon": "😍",
+				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
+			},
 			{
 				"label": "Database Monitoring and Alerting with n8n",
 				"icon": "📡",
-				"url": "https://medium.com/n8n-io/database-monitoring-and-alerting-with-n8n-f5082df7bdb2"
+				"url": "https://n8n.io/blog/database-monitoring-and-alerting-with-n8n/"
+			},
+			{
+				"label": "Running n8n on ships: An interview with Maranics",
+				"icon": "🛳",
+				"url": "https://n8n.io/blog/running-n8n-on-ships-an-interview-with-maranics/"
+			},
+			{
+				"label": "How Honest Burgers Use Automation to Save $100k per year",
+				"icon": "🍔",
+				"url": "https://n8n.io/blog/how-honest-burgers-use-automation-to-save-100k-per-year/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.json b/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
index 15586ff1fd..892b587e39 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.json
@@ -16,6 +16,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.questDb/"
 			}
+		],
+		"generic": [
+			{
+				"label": "A low-code bitcoin ticker built with QuestDB and n8n.io",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/a-low-code-bitcoin-ticker-built-with-questdb-and-n8n-io/"
+			}
 		]
 	}
 }
\ 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
new file mode 100644
index 0000000000..4ff1b1f6dd
--- /dev/null
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.raindrop",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Productivity"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/raindrop"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.raindrop/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ReadBinaryFile.node.json b/packages/nodes-base/nodes/ReadBinaryFile.node.json
index f496207652..5a189b75eb 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFile.node.json
@@ -13,8 +13,14 @@
 		],
 		"generic": [
 			{
-				"label": "HTTP Request Node — The Swiss Army Knife",
-				"url": "https://medium.com/n8n-io/http-request-node-the-swiss-army-knife-b14e22283383"
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
+				"icon": "👦",
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
+			},
+			{
+				"label": "How to use the HTTP Request Node - The Swiss Army Knife for Workflow Automation",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/how-to-use-the-http-request-node-the-swiss-army-knife-for-workflow-automation/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.json b/packages/nodes-base/nodes/Redis/Redis.node.json
index 813b832813..d435dbffda 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.json
+++ b/packages/nodes-base/nodes/Redis/Redis.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Why this Product Manager loves n8n",
+				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",
-				"url": "https://medium.com/n8n-io/why-this-product-manager-loves-n8n-215dc273d86a"
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
index 4e51573bad..96b8884855 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.json
@@ -19,7 +19,8 @@
 		"generic": [
 			{
 				"label": "Automate Designs with Bannerbear and n8n",
-				"url": "https://medium.com/n8n-io/automate-designs-with-bannerbear-and-n8n-2b64c94b54db"
+				"icon": "🎨",
+				"url": "https://n8n.io/blog/automate-designs-with-bannerbear-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/RssFeedRead.node.json b/packages/nodes-base/nodes/RssFeedRead.node.json
index 49ac2f7d52..b343818a0e 100644
--- a/packages/nodes-base/nodes/RssFeedRead.node.json
+++ b/packages/nodes-base/nodes/RssFeedRead.node.json
@@ -13,9 +13,14 @@
 		],
 		"generic": [
 			{
-				"label": "Why this CEO loves n8n",
+				"label": "Why business process automation with n8n can change your daily life",
 				"icon": "🧬",
-				"url": "https://medium.com/n8n-io/why-this-ceo-loves-n8n-ee7d102b0948"
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Why I chose n8n over Zapier in 2020",
+				"icon": "😍",
+				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
index 34d0d53dd3..90a626f06b 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Development"
+		"Analytics"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/Set.node.json b/packages/nodes-base/nodes/Set.node.json
index a05e178c28..e9ba8f1747 100644
--- a/packages/nodes-base/nodes/Set.node.json
+++ b/packages/nodes-base/nodes/Set.node.json
@@ -12,10 +12,60 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Learn to Automate Your Factory's Incident Reporting: A Step by Step Guide",
+				"icon": "🏭",
+				"url": "https://n8n.io/blog/learn-to-automate-your-factorys-incident-reporting-a-step-by-step-guide/"
+			},
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Automatically pulling and visualizing data with n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
 			{
 				"label": "Database Monitoring and Alerting with n8n",
 				"icon": "📡",
-				"url": "https://medium.com/n8n-io/database-monitoring-and-alerting-with-n8n-f5082df7bdb2"
+				"url": "https://n8n.io/blog/database-monitoring-and-alerting-with-n8n/"
+			},
+			{
+				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
+				"icon": "🧾",
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
+			{
+				"label": "Building an expense tracking app in 10 minutes",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
+			},
+			{
+				"label": "The ultimate guide to automate your video collaboration with Whereby, Mattermost, and n8n",
+				"icon": "📹",
+				"url": "https://n8n.io/blog/the-ultimate-guide-to-automate-your-video-collaboration-with-whereby-mattermost-and-n8n/"
+			},
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
+			},
+			{
+				"label": "A low-code bitcoin ticker built with QuestDB and n8n.io",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/a-low-code-bitcoin-ticker-built-with-questdb-and-n8n-io/"
+			},
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.json b/packages/nodes-base/nodes/Signl4/Signl4.node.json
index 8337da9d30..e6e06e864f 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.json
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.json
@@ -1,7 +1,7 @@
 {
 	"node": "n8n-nodes-base.signl4",
-	"nodeVersion": "1.1",
-	"codexVersion": "1.1",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
 	"categories": [
 		"Communication",
 		"Development"
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.json b/packages/nodes-base/nodes/Slack/Slack.node.json
index 4e44e9a6c3..053b5856c8 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.json
+++ b/packages/nodes-base/nodes/Slack/Slack.node.json
@@ -18,9 +18,14 @@
 		],
 		"generic": [
 			{
-				"label": "Giving kudos to contributors with GitHub, Slack, and n8n",
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
+				"icon": "👦",
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
+			},
+			{
+				"label": "How to automatically give kudos to contributors with GitHub, Slack, and n8n",
 				"icon": "👏",
-				"url": "https://medium.com/n8n-io/giving-kudos-to-contributors-with-github-slack-and-n8n-b3f5f4a653a6"
+				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/SplitInBatches.node.json b/packages/nodes-base/nodes/SplitInBatches.node.json
index ebf63e62f1..20b488918e 100644
--- a/packages/nodes-base/nodes/SplitInBatches.node.json
+++ b/packages/nodes-base/nodes/SplitInBatches.node.json
@@ -10,6 +10,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.splitInBatches/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile.node.json
index 6a5f6e44f9..dc8a94e23f 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.json
@@ -14,9 +14,9 @@
 		],
 		"generic": [
 			{
-				"label": "Nathan: Your n8n Virtual Assistant",
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
 				"icon": "👦",
-				"url": "https://medium.com/n8n-io/nathan-your-n8n-virtual-assistant-98ac611ee7a7"
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Start.node.json b/packages/nodes-base/nodes/Start.node.json
index 1341f35216..15e47651a9 100644
--- a/packages/nodes-base/nodes/Start.node.json
+++ b/packages/nodes-base/nodes/Start.node.json
@@ -12,9 +12,35 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Why I chose n8n over Zapier in 2020",
+				"icon": "😍",
+				"url": "https://n8n.io/blog/why-i-chose-n8n-over-zapier-in-2020/"
+			},
+			{
+				"label": "Automatically pulling and visualizing data with n8n",
+				"icon": "📈",
+				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
+			{
+				"label": "How to use the HTTP Request Node - The Swiss Army Knife for Workflow Automation",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/how-to-use-the-http-request-node-the-swiss-army-knife-for-workflow-automation/"
+			},
+			{
+				"label": "Sending SMS the Low-Code Way with Airtable, Twilio Programmable SMS, and n8n",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/sending-sms-the-low-code-way-with-airtable-twilio-programmable-sms-and-n8n/"
+			},
 			{
 				"label": "Automating Conference Organization Processes with n8n",
-				"url": "https://medium.com/n8n-io/automating-conference-organization-processes-with-n8n-ab8f64a7a520"
+				"icon": "🙋‍♀️",
+				"url": "https://n8n.io/blog/automating-conference-organization-processes-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.json b/packages/nodes-base/nodes/Strava/Strava.node.json
index 8fc06ea01a..f2df6f8747 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.json
+++ b/packages/nodes-base/nodes/Strava/Strava.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.strava/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			}
 		]
 	}
 }
\ 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 03d3854bcc..a1b7c45612 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.json
@@ -19,9 +19,9 @@
 		],
 		"generic": [
 			{
-				"label": "Maxime Jumelle talks about using n8n at Blent.ai",
+				"label": "Automate your customer journey with n8n: An interview with Blent.ai",
 				"icon": "🚀",
-				"url": "https://medium.com/n8n-io/maxime-jumelle-talks-about-using-n8n-at-blent-ai-c47d3fca6141"
+				"url": "https://n8n.io/blog/automate-your-customer-journey-with-n8n-an-interview-with-blent-ai/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Switch.node.json b/packages/nodes-base/nodes/Switch.node.json
index 5299351ad5..ab9c389dcc 100644
--- a/packages/nodes-base/nodes/Switch.node.json
+++ b/packages/nodes-base/nodes/Switch.node.json
@@ -13,9 +13,14 @@
 		],
 		"generic": [
 			{
-				"label": "Nathan: Your n8n Virtual Assistant",
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Build your own virtual assistant with n8n: A step by step guide",
 				"icon": "👦",
-				"url": "https://medium.com/n8n-io/nathan-your-n8n-virtual-assistant-98ac611ee7a7"
+				"url": "https://n8n.io/blog/build-your-own-virtual-assistant-with-n8n-a-step-by-step-guide/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.json b/packages/nodes-base/nodes/Telegram/Telegram.node.json
index f8494fb91a..a883edf615 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.json
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.json
@@ -17,9 +17,35 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Why business process automation with n8n can change your daily life",
+				"icon": "🧬",
+				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
+			},
+			{
+				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
+				"icon": "🧾",
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
+			{
+				"label": "Celebrating World Poetry Day with a daily poem in Telegram",
+				"icon": "📜",
+				"url": "https://n8n.io/blog/world-poetry-day-workflow/"
+			},
+			{
+				"label": "Using Automation to Boost Productivity in the Workplace",
+				"icon": "💪",
+				"url": "https://n8n.io/blog/using-automation-to-boost-productivity-in-the-workplace/"
+			},
+			{
+				"label": "Creating scheduled text affirmations with n8n",
+				"icon": "🤟",
+				"url": "https://n8n.io/blog/creating-scheduled-text-affirmations-with-n8n/"
+			},
 			{
 				"label": "Creating Telegram Bots with n8n, a No-Code Platform",
-				"url": "https://medium.com/n8n-io/creating-telegram-bots-with-n8n-a-no-code-platform-fdf1f0928da7"
+				"icon": "💬",
+				"url": "https://n8n.io/blog/creating-telegram-bots-with-n8n-a-no-code-platform/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
index 22f7c27530..0e6e71c05f 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.json
@@ -17,9 +17,15 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
+				"icon": "🧾",
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
 			{
 				"label": "Creating Telegram Bots with n8n, a No-Code Platform",
-				"url": "https://medium.com/n8n-io/creating-telegram-bots-with-n8n-a-no-code-platform-fdf1f0928da7"
+				"icon": "💬",
+				"url": "https://n8n.io/blog/creating-telegram-bots-with-n8n-a-no-code-platform/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDB.node.json b/packages/nodes-base/nodes/TimescaleDb/TimescaleDB.node.json
new file mode 100644
index 0000000000..a58dc6e209
--- /dev/null
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDB.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.timescaleDb",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Data & Storage",
+		"Development"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/timescaleDb"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.timescaleDb/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Todoist/Todoist.node.json b/packages/nodes-base/nodes/Todoist/Todoist.node.json
index e4e350df18..bb0a6c1e26 100644
--- a/packages/nodes-base/nodes/Todoist/Todoist.node.json
+++ b/packages/nodes-base/nodes/Todoist/Todoist.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.todoist/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
+				"icon": "🎖",
+				"url": "https://n8n.io/blog/benefits-of-automation-and-n8n-an-interview-with-hubspots-hugh-durkin/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.json b/packages/nodes-base/nodes/Trello/Trello.node.json
index 7f92a0124d..522237dd3a 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.json
+++ b/packages/nodes-base/nodes/Trello/Trello.node.json
@@ -17,9 +17,15 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "How a digital strategist uses n8n for online marketing",
+				"icon": "💻",
+				"url": "https://n8n.io/blog/how-a-digital-strategist-uses-n8n-for-online-marketing/"
+			},
 			{
 				"label": "Automating Conference Organization Processes with n8n",
-				"url": "https://medium.com/n8n-io/automating-conference-organization-processes-with-n8n-ab8f64a7a520"
+				"icon": "🙋‍♀️",
+				"url": "https://n8n.io/blog/automating-conference-organization-processes-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.json b/packages/nodes-base/nodes/Twilio/Twilio.node.json
index 778958d01f..e815ada157 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.json
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.json
@@ -18,10 +18,45 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Love at first sight: Ricardo’s n8n journey",
+				"icon": "❤️",
+				"url": "https://n8n.io/blog/love-at-first-sight-ricardos-n8n-journey/"
+			},
 			{
 				"label": "Database Monitoring and Alerting with n8n",
 				"icon": "📡",
-				"url": "https://medium.com/n8n-io/database-monitoring-and-alerting-with-n8n-f5082df7bdb2"
+				"url": "https://n8n.io/blog/database-monitoring-and-alerting-with-n8n/"
+			},
+			{
+				"label": "Automatically Adding Expense Receipts to Google Sheets with Telegram, Mindee, Twilio, and n8n",
+				"icon": "🧾",
+				"url": "https://n8n.io/blog/automatically-adding-expense-receipts-to-google-sheets-with-telegram-mindee-twilio-and-n8n/"
+			},
+			{
+				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
+				"icon": "🗓",
+				"url": "https://n8n.io/blog/tracking-time-spent-in-meetings-with-google-calendar-twilio-and-n8n/"
+			},
+			{
+				"label": "Creating Error Workflows in n8n",
+				"icon": "🌪",
+				"url": "https://n8n.io/blog/creating-error-workflows-in-n8n/"
+			},
+			{
+				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
+				"icon": "🙌",
+				"url": "https://n8n.io/blog/sending-automated-congratulations-with-google-sheets-twilio-and-n8n/"
+			},
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
+			},
+			{
+				"label": "Sending SMS the Low-Code Way with Airtable, Twilio Programmable SMS, and n8n",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/sending-sms-the-low-code-way-with-airtable-twilio-programmable-sms-and-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
index 08a0730af6..fddeae12cd 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
@@ -17,9 +17,25 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "2021: The Year to Automate the New You with n8n",
+				"icon": "☀️",
+				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
+			},
+			{
+				"label": "Supercharging your conference registration process with n8n",
+				"icon": "🎫",
+				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
+			},
+			{
+				"label": "Building an expense tracking app in 10 minutes",
+				"icon": "📱",
+				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
+			},
 			{
 				"label": "Automating Conference Organization Processes with n8n",
-				"url": "https://medium.com/n8n-io/automating-conference-organization-processes-with-n8n-ab8f64a7a520"
+				"icon": "🙋‍♀️",
+				"url": "https://n8n.io/blog/automating-conference-organization-processes-with-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/UProc/uProc.node.json b/packages/nodes-base/nodes/UProc/uProc.node.json
index a64480d3c0..90a6a8b9b8 100644
--- a/packages/nodes-base/nodes/UProc/uProc.node.json
+++ b/packages/nodes-base/nodes/UProc/uProc.node.json
@@ -17,4 +17,4 @@
 			}
 		]
 	}
-}
+}
\ 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 120f229559..a131553580 100644
--- a/packages/nodes-base/nodes/Vonage/Vonage.node.json
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.vonage/"
 			}
+		],
+		"generic": [
+			{
+				"label": "2021 Goals: Level Up Your Vocabulary With Vonage and n8n",
+				"icon": "🎯",
+				"url": "https://n8n.io/blog/2021-goals-level-up-your-vocabulary-with-vonage-and-n8n/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Webhook.node.json b/packages/nodes-base/nodes/Webhook.node.json
index b3667d8735..2e14614428 100644
--- a/packages/nodes-base/nodes/Webhook.node.json
+++ b/packages/nodes-base/nodes/Webhook.node.json
@@ -14,9 +14,54 @@
 		],
 		"generic": [
 			{
-				"label": "Webhooks Fun with n8n and Mattermost",
-				"icon": "🍸",
-				"url": "https://medium.com/n8n-io/webhooks-fun-with-n8n-and-mattermost-4ebf7e2b4d2a"
+				"label": "Learn how to automatically cross-post your content with n8n",
+				"icon": "✍️",
+				"url": "https://n8n.io/blog/learn-how-to-automatically-cross-post-your-content-with-n8n/"
+			},
+			{
+				"label": "Running n8n on ships: An interview with Maranics",
+				"icon": "🛳",
+				"url": "https://n8n.io/blog/running-n8n-on-ships-an-interview-with-maranics/"
+			},
+			{
+				"label": "How a digital strategist uses n8n for online marketing",
+				"icon": "💻",
+				"url": "https://n8n.io/blog/how-a-digital-strategist-uses-n8n-for-online-marketing/"
+			},
+			{
+				"label": "The ultimate guide to automate your video collaboration with Whereby, Mattermost, and n8n",
+				"icon": "📹",
+				"url": "https://n8n.io/blog/the-ultimate-guide-to-automate-your-video-collaboration-with-whereby-mattermost-and-n8n/"
+			},
+			{
+				"label": "How to automatically give kudos to contributors with GitHub, Slack, and n8n",
+				"icon": "👏",
+				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
+			},
+			{
+				"label": "Why this Product Manager loves workflow automation with n8n",
+				"icon": "🧠",
+				"url": "https://n8n.io/blog/why-this-product-manager-loves-workflow-automation-with-n8n/"
+			},
+			{
+				"label": "Creating Custom Incident Response Workflows with n8n",
+				"icon": "🚨",
+				"url": "https://n8n.io/blog/creating-custom-incident-response-workflows-with-n8n/"
+			},
+			{
+				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
+				"icon": "🧰",
+				"url": "https://n8n.io/blog/learn-to-build-powerful-api-endpoints-using-webhooks/"
+			},
+			{
+				"label": "Learn how to use webhooks with Mattermost slash commands",
+				"icon": "🦄",
+				"url": "https://n8n.io/blog/learn-how-to-use-webhooks-with-mattermost-slash-commands/"
+			},
+			{
+				"label": "How Goomer automated their operations with over 200 n8n workflows",
+				"icon": "🛵",
+				"url": "https://n8n.io/blog/how-goomer-automated-their-operations-with-over-200-n8n-workflows/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.json b/packages/nodes-base/nodes/Wise/Wise.node.json
new file mode 100644
index 0000000000..3c68423481
--- /dev/null
+++ b/packages/nodes-base/nodes/Wise/Wise.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.wise",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Finance & Accounting"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/wise"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wise/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.json b/packages/nodes-base/nodes/Wise/WiseTrigger.node.json
new file mode 100644
index 0000000000..457e7d2706
--- /dev/null
+++ b/packages/nodes-base/nodes/Wise/WiseTrigger.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.wiseTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Finance & Accounting"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/wise"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.wiseTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file

From b9070c12d034a79a0799eb9f0f357cc4dd198115 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Apr 2021 08:45:17 +0000
Subject: [PATCH 009/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.112.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index cb7e05155c..bcaedd4bd3 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.111.0",
+  "version": "0.112.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 64796d4c1c3856b7f9600d7237b7945e66dc27eb Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Apr 2021 08:46:19 +0000
Subject: [PATCH 010/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.85.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 806d31c247..2b53707120 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 00b5e5e68f714dc6c5fcf5b5118e721dc3e1a76a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Apr 2021 08:47:20 +0000
Subject: [PATCH 011/231] :arrow_up: Set n8n-editor-ui@0.85.0 and
 n8n-nodes-base@0.112.0 on n8n

---
 packages/cli/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index a0e9583c94..3fa851cd9e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -105,8 +105,8 @@
     "lodash.get": "^4.4.2",
     "mysql2": "~2.1.0",
     "n8n-core": "~0.67.0",
-    "n8n-editor-ui": "~0.84.0",
-    "n8n-nodes-base": "~0.111.0",
+    "n8n-editor-ui": "~0.85.0",
+    "n8n-nodes-base": "~0.112.0",
     "n8n-workflow": "~0.55.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 7a99f4256f3c072c81bb09d07d6fdfc31812ec04 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Apr 2021 08:47:20 +0000
Subject: [PATCH 012/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.115.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3fa851cd9e..bf161550ff 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.114.0",
+  "version": "0.115.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8f3bc32555be0166dac771d46bbf945a43c2ed88 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Apr 2021 15:45:17 +0200
Subject: [PATCH 013/231] :bug: Fix bug with expression in production webhook
 paths

---
 packages/cli/src/ActiveWorkflowRunner.ts | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 3ab8c932ed..07cd0a8b82 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -20,7 +20,6 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
 	IExecuteData,
 	IGetExecutePollFunctions,
 	IGetExecuteTriggerFunctions,
@@ -283,23 +282,11 @@ export class ActiveWorkflowRunner {
 			const node = workflow.getNode(webhookData.node) as INode;
 			node.name = webhookData.node;
 
-			path = node.parameters.path as string;
-
-			if (node.parameters.path === undefined) {
-				path = workflow.expression.getSimpleParameterValue(node, webhookData.webhookDescription['path'], mode) as string | undefined;
-
-				if (path === undefined) {
-					// TODO: Use a proper logger
-					console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflow.id}".`);
-					continue;
-				}
-			}
-
-			const isFullPath: boolean = workflow.expression.getSimpleParameterValue(node, webhookData.webhookDescription['isFullPath'], mode, false) as boolean;
+			path = webhookData.path;
 
 			const webhook = {
 				workflowId: webhookData.workflowId,
-				webhookPath: NodeHelpers.getNodeWebhookPath(workflow.id as string, node, path, isFullPath),
+				webhookPath: path,
 				node: node.name,
 				method: webhookData.httpMethod,
 			} as IWebhookDb;
@@ -317,7 +304,6 @@ export class ActiveWorkflowRunner {
 			}
 
 			try {
-
 				await Db.collections.Webhook?.insert(webhook);
 
 				const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, activation, false);

From dd445dafaa8662d4960fece587755d2834629565 Mon Sep 17 00:00:00 2001
From: entrailz <entrailz@googlemail.com>
Date: Tue, 13 Apr 2021 17:24:30 +0100
Subject: [PATCH 014/231] =?UTF-8?q?=E2=9C=A8=20Add=20INSERT=20modifiers=20?=
 =?UTF-8?q?support=20in=20mySQL=20node=20(#1423)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update MySql.node.ts

Allow for insert ignore - useful if you are wanting to insert data into an already established table with unique ids.

* :zap: Improve ignore errors change in mysql node

* :zap: move modifiers into separate options block

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
---
 packages/nodes-base/nodes/MySql/MySql.node.ts | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 5015954d98..4dc88412d7 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -113,6 +113,49 @@ export class MySql implements INodeType {
 				placeholder: 'id,name,description',
 				description: 'Comma separated list of the properties which should used as columns for the new rows.',
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				displayOptions: {
+					show: {
+						operation: [
+							'insert',
+						],
+					},
+				},
+				default: {},
+				placeholder: 'Add modifiers',
+				description: 'Modifiers for INSERT statement.',
+				options: [
+					{
+						displayName: 'Ignore',
+						name: 'ignore',
+						type: 'boolean',
+						default: true,
+						description: 'Ignore any ignorable errors that occur while executing the INSERT statement.',
+					},
+					{
+						displayName: 'Priority',
+						name: 'priority',
+						type: 'options',
+						options: [
+							{
+								name: 'Low Prioirity',
+								value: 'LOW_PRIORITY',
+								description: 'Delays execution of the INSERT until no other clients are reading from the table.',
+							},
+							{
+								name: 'High Priority',
+								value: 'HIGH_PRIORITY',
+								description: 'Overrides the effect of the --low-priority-updates option if the server was started with that option. It also causes concurrent inserts not to be used.',
+							},
+						],
+						default: 'LOW_PRIORITY',
+						description: 'Ignore any ignorable errors that occur while executing the INSERT statement.',
+					},
+				],
+			},
 
 
 			// ----------------------------------
@@ -215,8 +258,13 @@ export class MySql implements INodeType {
 			const columns = columnString.split(',').map(column => column.trim());
 			const insertItems = copyInputItems(items, columns);
 			const insertPlaceholder = `(${columns.map(column => '?').join(',')})`;
-			const insertSQL = `INSERT INTO ${table}(${columnString}) VALUES ${items.map(item => insertPlaceholder).join(',')};`;
+			const options = this.getNodeParameter('options', 0) as IDataObject;
+			const insertIgnore = options.ignore as boolean;
+			const insertPriority = options.priority as string;
+
+			const insertSQL = `INSERT ${insertPriority || ''} ${insertIgnore ? 'IGNORE' : ''} INTO ${table}(${columnString}) VALUES ${items.map(item => insertPlaceholder).join(',')};`;
 			const queryItems = insertItems.reduce((collection, item) => collection.concat(Object.values(item as any)), []); // tslint:disable-line:no-any
+			
 			const queryResult = await connection.query(insertSQL, queryItems);
 
 			returnItems = this.helpers.returnJsonArray(queryResult[0] as unknown as IDataObject);

From 8ed1099795857eda7757d715a97a483c934f822a Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Wed, 14 Apr 2021 00:26:25 +0800
Subject: [PATCH 015/231] =?UTF-8?q?=E2=9A=A1=20Use=20faster=20bcrypt=20imp?=
 =?UTF-8?q?lementation=20(#1593)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json  | 5 ++---
 packages/cli/src/Server.ts | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index bf161550ff..35141b2d67 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -55,7 +55,6 @@
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
     "@types/basic-auth": "^1.1.2",
-    "@types/bcryptjs": "^2.4.1",
     "@types/bull": "^3.3.10",
     "@types/compression": "1.0.1",
     "@types/connect-history-api-fallback": "^1.3.1",
@@ -80,11 +79,11 @@
     "typescript": "~3.9.7"
   },
   "dependencies": {
+    "@node-rs/bcrypt": "^1.2.0",
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
     "@types/jsonwebtoken": "^8.3.4",
     "basic-auth": "^2.0.1",
-    "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "body-parser-xml": "^1.1.0",
     "bull": "^3.19.0",
@@ -135,4 +134,4 @@
       "json"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 51e015d29c..cbe43697f3 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -22,7 +22,7 @@ import { RequestOptions } from 'oauth-1.0a';
 import * as csrf from 'csrf';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
-import { compare } from 'bcryptjs';
+import { compare } from '@node-rs/bcrypt';
 import * as promClient from 'prom-client';
 
 import {

From f4916c7efbff6ec4f76fb7cd948e3ad7f13ac821 Mon Sep 17 00:00:00 2001
From: Allan Daemon <AllanDaemon@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:27:25 -0300
Subject: [PATCH 016/231] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Close=20RabbitMQ?=
 =?UTF-8?q?=20connections=20left=20open=20after=20use=20(#1594)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts        | 3 +++
 packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index 80a209c4e4..3ce903d913 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -355,6 +355,7 @@ export class RabbitMQ implements INodeType {
 				});
 
 				await channel.close();
+				await channel.connection.close();
 			}
 			else if (mode === 'exchange') {
 				const exchange = this.getNodeParameter('exchange', 0) as string;
@@ -419,6 +420,7 @@ export class RabbitMQ implements INodeType {
 				});
 
 				await channel.close();
+				await channel.connection.close();
 			} else {
 				throw new Error(`The operation "${mode}" is not known!`);
 			}
@@ -428,6 +430,7 @@ export class RabbitMQ implements INodeType {
 		catch (error) {
 			if (channel) {
 				await channel.close();
+				await channel.connection.close();
 			}
 			throw error;
 		}
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index f39cacf080..3cb586dc59 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -151,6 +151,7 @@ export class RabbitMQTrigger implements INodeType {
 		// the workflow gets deactivated and can so clean up.
 		async function closeFunction() {
 			await channel.close();
+			await channel.connection.close();
 		}
 
 		// The "manualTriggerFunction" function gets called by n8n

From 315d3b59f554e5c9bd6b757dc80c0fef9c230ea5 Mon Sep 17 00:00:00 2001
From: Anton Romanov <iam@theone74.ru>
Date: Wed, 14 Apr 2021 14:41:56 +0300
Subject: [PATCH 017/231] :sparkles: Add limit, skip, sort, upsert in MongoDB
 node (#1439)

* mongodb find command improvements: limit, skip, sort

* mongodb update command improvement: upsert

* :zap: improve mongo node

* :art: add missing semicolons

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
---
 .../nodes-base/nodes/MongoDb/MongoDb.node.ts  | 25 +++++++--
 .../nodes/MongoDb/mongo.node.options.ts       | 54 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index c03a62816f..00dfe9f3a7 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -60,10 +60,24 @@ export class MongoDb implements INodeType {
 			//         find
 			// ----------------------------------
 
-			const queryResult = await mdb
+			let query = mdb
 				.collection(this.getNodeParameter('collection', 0) as string)
-				.find(JSON.parse(this.getNodeParameter('query', 0) as string))
-				.toArray();
+				.find(JSON.parse(this.getNodeParameter('query', 0) as string));
+
+			const options = this.getNodeParameter('options', 0) as IDataObject;
+			const limit = options.limit as number;
+			const skip = options.skip as number;
+			const sort = options.sort && JSON.parse(options.sort as string);
+			if (skip > 0) {
+				query = query.skip(skip);
+			}
+			if (limit > 0) {
+				query = query.limit(limit);
+			}
+			if (sort && Object.keys(sort).length !== 0 && sort.constructor === Object) {
+				query = query.sort(sort);
+			}
+			const queryResult = await query.toArray();
 
 			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
 		} else if (operation === 'insert') {
@@ -112,6 +126,9 @@ export class MongoDb implements INodeType {
 			let updateKey = this.getNodeParameter('updateKey', 0) as string;
 			updateKey = updateKey.trim();
 
+			const updateOptions = (this.getNodeParameter('upsert', 0) as boolean)
+				? { upsert: true } : undefined;
+
 			if (!fields.includes(updateKey)) {
 				fields.push(updateKey);
 			}
@@ -136,7 +153,7 @@ export class MongoDb implements INodeType {
 				}
 				await mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.updateOne(filter, { $set: item });
+					.updateOne(filter, { $set: item }, updateOptions);
 			}
 			returnItems = this.helpers.returnJsonArray(updateItems as IDataObject[]);
 		} else {
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
index 5fa8972c51..591e5b3afc 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
@@ -90,6 +90,47 @@ export const nodeDescription: INodeTypeDescription = {
 		// ----------------------------------
 		//         find
 		// ----------------------------------
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			displayOptions: {
+				show: {
+					operation: ['find'],
+				},
+			},
+			default: {},
+			placeholder: 'Add options',
+			description: 'Add query options',
+			options: [
+				{
+					displayName: 'Limit',
+					name: 'limit',
+					type: "number",
+					default: 0,
+					description: 'Use limit to specify the maximum number of documents or 0 for unlimited documents.',
+				},
+				{
+					displayName: 'Skip',
+					name: 'skip',
+					type: "number",
+					default: 0,
+					description: 'The number of documents to skip in the results set.',
+				},
+				{
+					displayName: 'Sort (JSON format)',
+					name: 'sort',
+					type: 'json',
+					typeOptions: {
+						rows: 2,
+					},
+					default: '{}',
+					placeholder: '{ "field": -1 }',
+					required: true,
+					description: 'A json that defines the sort order of the result set.',
+				},
+			],
+		},
 		{
 			displayName: 'Query (JSON format)',
 			name: 'query',
@@ -109,7 +150,6 @@ export const nodeDescription: INodeTypeDescription = {
 			required: true,
 			description: 'MongoDB Find query.',
 		},
-
 		// ----------------------------------
 		//         insert
 		// ----------------------------------
@@ -165,6 +205,18 @@ export const nodeDescription: INodeTypeDescription = {
 			description:
 				'Comma separated list of the fields to be included into the new document.',
 		},
+		{
+			displayName: 'Upsert',
+			name: 'upsert',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['update'],
+				},
+			},
+			default: false,
+			description: `Perform an insert if no documents match the update key`,
+		},
 		{
 			displayName: 'Options',
 			name: 'options',

From 41088fcd9e14d0846966d581f90f0fef7c9781b7 Mon Sep 17 00:00:00 2001
From: Cassiano Vailati <cassiano.vailati@gmail.com>
Date: Wed, 14 Apr 2021 13:43:12 +0200
Subject: [PATCH 018/231] :sparkles: Add SSL support to MySQL.credentials and
 MySQL.node (#1644)

* added SSL support to MySQL.credentials and MySQL.node

* :zap: hide certificate field data, change CA name

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
---
 .../credentials/MySql.credentials.ts          | 59 ++++++++++++++++++-
 packages/nodes-base/nodes/MySql/MySql.node.ts | 25 +++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/credentials/MySql.credentials.ts b/packages/nodes-base/credentials/MySql.credentials.ts
index 7d2e05ed9e..083fa240fb 100644
--- a/packages/nodes-base/credentials/MySql.credentials.ts
+++ b/packages/nodes-base/credentials/MySql.credentials.ts
@@ -48,6 +48,63 @@ export class MySql implements ICredentialType {
 			type: 'number' as NodePropertyTypes,
 			default: 10000,
 			description: 'The milliseconds before a timeout occurs during the initial connection to the MySQL server.',
-		},	
+		},
+		{
+			displayName: 'SSL',
+			name: 'ssl',
+			type: 'boolean' as NodePropertyTypes,
+			default: false,
+		},
+		{
+			displayName: 'CA Certificate',
+			name: 'caCertificate',
+			typeOptions: {
+				alwaysOpenEditWindow: true,
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					ssl: [
+						true,
+					],
+				},
+			},
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Client Private Key',
+			name: 'clientPrivateKey',
+			typeOptions: {
+				alwaysOpenEditWindow: true,
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					ssl: [
+						true,
+					],
+				},
+			},
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Client Certificate',
+			name: 'clientCertificate',
+			typeOptions: {
+				alwaysOpenEditWindow: true,
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					ssl: [
+						true,
+					],
+				},
+			},
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 4dc88412d7..03549c9260 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -218,7 +218,30 @@ export class MySql implements INodeType {
 			throw new Error('No credentials got returned!');
 		}
 
-		const connection = await mysql2.createConnection(credentials);
+		// Destructuring SSL configuration
+		const {
+			ssl,
+			caCertificate,
+			clientCertificate,
+			clientPrivateKey,
+			...baseCredentials
+		} = credentials;
+
+		if (ssl) {
+			baseCredentials.ssl = {};
+
+			if (caCertificate) {
+				baseCredentials.ssl.ca = caCertificate;
+			}
+
+			// client certificates might not be required
+			if (clientCertificate || clientPrivateKey) {
+				baseCredentials.ssl.cert = clientCertificate;
+				baseCredentials.ssl.key = clientPrivateKey;
+			}
+		}
+
+		const connection = await mysql2.createConnection(baseCredentials);
 		const items = this.getInputData();
 		const operation = this.getNodeParameter('operation', 0) as string;
 		let returnItems = [];

From 10ba8426101531e707b9b6b282f85e865b145089 Mon Sep 17 00:00:00 2001
From: Allan Daemon <AllanDaemon@users.noreply.github.com>
Date: Wed, 14 Apr 2021 09:02:51 -0300
Subject: [PATCH 019/231] :zap: close mongo connection on close  (#1597)

Fix #1595
---
 packages/nodes-base/nodes/MongoDb/MongoDb.node.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 00dfe9f3a7..30eefb02b1 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -160,6 +160,7 @@ export class MongoDb implements INodeType {
 			throw new Error(`The operation "${operation}" is not supported!`);
 		}
 
+		client.close();
 		return this.prepareOutputData(returnItems);
 	}
 }

From d59e6d1c4b41142495d5ca1ed0bdfdfcf6d66286 Mon Sep 17 00:00:00 2001
From: ahsan-virani <ahsan.virani@gmail.com>
Date: Wed, 14 Apr 2021 14:04:59 +0200
Subject: [PATCH 020/231] :shirt: Fix lint issue

---
 packages/nodes-base/nodes/MongoDb/mongo.node.options.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
index 591e5b3afc..6d863987cc 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
@@ -106,14 +106,14 @@ export const nodeDescription: INodeTypeDescription = {
 				{
 					displayName: 'Limit',
 					name: 'limit',
-					type: "number",
+					type: 'number',
 					default: 0,
 					description: 'Use limit to specify the maximum number of documents or 0 for unlimited documents.',
 				},
 				{
 					displayName: 'Skip',
 					name: 'skip',
-					type: "number",
+					type: 'number',
 					default: 0,
 					description: 'The number of documents to skip in the results set.',
 				},

From ca4c3fa980c549dcf3cff08ef981fe8cb20a2933 Mon Sep 17 00:00:00 2001
From: Allan Daemon <AllanDaemon@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:20:56 -0300
Subject: [PATCH 021/231] :sparkles: add RabbitMQ AMPQS support (#1598)

* WIP fixes #1596 (RabbitMQ AMPQS support)

* :zap: fix display options

Co-authored-by: ahsan-virani <ahsan.virani@gmail.com>
---
 .../credentials/RabbitMQ.credentials.ts       | 64 ++++++++++++-------
 .../nodes/RabbitMQ/GenericFunctions.ts        | 10 +--
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/packages/nodes-base/credentials/RabbitMQ.credentials.ts b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
index 046650f58a..6c69dfc0cc 100644
--- a/packages/nodes-base/credentials/RabbitMQ.credentials.ts
+++ b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
@@ -1,5 +1,6 @@
 import {
 	ICredentialType,
+	IDisplayOptions,
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
@@ -51,8 +52,22 @@ export class RabbitMQ implements ICredentialType {
 			default: false,
 		},
 		{
-			displayName: 'Client Certificate',
-			name: 'cert',
+			displayName: 'Passwordless',
+			name: 'passwordless',
+			type: 'boolean' as NodePropertyTypes,
+			displayOptions: {
+				show: {
+					ssl: [
+						true,
+					],
+				},
+			},
+			default: false,
+			description: 'Passwordless connection with certificates (SASL mechanism EXTERNAL)',
+		},
+		{
+			displayName: 'CA Certificates',
+			name: 'ca',
 			type: 'string' as NodePropertyTypes,
 			typeOptions: {
 				password: true,
@@ -65,6 +80,26 @@ export class RabbitMQ implements ICredentialType {
 				},
 			},
 			default: '',
+			description: 'SSL CA Certificates to use.',
+		},
+		{
+			displayName: 'Client Certificate',
+			name: 'cert',
+			type: 'string' as NodePropertyTypes,
+			typeOptions: {
+				password: true,
+			},
+			displayOptions: {
+				show: {
+					ssl: [
+						true,
+					],
+					passwordless: [
+						true,
+					],
+				},
+			} as IDisplayOptions,
+			default: '',
 			description: 'SSL Client Certificate to use.',
 		},
 		{
@@ -79,6 +114,9 @@ export class RabbitMQ implements ICredentialType {
 					ssl: [
 						true,
 					],
+					passwordless: [
+						true,
+					],
 				},
 			},
 			default: '',
@@ -96,31 +134,13 @@ export class RabbitMQ implements ICredentialType {
 					ssl: [
 						true,
 					],
-				},
-			},
-			default: '',
-			description: 'SSL passphrase to use.',
-		},
-		{
-			displayName: 'CA Certificates',
-			name: 'ca',
-			type: 'string' as NodePropertyTypes,
-			typeOptions: {
-				password: true,
-			},
-			// typeOptions: {
-			// 	multipleValues: true,
-			// 	multipleValueButtonText: 'Add Certificate',
-			// },
-			displayOptions: {
-				show: {
-					ssl: [
+					passwordless: [
 						true,
 					],
 				},
 			},
 			default: '',
-			description: 'SSL CA Certificates to use.',
+			description: 'SSL passphrase to use.',
 		},
 		// {
 		// 	displayName: 'Client ID',
diff --git a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
index 527b9dd55d..2b3fc67833 100644
--- a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
@@ -26,11 +26,13 @@ export async function rabbitmqConnect(this: IExecuteFunctions | ITriggerFunction
 	if (credentials.ssl === true) {
 		credentialData.protocol = 'amqps';
 
-		optsData.cert = credentials.cert === '' ? undefined : Buffer.from(credentials.cert as string);
-		optsData.key = credentials.key === '' ? undefined : Buffer.from(credentials.key as string);
-		optsData.passphrase = credentials.passphrase === '' ? undefined : credentials.passphrase;
 		optsData.ca = credentials.ca === '' ? undefined : [Buffer.from(credentials.ca as string)];
-		optsData.credentials = amqplib.credentials.external();
+		if (credentials.passwordless === true) {
+			optsData.cert = credentials.cert === '' ? undefined : Buffer.from(credentials.cert as string);
+			optsData.key = credentials.key === '' ? undefined : Buffer.from(credentials.key as string);
+			optsData.passphrase = credentials.passphrase === '' ? undefined : credentials.passphrase;
+			optsData.credentials = amqplib.credentials.external();
+		}
 	}
 
 

From b54aae8c31efdf1bd0e54c83f1a33f8e9f6d794e Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Thu, 15 Apr 2021 23:57:20 +0200
Subject: [PATCH 022/231] :arrow_up: Update types/node package in all packages
 (#1659)

* :arrow_up: Update types/node package in all packages, fix type in crypto node

* :zap: Fix build issue and some formatting

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/core/package.json               |  2 +-
 packages/editor-ui/package.json          |  2 +-
 packages/node-dev/package.json           |  2 +-
 packages/nodes-base/nodes/Crypto.node.ts | 32 ++++++++++++------------
 packages/nodes-base/package.json         |  2 +-
 packages/workflow/package.json           |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index f0eee7085c..2d5a5c1d30 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -32,7 +32,7 @@
     "@types/jest": "^26.0.13",
     "@types/lodash.get": "^4.4.6",
     "@types/mime-types": "^2.1.0",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "@types/request-promise-native": "~1.0.15",
     "jest": "^26.4.2",
     "source-map-support": "^0.5.9",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 2b53707120..4bbd604ca1 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -36,7 +36,7 @@
     "@types/jest": "^26.0.13",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.set": "^4.3.6",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "@types/quill": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^2.13.0",
     "@typescript-eslint/parser": "^2.13.0",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 6ba68331a2..b005de16d7 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -55,7 +55,7 @@
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
     "@types/express": "^4.17.6",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
diff --git a/packages/nodes-base/nodes/Crypto.node.ts b/packages/nodes-base/nodes/Crypto.node.ts
index 79403ae002..dc602598a2 100644
--- a/packages/nodes-base/nodes/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto.node.ts
@@ -9,12 +9,12 @@ import {
 } from 'n8n-workflow';
 
 import {
+	BinaryToTextEncoding,
 	createHash,
 	createHmac,
 	createSign,
 	getHashes,
-	HexBase64Latin1Encoding,
- } from 'crypto';
+} from 'crypto';
 
 export class Crypto implements INodeType {
 	description: INodeTypeDescription = {
@@ -60,7 +60,7 @@ export class Crypto implements INodeType {
 				name: 'type',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hash',
 						],
 					},
@@ -93,7 +93,7 @@ export class Crypto implements INodeType {
 				name: 'value',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hash',
 						],
 					},
@@ -123,7 +123,7 @@ export class Crypto implements INodeType {
 				name: 'encoding',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hash',
 						],
 					},
@@ -147,7 +147,7 @@ export class Crypto implements INodeType {
 				name: 'type',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hmac',
 						],
 					},
@@ -180,7 +180,7 @@ export class Crypto implements INodeType {
 				name: 'value',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hmac',
 						],
 					},
@@ -210,7 +210,7 @@ export class Crypto implements INodeType {
 				name: 'secret',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hmac',
 						],
 					},
@@ -224,7 +224,7 @@ export class Crypto implements INodeType {
 				name: 'encoding',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'hmac',
 						],
 					},
@@ -248,7 +248,7 @@ export class Crypto implements INodeType {
 				name: 'value',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'sign',
 						],
 					},
@@ -278,7 +278,7 @@ export class Crypto implements INodeType {
 				name: 'algorithm',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'sign',
 						],
 					},
@@ -295,7 +295,7 @@ export class Crypto implements INodeType {
 				name: 'encoding',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'sign',
 						],
 					},
@@ -319,7 +319,7 @@ export class Crypto implements INodeType {
 				name: 'privateKey',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'sign',
 						],
 					},
@@ -371,18 +371,18 @@ export class Crypto implements INodeType {
 
 			if (action === 'hash') {
 				const type = this.getNodeParameter('type', i) as string;
-				const encoding = this.getNodeParameter('encoding', i) as HexBase64Latin1Encoding;
+				const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
 				newValue = createHash(type).update(value).digest(encoding);
 			}
 			if (action === 'hmac') {
 				const type = this.getNodeParameter('type', i) as string;
 				const secret = this.getNodeParameter('secret', i) as string;
-				const encoding = this.getNodeParameter('encoding', i) as HexBase64Latin1Encoding;
+				const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
 				newValue = createHmac(type, secret).update(value).digest(encoding);
 			}
 			if (action === 'sign') {
 				const algorithm = this.getNodeParameter('algorithm', i) as string;
-				const encoding = this.getNodeParameter('encoding', i) as HexBase64Latin1Encoding;
+				const encoding = this.getNodeParameter('encoding', i) as BinaryToTextEncoding;
 				const privateKey = this.getNodeParameter('privateKey', i) as string;
 				const sign = createSign(algorithm);
 				sign.write(value as string);
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index bcaedd4bd3..e5e69ad4c4 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -566,7 +566,7 @@
     "@types/mongodb": "^3.5.4",
     "@types/mqtt": "^2.5.0",
     "@types/mssql": "^6.0.2",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "@types/nodemailer": "^6.4.0",
     "@types/redis": "^2.8.11",
     "@types/request-promise-native": "~1.0.15",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 170f4c640e..8c5bf0b1d7 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -29,7 +29,7 @@
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.13",
     "@types/lodash.get": "^4.4.6",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "jest": "^26.4.2",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",

From 242bbb865486290e283d35a71f440ec2fb753423 Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Thu, 15 Apr 2021 23:59:00 +0200
Subject: [PATCH 023/231] :arrow_up: Upgrade nodemailer, mailparser & redis
 (#1655)

* :arrow_up: Upgrade redis npm package

* :arrow_up: Upgrade nodemailer npm package

* :arrow_up: Upgrade mailparser npm package
---
 packages/nodes-base/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e5e69ad4c4..c1bf76bce8 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -606,7 +606,7 @@
     "lodash.set": "^4.3.2",
     "lodash.unset": "^4.5.2",
     "lossless-json": "^1.0.4",
-    "mailparser": "^2.8.1",
+    "mailparser": "^3.2.0",
     "moment": "2.28.0",
     "moment-timezone": "^0.5.28",
     "mongodb": "3.6.3",
@@ -614,12 +614,12 @@
     "mssql": "^6.2.0",
     "mysql2": "~2.1.0",
     "n8n-core": "~0.67.0",
-    "nodemailer": "^6.4.6",
+    "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",
     "pg-promise": "^10.5.8",
     "promise-ftp": "^1.3.5",
-    "redis": "^2.8.0",
+    "redis": "^3.1.1",
     "request": "^2.88.2",
     "rhea": "^1.0.11",
     "rss-parser": "^3.7.0",

From fc299f136f01ac55cd90e0890848a5b177d39043 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 16 Apr 2021 00:01:45 +0200
Subject: [PATCH 024/231] :arrow_up: Set mysql2@2.2.0 n8n & nodes-base

---
 packages/cli/package.json        | 2 +-
 packages/nodes-base/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 35141b2d67..fa70ea1a7b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -102,7 +102,7 @@
     "jwks-rsa": "~1.12.1",
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
-    "mysql2": "~2.1.0",
+    "mysql2": "~2.2.0",
     "n8n-core": "~0.67.0",
     "n8n-editor-ui": "~0.85.0",
     "n8n-nodes-base": "~0.112.0",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index c1bf76bce8..8930660809 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -612,7 +612,7 @@
     "mongodb": "3.6.3",
     "mqtt": "4.2.1",
     "mssql": "^6.2.0",
-    "mysql2": "~2.1.0",
+    "mysql2": "~2.2.0",
     "n8n-core": "~0.67.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",

From a8ab77b8e0b4e619a08b777c48bc996624a62ebf Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 16 Apr 2021 00:05:23 +0200
Subject: [PATCH 025/231] :arrow_up: Set tslib@1.13.0 on cli

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index fa70ea1a7b..98468899ea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -114,7 +114,7 @@
     "request-promise-native": "^1.0.7",
     "sqlite3": "^5.0.1",
     "sse-channel": "^3.1.1",
-    "tslib": "1.11.2",
+    "tslib": "1.13.0",
     "typeorm": "^0.2.30"
   },
   "jest": {

From dfdb797b31cff978e73f98dc28a3913cfbdd199b Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Fri, 16 Apr 2021 00:27:12 +0200
Subject: [PATCH 026/231] :sparkles: Add get/getAll/update/delete:Release to
 Gitlab node (#1629)

---
 .../nodes/Gitlab/GenericFunctions.ts          |  24 +-
 .../nodes-base/nodes/Gitlab/Gitlab.node.ts    | 343 +++++++++++++++++-
 2 files changed, 364 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index 3bb0e12c5b..2a8736d620 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -18,7 +18,7 @@ import { OptionsWithUri } from 'request';
  * @param {object} body
  * @returns {Promise<any>}
  */
-export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object): Promise<any> { // tslint:disable-line:no-any
+export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const options : OptionsWithUri = {
 		method,
 		headers: {},
@@ -28,6 +28,9 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 		json: true,
 	};
 
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
 	if (query === undefined) {
 		delete options.qs;
 	}
@@ -71,3 +74,22 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 		throw error;
 	}
 }
+
+export async function gitlabApiRequestAllItems(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.per_page = 100;
+	query.page = 1;
+
+	do {
+		responseData = await gitlabApiRequest.call(this, method, endpoint, body, query, { resolveWithFullResponse: true });
+		query.page++;
+		returnData.push.apply(returnData, responseData.body);		
+	} while (
+		responseData.headers.link && responseData.headers.link.includes('next')
+	);
+	return returnData;
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 6056af734b..0e99f07fa8 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -11,6 +11,7 @@ import {
 
 import {
 	gitlabApiRequest,
+	gitlabApiRequestAllItems,
 } from './GenericFunctions';
 
 export class Gitlab implements INodeType {
@@ -209,6 +210,26 @@ export class Gitlab implements INodeType {
 						value: 'create',
 						description: 'Create a new release',
 					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a new release',
+					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Get a new release',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Get all releases',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update a new release',
+					},
 				],
 				default: 'create',
 				description: 'The operation to perform.',
@@ -692,8 +713,254 @@ export class Gitlab implements INodeType {
 				],
 			},
 
+			// ----------------------------------
+			//         release:get/delete
+			// ----------------------------------
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'delete',
+							'get',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				description: 'The ID or URL-encoded path of the project.',
+			},
+			{
+				displayName: 'Tag Name',
+				name: 'tag_name',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'delete',
+							'get',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				description: 'The Git tag the release is associated with.',
+			},
 
+			// ----------------------------------
+			//         release:getAll
+			// ----------------------------------
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'getAll',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				description: 'The ID or URL-encoded path of the project.',
+			},
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'release',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				default: false,
+				description: 'If all results should be returned or only up to a given limit.',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				displayOptions: {
+					show: {
+						resource: [
+							'release',
+						],
+						operation: [
+							'getAll',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 100,
+				},
+				default: 20,
+				description: 'How many results to return.',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				typeOptions: {
+					multipleValueButtonText: 'Add Field',
+				},
+				displayOptions: {
+					show: {
+						operation: [
+							'getAll',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Order by',
+						name: 'order_by',
+						type: 'options',
+						options: [
+							{
+								name: 'Created At',
+								value: 'created_at',
+							},
+							{
+								name: 'Released At',
+								value: 'released_at',
+							},
+						],
+						default: 'released_at',
+						description: 'The field to use as order.',
+					},
+					{
+						displayName: 'Sort',
+						name: 'sort',
+						type: 'options',
+						options: [
+							{
+								name: 'ASC',
+								value: 'asc',
+							},
+							{
+								name: 'DESC',
+								value: 'desc',
+							},
+						],
+						default: 'desc',
+						description: 'The direction of the order. .',
+					},
+				],
+			},
 
+			// ----------------------------------
+			//         release:update
+			// ----------------------------------
+			{
+				displayName: 'Project ID',
+				name: 'projectId',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'update',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				description: 'The ID or URL-encoded path of the project.',
+			},
+			{
+				displayName: 'Tag Name',
+				name: 'tag_name',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'update',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				description: 'The Git tag the release is associated with.',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				typeOptions: {
+					multipleValueButtonText: 'Add Field',
+				},
+				displayOptions: {
+					show: {
+						operation: [
+							'update',
+						],
+						resource: [
+							'release',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'The release name.',
+					},
+					{
+						displayName: 'Description',
+						name: 'description',
+						type: 'string',
+						default: '',
+						description: 'The description of the release. You can use Markdown.',
+					},
+					{
+						displayName: 'Milestones',
+						name: 'milestones',
+						type: 'string',
+						default: '',
+						description: 'The title of each milestone to associate with the release (provide a titles list spearated with comma).',
+					},
+					{
+						displayName: 'Released At',
+						name: 'released_at',
+						type: 'dateTime',
+						default: '',
+						description: 'The date when the release is/was ready..',
+					},
+				],
+			},
 			// ----------------------------------
 			//         repository
 			// ----------------------------------
@@ -856,16 +1123,20 @@ export class Gitlab implements INodeType {
 			'issue:edit',
 			'issue:get',
 			'release:create',
+			'release:delete',
+			'release:get',
+			'release:update',
 			'repository:get',
 		];
 		// Operations which overwrite the returned data and return arrays
 		// and has so to be merged with the data of other items
 		const overwriteDataOperationsArray = [
+			'release:getAll',
 			'repository:getIssues',
 			'user:getRepositories',
 		];
 
-
+		let responseData;
 		// For Post
 		let body: IDataObject;
 		// For Query string
@@ -873,6 +1144,7 @@ export class Gitlab implements INodeType {
 
 		let requestMethod: string;
 		let endpoint: string;
+		let returnAll = false;
 
 		const operation = this.getNodeParameter('operation', 0) as string;
 		const resource = this.getNodeParameter('resource', 0) as string;
@@ -984,6 +1256,69 @@ export class Gitlab implements INodeType {
 
 					endpoint = `${baseEndpoint}/releases`;
 				}
+				if (operation === 'delete') {
+					// ----------------------------------
+					//         delete
+					// ----------------------------------
+
+					requestMethod = 'DELETE';
+
+					const id = this.getNodeParameter('projectId', i) as string;
+
+					const tagName = this.getNodeParameter('tag_name', i) as string;
+
+					endpoint = `/projects/${id}/releases/${tagName}`;
+				}
+				if (operation === 'get') {
+					// ----------------------------------
+					//         get
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const id = this.getNodeParameter('projectId', i) as string;
+
+					const tagName = this.getNodeParameter('tag_name', i) as string;
+
+					endpoint = `/projects/${id}/releases/${tagName}`;
+				}
+				if (operation === 'getAll') {
+					// ----------------------------------
+					//         getAll
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					const id = this.getNodeParameter('projectId', i) as string;
+
+					qs = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
+	
+					returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+
+					if (returnAll === false) {
+						qs.per_page = this.getNodeParameter('limit', 0) as number;
+					}
+
+					endpoint = `/projects/${id}/releases`;
+				}
+				if (operation === 'update') {
+					// ----------------------------------
+					//         update
+					// ----------------------------------
+
+					requestMethod = 'PUT';
+
+					const id = this.getNodeParameter('projectId', i) as string;
+
+					const tagName = this.getNodeParameter('tag_name', i) as string;
+
+					body = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
+					if(body.milestones){
+						body.milestones = (body.milestones as string).split(',');
+					}
+					
+					endpoint = `/projects/${id}/releases/${tagName}`;
+				}
 			} else if (resource === 'repository') {
 				if (operation === 'get') {
 					// ----------------------------------
@@ -1018,7 +1353,11 @@ export class Gitlab implements INodeType {
 				throw new Error(`The resource "${resource}" is not known!`);
 			}
 
-			const responseData = await gitlabApiRequest.call(this, requestMethod, endpoint, body, qs);
+			if (returnAll === true) {
+				responseData = await gitlabApiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
+			} else {
+				responseData = await gitlabApiRequest.call(this, requestMethod, endpoint, body, qs);
+			}
 
 			if (overwriteDataOperations.includes(fullOperation)) {
 				returnData.push(responseData);

From d87d4973716fc1bba7fd0c80dbf96d534055396b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 16 Apr 2021 00:27:49 +0200
Subject: [PATCH 027/231] :zap: Minor formatting improvements

---
 packages/nodes-base/nodes/Gitlab/GenericFunctions.ts   | 6 +++---
 packages/nodes-base/nodes/Gitlab/Gitlab.node.ts        | 4 ++--
 packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index 2a8736d620..c25c051ef5 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -19,7 +19,7 @@ import { OptionsWithUri } from 'request';
  * @returns {Promise<any>}
  */
 export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const options : OptionsWithUri = {
+	const options: OptionsWithUri = {
 		method,
 		headers: {},
 		body,
@@ -87,9 +87,9 @@ export async function gitlabApiRequestAllItems(this: IHookFunctions | IExecuteFu
 	do {
 		responseData = await gitlabApiRequest.call(this, method, endpoint, body, query, { resolveWithFullResponse: true });
 		query.page++;
-		returnData.push.apply(returnData, responseData.body);		
+		returnData.push.apply(returnData, responseData.body);
 	} while (
 		responseData.headers.link && responseData.headers.link.includes('next')
 	);
 	return returnData;
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 0e99f07fa8..08ff633af6 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1292,7 +1292,7 @@ export class Gitlab implements INodeType {
 					const id = this.getNodeParameter('projectId', i) as string;
 
 					qs = this.getNodeParameter('additionalFields', i, {}) as IDataObject;
-	
+
 					returnAll = this.getNodeParameter('returnAll', 0) as boolean;
 
 					if (returnAll === false) {
@@ -1316,7 +1316,7 @@ export class Gitlab implements INodeType {
 					if(body.milestones){
 						body.milestones = (body.milestones as string).split(',');
 					}
-					
+
 					endpoint = `/projects/${id}/releases/${tagName}`;
 				}
 			} else if (resource === 'repository') {
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 66412981ec..4a8688f6ee 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -170,7 +170,7 @@ export class GitlabTrigger implements INodeType {
 				const owner = this.getNodeParameter('owner') as string;
 				const repository = this.getNodeParameter('repository') as string;
 
-				const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+				const path = (`${owner}/${repository}`).replace(/\//g, '%2F');
 
 				const endpoint = `/projects/${path}/hooks/${webhookData.webhookId}`;
 
@@ -207,7 +207,7 @@ export class GitlabTrigger implements INodeType {
 					eventsArray = ['note', 'issues', 'job', 'merge_requests', 'pipeline', 'push', 'tag_push', 'wiki_page'];
 				}
 
-				const events: { [key: string]: boolean } = { };
+				const events: { [key: string]: boolean } = {};
 				for (const e of eventsArray) {
 					events[`${e}_events`] = true;
 				}
@@ -218,7 +218,7 @@ export class GitlabTrigger implements INodeType {
 					events['push_events'] = false;
 				}
 
-				const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+				const path = (`${owner}/${repository}`).replace(/\//g, '%2F');
 
 				const endpoint = `/projects/${path}/hooks`;
 
@@ -253,7 +253,7 @@ export class GitlabTrigger implements INodeType {
 					const owner = this.getNodeParameter('owner') as string;
 					const repository = this.getNodeParameter('repository') as string;
 
-					const path = (`${owner}/${repository}`).replace(/\//g,'%2F');
+					const path = (`${owner}/${repository}`).replace(/\//g, '%2F');
 
 					const endpoint = `/projects/${path}/hooks/${webhookData.webhookId}`;
 					const body = {};

From 1a0e129921d8a265c90b57b0f6bab9711d833668 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Thu, 15 Apr 2021 18:35:39 -0400
Subject: [PATCH 028/231] :zap: Add OAuth2 support to Monday.com node (#1642)

---
 .../MondayComOAuth2Api.credentials.ts         | 52 +++++++++++++++++++
 .../nodes/MondayCom/GenericFunctions.ts       | 19 ++++---
 .../nodes/MondayCom/MondayCom.node.ts         | 35 +++++++++++++
 packages/nodes-base/package.json              |  1 +
 4 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts

diff --git a/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..9adec39bc7
--- /dev/null
+++ b/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts
@@ -0,0 +1,52 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+const scopes = [
+	'boards:write',
+	'boards:read',
+];
+
+export class MondayComOAuth2Api implements ICredentialType {
+	name = 'mondayComOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'Monday.com OAuth2 API';
+	documentationUrl = 'monday';
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://auth.monday.com/oauth2/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://auth.monday.com/oauth2/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: scopes.join(' '),
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index 477f7e07a0..030e4f2310 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -18,19 +18,13 @@ import {
 } from 'lodash';
 
 export async function mondayComApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, body: any = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-
-	const credentials = this.getCredentials('mondayComApi');
-
-	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
-	}
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
 
 	const endpoint = 'https://api.monday.com/v2/';
 
 	let options: OptionsWithUri = {
 		headers: {
 			'Content-Type': 'application/json',
-			'Authorization': credentials.apiToken,
 		},
 		method: 'POST',
 		body,
@@ -39,7 +33,16 @@ export async function mondayComApiRequest(this: IExecuteFunctions | IWebhookFunc
 	};
 	options = Object.assign({}, options, option);
 	try {
-		return await this.helpers.request!(options);
+		if (authenticationMethod === 'accessToken') {
+			const credentials = this.getCredentials('mondayComApi') as IDataObject;
+
+			options.headers = { Authorization: `Bearer ${credentials.apiToken}` };
+
+			return await this.helpers.request!(options);
+		} else {
+
+			return await this.helpers.requestOAuth2!.call(this, 'mondayComOAuth2Api', options);
+		}
 	} catch (error) {
 		if (error.response) {
 			const errorMessage = error.response.body.error_message;
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index f1aa20f977..389e9b19c8 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -64,9 +64,44 @@ export class MondayCom implements INodeType {
 			{
 				name: 'mondayComApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'mondayComOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 8930660809..dbecf013b8 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -160,6 +160,7 @@
       "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
       "dist/credentials/MondayComApi.credentials.js",
+      "dist/credentials/MondayComOAuth2Api.credentials.js",
       "dist/credentials/MongoDb.credentials.js",
       "dist/credentials/Mqtt.credentials.js",
       "dist/credentials/Msg91Api.credentials.js",

From 1d27a9e87e22f02d3a7762202afd1951b3212a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 16 Apr 2021 18:33:36 +0200
Subject: [PATCH 029/231] :sparkles: Improve node error handling (#1309)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add path mapping and response error interfaces

* Add error handling and throwing functionality

* Refactor error handling into a single function

* Re-implement error handling in Hacker News node

* Fix linting details

* Re-implement error handling in Spotify node

* Re-implement error handling in G Suite Admin node

* :construction: create basic setup NodeError

* :construction: add httpCodes

* :construction: add path priolist

* :construction: handle statusCode in error, adjust interfaces

* :construction: fixing type issues w/Ivan

* :construction: add error exploration

* 👔 fix linter issues

* :wrench: improve object check

* :construction: remove path passing from NodeApiError

* :construction: add multi error + refactor findProperty method

* 👔 allow any

* :wrench: handle multi error message callback

* :zap: change return type of callback

* :zap: add customCallback to MultiError

* :construction: refactor to use INode

* :hammer: handle arrays, continue search after first null property found

* 🚫 refactor method access

* :construction: setup NodeErrorView

* :zap: change timestamp to Date.now

* :books: Add documentation for methods and constants

* :construction: change message setting

* 🚚 move NodeErrors to workflow

* :sparkles: add new ErrorView for Nodes

* :art: improve error notification

* :art: refactor interfaces

* :zap: add WorkflowOperationError, refactor error throwing

* 👕 fix linter issues

* :art: rename param

* :bug: fix handling normal errors

* :zap: add usage of NodeApiError

* :art: fix throw new error instead of constructor

* :art: remove unnecessary code/comments

* :art: adjusted spacing + updated status messages

* :art: fix tab indentation

* ✨ Replace current errors with custom errors (#1576)

* :zap: Introduce NodeApiError in catch blocks

* :zap: Introduce NodeOperationError in nodes

* :zap: Add missing errors and remove incompatible

* :zap: Fix NodeOperationError in incompatible nodes

* :wrench: Adjust error handling in missed nodes

PayPal, FileMaker, Reddit, Taiga and Facebook Graph API nodes

* :hammer: Adjust Strava Trigger node error handling

* :hammer: Adjust AWS nodes error handling

* :hammer: Remove duplicate instantiation of NodeApiError

* :bug: fix strava trigger node error handling

* Add XML parsing to NodeApiError constructor (#1633)

* :bug: Remove type annotation from catch variable

* :sparkles: Add XML parsing to NodeApiError

* :zap: Simplify error handling in Rekognition node

* :zap: Pass in XML flag in generic functions

* :fire: Remove try/catch wrappers at call sites

* :hammer: Refactor setting description from XML

* :hammer: Refactor let to const in resource loaders

* :zap: Find property in parsed XML

* :zap: Change let to const

* :fire: Remove unneeded try/catch block

* :shirt: Fix linting issues

* :bug: Fix errors from merge conflict resolution

* :zap: Add custom errors to latest contributions

* :shirt: Fix linting issues

* :zap: Refactor MongoDB helpers for custom errors

* :bug: Correct custom error type

* :zap: Apply feedback to A nodes

* :zap: Apply feedback to missed A node

* :zap: Apply feedback to B-D nodes

* :zap: Apply feedback to E-F nodes

* :zap: Apply feedback to G nodes

* :zap: Apply feedback to H-L nodes

* :zap: Apply feedback to M nodes

* :zap: Apply feedback to P nodes

* :zap: Apply feedback to R nodes

* :zap: Apply feedback to S nodes

* :zap: Apply feedback to T nodes

* :zap: Apply feedback to V-Z nodes

* :zap: Add HTTP code to iterable node error

* :hammer: Standardize e as error

* :hammer: Standardize err as error

* :zap: Fix error handling for non-standard nodes

Co-authored-by: Ben Hesseldieck <b.hesseldieck@gmail.com>

Co-authored-by: Ben Hesseldieck <b.hesseldieck@gmail.com>
Co-authored-by: Ben Hesseldieck <1849459+BHesseldieck@users.noreply.github.com>
---
 packages/cli/commands/execute.ts              |  10 +-
 packages/cli/src/Interfaces.ts                |   7 +-
 packages/cli/src/WebhookHelpers.ts            |   7 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |   8 +-
 packages/cli/src/WorkflowRunner.ts            |  24 +-
 packages/cli/src/WorkflowRunnerProcess.ts     |  15 +-
 packages/core/src/Interfaces.ts               |   2 -
 packages/core/src/NodeExecuteFunctions.ts     |  11 +-
 packages/core/src/WorkflowExecute.ts          |  14 +-
 .../src/components/Error/NodeViewError.vue    | 177 +++++++++++++
 packages/editor-ui/src/components/RunData.vue |  12 +-
 .../src/components/mixins/pushConnection.ts   |  13 +-
 packages/editor-ui/src/n8n-theme.scss         |   4 +
 .../ActiveCampaign/ActiveCampaign.node.ts     |  25 +-
 .../ActiveCampaignTrigger.node.ts             |   2 +-
 .../nodes/ActiveCampaign/GenericFunctions.ts  |  14 +-
 .../AcuityScheduling/GenericFunctions.ts      |   6 +-
 .../nodes/Affinity/AffinityTrigger.node.ts    |   3 +-
 .../nodes/Affinity/GenericFunctions.ts        |  10 +-
 .../nodes/AgileCrm/AgileCrm.node.ts           |  11 +-
 .../nodes/AgileCrm/GenericFunctions.ts        |   8 +-
 .../nodes/Airtable/Airtable.node.ts           |   3 +-
 .../nodes/Airtable/AirtableTrigger.node.ts    |   3 +-
 .../nodes/Airtable/GenericFunctions.ts        |  22 +-
 packages/nodes-base/nodes/Amqp/Amqp.node.ts   |   5 +-
 .../nodes-base/nodes/Amqp/AmqpTrigger.node.ts |   5 +-
 .../nodes/ApiTemplateIo/ApiTemplateIo.node.ts |   7 +-
 .../nodes/ApiTemplateIo/GenericFunctions.ts   |   8 +-
 packages/nodes-base/nodes/Asana/Asana.node.ts |  16 +-
 .../nodes/Asana/AsanaTrigger.node.ts          |   5 +-
 .../nodes/Asana/GenericFunctions.ts           |  24 +-
 .../nodes/Automizy/GenericFunctions.ts        |  11 +-
 .../nodes/Autopilot/GenericFunctions.ts       |   7 +-
 .../nodes-base/nodes/Aws/AwsLambda.node.ts    |  39 ++-
 packages/nodes-base/nodes/Aws/AwsSns.node.ts  |  17 +-
 .../nodes/Aws/AwsSnsTrigger.node.ts           |  11 +-
 .../nodes/Aws/Comprehend/GenericFunctions.ts  |  20 +-
 .../nodes-base/nodes/Aws/GenericFunctions.ts  |  24 +-
 .../Aws/Rekognition/AwsRekognition.node.ts    |   8 +-
 .../nodes/Aws/Rekognition/GenericFunctions.ts |  22 +-
 .../nodes-base/nodes/Aws/S3/AwsS3.node.ts     |   7 +-
 .../nodes/Aws/S3/GenericFunctions.ts          |  24 +-
 .../nodes-base/nodes/Aws/SES/AwsSes.node.ts   |   5 +-
 .../nodes/Aws/SES/GenericFunctions.ts         |  20 +-
 .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts   |  14 +-
 .../nodes/Bannerbear/GenericFunctions.ts      |  11 +-
 .../Beeminder/Beeminder.node.functions.ts     |   9 +-
 .../nodes/Beeminder/Beeminder.node.ts         |   3 +-
 .../nodes/Beeminder/GenericFunctions.ts       |   6 +-
 .../nodes/Bitbucket/BitbucketTrigger.node.ts  |   2 +-
 .../nodes/Bitbucket/GenericFunctions.ts       |   8 +-
 .../nodes/Bitly/GenericFunctions.ts           |  14 +-
 .../nodes/Bitwarden/Bitwarden.node.ts         |   7 +-
 .../nodes/Bitwarden/GenericFunctions.ts       |  15 +-
 packages/nodes-base/nodes/Box/Box.node.ts     |   7 +-
 .../nodes-base/nodes/Box/BoxTrigger.node.ts   |   2 +-
 .../nodes-base/nodes/Box/GenericFunctions.ts  |  18 +-
 .../nodes/Brandfetch/GenericFunctions.ts      |  16 +-
 .../nodes-base/nodes/Bubble/Bubble.node.ts    |   3 +-
 .../nodes/Bubble/GenericFunctions.ts          |   7 +-
 .../nodes/Calendly/CalendlyTrigger.node.ts    |   2 +-
 .../nodes/Calendly/GenericFunctions.ts        |  12 +-
 .../nodes/Chargebee/Chargebee.node.ts         |  20 +-
 .../nodes/CircleCi/GenericFunctions.ts        |  15 +-
 .../nodes/Clearbit/GenericFunctions.ts        |  19 +-
 .../nodes-base/nodes/ClickUp/ClickUp.node.ts  |  13 +-
 .../nodes/ClickUp/GenericFunctions.ts         |  19 +-
 .../nodes/Clockify/GenericFunctions.ts        |  17 +-
 .../nodes/Cockpit/GenericFunctions.ts         |  11 +-
 packages/nodes-base/nodes/Coda/Coda.node.ts   |  10 +-
 .../nodes-base/nodes/Coda/GenericFunctions.ts |  11 +-
 .../nodes/CoinGecko/GenericFunctions.ts       |   5 +-
 packages/nodes-base/nodes/Compression.node.ts |   9 +-
 .../nodes/Contentful/GenericFunctions.ts      |   6 +-
 .../nodes/ConvertKit/GenericFunctions.ts      |  17 +-
 .../nodes/Copper/CopperTrigger.node.ts        |   2 +-
 .../nodes/Copper/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Cortex/Cortex.node.ts    |  13 +-
 .../nodes/Cortex/GenericFunctions.ts          |   9 +-
 .../nodes-base/nodes/CrateDb/CrateDb.node.ts  |   7 +-
 .../nodes/CustomerIo/CustomerIo.node.ts       |   9 +-
 .../CustomerIo/CustomerIoTrigger.node.ts      |   2 +-
 .../nodes/CustomerIo/GenericFunctions.ts      |  18 +-
 packages/nodes-base/nodes/DateTime.node.ts    |   3 +-
 .../nodes/DeepL/GenericFunctions.ts           |  10 +-
 .../nodes/Demio/GenericFunctions.ts           |  14 +-
 .../nodes-base/nodes/Discord/Discord.node.ts  |   7 +-
 .../nodes/Discourse/GenericFunctions.ts       |  12 +-
 .../nodes-base/nodes/Disqus/Disqus.node.ts    |   5 +-
 .../nodes/Disqus/GenericFunctions.ts          |  20 +-
 .../nodes/Drift/GenericFunctions.ts           |  13 +-
 .../nodes-base/nodes/Dropbox/Dropbox.node.ts  |   7 +-
 .../nodes/Dropbox/GenericFunctions.ts         |  17 +-
 .../nodes-base/nodes/ERPNext/ERPNext.node.ts  |   5 +-
 .../nodes/ERPNext/GenericFunctions.ts         |  24 +-
 packages/nodes-base/nodes/EditImage.node.ts   |   9 +-
 .../nodes-base/nodes/Egoi/GenericFunctions.ts |  17 +-
 .../nodes-base/nodes/EmailReadImap.node.ts    |  11 +-
 packages/nodes-base/nodes/EmailSend.node.ts   |   3 +-
 .../nodes/Emelia/GenericFunctions.ts          |  15 +-
 .../Eventbrite/EventbriteTrigger.node.ts      |   3 +-
 .../nodes/Eventbrite/GenericFunctions.ts      |  10 +-
 .../nodes-base/nodes/ExecuteWorkflow.node.ts  |   3 +-
 .../nodes/Facebook/FacebookGraphApi.node.ts   |  10 +-
 .../nodes/Facebook/FacebookTrigger.node.ts    |   5 +-
 .../nodes/Facebook/GenericFunctions.ts        |  11 +-
 .../nodes/FileMaker/FileMaker.node.ts         |  38 +--
 .../nodes/FileMaker/GenericFunctions.ts       |  32 +--
 packages/nodes-base/nodes/Flow/Flow.node.ts   |  20 +-
 .../nodes-base/nodes/Flow/FlowTrigger.node.ts |  13 +-
 .../nodes-base/nodes/Flow/GenericFunctions.ts |  11 +-
 .../nodes/Freshdesk/Freshdesk.node.ts         |   5 +-
 .../nodes/Freshdesk/GenericFunctions.ts       |  14 +-
 packages/nodes-base/nodes/Ftp.node.ts         |  18 +-
 packages/nodes-base/nodes/Function.node.ts    |  15 +-
 .../nodes-base/nodes/FunctionItem.node.ts     |   8 +-
 .../nodes/GetResponse/GenericFunctions.ts     |   8 +-
 .../GetResponse/GetResponseTrigger.node.ts    |   6 +-
 .../nodes/Ghost/GenericFunctions.ts           |  18 +-
 packages/nodes-base/nodes/Ghost/Ghost.node.ts |   9 +-
 .../nodes/Github/GenericFunctions.ts          |  19 +-
 .../nodes-base/nodes/Github/Github.node.ts    |   7 +-
 .../nodes/Github/GithubTrigger.node.ts        |  22 +-
 .../nodes/Gitlab/GenericFunctions.ts          |  19 +-
 .../nodes-base/nodes/Gitlab/Gitlab.node.ts    |   9 +-
 .../nodes/Gitlab/GitlabTrigger.node.ts        |  16 +-
 .../nodes/GoToWebinar/GenericFunctions.ts     |  15 +-
 .../nodes/GoToWebinar/GoToWebinar.node.ts     |   3 +-
 .../Google/Analytics/GenericFunctions.ts      |  22 +-
 .../nodes/Google/Books/GenericFunctions.ts    |  23 +-
 .../nodes/Google/Calendar/GenericFunctions.ts |  14 +-
 .../Google/Calendar/GoogleCalendar.node.ts    |  12 +-
 .../CloudNaturalLanguage/GenericFunctions.ts  |  22 +-
 .../nodes/Google/Contacts/GenericFunctions.ts |  23 +-
 .../nodes/Google/Drive/GenericFunctions.ts    |  26 +-
 .../nodes/Google/Drive/GoogleDrive.node.ts    |   7 +-
 .../Google/Drive/GoogleDriveTrigger.node.ts   |  19 +-
 .../CloudFirestore/GenericFunctions.ts        |  22 +-
 .../RealtimeDatabase/GenericFunctions.ts      |  23 +-
 .../RealtimeDatabase/RealtimeDatabase.node.ts |   6 +-
 .../Google/GSuiteAdmin/GSuiteAdmin.node.ts    |   5 +-
 .../Google/GSuiteAdmin/GenericFunctions.ts    |  13 +-
 .../nodes/Google/Gmail/GenericFunctions.ts    |  26 +-
 .../nodes/Google/Sheet/GenericFunctions.ts    |  10 +-
 .../nodes/Google/Sheet/GoogleSheet.ts         |  16 +-
 .../nodes/Google/Sheet/GoogleSheets.node.ts   |   3 +-
 .../nodes/Google/Slides/GenericFunctions.ts   |   7 +-
 .../nodes/Google/Task/GenericFunctions.ts     |  14 +-
 .../Google/Translate/GenericFunctions.ts      |  10 +-
 .../nodes/Google/YouTube/GenericFunctions.ts  |  25 +-
 .../nodes/Google/YouTube/YouTube.node.ts      |  11 +-
 .../nodes/Gotify/GenericFunctions.ts          |  12 +-
 .../nodes-base/nodes/GraphQL/GraphQL.node.ts  |  10 +-
 .../nodes/Gumroad/GenericFunctions.ts         |   6 +-
 .../nodes/HackerNews/GenericFunctions.ts      |  10 +-
 .../nodes/HackerNews/HackerNews.node.ts       |   9 +-
 .../nodes/Harvest/GenericFunctions.ts         |  17 +-
 .../nodes-base/nodes/Harvest/Harvest.node.ts  |  23 +-
 .../nodes/HelpScout/GenericFunctions.ts       |  14 +-
 .../nodes/HelpScout/HelpScout.node.ts         |  13 +-
 .../nodes/HelpScout/HelpScoutTrigger.node.ts  |   2 +-
 .../nodes/HtmlExtract/HtmlExtract.node.ts     |   7 +-
 packages/nodes-base/nodes/HttpRequest.node.ts |  26 +-
 .../nodes/Hubspot/GenericFunctions.ts         |  23 +-
 .../nodes/Hubspot/HubspotTrigger.node.ts      |  10 +-
 .../nodes/HumanticAI/GenericFunctions.ts      |  16 +-
 .../nodes/HumanticAI/HumanticAi.node.ts       |   9 +-
 .../nodes/Hunter/GenericFunctions.ts          |   8 +-
 packages/nodes-base/nodes/If.node.ts          |   7 +-
 .../nodes/Intercom/GenericFunctions.ts        |  11 +-
 .../nodes/Intercom/Intercom.node.ts           |  54 ++--
 packages/nodes-base/nodes/Interval.node.ts    |   3 +-
 .../nodes/InvoiceNinja/GenericFunctions.ts    |  14 +-
 .../InvoiceNinja/InvoiceNinjaTrigger.node.ts  |   2 +-
 .../nodes/Iterable/GenericFunctions.ts        |  13 +-
 .../nodes/Iterable/Iterable.node.ts           |  14 +-
 .../nodes-base/nodes/Jira/GenericFunctions.ts |  23 +-
 packages/nodes-base/nodes/Jira/Jira.node.ts   |  13 +-
 .../nodes-base/nodes/Jira/JiraTrigger.node.ts |   2 +-
 .../nodes/JotForm/GenericFunctions.ts         |   6 +-
 .../nodes/JotForm/JotFormTrigger.node.ts      |   2 +-
 packages/nodes-base/nodes/Kafka/Kafka.node.ts |   5 +-
 .../nodes/Kafka/KafkaTrigger.node.ts          |   5 +-
 .../nodes-base/nodes/Keap/GenericFunctions.ts |   8 +-
 packages/nodes-base/nodes/Keap/Keap.node.ts   |   9 +-
 .../nodes-base/nodes/Keap/KeapTrigger.node.ts |   2 +-
 .../nodes/Lemlist/GenericFunctions.ts         |   8 +-
 .../nodes-base/nodes/Line/GenericFunctions.ts |  13 +-
 packages/nodes-base/nodes/Line/Line.node.ts   |   5 +-
 .../nodes/LingvaNex/GenericFunctions.ts       |  16 +-
 .../nodes/LinkedIn/GenericFunctions.ts        |   6 +-
 .../nodes/LinkedIn/LinkedIn.node.ts           |   5 +-
 .../nodes-base/nodes/MQTT/MqttTrigger.node.ts |   7 +-
 .../nodes/Mailchimp/GenericFunctions.ts       |  11 +-
 .../nodes/Mailchimp/MailchimpTrigger.node.ts  |  18 +-
 .../nodes/MailerLite/GenericFunctions.ts      |  13 +-
 .../MailerLite/MailerLiteTrigger.node.ts      |   2 +-
 .../nodes-base/nodes/Mailgun/Mailgun.node.ts  |  12 +-
 .../nodes/Mailjet/GenericFunctions.ts         |   7 +-
 .../nodes/Mandrill/GenericFunctions.ts        |  17 +-
 .../nodes/Mandrill/Mandrill.node.ts           |   6 +-
 .../nodes/Matrix/GenericFunctions.ts          |  21 +-
 .../nodes-base/nodes/Matrix/Matrix.node.ts    |   2 +-
 .../nodes/Mattermost/GenericFunctions.ts      |  19 +-
 .../nodes/Mattermost/Mattermost.node.ts       |  23 +-
 .../nodes/Mautic/GenericFunctions.ts          |  20 +-
 .../nodes-base/nodes/Mautic/Mautic.node.ts    |  11 +-
 .../nodes/Mautic/MauticTrigger.node.ts        |   2 +-
 .../nodes/Medium/GenericFunctions.ts          |   9 +-
 .../nodes-base/nodes/Medium/Medium.node.ts    |   5 +-
 .../nodes/MessageBird/GenericFunctions.ts     |  18 +-
 .../nodes/MessageBird/MessageBird.node.ts     |   5 +-
 .../nodes/Microsoft/Excel/GenericFunctions.ts |   8 +-
 .../Microsoft/Excel/MicrosoftExcel.node.ts    |   6 +-
 .../Microsoft/OneDrive/GenericFunctions.ts    |   8 +-
 .../OneDrive/MicrosoftOneDrive.node.ts        |  10 +-
 .../Microsoft/Outlook/GenericFunctions.ts     |   7 +-
 .../Outlook/MicrosoftOutlook.node.ts          |  22 +-
 .../nodes/Microsoft/Sql/MicrosoftSql.node.ts  |   9 +-
 .../nodes/Microsoft/Teams/GenericFunctions.ts |   8 +-
 .../nodes/Mindee/GenericFunctions.ts          |  14 +-
 .../nodes-base/nodes/Mindee/Mindee.node.ts    |   9 +-
 .../nodes/Mocean/GenericFunctions.ts          |  22 +-
 .../nodes-base/nodes/Mocean/Mocean.node.ts    |   5 +-
 .../nodes/MondayCom/GenericFunctions.ts       |  11 +-
 .../nodes/MondayCom/MondayCom.node.ts         |  17 +-
 .../nodes-base/nodes/MongoDb/MongoDb.node.ts  |   6 +-
 .../nodes/MongoDb/mongo.node.utils.ts         |  15 +-
 .../nodes-base/nodes/MoveBinaryData.node.ts   |   3 +-
 .../nodes/Msg91/GenericFunctions.ts           |  22 +-
 packages/nodes-base/nodes/Msg91/Msg91.node.ts |   5 +-
 packages/nodes-base/nodes/MySql/MySql.node.ts |   5 +-
 .../nodes-base/nodes/Nasa/GenericFunctions.ts |  15 +-
 packages/nodes-base/nodes/Nasa/Nasa.node.ts   |   5 +-
 .../nodes/NextCloud/GenericFunctions.ts       |   7 +-
 .../nodes/NextCloud/NextCloud.node.ts         |   9 +-
 .../nodes/OpenThesaurus/GenericFunctions.ts   |  12 +-
 .../nodes-base/nodes/OpenWeatherMap.node.ts   |  16 +-
 .../nodes/Orbit/GenericFunctions.ts           |  14 +-
 .../nodes-base/nodes/Oura/GenericFunctions.ts |  13 +-
 .../nodes/Paddle/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Paddle/Paddle.node.ts    |  14 +-
 .../nodes/PagerDuty/GenericFunctions.ts       |  12 +-
 .../nodes/PayPal/GenericFunctions.ts          |  23 +-
 .../nodes-base/nodes/PayPal/PayPal.node.ts    |  38 +--
 .../nodes/PayPal/PayPalTrigger.node.ts        |  22 +-
 .../nodes/Peekalink/GenericFunctions.ts       |  14 +-
 .../nodes/Phantombuster/GenericFunctions.ts   |  16 +-
 .../nodes/Phantombuster/Phantombuster.node.ts |   5 +-
 .../nodes/PhilipsHue/GenericFunctions.ts      |  13 +-
 .../nodes/Pipedrive/GenericFunctions.ts       |  25 +-
 .../nodes/Pipedrive/Pipedrive.node.ts         |   7 +-
 .../nodes/Pipedrive/PipedriveTrigger.node.ts  |   2 +-
 .../nodes/Plivo/GenericFunctions.ts           |  18 +-
 .../nodes/PostHog/GenericFunctions.ts         |  12 +-
 .../nodes/Postgres/Postgres.node.ts           |   7 +-
 .../nodes/Postmark/GenericFunctions.ts        |   8 +-
 .../nodes/Postmark/PostmarkTrigger.node.ts    |   2 +-
 .../nodes/ProfitWell/GenericFunctions.ts      |  14 +-
 .../nodes/Pushbullet/GenericFunctions.ts      |  13 +-
 .../nodes/Pushbullet/Pushbullet.node.ts       |   5 +-
 .../nodes/Pushcut/GenericFunctions.ts         |  12 +-
 .../nodes/Pushcut/PushcutTrigger.node.ts      |   2 +-
 .../nodes/Pushover/GenericFunctions.ts        |  14 +-
 .../nodes/Pushover/Pushover.node.ts           |   5 +-
 .../nodes-base/nodes/QuestDb/QuestDb.node.ts  |   5 +-
 .../nodes/QuickBase/GenericFunctions.ts       |  20 +-
 .../nodes/QuickBase/QuickBase.node.ts         |   5 +-
 .../nodes/QuickBooks/GenericFunctions.ts      |  14 +-
 .../nodes/QuickBooks/QuickBooks.node.ts       |  35 +--
 .../nodes/RabbitMQ/RabbitMQ.node.ts           |   8 +-
 .../nodes/Raindrop/GenericFunctions.ts        |  10 +-
 .../nodes/Raindrop/Raindrop.node.ts           |   9 +-
 .../nodes-base/nodes/ReadBinaryFile.node.ts   |   3 +-
 .../nodes/Reddit/GenericFunctions.ts          |  26 +-
 .../nodes-base/nodes/Reddit/Reddit.node.ts    |   5 +-
 packages/nodes-base/nodes/Redis/Redis.node.ts |   9 +-
 .../nodes/Rocketchat/GenericFunctions.ts      |  13 +-
 packages/nodes-base/nodes/RssFeedRead.node.ts |  11 +-
 .../nodes-base/nodes/Rundeck/Rundeck.node.ts  |   5 +-
 .../nodes-base/nodes/Rundeck/RundeckApi.ts    |  15 +-
 .../nodes-base/nodes/S3/GenericFunctions.ts   |  24 +-
 packages/nodes-base/nodes/S3/S3.node.ts       |  10 +-
 .../nodes/Salesforce/GenericFunctions.ts      |   7 +-
 .../nodes/Salesforce/Salesforce.node.ts       |  78 +++---
 .../nodes/Salesmate/GenericFunctions.ts       |   6 +-
 .../nodes/Salesmate/Salesmate.node.ts         |   7 +-
 .../SecurityScorecard/GenericFunctions.ts     |   9 +-
 .../nodes/Segment/GenericFunctions.ts         |   6 +-
 .../nodes/SendGrid/GenericFunctions.ts        |  14 +-
 .../nodes/SendGrid/SendGrid.node.ts           |   5 +-
 .../nodes/Sendy/GenericFunctions.ts           |  14 +-
 packages/nodes-base/nodes/Sendy/Sendy.node.ts |  14 +-
 .../nodes/SentryIo/GenericFunctions.ts        |   4 +-
 .../nodes/Shopify/GenericFunctions.ts         |  19 +-
 .../nodes-base/nodes/Shopify/Shopify.node.ts  |   3 +-
 .../nodes/Shopify/ShopifyTrigger.node.ts      |   6 +-
 .../nodes/Signl4/GenericFunctions.ts          |   9 +-
 .../nodes-base/nodes/Signl4/Signl4.node.ts    |   5 +-
 .../nodes/Slack/GenericFunctions.ts           |  19 +-
 packages/nodes-base/nodes/Slack/Slack.node.ts |  13 +-
 .../nodes/Sms77/GenericFunctions.ts           |   6 +-
 packages/nodes-base/nodes/Sms77/Sms77.node.ts |   6 +-
 .../nodes/Spontit/GenericFunctions.ts         |  13 +-
 .../nodes/Spotify/GenericFunctions.ts         |  30 +--
 .../nodes-base/nodes/SpreadsheetFile.node.ts  |   7 +-
 .../nodes/Stackby/GenericFunction.ts          |  16 +-
 .../nodes-base/nodes/Stackby/Stackby.node.ts  |   3 +-
 .../nodes/Storyblok/GenericFunctions.ts       |  11 +-
 .../nodes/Strapi/GenericFunctions.ts          |  16 +-
 .../nodes-base/nodes/Strapi/Strapi.node.ts    |   3 +-
 .../nodes/Strava/GenericFunctions.ts          |  21 +-
 .../nodes/Strava/StravaTrigger.node.ts        |  23 +-
 .../nodes/Stripe/StripeTrigger.node.ts        |  16 +-
 packages/nodes-base/nodes/Stripe/helpers.ts   |  16 +-
 .../nodes/SurveyMonkey/GenericFunctions.ts    |  12 +-
 .../SurveyMonkey/SurveyMonkeyTrigger.node.ts  |   8 +-
 packages/nodes-base/nodes/Switch.node.ts      |  13 +-
 .../nodes/Taiga/GenericFunctions.ts           |  13 +-
 .../nodes/Tapfiliate/GenericFunctions.ts      |  20 +-
 .../nodes/Tapfiliate/Tapfiliate.node.ts       |   5 +-
 .../nodes/Telegram/GenericFunctions.ts        |  19 +-
 .../nodes/Telegram/Telegram.node.ts           |   5 +-
 .../nodes/Telegram/TelegramTrigger.node.ts    |   2 +-
 .../nodes/TheHive/GenericFunctions.ts         |   9 +-
 .../nodes-base/nodes/TheHive/TheHive.node.ts  |  19 +-
 .../nodes/TimescaleDb/TimescaleDb.node.ts     |   5 +-
 .../nodes/Todoist/GenericFunctions.ts         |  10 +-
 .../nodes/Toggl/GenericFunctions.ts           |  15 +-
 .../nodes/Toggl/TogglTrigger.node.ts          |   8 +-
 .../nodes/TravisCi/GenericFunctions.ts        |  14 +-
 .../nodes/Trello/GenericFunctions.ts          |  10 +-
 .../nodes-base/nodes/Trello/Trello.node.ts    |  17 +-
 .../nodes/Trello/TrelloTrigger.node.ts        |  11 +-
 .../nodes/Twake/GenericFunctions.ts           |  20 +-
 packages/nodes-base/nodes/Twake/Twake.node.ts |   3 +-
 .../nodes/Twilio/GenericFunctions.ts          |  22 +-
 .../nodes-base/nodes/Twilio/Twilio.node.ts    |   5 +-
 .../nodes/Twist/GenericFunctions.ts           |  13 +-
 packages/nodes-base/nodes/Twist/Twist.node.ts |   3 +-
 .../nodes/Twitter/GenericFunctions.ts         |  16 +-
 .../nodes/Typeform/GenericFunctions.ts        |  20 +-
 .../nodes/Typeform/TypeformTrigger.node.ts    |   5 +-
 .../nodes/UProc/GenericFunctions.ts           |  17 +-
 .../UnleashedSoftware/GenericFunctions.ts     |  11 +-
 .../nodes/Uplead/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Vero/GenericFunctions.ts |  11 +-
 packages/nodes-base/nodes/Vero/Vero.node.ts   |  22 +-
 .../nodes/Vonage/GenericFunctions.ts          |  14 +-
 .../nodes/Webflow/GenericFunctions.ts         |   9 +-
 .../nodes/Webflow/WebflowTrigger.node.ts      |   2 +-
 packages/nodes-base/nodes/Webhook.node.ts     |   6 +-
 .../nodes/Wekan/GenericFunctions.ts           |  10 +-
 packages/nodes-base/nodes/Wekan/Wekan.node.ts |  11 +-
 .../nodes-base/nodes/Wise/GenericFunctions.ts |  11 +-
 .../nodes/WooCommerce/GenericFunctions.ts     |  27 +-
 .../nodes/Wordpress/GenericFunctions.ts       |  11 +-
 .../nodes-base/nodes/WriteBinaryFile.node.ts  |   5 +-
 .../nodes/Wufoo/GenericFunctions.ts           |   6 +-
 .../nodes-base/nodes/Xero/GenericFunctions.ts |  20 +-
 packages/nodes-base/nodes/Xml.node.ts         |   5 +-
 .../nodes/Yourls/GenericFunctions.ts          |  15 +-
 .../nodes/Zendesk/GenericFunctions.ts         |  19 +-
 .../nodes-base/nodes/Zendesk/Zendesk.node.ts  |  10 +-
 .../nodes/Zendesk/ZendeskTrigger.node.ts      |   3 +-
 .../nodes-base/nodes/Zoho/GenericFunctions.ts |   8 +-
 .../nodes-base/nodes/Zoom/GenericFunctions.ts |  17 +-
 .../nodes/Zulip/GenericFunctions.ts           |  12 +-
 packages/nodes-base/nodes/Zulip/Zulip.node.ts |   9 +-
 packages/workflow/src/Interfaces.ts           |  21 +-
 packages/workflow/src/NodeErrors.ts           | 241 ++++++++++++++++++
 packages/workflow/src/Workflow.ts             |   1 +
 packages/workflow/src/WorkflowErrors.ts       |  16 ++
 packages/workflow/src/index.ts                |   2 +
 374 files changed, 2041 insertions(+), 2826 deletions(-)
 create mode 100644 packages/editor-ui/src/components/Error/NodeViewError.vue
 create mode 100644 packages/workflow/src/NodeErrors.ts
 create mode 100644 packages/workflow/src/WorkflowErrors.ts

diff --git a/packages/cli/commands/execute.ts b/packages/cli/commands/execute.ts
index 3091778def..864748f8cb 100644
--- a/packages/cli/commands/execute.ts
+++ b/packages/cli/commands/execute.ts
@@ -167,10 +167,11 @@ export class Execute extends Command {
 				this.log('====================================');
 				this.log(JSON.stringify(data, null, 2));
 
-				// console.log(data.data.resultData.error);
-				const error = new Error(data.data.resultData.error.message);
-				error.stack = data.data.resultData.error.stack;
-				throw error;
+				const { error } = data.data.resultData;
+				throw {
+					...error,
+					stack: error.stack,
+				};
 			}
 
 			this.log('Execution was successfull:');
@@ -182,7 +183,6 @@ export class Execute extends Command {
 			console.error(e.message);
 			console.error(e.stack);
 			this.exit(1);
-			return;
 		}
 
 		this.exit();
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index d5f8f1af3c..ceee653a15 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -1,10 +1,10 @@
 import {
+	ExecutionError,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialsEncrypted,
 	ICredentialType,
 	IDataObject,
-	IExecutionError,
 	IRun,
 	IRunData,
 	IRunExecutionData,
@@ -18,7 +18,6 @@ import {
 	IDeferredPromise,
 } from 'n8n-core';
 
-
 import * as PCancelable from 'p-cancelable';
 import { ObjectID, Repository } from 'typeorm';
 
@@ -374,10 +373,10 @@ export interface ITransferNodeTypes {
 
 
 export interface IWorkflowErrorData {
-	[key: string]: IDataObject | string | number | IExecutionError;
+	[key: string]: IDataObject | string | number | ExecutionError;
 	execution: {
 		id?: string;
-		error: IExecutionError;
+		error: ExecutionError;
 		lastNodeExecuted: string;
 		mode: WorkflowExecuteMode;
 	};
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index 8c5ad273b6..8913777329 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -144,7 +144,7 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 
 		try {
 			webhookResultData = await workflow.runWebhook(webhookData, workflowStartNode, additionalData, NodeExecuteFunctions, executionMode);
-		} catch (e) {
+		} catch (err) {
 			// Send error response to webhook caller
 			const errorMessage = 'Workflow Webhook Error: Workflow could not be started!';
 			responseCallback(new Error(errorMessage), {});
@@ -156,8 +156,9 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 					runData: {},
 					lastNodeExecuted: workflowStartNode.name,
 					error: {
-						message: e.message,
-						stack: e.stack,
+						...err,
+						message: err.message,
+						stack: err.stack,
 					},
 				},
 			};
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 92f6a93afc..970835a90c 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -627,9 +627,11 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	} else {
 		await ActiveExecutions.getInstance().remove(executionId, data);
 		// Workflow did fail
-		const error = new Error(data.data.resultData.error!.message);
-		error.stack = data.data.resultData.error!.stack;
-		throw error;
+		const { error } = data.data.resultData;
+		throw {
+			...error,
+			stack: error!.stack,
+		};
 	}
 }
 
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index f884ac5dcc..386f1c51f7 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -27,12 +27,12 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
-	IExecutionError,
+	ExecutionError,
 	IRun,
 	Workflow,
 	WorkflowExecuteMode,
 	WorkflowHooks,
+	WorkflowOperationError,
 } from 'n8n-workflow';
 
 import * as config from '../config';
@@ -78,13 +78,13 @@ export class WorkflowRunner {
 	/**
 	 * The process did error
 	 *
-	 * @param {IExecutionError} error
+	 * @param {ExecutionError} error
 	 * @param {Date} startedAt
 	 * @param {WorkflowExecuteMode} executionMode
 	 * @param {string} executionId
 	 * @memberof WorkflowRunner
 	 */
-	processError(error: IExecutionError, startedAt: Date, executionMode: WorkflowExecuteMode, executionId: string) {
+	processError(error: ExecutionError, startedAt: Date, executionMode: WorkflowExecuteMode, executionId: string) {
 		const fullRunData: IRun = {
 			data: {
 				resultData: {
@@ -250,9 +250,7 @@ export class WorkflowRunner {
 				const fullRunData :IRun = {
 					data: {
 						resultData: {
-							error: {
-								message: 'Workflow has been canceled!',
-							} as IExecutionError,
+							error: new WorkflowOperationError('Workflow has been canceled!'),
 							runData: {},
 						},
 					},
@@ -464,14 +462,14 @@ export class WorkflowRunner {
 
 			} else if (message.type === 'processError') {
 				clearTimeout(executionTimeout);
-				const executionError = message.data.executionError as IExecutionError;
+				const executionError = message.data.executionError as ExecutionError;
 				this.processError(executionError, startedAt, data.executionMode, executionId);
 
 			} else if (message.type === 'processHook') {
 				this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook);
 			} else if (message.type === 'timeout') {
 				// Execution timed out and its process has been terminated
-				const timeoutError = { message: 'Workflow execution timed out!' } as IExecutionError;
+				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
 
 				this.processError(timeoutError, startedAt, data.executionMode, executionId);
 			} else if (message.type === 'startExecution') {
@@ -486,16 +484,12 @@ export class WorkflowRunner {
 		subprocess.on('exit', (code, signal) => {
 			if (signal === 'SIGTERM'){
 				// Execution timed out and its process has been terminated
-				const timeoutError = {
-					message: 'Workflow execution timed out!',
-				} as IExecutionError;
+				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
 
 				this.processError(timeoutError, startedAt, data.executionMode, executionId);
 			} else if (code !== 0) {
 				// Process did exit with error code, so something went wrong.
-				const executionError = {
-					message: 'Workflow execution process did crash for an unknown reason!',
-				} as IExecutionError;
+				const executionError = new WorkflowOperationError('Workflow execution process did crash for an unknown reason!');
 
 				this.processError(executionError, startedAt, data.executionMode, executionId);
 			}
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 70c140a7e3..b263fa864f 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -16,10 +16,9 @@ import {
 } from 'n8n-core';
 
 import {
+	ExecutionError,
 	IDataObject,
-	IExecuteData,
 	IExecuteWorkflowInfo,
-	IExecutionError,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeData,
@@ -30,6 +29,7 @@ import {
 	IWorkflowExecuteHooks,
 	Workflow,
 	WorkflowHooks,
+	WorkflowOperationError,
 } from 'n8n-workflow';
 
 import * as config from '../config';
@@ -270,7 +270,7 @@ process.on('message', async (message: IProcessMessage) => {
 				// Workflow started already executing
 				runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt);
 
-				const timeOutError = message.type === 'timeout' ? { message: 'Workflow execution timed out!' } as IExecutionError : undefined;
+				const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : undefined;
 
 				// If there is any data send it to parent process, if execution timedout add the error
 				await workflowRunner.workflowExecute.processSuccessExecution(workflowRunner.startedAt, workflowRunner.workflow!, timeOutError);
@@ -301,11 +301,14 @@ process.on('message', async (message: IProcessMessage) => {
 			workflowRunner.executionIdCallback(message.data.executionId);
 		}
 	} catch (error) {
+
 		// Catch all uncaught errors and forward them to parent process
 		const executionError = {
-			message: error.message,
-			stack: error.stack,
-		} as IExecutionError;
+			...error,
+			name: error!.name || 'Error',
+			message: error!.message,
+			stack: error!.stack,
+		} as ExecutionError;
 
 		await sendToParentProcess('processError', {
 			executionError,
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/Interfaces.ts
index b67d1ccfc9..763afdf4b8 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/Interfaces.ts
@@ -18,7 +18,6 @@ import {
 	IWorkflowSettings as IWorkflowSettingsWorkflow,
  } from 'n8n-workflow';
 
-
 import { OptionsWithUri, OptionsWithUrl } from 'request';
 import * as requestPromise from 'request-promise-native';
 
@@ -26,7 +25,6 @@ interface Constructable<T> {
 	new(): T;
 }
 
-
 export interface IProcessMessage {
 	data?: any; // tslint:disable-line:no-any
 	type: string;
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 2646fbb7b7..9493e993b8 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -32,6 +32,7 @@ import {
 	IWorkflowExecuteAdditionalData,
 	IWorkflowMetadata,
 	NodeHelpers,
+	NodeOperationError,
 	NodeParameterValue,
 	Workflow,
 	WorkflowActivateMode,
@@ -309,16 +310,16 @@ export function getCredentials(workflow: Workflow, node: INode, type: string, ad
 	// Get the NodeType as it has the information if the credentials are required
 	const nodeType = workflow.nodeTypes.getByName(node.type);
 	if (nodeType === undefined) {
-		throw new Error(`Node type "${node.type}" is not known so can not get credentials!`);
+		throw new NodeOperationError(node, `Node type "${node.type}" is not known so can not get credentials!`);
 	}
 
 	if (nodeType.description.credentials === undefined) {
-		throw new Error(`Node type "${node.type}" does not have any credentials defined!`);
+		throw new NodeOperationError(node, `Node type "${node.type}" does not have any credentials defined!`);
 	}
 
 	const nodeCredentialDescription = nodeType.description.credentials.find((credentialTypeDescription) => credentialTypeDescription.name === type);
 	if (nodeCredentialDescription === undefined) {
-		throw new Error(`Node type "${node.type}" does not have any credentials of type "${type}" defined!`);
+		throw new NodeOperationError(node, `Node type "${node.type}" does not have any credentials of type "${type}" defined!`);
 	}
 
 	if (NodeHelpers.displayParameter(additionalData.currentNodeParameters || node.parameters, nodeCredentialDescription, node.parameters) === false) {
@@ -333,10 +334,10 @@ export function getCredentials(workflow: Workflow, node: INode, type: string, ad
 		if (nodeCredentialDescription.required === true) {
 			// Credentials are required so error
 			if (!node.credentials) {
-				throw new Error('Node does not have any credentials set!');
+				throw new NodeOperationError(node,'Node does not have any credentials set!');
 			}
 			if (!node.credentials[type]) {
-				throw new Error(`Node does not have any credentials set for "${type}"!`);
+				throw new NodeOperationError(node,`Node does not have any credentials set for "${type}"!`);
 			}
 		} else {
 			// Credentials are not required so resolve with undefined
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index a71bc3bfa3..210711aee7 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1,10 +1,10 @@
 import * as PCancelable from 'p-cancelable';
 
 import {
+	ExecutionError,
 	IConnection,
 	IDataObject,
 	IExecuteData,
-	IExecutionError,
 	INode,
 	INodeConnections,
 	INodeExecutionData,
@@ -17,6 +17,7 @@ import {
 	IWorkflowExecuteAdditionalData,
 	Workflow,
 	WorkflowExecuteMode,
+	WorkflowOperationError,
 } from 'n8n-workflow';
 import {
 	NodeExecuteFunctions,
@@ -490,7 +491,7 @@ export class WorkflowExecute {
 
 		// Variables which hold temporary data for each node-execution
 		let executionData: IExecuteData;
-		let executionError: IExecutionError | undefined;
+		let executionError: ExecutionError | undefined;
 		let executionNode: INode;
 		let nodeSuccessData: INodeExecutionData[][] | null | undefined;
 		let runIndex: number;
@@ -517,8 +518,10 @@ export class WorkflowExecute {
 				try {
 					await this.executeHook('workflowExecuteBefore', [workflow]);
 				} catch (error) {
+
 					// Set the error that it can be saved correctly
 					executionError = {
+						...error,
 						message: error.message,
 						stack: error.stack,
 					};
@@ -683,9 +686,11 @@ export class WorkflowExecute {
 
 							break;
 						} catch (error) {
+
 							this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
 
 							executionError = {
+								...error,
 								message: error.message,
 								stack: error.stack,
 							};
@@ -784,7 +789,7 @@ export class WorkflowExecute {
 			})()
 			.then(async () => {
 				if (gotCancel && executionError === undefined) {
-					return this.processSuccessExecution(startedAt, workflow, { message: 'Workflow has been canceled!' } as IExecutionError);
+					return this.processSuccessExecution(startedAt, workflow, new WorkflowOperationError('Workflow has been canceled!'));
 				}
 				return this.processSuccessExecution(startedAt, workflow, executionError);
 			})
@@ -792,6 +797,7 @@ export class WorkflowExecute {
 				const fullRunData = this.getFullRunData(startedAt);
 
 				fullRunData.data.resultData.error = {
+					...error,
 					message: error.message,
 					stack: error.stack,
 				};
@@ -815,7 +821,7 @@ export class WorkflowExecute {
 
 
 	// @ts-ignore
-	async processSuccessExecution(startedAt: Date, workflow: Workflow, executionError?: IExecutionError): PCancelable<IRun> {
+	async processSuccessExecution(startedAt: Date, workflow: Workflow, executionError?: ExecutionError): PCancelable<IRun> {
 		const fullRunData = this.getFullRunData(startedAt);
 
 		if (executionError !== undefined) {
diff --git a/packages/editor-ui/src/components/Error/NodeViewError.vue b/packages/editor-ui/src/components/Error/NodeViewError.vue
new file mode 100644
index 0000000000..2c8cc2f056
--- /dev/null
+++ b/packages/editor-ui/src/components/Error/NodeViewError.vue
@@ -0,0 +1,177 @@
+<template>
+	<div>
+		<div class="error-header">
+			<div class="error-message">ERROR: {{error.message}}</div>
+			<div class="error-description" v-if="error.description">{{error.description}}</div>
+		</div>
+		<details>
+			<summary class="error-details__summary">
+				<font-awesome-icon class="error-details__icon" icon="angle-right" /> Details
+			</summary>
+			<div class="error-details__content">
+				<div v-if="error.timestamp">
+					<el-card class="box-card" shadow="never">
+						<div slot="header" class="clearfix box-card__title">
+							<span>Time</span>
+						</div>
+						<div>
+							{{new Date(error.timestamp).toLocaleString()}}
+						</div>
+					</el-card>
+				</div>
+				<div v-if="error.httpCode">
+					<el-card class="box-card" shadow="never">
+						<div slot="header" class="clearfix box-card__title">
+							<span>HTTP-Code</span>
+						</div>
+						<div>
+							{{error.httpCode}}
+						</div>
+					</el-card>
+				</div>
+				<div v-if="error.cause">
+					<el-card class="box-card" shadow="never">
+						<div slot="header" class="clearfix box-card__title">
+							<span>Cause</span>
+							<br>
+							<span class="box-card__subtitle">Data below may contain sensitive information. Proceed with caution when sharing.</span>
+						</div>
+						<div>
+							<el-button class="copy-button" @click="copyCause" circle type="text" title="Copy to clipboard">
+								<font-awesome-icon icon="copy" />
+							</el-button>
+							<vue-json-pretty
+								:data="error.cause"
+								:deep="3"
+								:showLength="true"
+								selectableType="single"
+								path="error"
+								class="json-data"
+							/>
+						</div>
+					</el-card>
+				</div>
+				<div v-if="error.stack">
+					<el-card class="box-card" shadow="never">
+						<div slot="header" class="clearfix box-card__title">
+							<span>Stack</span>
+						</div>
+						<div>
+							<pre><code>{{error.stack}}</code></pre>
+						</div>
+					</el-card>
+				</div>
+			</div>
+		</details>
+	</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+//@ts-ignore
+import VueJsonPretty from 'vue-json-pretty';
+import { copyPaste } from '@/components/mixins/copyPaste';
+import { showMessage } from '@/components/mixins/showMessage';
+import mixins from 'vue-typed-mixins';
+
+
+export default mixins(
+	copyPaste,
+	showMessage,
+).extend({
+	name: 'NodeErrorView',
+	props: [
+		'error',
+	],
+	components: {
+		VueJsonPretty,
+	},
+	methods: {
+		copyCause() {
+			this.copyToClipboard(JSON.stringify(this.error.cause));
+			this.copySuccess();
+		},
+		copySuccess() {
+			this.$showMessage({
+				title: 'Copied to clipboard',
+				message: '',
+				type: 'info',
+			});
+		},
+	},
+});
+</script>
+
+<style lang="scss">
+
+.error-header {
+	margin-bottom: 10px;
+}
+
+.error-message {
+	color: #ff0000;
+	font-weight: bold;
+	font-size: 1.1rem;
+}
+
+.error-description {
+	margin-top: 10px;
+	font-size: 1rem;
+}
+
+.error-details__summary {
+	font-weight: 600;
+	font-size: 16px;
+	cursor: pointer;
+	outline:none;
+}
+
+.error-details__icon {
+	margin-right: 4px;
+}
+
+details > summary {
+    list-style-type: none;
+}
+
+details > summary::-webkit-details-marker {
+    display: none;
+}
+
+details[open] {
+  .error-details__icon {
+		transform: rotate(90deg);
+	}
+}
+
+.error-details__content {
+	margin-top: 15px;
+}
+
+.el-divider__text {
+	background-color: #f9f9f9;
+}
+
+.box-card {
+	margin-top: 1em;
+	overflow: auto;
+}
+
+.box-card__title {
+	font-weight: 400;
+}
+
+.box-card__subtitle {
+	font-weight: 200;
+	font-style: italic;
+	font-size: 0.7rem;
+}
+
+.copy-button {
+	position: absolute;
+	font-size: 1.1rem;
+	right: 50px;
+	z-index: 1000;
+}
+
+</style>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index bc338fa9dc..b64029e69b 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -81,8 +81,7 @@
 		<div class="data-display-content">
 			<span v-if="node && workflowRunData !== null && workflowRunData.hasOwnProperty(node.name)">
 				<div v-if="workflowRunData[node.name][runIndex].error" class="error-display">
-					<div class="error-message">ERROR: {{workflowRunData[node.name][runIndex].error.message}}</div>
-					<pre><code>{{workflowRunData[node.name][runIndex].error.stack}}</code></pre>
+					<NodeErrorView :error="workflowRunData[node.name][runIndex].error" />
 				</div>
 				<span v-else>
 					<div v-if="showData === false" class="to-much-data">
@@ -226,6 +225,7 @@ import {
 } from '@/constants';
 
 import BinaryDataDisplay from '@/components/BinaryDataDisplay.vue';
+import NodeErrorView from '@/components/Error/NodeViewError.vue';
 
 import { copyPaste } from '@/components/mixins/copyPaste';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
@@ -247,6 +247,7 @@ export default mixins(
 		name: 'RunData',
 		components: {
 			BinaryDataDisplay,
+			NodeErrorView,
 			VueJsonPretty,
 		},
 		data () {
@@ -739,13 +740,6 @@ export default mixins(
 			}
 		}
 
-		.error-display {
-			.error-message {
-				color: #ff0000;
-				font-weight: bold;
-			}
-		}
-
 		table {
 			border-collapse: collapse;
 			text-align: left;
diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
index 4651301316..5cb47ef44a 100644
--- a/packages/editor-ui/src/components/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -207,8 +207,19 @@ export const pushConnection = mixins(
 					if (runDataExecuted.finished !== true) {
 						// There was a problem with executing the workflow
 						let errorMessage = 'There was a problem executing the workflow!';
+
 						if (runDataExecuted.data.resultData.error && runDataExecuted.data.resultData.error.message) {
-							errorMessage = `There was a problem executing the workflow:<br /><strong>"${runDataExecuted.data.resultData.error.message}"</strong>`;
+							let nodeName: string | undefined;
+							if (runDataExecuted.data.resultData.error.node) {
+								nodeName = typeof runDataExecuted.data.resultData.error.node === 'string'
+									? runDataExecuted.data.resultData.error.node
+									: runDataExecuted.data.resultData.error.node.name;
+							}
+
+							const receivedError = nodeName
+								? `${nodeName}: ${runDataExecuted.data.resultData.error.message}`
+								: runDataExecuted.data.resultData.error.message;
+							errorMessage = `There was a problem executing the workflow:<br /><strong>"${receivedError}"</strong>`;
 						}
 						this.$titleSet(workflow.name, 'ERROR');
 						this.$showMessage({
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 9b252a6c5f..65610ef8c1 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -459,6 +459,10 @@ h1, h2, h3, h4, h5, h6 {
 	border: none;
 }
 
+.el-notification__content {
+	text-align: left;
+}
+
 
 // Custom scrollbar
 ::-webkit-scrollbar {
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index ecc6dc6e6d..6727c80540 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -431,7 +432,7 @@ export class ActiveCampaign implements INodeType {
 					addAdditionalFields(body.contact as IDataObject, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'account') {
 				if (operation === 'create') {
@@ -512,7 +513,7 @@ export class ActiveCampaign implements INodeType {
 					addAdditionalFields(body.account as IDataObject, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'accountContact') {
 				if (operation === 'create') {
@@ -562,7 +563,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/accountContacts/${accountContactId}`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'contactTag') {
 				if (operation === 'add') {
@@ -592,7 +593,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/contactTags/${contactTagId}`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'contactList') {
 				if (operation === 'add') {
@@ -630,7 +631,7 @@ export class ActiveCampaign implements INodeType {
 					dataKey = 'contacts';
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'list') {
 				if (operation === 'getAll') {
@@ -732,7 +733,7 @@ export class ActiveCampaign implements INodeType {
 					addAdditionalFields(body.tag as IDataObject, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'deal') {
 				if (operation === 'create') {
@@ -851,7 +852,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/deals/${dealId}/notes/${dealNoteId}`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'connection') {
 				if (operation === 'create') {
@@ -926,7 +927,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/connections`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'ecommerceOrder') {
 				if (operation === 'create') {
@@ -1024,7 +1025,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/ecomOrders`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'ecommerceCustomer') {
 				if (operation === 'create') {
@@ -1114,7 +1115,7 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/ecomCustomers`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 			} else if (resource === 'ecommerceOrderProducts') {
 				if (operation === 'getByProductId') {
@@ -1160,11 +1161,11 @@ export class ActiveCampaign implements INodeType {
 					endpoint = `/api/3/ecomOrderProducts`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known`);
 				}
 
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			let responseData;
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
index aad65ee1b4..fb028803d7 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
@@ -116,7 +116,7 @@ export class ActiveCampaignTrigger implements INodeType {
 				const endpoint = `/api/3/webhooks/${webhookData.webhookId}`;
 				try {
 					await activeCampaignApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index 231d2e0d24..215d31934c 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject, ILoadOptionsFunctions, INodeProperties,
+	IDataObject, ILoadOptionsFunctions, INodeProperties, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -28,7 +28,7 @@ export interface IProduct {
 export async function activeCampaignApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject, dataKey?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('activeCampaignApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (query === undefined) {
@@ -53,7 +53,7 @@ export async function activeCampaignApiRequest(this: IHookFunctions | IExecuteFu
 		const responseData = await this.helpers.request!(options);
 
 		if (responseData.success === false) {
-			throw new Error(`ActiveCampaign error response: ${responseData.error} (${responseData.error_info})`);
+			throw new NodeApiError(this.getNode(), responseData);
 		}
 
 		if (dataKey === undefined) {
@@ -63,13 +63,7 @@ export async function activeCampaignApiRequest(this: IHookFunctions | IExecuteFu
 		}
 
 	} catch (error) {
-		if (error.statusCode === 403) {
-			// Return a clear error
-			throw new Error('The ActiveCampaign credentials are not valid!');
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
index bf13f1aefc..e974fc8042 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
@@ -6,7 +6,7 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function acuitySchedulingApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
@@ -27,7 +27,7 @@ export async function acuitySchedulingApiRequest(this: IHookFunctions | IExecute
 		if (authenticationMethod === 'apiKey') {
 			const credentials = this.getCredentials('acuitySchedulingApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.auth = {
@@ -42,6 +42,6 @@ export async function acuitySchedulingApiRequest(this: IHookFunctions | IExecute
 			return await this.helpers.requestOAuth2!.call(this, 'acuitySchedulingOAuth2Api', options, true);
 		}
 	} catch (error) {
-		throw new Error('Acuity Scheduling Error: ' + error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
index 4d3ba70f17..58a608ecca 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -187,7 +188,7 @@ export class AffinityTrigger implements INodeType {
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
 				if (webhookUrl.includes('%20')) {
-					throw new Error('The name of the Affinity Trigger Node is not allowed to contain any spaces!');
+					throw new NodeOperationError(this.getNode(), 'The name of the Affinity Trigger Node is not allowed to contain any spaces!');
 				}
 
 				const events = this.getNodeParameter('events') as string[];
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index cabc297e65..04443d4d79 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -12,6 +12,8 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function affinityApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -19,7 +21,7 @@ export async function affinityApiRequest(this: IExecuteFunctions | IWebhookFunct
 	const credentials = this.getCredentials('affinityApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const apiKey = `:${credentials.apiKey}`;
@@ -47,11 +49,7 @@ export async function affinityApiRequest(this: IExecuteFunctions | IWebhookFunct
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response) {
-			const errorMessage = error.response.body.message || error.response.body.description || error.message;
-			throw new Error(`Affinity error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index a79e2c6829..c3401f7d86 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -3,7 +3,8 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -149,7 +150,7 @@ export class AgileCrm implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -305,7 +306,7 @@ export class AgileCrm implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 					} else {
@@ -483,7 +484,7 @@ export class AgileCrm implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -525,7 +526,7 @@ export class AgileCrm implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be valid JSON');
 							}
 						}
 
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index 75b8a71c8b..d0ee821a01 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 import { IContactUpdate } from './ContactInterface';
 
@@ -39,7 +39,7 @@ export async function agileCrmApiRequest(this: IHookFunctions | IExecuteFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error(`AgileCRM error response: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 
 }
@@ -114,9 +114,9 @@ export async function agileCrmApiRequestUpdate(this: IHookFunctions | IExecuteFu
 
 	} catch (error) {
 		if (successfulUpdates.length === 0) {
-			throw new Error(`AgileCRM error response: ${error.message}`);
+			throw new NodeApiError(this.getNode(), error);
 		} else {
-			throw new Error(`Not all properties updated. Updated properties: ${successfulUpdates.join(', ')} \n \nAgileCRM error response: ${error.message}`);
+			throw new NodeApiError(this.getNode(), error, { message: `Not all properties updated. Updated properties: ${successfulUpdates.join(', ')}`, description: error.message, httpCode: error.statusCode });
 		}
 	}
 
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 62dc8a47fc..36c2846618 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -636,7 +637,7 @@ export class Airtable implements INodeType {
 			}
 
 		} else {
-			throw new Error(`The operation "${operation}" is not known!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index abba82b256..0cd4c3e8ad 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -170,7 +171,7 @@ export class AirtableTrigger implements INodeType {
 
 		if (Array.isArray(records) && records.length) {
 			if (this.getMode() === 'manual' && records[0].fields[triggerField] === undefined) {
-				throw new Error(`The Field "${triggerField}" does not exist.`);
+				throw new NodeOperationError(this.getNode(), `The Field "${triggerField}" does not exist.`);
 			}
 
 			if (downloadAttachments === true) {
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
index 9fbcd5785d..54eb8ea387 100644
--- a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
@@ -13,6 +13,8 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	IPollFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -41,7 +43,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	const credentials = this.getCredentials('airtableApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -73,23 +75,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Airtable credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error) {
-			// Try to return the error prettier
-
-			const airtableError = error.response.body.error;
-
-			if (airtableError.type && airtableError.message) {
-				throw new Error(`Airtable error response [${airtableError.type}]: ${airtableError.message}`);
-			}
-		}
-
-		// Expected error data did not get returned so rhow the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index 2b4987078a..931b82104f 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -11,6 +11,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export class Amqp implements INodeType {
@@ -98,7 +99,7 @@ export class Amqp implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const credentials = this.getCredentials('amqp');
 		if (!credentials) {
-			throw new Error('Credentials are mandatory!');
+			throw new NodeOperationError(this.getNode(), 'Credentials are mandatory!');
 		}
 
 		const sink = this.getNodeParameter('sink', 0, '') as string;
@@ -116,7 +117,7 @@ export class Amqp implements INodeType {
 		}
 
 		if (sink === '') {
-			throw new Error('Queue or Topic required!');
+			throw new NodeOperationError(this.getNode(), 'Queue or Topic required!');
 		}
 
 		const container = create_container();
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index be9b91c910..f7f3291923 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -12,6 +12,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -133,7 +134,7 @@ export class AmqpTrigger implements INodeType {
 
 		const credentials = this.getCredentials('amqp');
 		if (!credentials) {
-			throw new Error('Credentials are mandatory!');
+			throw new NodeOperationError(this.getNode(), 'Credentials are mandatory!');
 		}
 
 		const sink = this.getNodeParameter('sink', '') as string;
@@ -146,7 +147,7 @@ export class AmqpTrigger implements INodeType {
 		const containerReconnectLimit = options.reconnectLimit as number || 50;
 
 		if (sink === '') {
-			throw new Error('Queue or Topic required!');
+			throw new NodeOperationError(this.getNode(), 'Queue or Topic required!');
 		}
 
 		let durable = false;
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index ef3e325be8..86055ad49c 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -466,7 +467,7 @@ export class ApiTemplateIo implements INodeType {
 						if (overrideJson !== '') {
 							const data = validateJSON(overrideJson);
 							if (data === undefined) {
-								throw new Error('A valid JSON must be provided.');
+								throw new NodeOperationError(this.getNode(), 'A valid JSON must be provided.');
 							}
 							body.overrides = data;
 						}
@@ -523,14 +524,14 @@ export class ApiTemplateIo implements INodeType {
 					if (jsonParameters === false) {
 						const properties = (this.getNodeParameter('propertiesUi', i) as IDataObject || {}).propertyValues as IDataObject[] || [];
 						if (properties.length === 0) {
-							throw new Error('The parameter properties cannot be empty');
+							throw new NodeOperationError(this.getNode(), 'The parameter properties cannot be empty');
 						}
 						data = properties.reduce((obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }), {});
 					} else {
 						const propertiesJson = this.getNodeParameter('propertiesJson', i) as string;
 						data = validateJSON(propertiesJson);
 						if (data === undefined) {
-							throw new Error('A valid JSON must be provided.');
+							throw new NodeOperationError(this.getNode(), 'A valid JSON must be provided.');
 						}
 					}
 
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
index 083683434d..e096d81acf 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
+import { NodeApiError } from 'n8n-workflow';
 
 export async function apiTemplateIoApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
@@ -42,14 +43,11 @@ export async function apiTemplateIoApiRequest(
 	try {
 		const response = await this.helpers.request!(options);
 		if (response.status === 'error') {
-			throw new Error(response.message);
+			throw new NodeApiError(this.getNode(), response.message);
 		}
 		return response;
 	} catch (error) {
-		if (error?.response?.body?.message) {
-			throw new Error(`APITemplate.io error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index c2ed508654..d7d1971dcf 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1639,7 +1641,7 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1674,7 +1676,7 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1711,7 +1713,7 @@ export class Asana implements INodeType {
 				// to retrieve the teams from an organization just work with workspaces that are an organization
 
 				if (workspace.is_organization === false) {
-					throw Error('To filter by team, the workspace selected has to be an organization');
+					throw new NodeOperationError(this.getNode(), 'To filter by team, the workspace selected has to be an organization');
 				}
 
 				const endpoint = `/organizations/${workspaceId}/teams`;
@@ -1750,15 +1752,15 @@ export class Asana implements INodeType {
 				let taskData;
 				try {
 					taskData = await asanaApiRequest.call(this, 'GET', `/tasks/${taskId}`, {});
-				} catch (e) {
-					throw new Error(`Could not find task with id "${taskId}" so tags could not be loaded.`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error, { message: `Could not find task with id "${taskId}" so tags could not be loaded.` });
 				}
 
 				const workspace = taskData.data.workspace.gid;
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
 
 				if (responseData.data === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1790,7 +1792,7 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
 				}
 
 				const returnData: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index 78c00c2fcd..28a57178e8 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -10,6 +10,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -155,7 +156,7 @@ export class AsanaTrigger implements INodeType {
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
 				if (webhookUrl.includes('%20')) {
-					throw new Error('The name of the Asana Trigger Node is not allowed to contain any spaces!');
+					throw new NodeOperationError(this.getNode(), 'The name of the Asana Trigger Node is not allowed to contain any spaces!');
 				}
 
 				const resource = this.getNodeParameter('resource') as string;
@@ -189,7 +190,7 @@ export class AsanaTrigger implements INodeType {
 
 					try {
 						await asanaApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index c480beb078..6741ef96fb 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -11,6 +11,8 @@ import {
 import {
 	IDataObject,
 	INodePropertyOptions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -43,7 +45,7 @@ export async function asanaApiRequest(this: IHookFunctions | IExecuteFunctions |
 			const credentials = this.getCredentials('asanaApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `Bearer ${credentials.accessToken}`;
@@ -54,25 +56,7 @@ export async function asanaApiRequest(this: IHookFunctions | IExecuteFunctions |
 			return await this.helpers.requestOAuth2.call(this, 'asanaOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Asana credentials are not valid!');
-		}
-
-		if (error.statusCode === 403) {
-			throw error;
-		}
-
-		if (error.response && error.response.body && error.response.body.errors) {
-			// Try to return the error prettier
-			const errorMessages = error.response.body.errors.map((errorData: { message: string }) => {
-				return errorData.message;
-			});
-			throw new Error(`Asana error response [${error.statusCode}]: ${errorMessages.join(' | ')}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index f4265af137..8db073461e 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function automizyApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -40,14 +40,7 @@ export async function automizyApiRequest(this: IExecuteFunctions | IExecuteSingl
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body) {
-
-			throw new Error(
-				`Automizy error response [${error.statusCode}]: ${error.response.body.title}`,
-			);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
index b4477f09b1..4431e433d1 100644
--- a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
@@ -11,6 +11,7 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function autopilotApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -42,11 +43,7 @@ export async function autopilotApiRequest(this: IExecuteFunctions | IWebhookFunc
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response) {
-			const errorMessage = error.response.body.message || error.response.body.description || error.message;
-			throw new Error(`Autopilot error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index 0d08efbaec..75d5e98680 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -6,6 +6,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { awsApiRequestREST } from './GenericFunctions';
@@ -130,13 +132,7 @@ export class AwsLambda implements INodeType {
 		loadOptions: {
 			async getFunctions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-
-				let data;
-				try {
-					data = await awsApiRequestREST.call(this, 'lambda', 'GET', '/2015-03-31/functions/');
-				} catch (err) {
-					throw new Error(`AWS Error: ${err}`);
-				}
+				const data = await awsApiRequestREST.call(this, 'lambda', 'GET', '/2015-03-31/functions/');
 
 				for (const func of data.Functions!) {
 					returnData.push({
@@ -162,22 +158,17 @@ export class AwsLambda implements INodeType {
 				Qualifier: this.getNodeParameter('qualifier', i) as string,
 			};
 
-			let responseData;
-			try {
-				responseData = await awsApiRequestREST.call(
-					this,
-					'lambda',
-					'POST',
-					`/2015-03-31/functions/${params.FunctionName}/invocations?Qualifier=${params.Qualifier}`,
-					params.Payload,
-					{
-						'X-Amz-Invocation-Type': params.InvocationType,
-						'Content-Type': 'application/x-amz-json-1.0',
-					},
-				);
-			} catch (err) {
-				throw new Error(`AWS Error: ${err}`);
-			}
+			const responseData = await awsApiRequestREST.call(
+				this,
+				'lambda',
+				'POST',
+				`/2015-03-31/functions/${params.FunctionName}/invocations?Qualifier=${params.Qualifier}`,
+				params.Payload,
+				{
+					'X-Amz-Invocation-Type': params.InvocationType,
+					'Content-Type': 'application/x-amz-json-1.0',
+				},
+			);
 
 			if (responseData !== null && responseData.errorMessage !== undefined) {
 				let errorMessage = responseData.errorMessage;
@@ -186,7 +177,7 @@ export class AwsLambda implements INodeType {
 					errorMessage += `\n\nStack trace:\n${responseData.stackTrace}`;
 				}
 
-				throw new Error(errorMessage);
+				throw new NodeApiError(this.getNode(), responseData);
 			} else {
 				returnData.push({
 					result: responseData,
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index 16eb1c4328..9d25a6762a 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -6,6 +6,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { awsApiRequestSOAP } from './GenericFunctions';
@@ -107,12 +109,7 @@ export class AwsSns implements INodeType {
 			// select them easily
 			async getTopics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				let data;
-				try {
-					data = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=ListTopics');
-				} catch (err) {
-					throw new Error(`AWS Error: ${err}`);
-				}
+				const data = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=ListTopics');
 
 				let topics = data.ListTopicsResponse.ListTopicsResult.Topics.member;
 
@@ -149,12 +146,8 @@ export class AwsSns implements INodeType {
 				'Message=' + this.getNodeParameter('message', i) as string,
 			];
 
-			let responseData;
-			try {
-				responseData = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=Publish&' + params.join('&'));
-			} catch (err) {
-				throw new Error(`AWS Error: ${err}`);
-			}
+
+			const	responseData = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=Publish&' + params.join('&'));
 			returnData.push({MessageId: responseData.PublishResponse.PublishResult.MessageId} as IDataObject);
 		}
 
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index e41f9de57f..79197b1104 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -9,6 +9,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -68,12 +70,7 @@ export class AwsSnsTrigger implements INodeType {
 			// select them easily
 			async getTopics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				let data;
-				try {
-					data = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=ListTopics');
-				} catch (err) {
-					throw new Error(`AWS Error: ${err}`);
-				}
+				const data = await awsApiRequestSOAP.call(this, 'sns', 'GET', '/?Action=ListTopics');
 
 				let topics = data.ListTopicsResponse.ListTopicsResult.Topics.member;
 
@@ -134,7 +131,7 @@ export class AwsSnsTrigger implements INodeType {
 				const topic = this.getNodeParameter('topic') as string;
 
 				if (webhookUrl.includes('%20')) {
-					throw new Error('The name of the SNS Trigger Node is not allowed to contain any spaces!');
+					throw new NodeOperationError(this.getNode(), 'The name of the SNS Trigger Node is not allowed to contain any spaces!');
 				}
 
 				const params = [
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index 9e6731ebbb..13c389e26a 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -22,7 +22,7 @@ import {
 } from 'n8n-core';
 
 import {
-	ICredentialDataDecryptedObject,
+	ICredentialDataDecryptedObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 function getEndpointForService(service: string, credentials: ICredentialDataDecryptedObject): string {
@@ -40,7 +40,7 @@ function getEndpointForService(service: string, credentials: ICredentialDataDecr
 export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('aws');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	// Concatenate path and instantiate URL object so it parses correctly query strings
@@ -61,17 +61,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The AWS credentials are not valid!');
-			}
-		}
-
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error); // no XML parsing needed
 	}
 }
 
@@ -79,7 +69,7 @@ export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -95,7 +85,7 @@ export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 				resolve(data);
 			});
 		});
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index edc733af64..59caff7b82 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -1,7 +1,7 @@
 import { URL } from 'url';
 import { sign } from 'aws4';
 import { OptionsWithUri } from 'request';
-import { parseString } from 'xml2js';
+import { parseString as parseXml } from 'xml2js';
 
 import {
 	IExecuteFunctions,
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	ICredentialDataDecryptedObject,
+	ICredentialDataDecryptedObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 function getEndpointForService(service: string, credentials: ICredentialDataDecryptedObject): string {
@@ -31,7 +31,7 @@ function getEndpointForService(service: string, credentials: ICredentialDataDecr
 export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('aws');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	// Concatenate path and instantiate URL object so it parses correctly query strings
@@ -52,17 +52,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The AWS credentials are not valid!');
-			}
-		}
-
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error, { parseXml: true });
 	}
 }
 
@@ -70,7 +60,7 @@ export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -79,14 +69,14 @@ export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseXml(response, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
 				resolve(data);
 			});
 		});
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index ad6618232c..afc5dfe875 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -459,11 +461,11 @@ export class AwsRekognition implements INodeType {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 
 							if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 							}
 
 							const binaryPropertyData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -494,7 +496,9 @@ export class AwsRekognition implements INodeType {
 								body.Image.S3Object.Version = additionalFields.version as string;
 							}
 						}
+
 						responseData = await awsApiRequestREST.call(this, 'rekognition', 'POST', '', JSON.stringify(body), {}, { 'X-Amz-Target': action, 'Content-Type': 'application/x-amz-json-1.1' });
+
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index 8afb205f9c..38a41a3235 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -27,6 +27,8 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
  } from 'n8n-workflow';
 
 import {
@@ -36,7 +38,7 @@ import {
 export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string | Buffer | IDataObject, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('aws');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = new URL(((credentials.rekognitionEndpoint as string || '').replace('{region}', credentials.region as string) || `https://${service}.${credentials.region}.amazonaws.com`) + path);
@@ -59,17 +61,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The AWS credentials are not valid!');
-			}
-		}
-
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -77,7 +69,7 @@ export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, query, headers, options, region);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -93,8 +85,8 @@ export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 				resolve(data);
 			});
 		});
-	} catch (e) {
-		return e;
+	} catch (error) {
+		return error;
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index c6d714a898..08a2a531a4 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -23,6 +23,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -422,7 +423,7 @@ export class AwsS3 implements INodeType {
 					const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
 
 					if (fileKey.substring(fileKey.length - 1) === '/') {
-						throw new Error('Downloding a whole directory is not yet supported, please provide a file key');
+						throw new NodeOperationError(this.getNode(), 'Downloding a whole directory is not yet supported, please provide a file key');
 					}
 
 					let region = await awsApiRequestSOAP.call(this, `${bucketName}.s3`, 'GET', '', '', { location: '' });
@@ -588,11 +589,11 @@ export class AwsS3 implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
index 0c5e3b83aa..e422b449cf 100644
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
@@ -26,20 +26,20 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
  } from 'n8n-workflow';
 
 export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string | Buffer, query: IDataObject = {}, headers?: object, option: IDataObject = {}, region?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('aws');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = new URL(((credentials.s3Endpoint as string || '').replace('{region}', credentials.region as string) || `https://${service}.${credentials.region}.amazonaws.com`) + path);
 
 	// Sign AWS API request with the user credentials
 	const signOpts = {headers: headers || {}, host: endpoint.host, method, path: `${endpoint.pathname}?${queryToString(query).replace(/\+/g, '%2B')}`, body};
-	
+
 
 	sign(signOpts, { accessKeyId: `${credentials.accessKeyId}`.trim(), secretAccessKey: `${credentials.secretAccessKey}`.trim()});
 
@@ -57,17 +57,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The AWS credentials are not valid!');
-			}
-		}
-
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error, { parseXml: true });
 	}
 }
 
@@ -75,7 +65,7 @@ export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, query, headers, options, region);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -91,8 +81,8 @@ export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 				resolve(data);
 			});
 		});
-	} catch (e) {
-		return e;
+	} catch (error) {
+		return error;
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 58d77eb18c..251b9b0e8e 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1098,7 +1099,7 @@ export class AwsSes implements INodeType {
 					if (toAddresses.length) {
 						setParameter(params, 'Destination.ToAddresses.member', toAddresses);
 					} else {
-						throw new Error('At least one "To Address" has to be added!');
+						throw new NodeOperationError(this.getNode(), 'At least one "To Address" has to be added!');
 					}
 
 					if (additionalFields.configurationSetName) {
@@ -1151,7 +1152,7 @@ export class AwsSes implements INodeType {
 					if (toAddresses.length) {
 						setParameter(params, 'Destination.ToAddresses.member', toAddresses);
 					} else {
-						throw new Error('At least one "To Address" has to be added!');
+						throw new NodeOperationError(this.getNode(), 'At least one "To Address" has to be added!');
 					}
 
 					if (additionalFields.configurationSetName) {
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index 915a5805a6..46b33d6a09 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -22,7 +22,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -32,7 +32,7 @@ import {
 export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions, service: string, method: string, path: string, body?: string, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('aws');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = new URL(((credentials.sesEndpoint as string || '').replace('{region}', credentials.region as string) || `https://${service}.${credentials.region}.amazonaws.com`) + path);
@@ -52,17 +52,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = (error.response && error.response.body.message) || (error.response && error.response.body.Message) || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The AWS credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The AWS credentials are not valid!');
-			}
-		}
-
-		throw new Error(`AWS error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error, { parseXml: true });
 	}
 }
 
@@ -70,7 +60,7 @@ export async function awsApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -86,7 +76,7 @@ export async function awsApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 				resolve(data);
 			});
 		});
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index fb58bd7139..63a5dd4ff9 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -11,6 +11,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -270,8 +272,8 @@ export class AwsSqs implements INodeType {
 				try {
 					// loads first 1000 queues from SQS
 					data = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `?Action=ListQueues`);
-				} catch (err) {
-					throw new Error(`AWS Error: ${err}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 
 				let queues = data.ListQueuesResponse.ListQueuesResult.QueueUrl;
@@ -349,11 +351,11 @@ export class AwsSqs implements INodeType {
 				const item = items[i];
 
 				if (item.binary === undefined) {
-					throw new Error('No binary data set. So message attribute cannot be added!');
+					throw new NodeOperationError(this.getNode(), 'No binary data set. So message attribute cannot be added!');
 				}
 
 				if (item.binary[dataPropertyName] === undefined) {
-					throw new Error(`The binary property "${dataPropertyName}" does not exist. So message attribute cannot be added!`);
+					throw new NodeOperationError(this.getNode(), `The binary property "${dataPropertyName}" does not exist. So message attribute cannot be added!`);
 				}
 
 				const binaryData = item.binary[dataPropertyName].data;
@@ -374,8 +376,8 @@ export class AwsSqs implements INodeType {
 			let responseData;
 			try {
 				responseData = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `${queuePath}/?Action=${operation}&` + params.join('&'));
-			} catch (err) {
-				throw new Error(`AWS Error: ${err}`);
+			} catch (error) {
+				throw new NodeApiError(this.getNode(), error);
 			}
 
 			const result = responseData.SendMessageResponse.SendMessageResult;
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index 396c7e52ec..45d7996ead 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -11,6 +11,8 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -22,7 +24,7 @@ export async function bannerbearApiRequest(this: IExecuteFunctions | IWebhookFun
 	const credentials = this.getCredentials('bannerbearApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const options: OptionsWithUri = {
@@ -46,12 +48,7 @@ export async function bannerbearApiRequest(this: IExecuteFunctions | IWebhookFun
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-				//@ts-ignore
-				throw new Error(`Bannerbear error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
index 4f332faf47..17cf295342 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
@@ -7,6 +7,7 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -18,7 +19,7 @@ export async function createDatapoint(this: IExecuteFunctions | IWebhookFunction
 	const credentials = this.getCredentials('beeminderApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints.json`;
@@ -30,7 +31,7 @@ export async function getAllDatapoints(this: IExecuteFunctions | IHookFunctions
 	const credentials = this.getCredentials('beeminderApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints.json`;
@@ -46,7 +47,7 @@ export async function updateDatapoint(this: IExecuteFunctions | IWebhookFunction
 	const credentials = this.getCredentials('beeminderApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints/${data.datapointId}.json`;
@@ -58,7 +59,7 @@ export async function deleteDatapoint(this: IExecuteFunctions | IWebhookFunction
 	const credentials = this.getCredentials('beeminderApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = `/users/${credentials.user}/goals/${data.goalName}/datapoints/${data.datapointId}.json`;
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 966c783e25..435e1ecb30 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -308,7 +309,7 @@ export class Beeminder implements INodeType {
 				const credentials = this.getCredentials('beeminderApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				const endpoint = `/users/${credentials.user}/goals.json`;
diff --git a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
index d991e57a03..722646f40b 100644
--- a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
@@ -11,6 +11,7 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 const BEEMINDER_URI = 'https://www.beeminder.com/api/v1';
@@ -40,10 +41,7 @@ export async function beeminderApiRequest(this: IExecuteFunctions | IWebhookFunc
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error?.message) {
-			throw new Error(`Beeminder error response [${error.statusCode}]: ${error.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index 6fa13fad2f..005dc15dae 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -280,7 +280,7 @@ export class BitbucketTrigger implements INodeType {
 				}
 				try {
 					await bitbucketApiRequest.call(this, 'GET', endpoint);
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
index 4963f2c10c..3c2f88ab23 100644
--- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
@@ -5,12 +5,12 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function bitbucketApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('bitbucketApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		method,
@@ -30,8 +30,8 @@ export async function bitbucketApiRequest(this: IHookFunctions | IExecuteFunctio
 
 	try {
 		return await this.helpers.request!(options);
-	} catch (err) {
-		throw new Error('Bitbucket Error: ' + err.message);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
index b12da33938..3875d10182 100644
--- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
  } from 'n8n-workflow';
 
 export async function bitlyApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -32,7 +32,7 @@ export async function bitlyApiRequest(this: IHookFunctions | IExecuteFunctions |
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('bitlyApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 			options.headers = { Authorization: `Bearer ${credentials.accessToken}`};
 
@@ -42,15 +42,7 @@ export async function bitlyApiRequest(this: IHookFunctions | IExecuteFunctions |
 			return await this.helpers.requestOAuth2!.call(this, 'bitlyOAuth2Api', options, { tokenType: 'Bearer' });
 		}
 	} catch(error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Bitly error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index 4904329013..1211ae5733 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -177,7 +178,7 @@ export class Bitwarden implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as CollectionUpdateFields;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					const { groups, externalId } = updateFields;
@@ -308,7 +309,7 @@ export class Bitwarden implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as GroupUpdateFields;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					// set defaults for `name` and `accessAll`, required by Bitwarden but optional in n8n
@@ -452,7 +453,7 @@ export class Bitwarden implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as MemberUpdateFields;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					const { accessAll, collections, externalId, type } = updateFields;
diff --git a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
index a46df9d46f..48e739268c 100644
--- a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -48,17 +49,7 @@ export async function bitwardenApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.statusCode === 404) {
-			throw new Error('Bitwarden error response [404]: Not found');
-		}
-
-		if (error?.response?.body?.Message) {
-			const message = error?.response?.body?.Message;
-			throw new Error(`Bitwarden error response [${error.statusCode}]: ${message}`);
-		}
-		//TODO handle Errors array
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -93,7 +84,7 @@ export async function getAccessToken(
 		const { access_token } = await this.helpers.request!(options);
 		return access_token;
 	} catch (error) {
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 8a835451b0..75006e46c2 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -9,6 +9,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -217,11 +218,11 @@ export class Box implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 						//@ts-ignore
 						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -248,7 +249,7 @@ export class Box implements INodeType {
 						const content = this.getNodeParameter('fileContent', i) as string;
 
 						if (fileName === '') {
-							throw new Error('File name must be set!');
+							throw new NodeOperationError(this.getNode(), 'File name must be set!');
 						}
 
 						attributes['name'] = fileName;
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 03cb4a75dc..534f11a993 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -327,7 +327,7 @@ export class BoxTrigger implements INodeType {
 
 					try {
 						await boxApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index 1a586c1df5..1483b7f43d 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -12,6 +12,7 @@ import {
 import {
 	IDataObject,
 	IOAuth2Options,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function boxApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -41,22 +42,7 @@ export async function boxApiRequest(this: IExecuteFunctions | IExecuteSingleFunc
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 
 	} catch (error) {
-
-		let errorMessage;
-
-		if (error.response && error.response.body) {
-
-			if (error.response.body.context_info && error.response.body.context_info.errors) {
-				const errors = error.response.body.context_info.errors;
-				errorMessage = errors.map((e: IDataObject) => e.message);
-				errorMessage = errorMessage.join('|');
-			} else if (error.response.body.message) {
-				errorMessage = error.response.body.message;
-			}
-
-			throw new Error(`Box error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
index f3ae6e48ca..83c404e869 100644
--- a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function brandfetchApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('brandfetchApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -46,20 +46,12 @@ export async function brandfetchApiRequest(this: IHookFunctions | IExecuteFuncti
 		const response = await this.helpers.request!(options);
 
 		if (response.statusCode && response.statusCode !== 200) {
-			throw new Error(`Brandfetch error response [${response.statusCode}]: ${response.response}`);
+			throw new NodeApiError(this.getNode(), response);
 		}
 
 		return response;
 
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Brandfetch error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index 433657bb82..541a90368a 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -153,7 +154,7 @@ export class Bubble implements INodeType {
 						const filter = options.filtersJson as string;
 						const data = validateJSON(filter);
 						if (data === undefined) {
-							throw new Error('Filters must be a valid JSON');
+							throw new NodeOperationError(this.getNode(), 'Filters must be a valid JSON');
 						}
 						qs.constraints = JSON.stringify(data);
 					}
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 72cedfb8b7..981b9e10c8 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -57,11 +58,7 @@ export async function bubbleApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error?.response?.body?.body?.message) {
-			const errorMessage = error.response.body.body.message;
-			throw new Error(`Bubble.io error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 8369ab3ebf..62589964de 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -122,7 +122,7 @@ export class CalendlyTrigger implements INodeType {
 
 					try {
 						await calendlyApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index 464d8a5bfb..d2b1e6acf5 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -8,7 +8,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function calendlyApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -16,7 +18,7 @@ export async function calendlyApiRequest(this: IExecuteFunctions | IWebhookFunct
 	const credentials = this.getCredentials('calendlyApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = 'https://calendly.com/api/v1';
@@ -42,10 +44,6 @@ export async function calendlyApiRequest(this: IExecuteFunctions | IWebhookFunct
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response) {
-			const errorMessage = error.response.body.message || error.response.body.description || error.message;
-			throw new Error(`Calendly error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index 1970910c35..ccbb19b65b 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -4,6 +4,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 	NodeParameterValue,
 } from 'n8n-workflow';
 
@@ -489,7 +491,7 @@ export class Chargebee implements INodeType {
 		const credentials = this.getCredentials('chargebeeApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const baseUrl = `https://${credentials.accountName}.chargebee.com/api/v2`;
@@ -531,7 +533,7 @@ export class Chargebee implements INodeType {
 
 					endpoint = `customers`;
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'invoice') {
@@ -569,7 +571,7 @@ export class Chargebee implements INodeType {
 					const invoiceId = this.getNodeParameter('invoiceId', i) as string;
 					endpoint = `invoices/${invoiceId.trim()}/pdf`;
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'subscription') {
@@ -595,10 +597,10 @@ export class Chargebee implements INodeType {
 
 					endpoint = `subscriptions/${subscriptionId.trim()}/delete`;
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const options = {
@@ -613,7 +615,13 @@ export class Chargebee implements INodeType {
 				json: true,
 			};
 
-			const responseData = await this.helpers.request!(options);
+			let responseData;
+
+			try {
+				responseData = await this.helpers.request!(options);
+			} catch (error) {
+				throw new NodeApiError(this.getNode(), error);
+			}
 
 			if (resource === 'invoice' && operation === 'list') {
 				responseData.list.forEach((data: IDataObject) => {
diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
index 9548586fde..3e40012303 100644
--- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
@@ -10,13 +10,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function circleciApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('circleCiApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: {
@@ -35,14 +35,9 @@ export async function circleciApiRequest(this: IHookFunctions | IExecuteFunction
 	}
 	try {
 		return await this.helpers.request!(options);
-	} catch (err) {
-		if (err.response && err.response.body && err.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`CircleCI error response [${err.statusCode}]: ${err.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw err;	}
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
 }
 
 /**
diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
index e22d0e607e..1dc18b0482 100644
--- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
@@ -9,14 +9,12 @@ import {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import {
-	IDataObject,
-} from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function clearbitApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, api: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('clearbitApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: { Authorization: `Bearer ${credentials.apiKey}` },
@@ -33,17 +31,6 @@ export async function clearbitApiRequest(this: IHookFunctions | IExecuteFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Clearbit credentials are not valid!');
-		}
-
-		if (error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Clearbit Error [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw new Error('Clearbit Error: ' + error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 14628f6c5d..09d4dfc97b 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -719,14 +720,14 @@ export class ClickUp implements INodeType {
 					};
 					if (type === 'number' || type === 'currency') {
 						if (!additionalFields.unit) {
-							throw new Error('Unit field must be set');
+							throw new NodeOperationError(this.getNode(), 'Unit field must be set');
 						}
 					}
 					if (type === 'number' || type === 'percentaje'
 						|| type === 'automatic' || type === 'currency') {
 						if (additionalFields.stepsStart === undefined
 							|| !additionalFields.stepsEnd === undefined) {
-							throw new Error('Steps start and steps end fields must be set');
+							throw new NodeOperationError(this.getNode(), 'Steps start and steps end fields must be set');
 						}
 					}
 					if (additionalFields.unit) {
@@ -845,7 +846,7 @@ export class ClickUp implements INodeType {
 					if (additionalFields.customFieldsJson) {
 						const customFields = validateJSON(additionalFields.customFieldsJson as string);
 						if (customFields === undefined) {
-							throw new Error('Custom Fields: Invalid JSON');
+							throw new NodeOperationError(this.getNode(), 'Custom Fields: Invalid JSON');
 						}
 						body.custom_fields = customFields;
 					}
@@ -1042,7 +1043,7 @@ export class ClickUp implements INodeType {
 					if (jsonParse === true) {
 						body.value = validateJSON(body.value);
 						if (body.value === undefined) {
-							throw new Error('Value is invalid JSON!');
+							throw new NodeOperationError(this.getNode(), 'Value is invalid JSON!');
 						}
 					} else {
 						//@ts-ignore
@@ -1213,7 +1214,7 @@ export class ClickUp implements INodeType {
 					if (responseData.data) {
 						responseData = responseData.data;
 					} else {
-						throw new Error('There seems to be nothing to stop.');
+						throw new NodeOperationError(this.getNode(), 'There seems to be nothing to stop.');
 					}
 				}
 				if (operation === 'delete') {
@@ -1233,7 +1234,7 @@ export class ClickUp implements INodeType {
 					if (tagsUi) {
 						const tags = (tagsUi as IDataObject).tagsValues as IDataObject[];
 						if (tags === undefined) {
-							throw new Error('At least one tag must be set');
+							throw new NodeOperationError(this.getNode(), 'At least one tag must be set');
 						}
 						body.tags = tags;
 					}
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index 0de73a430b..7213056fe8 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -13,8 +13,10 @@ import {
 import {
 	IDataObject,
 	IOAuth2Options,
+	NodeApiError,
 } from 'n8n-workflow';
 
+
 export async function clickupApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const options: OptionsWithUri = {
 		headers: {
@@ -34,15 +36,10 @@ export async function clickupApiRequest(this: IHookFunctions | IExecuteFunctions
 
 			const credentials = this.getCredentials('clickUpApi');
 
-			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
-			}
-
-			options.headers!['Authorization'] = credentials.accessToken;
+			options.headers!['Authorization'] = credentials?.accessToken;
 			return await this.helpers.request!(options);
 
 		} else {
-
 			const oAuth2Options: IOAuth2Options = {
 				keepBearer: false,
 				tokenType: 'Bearer',
@@ -50,15 +47,9 @@ export async function clickupApiRequest(this: IHookFunctions | IExecuteFunctions
 			// @ts-ignore
 			return await this.helpers.requestOAuth2!.call(this, 'clickUpOAuth2Api', options, oAuth2Options);
 		}
-
-	} catch (error) {
-		let errorMessage = error;
-		if (error.err) {
-			errorMessage = error.err;
-		}
-		throw new Error('ClickUp Error: ' + errorMessage);
+	} catch(error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
-
 }
 
 export async function clickupApiRequestAllItems(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, resource: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
diff --git a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
index b8288427c3..e8fc43e6c4 100644
--- a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunctions | IExecuteFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -17,7 +17,7 @@ export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunc
 	const credentials = this.getCredentials('clockifyApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 
 	}
 	const BASE_URL = 'https://api.clockify.me/api/v1';
@@ -36,20 +36,9 @@ export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunc
 	};
 
 	try {
-
 		return await this.helpers.request!(options);
-
 	} catch (error) {
-
-		let errorMessage = error.message;
-
-		if (error.response.body && error.response.body.message) {
-
-			errorMessage = `[${error.statusCode}] ${error.response.body.message}`;
-
-		}
-
-		throw new Error('Clockify Error: ' + errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
index 65a5c2005c..5e34e76615 100644
--- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
@@ -3,14 +3,14 @@ import {
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 import { OptionsWithUri } from 'request';
 
 export async function cockpitApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('cockpitApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials available.');
+		throw new NodeOperationError(this.getNode(), 'No credentials available.');
 	}
 
 	let options: OptionsWithUri = {
@@ -36,12 +36,7 @@ export async function cockpitApiRequest(this: IExecuteFunctions | IExecuteSingle
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.error) {
-			errorMessage = error.error.message || error.error.error;
-		}
-
-		throw new Error(`Cockpit error [${error.statusCode}]: ` + errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index f360b825b1..b53af362ed 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -8,6 +8,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	codaApiRequest,
@@ -338,8 +340,8 @@ export class Coda implements INodeType {
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {}, qs);
 						responseData = responseData.items;
 					}
-				} catch (err) {
-					throw new Error(`Coda Error: ${err.message}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 
 				if (options.rawData === true) {
@@ -540,8 +542,8 @@ export class Coda implements INodeType {
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {}, qs);
 						responseData = responseData.items;
 					}
-				} catch (err) {
-					throw new Error(`Coda Error: ${err.message}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 
 				if (options.rawData === true) {
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index b9270b5151..2dd7691150 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -4,12 +4,12 @@ import {
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function codaApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('codaApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -28,12 +28,7 @@ export async function codaApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response.body) {
-			errorMessage = error.response.body.message || error.response.body.Message || error.message;
-		}
-
-		throw new Error('Coda Error: ' + errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index d5f3e0b51a..73c35b56eb 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function coinGeckoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string,
@@ -37,8 +37,7 @@ export async function coinGeckoApiRequest(this: IExecuteFunctions | IExecuteSing
 		return await this.helpers.request.call(this, options);
 
 	} catch (error) {
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Compression.node.ts b/packages/nodes-base/nodes/Compression.node.ts
index 920570cc22..80ac7f0e6f 100644
--- a/packages/nodes-base/nodes/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as fflate from 'fflate';
@@ -216,11 +217,11 @@ export class Compression implements INodeType {
 
 				for (const [index, binaryPropertyName] of binaryPropertyNames.entries()) {
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 					//@ts-ignore
 					if (items[i].binary[binaryPropertyName] === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -270,11 +271,11 @@ export class Compression implements INodeType {
 				for (const [index, binaryPropertyName] of binaryPropertyNames.entries()) {
 
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 					//@ts-ignore
 					if (items[i].binary[binaryPropertyName] === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index f5a25b8c42..24cf806560 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -9,14 +9,14 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function contentfulApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const credentials = this.getCredentials('contentfulApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const source = this.getNodeParameter('source', 0) as string;
@@ -39,7 +39,7 @@ export async function contentfulApiRequest(this: IExecuteFunctions | IExecuteSin
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error(`Contentful error response [${error.statusCode}]: ${error.error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 
 }
diff --git a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
index 2f034f6892..50741c267a 100644
--- a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
@@ -10,7 +10,9 @@ import {
 
 import {
 	IDataObject,
-	IHookFunctions
+	IHookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function convertKitApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
@@ -19,7 +21,7 @@ export async function convertKitApiRequest(this: IExecuteFunctions | IExecuteSin
 	const credentials = this.getCredentials('convertKitApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -51,17 +53,8 @@ export async function convertKitApiRequest(this: IExecuteFunctions | IExecuteSin
 	}
 
 	try {
-
 		return await this.helpers.request!(options);
-
 	} catch (error) {
-
-		let errorMessage = error;
-
-		if (error.response && error.response.body && error.response.body.message) {
-			errorMessage = error.response.body.message;
-		}
-
-		throw new Error(`ConvertKit error response: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
index cfaf575f38..eaf48ed1ee 100644
--- a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
+++ b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
@@ -116,7 +116,7 @@ export class CopperTrigger implements INodeType {
 				const endpoint = `/webhooks/${webhookData.webhookId}`;
 				try {
 					await copperApiRequest.call(this, 'GET', endpoint);
-				} catch (err) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 2fbf4f315d..8d91f53285 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -17,6 +17,7 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -72,12 +73,7 @@ export async function copperApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response.body?.message) {
-			errorMessage = error.response.body.message;
-		}
-
-		throw new Error(`Copper error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 27a2d2c9e1..d2b934fcdc 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -23,6 +23,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -231,13 +232,13 @@ export class Cortex implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const fileBufferData = Buffer.from(item.binary[binaryPropertyName].data, BINARY_ENCODING);
@@ -386,13 +387,13 @@ export class Cortex implements INodeType {
 											const item = items[i];
 
 											if (item.binary === undefined) {
-												throw new Error('No binary data exists on item!');
+												throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 											}
 
 											const binaryPropertyName = artifactvalue.binaryProperty as string;
 
 											if (item.binary[binaryPropertyName] === undefined) {
-												throw new Error(`No binary data property '${binaryPropertyName}' does not exists on item!`);
+												throw new NodeOperationError(this.getNode(), `No binary data property '${binaryPropertyName}' does not exists on item!`);
 											}
 
 											const binaryData = item.binary[binaryPropertyName] as IBinaryData;
@@ -415,12 +416,12 @@ export class Cortex implements INodeType {
 								const item = items[i];
 
 								if (item.binary === undefined) {
-									throw new Error('No binary data exists on item!');
+									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 								}
 
 								const binaryPropertyName = (body.data as IDataObject).binaryPropertyName as string;
 								if (item.binary[binaryPropertyName] === undefined) {
-									throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+									throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 								}
 
 								const fileBufferData = Buffer.from(item.binary[binaryPropertyName].data, BINARY_ENCODING);
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index c0945e932b..a44837b77f 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -16,7 +16,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment';
@@ -26,7 +26,7 @@ export async function cortexApiRequest(this: IHookFunctions | IExecuteFunctions
 	const credentials = this.getCredentials('cortexApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const headerWithAuthentication = Object.assign({}, { Authorization: ` Bearer ${credentials.cortexApiKey}` });
@@ -53,10 +53,7 @@ export async function cortexApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.error) {
-			const errorMessage = `Cortex error response [${error.statusCode}]: ${error.error.message}`;
-			throw new Error(errorMessage);
-		} else throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index a93c0c222d..a2577282b8 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -188,7 +189,7 @@ export class CrateDb implements INodeType {
 		const credentials = this.getCredentials('crateDb');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const pgp = pgPromise();
@@ -262,7 +263,7 @@ export class CrateDb implements INodeType {
 				updateKeyValue = item.json[updateKey] as string | number;
 
 				if (updateKeyValue === undefined) {
-					throw new Error('No value found for update key!');
+					throw new NodeOperationError(this.getNode(), 'No value found for update key!');
 				}
 
 				updatedKeys.push(updateKeyValue as string);
@@ -277,7 +278,7 @@ export class CrateDb implements INodeType {
 			returnItems = this.helpers.returnJsonArray(getItemCopy(items, columns) as IDataObject[]);
 		} else {
 			await pgp.end();
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		// Close the connection
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index f97efc052f..fd6f6f6146 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -6,6 +6,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	customerIoApiRequest,
@@ -131,7 +132,7 @@ export class CustomerIo implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 					} else {
@@ -175,7 +176,7 @@ export class CustomerIo implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 					} else {
@@ -238,7 +239,7 @@ export class CustomerIo implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 					} else {
@@ -283,7 +284,7 @@ export class CustomerIo implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 					} else {
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index eb258a20be..070df18dc3 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -308,7 +308,7 @@ export class CustomerIoTrigger implements INodeType {
 					const endpoint = `/reporting_webhooks/${webhookData.webhookId}`;
 					try {
 						await customerIoApiRequest.call(this, 'DELETE', endpoint, {}, 'beta');
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					delete webhookData.webhookId;
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index c58bea8883..609baeb52d 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -20,7 +20,7 @@ export async function customerIoApiRequest(this: IHookFunctions | IExecuteFuncti
 	const credentials = this.getCredentials('customerIoApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -51,19 +51,7 @@ export async function customerIoApiRequest(this: IHookFunctions | IExecuteFuncti
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Customer.io credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error_code) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Customer.io error response [${errorBody.error_code}]: ${errorBody.description}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/DateTime.node.ts b/packages/nodes-base/nodes/DateTime.node.ts
index 019ff3d4a5..a5dabb43a0 100644
--- a/packages/nodes-base/nodes/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -244,7 +245,7 @@ export class DateTime implements INodeType {
 					continue;
 				}
 				if (options.fromFormat === undefined && !moment(currentDate as string | number).isValid()) {
-					throw new Error('The date input format could not be recognized. Please set the "From Format" field');
+					throw new NodeOperationError(this.getNode(), 'The date input format could not be recognized. Please set the "From Format" field');
 				}
 
 				if (Number.isInteger(currentDate as unknown as number)) {
diff --git a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
index 7b8f9a1004..0baa69665a 100644
--- a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function deepLApiRequest(
@@ -45,7 +45,7 @@ export async function deepLApiRequest(
 		const credentials = this.getCredentials('deepLApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		options.qs.auth_key = credentials.apiKey;
@@ -53,10 +53,6 @@ export async function deepLApiRequest(
 		return await this.helpers.request!(options);
 
 	} catch (error) {
-		if (error?.response?.body?.message) {
-			// Try to return the error prettier
-			throw new Error(`DeepL error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Demio/GenericFunctions.ts b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
index 3d96faacca..04b7a9d6cc 100644
--- a/packages/nodes-base/nodes/Demio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function demioApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('demioApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -35,14 +35,6 @@ export async function demioApiRequest(this: IHookFunctions | IExecuteFunctions |
 
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Demio error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index 995c0e7e08..36531aa9c3 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -5,6 +5,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export class Discord implements INodeType {
@@ -86,15 +88,14 @@ export class Discord implements INodeType {
 							}, get(error, 'response.body.retry_after', 150));
 						});
 					} else {
-						// If it's another error code then return the JSON response
-						throw error;
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 
 			} while (--maxTries);
 
 			if (maxTries <= 0) {
-				throw new Error('Could not send message. Max. amount of rate-limit retries got reached.');
+				throw new NodeApiError(this.getNode(), { request: options }, { message: 'Could not send message. Max. amount of rate-limit retries got reached.' });
 			}
 
 			returnData.push({success: true});
diff --git a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
index 0a8057bd08..a5c5acd55e 100644
--- a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function discourseApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -35,15 +35,7 @@ export async function discourseApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			const errors = error.response.body.errors;
-			// Try to return the error prettier
-			throw new Error(
-				`Discourse error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index 8278f39970..dc92b80fb6 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -6,6 +6,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { disqusApiRequest, disqusApiRequestAllItems } from './GenericFunctions';
@@ -771,11 +772,11 @@ export class Disqus implements INodeType {
 					}
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index b9bb22207f..2b1414989c 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function disqusApiRequest(
 		this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
@@ -19,7 +19,7 @@ export async function disqusApiRequest(
 	const credentials = this.getCredentials('disqusApi') as IDataObject;
 	qs.api_key = credentials.accessToken;
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	// Convert to query string into a format the API can read
@@ -46,21 +46,9 @@ export async function disqusApiRequest(
 		delete options.body;
 	}
 	try {
-		const result = await this.helpers.request!(options);
-		return result;
+		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Disqus credentials are not valid!');
-		}
-
-		if (error.error && error.error.error_summary) {
-			// Try to return the error prettier
-			throw new Error(`Disqus error response [${error.statusCode}]: ${error.error.error_summary}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Drift/GenericFunctions.ts b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
index f021a01d37..9b288c04eb 100644
--- a/packages/nodes-base/nodes/Drift/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
@@ -8,7 +8,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function driftApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,7 +38,7 @@ export async function driftApiRequest(this: IExecuteFunctions | IWebhookFunction
 			const credentials = this.getCredentials('driftApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `Bearer ${credentials.accessToken}`;
@@ -46,11 +48,6 @@ export async function driftApiRequest(this: IExecuteFunctions | IWebhookFunction
 			return await this.helpers.requestOAuth2!.call(this, 'driftOAuth2Api', options);
 		}
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.error) {
-			const errorMessage = error.response.body.error.message;
-			throw new Error(`Drift error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 17be478c36..fcb3b2f7a5 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -849,13 +850,13 @@ export class Dropbox implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						body = Buffer.from(item.binary[propertyNameUpload].data, BINARY_ENCODING);
@@ -980,7 +981,7 @@ export class Dropbox implements INodeType {
 					endpoint = 'https://api.dropboxapi.com/2/files/move_v2';
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			if (resource === 'file' && operation === 'download') {
diff --git a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
index ca7e4829bb..caf476bee9 100644
--- a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 /**
@@ -51,20 +51,7 @@ export async function dropboxApiRequest(this: IHookFunctions | IExecuteFunctions
 			return await this.helpers.requestOAuth2.call(this, 'dropboxOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Dropbox credentials are not valid!');
-		}
-
-		if (error.error && error.error.error_summary) {
-			// Try to return the error prettier
-			throw new Error(
-				`Dropbox error response [${error.statusCode}]: ${error.error.error_summary}`,
-			);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index b5fc28a8bb..befe2af7c8 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -206,7 +207,7 @@ export class ERPNext implements INodeType {
 					const properties = this.getNodeParameter('properties', i) as DocumentProperties;
 
 					if (!properties.customProperty.length) {
-						throw new Error('Please enter at least one property for the document to create.');
+						throw new NodeOperationError(this.getNode(), 'Please enter at least one property for the document to create.');
 					}
 
 					properties.customProperty.forEach(property => {
@@ -242,7 +243,7 @@ export class ERPNext implements INodeType {
 					const properties = this.getNodeParameter('properties', i) as DocumentProperties;
 
 					if (!properties.customProperty.length) {
-						throw new Error('Please enter at least one property for the document to update.');
+						throw new NodeOperationError(this.getNode(), 'Please enter at least one property for the document to update.');
 					}
 
 					properties.customProperty.forEach(property => {
diff --git a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
index b8da3d99d6..08de44e8e0 100644
--- a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
@@ -10,7 +10,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError
 } from 'n8n-workflow';
 
 export async function erpNextApiRequest(
@@ -26,7 +28,7 @@ export async function erpNextApiRequest(
 	const credentials = this.getCredentials('erpNextApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -56,27 +58,15 @@ export async function erpNextApiRequest(
 	} catch (error) {
 
 		if (error.statusCode === 403) {
-			throw new Error(
-				`ERPNext error response [${error.statusCode}]: DocType unavailable.`,
-			);
+			throw new NodeApiError(this.getNode(), { message: `DocType unavailable.` });
 		}
 
 		if (error.statusCode === 307) {
-			throw new Error(
-				`ERPNext error response [${error.statusCode}]: Please ensure the subdomain is correct.`,
-			);
+			throw new NodeApiError(this.getNode(), { message:`Please ensure the subdomain is correct.` });
 		}
 
-		let errorMessages;
-		if (error?.response?.body?._server_messages) {
-			const errors = JSON.parse(error.response.body._server_messages);
-			errorMessages = errors.map((e: string) => JSON.parse(e).message);
-			throw new Error(
-				`ARPNext error response [${error.statusCode}]: ${errorMessages.join('|')}`,
-			);
-		}
+		throw new NodeApiError(this.getNode(), error);
 
-		throw error;
 	}
 }
 
diff --git a/packages/nodes-base/nodes/EditImage.node.ts b/packages/nodes-base/nodes/EditImage.node.ts
index 0c871e01e8..f23f42bb7b 100644
--- a/packages/nodes-base/nodes/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import * as gm from 'gm';
 import { file } from 'tmp-promise';
@@ -1041,7 +1042,7 @@ export class EditImage implements INodeType {
 				requiredOperationParameters[operation].forEach(parameterName => {
 					try {
 						operationParameters[parameterName] = this.getNodeParameter(parameterName, itemIndex);
-					} catch (e) {}
+					} catch (error) {}
 				});
 
 				operations = [
@@ -1055,11 +1056,11 @@ export class EditImage implements INodeType {
 			if (operations[0].operation !== 'create') {
 				// "create" generates a new image so does not require any incoming data.
 				if (item.binary === undefined) {
-					throw new Error('Item does not contain any binary data.');
+					throw new NodeOperationError(this.getNode(), 'Item does not contain any binary data.');
 				}
 
 				if (item.binary[dataPropertyName as string] === undefined) {
-					throw new Error(`Item does not contain any binary data with the name "${dataPropertyName}".`);
+					throw new NodeOperationError(this.getNode(), `Item does not contain any binary data with the name "${dataPropertyName}".`);
 				}
 
 				gmInstance = gm(Buffer.from(item.binary![dataPropertyName as string].data, BINARY_ENCODING));
@@ -1095,7 +1096,7 @@ export class EditImage implements INodeType {
 					const geometryString = (positionX >= 0 ? '+' : '') + positionX + (positionY >= 0 ? '+' : '') + positionY;
 
 					if (item.binary![operationData.dataPropertyNameComposite as string] === undefined) {
-						throw new Error(`Item does not contain any binary data with the name "${operationData.dataPropertyNameComposite}".`);
+						throw new NodeOperationError(this.getNode(), `Item does not contain any binary data with the name "${operationData.dataPropertyNameComposite}".`);
 					}
 
 					const { fd, path, cleanup } = await file();
diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
index 7694223ed9..e7447d9084 100644
--- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 interface IContact {
@@ -58,20 +58,7 @@ export async function egoiApiRequest(this: IHookFunctions | IExecuteFunctions |
 		return await this.helpers.request!(options);
 
 	} catch (error) {
-		let errorMessage;
-
-		if (error.response && error.response.body) {
-
-			if (Array.isArray(error.response.body.errors)) {
-				const errors = error.response.body.errors;
-				errorMessage = errors.map((e: IDataObject) => e.detail);
-			} else {
-				errorMessage = error.response.body.detail;
-			}
-
-			throw new Error(`e-goi Error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index 62fdfce194..fed766849d 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -168,7 +169,7 @@ export class EmailReadImap implements INodeType {
 		const credentials = this.getCredentials('imap');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const mailbox = this.getNodeParameter('mailbox') as string;
@@ -181,8 +182,8 @@ export class EmailReadImap implements INodeType {
 		if (options.customEmailConfig !== undefined) {
 			try {
 				searchCriteria = JSON.parse(options.customEmailConfig as string);
-			} catch (err) {
-				throw new Error(`Custom email config is not valid JSON.`);
+			} catch (error) {
+				throw new NodeOperationError(this.getNode(), `Custom email config is not valid JSON.`);
 			}
 		}
 
@@ -279,7 +280,7 @@ export class EmailReadImap implements INodeType {
 					const part = lodash.find(message.parts, { which: '' });
 
 					if (part === undefined) {
-						throw new Error('Email part could not be parsed.');
+						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
 					}
 					const parsedEmail = await parseRawEmail.call(this, part.body, dataPropertyAttachmentsPrefixName);
 
@@ -337,7 +338,7 @@ export class EmailReadImap implements INodeType {
 					const part = lodash.find(message.parts, { which: 'TEXT' });
 
 					if (part === undefined) {
-						throw new Error('Email part could not be parsed.');
+						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
 					}
 					// Return base64 string
 					newEmail = {
diff --git a/packages/nodes-base/nodes/EmailSend.node.ts b/packages/nodes-base/nodes/EmailSend.node.ts
index 6028d6c547..cbe1dd5cbe 100644
--- a/packages/nodes-base/nodes/EmailSend.node.ts
+++ b/packages/nodes-base/nodes/EmailSend.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { createTransport } from 'nodemailer';
@@ -148,7 +149,7 @@ export class EmailSend implements INodeType {
 			const credentials = this.getCredentials('smtp');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const connectionOptions: SMTPTransport.Options = {
diff --git a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
index e5577b9680..916da27c98 100644
--- a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 import {
 	IHookFunctions,
 	INodePropertyOptions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 /**
@@ -18,7 +19,7 @@ export async function emeliaGraphqlRequest(
 	const response = await emeliaApiRequest.call(this, 'POST', '/graphql', body);
 
 	if (response.errors) {
-		throw new Error(`Emelia error message: ${response.errors[0].message}`);
+		throw new NodeApiError(this.getNode(), response);
 	}
 
 	return response;
@@ -48,19 +49,9 @@ export async function emeliaApiRequest(
 	};
 
 	try {
-
 		return await this.helpers.request!.call(this, options);
-
 	} catch (error) {
-
-		if (error?.response?.body?.error) {
-			const { error: errorMessage } = error.response.body;
-			throw new Error(
-				`Emelia error response [${error.statusCode}]: ${errorMessage}`,
-			);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
index 26d8d7c2b1..95cd14ab37 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
@@ -10,6 +10,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -292,7 +293,7 @@ export class EventbriteTrigger implements INodeType {
 		const req = this.getRequestObject();
 
 		if (req.body.api_url === undefined) {
-			throw new Error('The received data does not contain required "api_url" property!');
+			throw new NodeApiError(this.getNode(), req.body, { message: 'The received data does not contain required "api_url" property!' });
 		}
 
 		const resolveData = this.getNodeParameter('resolveData', false) as boolean;
diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
index 3916aece69..8490896b1e 100644
--- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -34,7 +34,7 @@ export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFuncti
 		if (authenticationMethod === 'privateKey') {
 			const credentials = this.getCredentials('eventbriteApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `Bearer ${credentials.apiKey}`;
@@ -44,11 +44,7 @@ export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFuncti
 			return await this.helpers.requestOAuth2!.call(this, 'eventbriteOAuth2Api', options);
 		}
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response.body && error.response.body.error_description) {
-			errorMessage = error.response.body.error_description;
-		}
-		throw new Error('Eventbrite Error: ' + errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
index 4e49883310..e4883cd4e8 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
@@ -12,6 +12,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWorkflowBase,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -164,7 +165,7 @@ export class ExecuteWorkflow implements INodeType {
 				workflowJson = await fsReadFileAsync(workflowPath, { encoding: 'utf8' }) as string;
 			} catch (error) {
 				if (error.code === 'ENOENT') {
-					throw new Error(`The file "${workflowPath}" could not be found.`);
+					throw new NodeOperationError(this.getNode(), `The file "${workflowPath}" could not be found.`);
 				}
 
 				throw error;
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 1b5582de7f..0beabbb9b6 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -365,7 +367,7 @@ export class FacebookGraphApi implements INodeType {
 			if (sendBinaryData) {
 				const item = items[itemIndex];
 				if (item.binary === undefined) {
-					throw new Error('No binary data exists on item!');
+					throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 				}
 
 				const binaryPropertyNameFull = this.getNodeParameter('binaryPropertyName', itemIndex) as string;
@@ -379,7 +381,7 @@ export class FacebookGraphApi implements INodeType {
 				}
 
 				if (item.binary[binaryPropertyName] === undefined) {
-					throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+					throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 				}
 
 				const binaryProperty = item.binary[binaryPropertyName] as IBinaryData;
@@ -400,7 +402,7 @@ export class FacebookGraphApi implements INodeType {
 				response = await this.helpers.request(requestOptions);
 			} catch (error) {
 				if (this.continueOnFail() === false) {
-					throw error;
+					throw new NodeApiError(this.getNode(), error);
 				}
 
 				let errorItem;
@@ -425,7 +427,7 @@ export class FacebookGraphApi implements INodeType {
 
 			if (typeof response === 'string') {
 				if (this.continueOnFail() === false) {
-					throw new Error('Response body is not valid JSON.');
+					throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON.');
 				}
 
 				returnItems.push({ json: { message: response } });
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 278ca729bc..d532bfc1a9 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import * as uuid from 'uuid/v4';
@@ -192,7 +193,7 @@ export class FacebookTrigger implements INodeType {
 
 				if (responseData.success !== true) {
 					// Facebook did not return success, so something went wrong
-					throw new Error('Facebook webhook creation response did not contain the expected data.');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'Facebook webhook creation response did not contain the expected data.' });
 				}
 				return true;
 			},
@@ -202,7 +203,7 @@ export class FacebookTrigger implements INodeType {
 
 				try {
 					await facebookApiRequest.call(this, 'DELETE', `/${appId}/subscriptions`, { object: snakeCase(object) });
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index 20e16ecf49..609cc14042 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function facebookApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -41,13 +41,6 @@ export async function facebookApiRequest(this: IHookFunctions | IExecuteFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response.body && error.response.body.error) {
-			const message = error.response.body.error.message;
-			throw new Error(
-				`Facebook Trigger error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw new Error(error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 5efa053cb4..402ff35f9d 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData, INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -680,8 +681,8 @@ export class FileMaker implements INodeType {
 
 				try {
 					returnData = await layoutsApiRequest.call(this);
-				} catch (err) {
-					throw new Error(`FileMaker Error: ${err}`);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), `FileMaker Error: ${error}`);
 				}
 
 				return returnData;
@@ -696,8 +697,8 @@ export class FileMaker implements INodeType {
 				let layouts;
 				try {
 					layouts = await layoutsApiRequest.call(this);
-				} catch (err) {
-					throw new Error(`FileMaker Error: ${err}`);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), `FileMaker Error: ${error}`);
 				}
 				for (const layout of layouts) {
 					returnData.push({
@@ -714,8 +715,8 @@ export class FileMaker implements INodeType {
 				let fields;
 				try {
 					fields = await getFields.call(this);
-				} catch (err) {
-					throw new Error(`FileMaker Error: ${err}`);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), `FileMaker Error: ${error}`);
 				}
 				for (const field of fields) {
 					returnData.push({
@@ -732,8 +733,8 @@ export class FileMaker implements INodeType {
 				let scripts;
 				try {
 					scripts = await getScripts.call(this);
-				} catch (err) {
-					throw new Error(`FileMaker Error: ${err}`);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), `FileMaker Error: ${error}`);
 				}
 				for (const script of scripts) {
 					if (!script.isFolder) {
@@ -752,8 +753,8 @@ export class FileMaker implements INodeType {
 				let portals;
 				try {
 					portals = await getPortals.call(this);
-				} catch (err) {
-					throw new Error(`FileMaker Error: ${err}`);
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), `FileMaker Error: ${error}`);
 				}
 				Object.keys(portals).forEach((portal) => {
 					returnData.push({
@@ -775,14 +776,14 @@ export class FileMaker implements INodeType {
 		const credentials = this.getCredentials('fileMaker');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		let token;
 		try {
 			token = await getToken.call(this);
-		} catch (e) {
-			throw new Error(`Login fail: ${e}`);
+		} catch (error) {
+			throw new NodeOperationError(this.getNode(), `Login fail: ${error}`);
 		}
 
 		let requestOptions: OptionsWithUri;
@@ -886,7 +887,7 @@ export class FileMaker implements INodeType {
 						...parseScripts.call(this, i),
 					};
 				} else {
-					throw new Error(`The action "${action}" is not implemented yet!`);
+					throw new NodeOperationError(this.getNode(), `The action "${action}" is not implemented yet!`);
 				}
 
 				// Now that the options are all set make the actual http request
@@ -898,13 +899,18 @@ export class FileMaker implements INodeType {
 				}
 
 				if (typeof response === 'string') {
-					throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+					throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 				}
 				returnData.push({json: response});
 			}
 		} catch (error) {
 			await logout.call(this, token);
-			throw new Error(`The action "${error.message}" is not implemented yet!`);
+
+			if (error.node) {
+				throw error;
+			}
+
+			throw new NodeOperationError(this.getNode(), `The action "${error.message}" is not implemented yet!`);
 		}
 
 		return this.prepareOutputData(returnData);
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index d11047b41b..f2f979cb5f 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject, INodePropertyOptions,
+	IDataObject, INodePropertyOptions, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {OptionsWithUri} from 'request';
@@ -42,7 +42,7 @@ export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFu
 	const credentials = this.getCredentials('fileMaker');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const host = credentials.host as string;
 	const db = credentials.db as string;
@@ -63,8 +63,7 @@ export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFu
 		items.sort((a, b) => a.name > b.name ? 0 : 1);
 		return items;
 	} catch (error) {
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -94,7 +93,7 @@ export async function getFields(this: ILoadOptionsFunctions): Promise<any> { //
 	const layout = this.getCurrentNodeParameter('layout') as string;
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const host = credentials.host as string;
 	const db = credentials.db as string;
@@ -130,7 +129,7 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { //
 	const layout = this.getCurrentNodeParameter('layout') as string;
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const host = credentials.host as string;
 	const db = credentials.db as string;
@@ -165,7 +164,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { //
 	const credentials = this.getCredentials('fileMaker');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const host = credentials.host as string;
 	const db = credentials.db as string;
@@ -210,7 +209,7 @@ function parseScriptsList(scripts: ScriptObject[]): INodePropertyOptions[] {
 export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('fileMaker');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const host = credentials.host as string;
@@ -247,28 +246,19 @@ export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions |
 		const response = await this.helpers.request!(requestOptions);
 
 		if (typeof response === 'string') {
-			throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+			throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 		}
 
 		return response.response.token;
 	} catch (error) {
-		let errorMessage;
-		if (error.response) {
-			errorMessage = error.response.body.messages[0].message + '(' + error.response.body.messages[0].message + ')';
-		} else {
-			errorMessage = `${error.message} (${error.name})`;
-		}
-		if (errorMessage !== undefined) {
-			throw errorMessage;
-		}
-		throw error.message;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
 export async function logout(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, token: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('fileMaker');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const host = credentials.host as string;
@@ -290,7 +280,7 @@ export async function logout(this: ILoadOptionsFunctions | IExecuteFunctions | I
 		const response = await this.helpers.request!(requestOptions);
 
 		if (typeof response === 'string') {
-			throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+			throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 		}
 
 		return response;
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index eb6f6728f0..79bc09f985 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -6,6 +6,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	flowApiRequest,
@@ -64,7 +66,7 @@ export class Flow implements INodeType {
 		const credentials = this.getCredentials('flowApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const items = this.getInputData();
@@ -135,8 +137,8 @@ export class Flow implements INodeType {
 					try {
 						responseData = await flowApiRequest.call(this, 'POST', '/tasks', body);
 						responseData = responseData.task;
-					} catch (err) {
-						throw new Error(`Flow Error: ${err.message}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_update-a-task
@@ -203,8 +205,8 @@ export class Flow implements INodeType {
 					try {
 						responseData = await flowApiRequest.call(this, 'PUT', `/tasks/${taskId}`, body);
 						responseData = responseData.task;
-					} catch (err) {
-						throw new Error(`Flow Error: ${err.message}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_get-task
@@ -217,8 +219,8 @@ export class Flow implements INodeType {
 					}
 					try {
 						responseData = await flowApiRequest.call(this,'GET', `/tasks/${taskId}`, {}, qs);
-					} catch (err) {
-						throw new Error(`Flow Error: ${err.message}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_get-tasks
@@ -261,8 +263,8 @@ export class Flow implements INodeType {
 							responseData = await flowApiRequest.call(this, 'GET', '/tasks', {}, qs);
 							responseData = responseData.tasks;
 						}
-					} catch (err) {
-						throw new Error(`Flow Error: ${err.message}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index e9b7240888..062dbe1630 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -111,7 +112,7 @@ export class FlowTrigger implements INodeType {
 				const credentials = this.getCredentials('flowApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				let webhooks;
@@ -128,8 +129,8 @@ export class FlowTrigger implements INodeType {
 				try {
 					webhooks = await flowApiRequest.call(this, 'GET', endpoint, {}, qs);
 					webhooks = webhooks.integration_webhooks;
-				} catch (e) {
-					throw e;
+				} catch (error) {
+					throw error;
 				}
 				for (const webhook of webhooks) {
 					// @ts-ignore
@@ -145,7 +146,7 @@ export class FlowTrigger implements INodeType {
 				const credentials = this.getCredentials('flowApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				let resourceIds, body, responseData;
@@ -189,7 +190,7 @@ export class FlowTrigger implements INodeType {
 				const credentials = this.getCredentials('flowApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				const qs: IDataObject = {};
@@ -202,7 +203,7 @@ export class FlowTrigger implements INodeType {
 						const endpoint = `/integration_webhooks/${webhookId}`;
 						try {
 							await flowApiRequest.call(this, 'DELETE', endpoint, {}, qs);
-						} catch (e) {
+						} catch (error) {
 							return false;
 						}
 					}
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 20d045385a..447d9eca06 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -5,12 +5,12 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function flowApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('flowApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -29,12 +29,7 @@ export async function flowApiRequest(this: IHookFunctions | IExecuteFunctions |
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response.body) {
-			errorMessage = error.response.body.message || error.response.body.Message || error.message;
-		}
-
-		throw new Error(errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 3b7d26f405..57f6aa1041 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -5,6 +5,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1169,7 +1170,7 @@ export class Freshdesk implements INodeType {
 					if (requester === 'requesterId') {
 						// @ts-ignore
 						if (isNaN(value)) {
-							throw new Error('Requester Id must be a number');
+							throw new NodeOperationError(this.getNode(), 'Requester Id must be a number');
 						}
 						body.requester_id = parseInt(value, 10);
 					} else if (requester === 'email') {
@@ -1254,7 +1255,7 @@ export class Freshdesk implements INodeType {
 						if (updateFields.requester === 'requesterId') {
 							// @ts-ignore
 							if (isNaN(parseInt(value, 10))) {
-								throw new Error('Requester Id must be a number');
+								throw new NodeOperationError(this.getNode(), 'Requester Id must be a number');
 							}
 							body.requester_id = parseInt(value as string, 10);
 						} else if (updateFields.requester === 'email') {
diff --git a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
index 71c9c61108..dea3ef15a0 100644
--- a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function freshdeskApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -17,7 +17,7 @@ export async function freshdeskApiRequest(this: IExecuteFunctions | ILoadOptions
 	const credentials = this.getCredentials('freshdeskApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const apiKey = `${credentials.apiKey}:X`;
@@ -45,15 +45,7 @@ export async function freshdeskApiRequest(this: IExecuteFunctions | ILoadOptions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response) {
-			let errorMessage = error.response.body.message || error.response.body.description || error.message;
-			if (error.response.body && error.response.body.errors) {
-				errorMessage = error.response.body.errors.map((err: IDataObject) => `"${err.field}" => ${err.message}`).join(', ');
-			}
-			throw new Error(`Freshdesk error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Ftp.node.ts b/packages/nodes-base/nodes/Ftp.node.ts
index ae728dac7c..12835376e0 100644
--- a/packages/nodes-base/nodes/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp.node.ts
@@ -7,7 +7,9 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	basename,
@@ -338,7 +340,7 @@ export class Ftp implements INodeType {
 		}
 
 		if (credentials === undefined) {
-			throw new Error('Failed to get credentials!');
+			throw new NodeOperationError(this.getNode(), 'Failed to get credentials!');
 		}
 
 		let ftp : ftpClient;
@@ -446,13 +448,13 @@ export class Ftp implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						const buffer = Buffer.from(item.binary[propertyNameUpload].data, BINARY_ENCODING) as Buffer;
@@ -535,13 +537,13 @@ export class Ftp implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						const buffer = Buffer.from(item.binary[propertyNameUpload].data, BINARY_ENCODING) as Buffer;
@@ -554,7 +556,7 @@ export class Ftp implements INodeType {
 								await ftp!.mkdir(dirPath, true);
 								await ftp!.put(buffer, remotePath);
 							} else {
-								throw new Error(error);
+								throw new NodeApiError(this.getNode(), error);
 							}
 						}
 					} else {
@@ -568,7 +570,7 @@ export class Ftp implements INodeType {
 								await ftp!.mkdir(dirPath, true);
 								await ftp!.put(buffer, remotePath);
 							} else {
-								throw new Error(error);
+								throw new NodeApiError(this.getNode(), error);
 							}
 						}
 					}
diff --git a/packages/nodes-base/nodes/Function.node.ts b/packages/nodes-base/nodes/Function.node.ts
index 663f94938c..91f50f0617 100644
--- a/packages/nodes-base/nodes/Function.node.ts
+++ b/packages/nodes-base/nodes/Function.node.ts
@@ -3,6 +3,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 const { NodeVM } = require('vm2');
@@ -85,28 +86,28 @@ export class Function implements INodeType {
 		try {
 			// Execute the function code
 			items = (await vm.run(`module.exports = async function() {${functionCode}}()`, __dirname));
-		} catch (e) {
-			return Promise.reject(e);
+		} catch (error) {
+			return Promise.reject(error);
 		}
 
 
 		// Do very basic validation of the data
 		if (items === undefined) {
-			throw new Error('No data got returned. Always return an Array of items!');
+			throw new NodeOperationError(this.getNode(), 'No data got returned. Always return an Array of items!');
 		}
 		if (!Array.isArray(items)) {
-			throw new Error('Always an Array of items has to be returned!');
+			throw new NodeOperationError(this.getNode(), 'Always an Array of items has to be returned!');
 		}
 		for (const item of items) {
 			if (item.json === undefined) {
-				throw new Error('All returned items have to contain a property named "json"!');
+				throw new NodeOperationError(this.getNode(), 'All returned items have to contain a property named "json"!');
 			}
 			if (typeof item.json !== 'object') {
-				throw new Error('The json-property has to be an object!');
+				throw new NodeOperationError(this.getNode(), 'The json-property has to be an object!');
 			}
 			if (item.binary !== undefined) {
 				if (Array.isArray(item.binary) || typeof item.binary !== 'object') {
-					throw new Error('The binary-property has to be an object!');
+					throw new NodeOperationError(this.getNode(), 'The binary-property has to be an object!');
 				}
 			}
 		}
diff --git a/packages/nodes-base/nodes/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem.node.ts
index e7032e460e..8af33afeb9 100644
--- a/packages/nodes-base/nodes/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem.node.ts
@@ -5,6 +5,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 const { NodeVM } = require('vm2');
@@ -95,17 +96,18 @@ export class FunctionItem implements INodeType {
 			const functionCode = this.getNodeParameter('functionCode', itemIndex) as string;
 
 
+
 			let jsonData: IDataObject;
 			try {
 				// Execute the function code
 				jsonData = await vm.run(`module.exports = async function() {${functionCode}}()`, __dirname);
-			} catch (e) {
-				return Promise.reject(e);
+			} catch (error) {
+				return Promise.reject(error);
 			}
 
 			// Do very basic validation of the data
 			if (jsonData === undefined) {
-				throw new Error('No data got returned. Always an object has to be returned!');
+				throw new NodeOperationError(this.getNode(), 'No data got returned. Always an object has to be returned!');
 			}
 
 			const returnItem: INodeExecutionData = {
diff --git a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index f07d130da4..a0c8119f36 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject
+	IDataObject, NodeApiError
 } from 'n8n-workflow';
 
 export async function getresponseApiRequest(this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -43,11 +43,7 @@ export async function getresponseApiRequest(this: IWebhookFunctions | IHookFunct
 			return await this.helpers.requestOAuth2.call(this, 'getResponseOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`GetResponse error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index 3fe031b530..8fe8eb9718 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -10,6 +10,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -174,7 +176,7 @@ export class GetResponseTrigger implements INodeType {
 
 					if (data.url !== webhookUrl) {
 						if (deleteCurrentSubscription === false) {
-							throw new Error(`The webhook (${data.url}) is active in the account. Delete it manually or set the parameter "Delete Current Subscription" to true, and the node will delete it for you.`);
+							throw new NodeApiError(this.getNode(), data, { message: `The webhook (${data.url}) is active in the account. Delete it manually or set the parameter "Delete Current Subscription" to true, and the node will delete it for you.` });
 						}
 					}
 				} catch (error) {
@@ -206,7 +208,7 @@ export class GetResponseTrigger implements INodeType {
 			async delete(this: IHookFunctions): Promise<boolean> {
 				try {
 					await getresponseApiRequest.call(this, 'DELETE', '/accounts/callbacks');
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 
diff --git a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
index 89664f576e..62c6155918 100644
--- a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 import * as jwt from 'jsonwebtoken';
@@ -60,21 +60,7 @@ export async function ghostApiRequest(this: IHookFunctions | IExecuteFunctions |
 		return await this.helpers.request!(options);
 
 	} catch (error) {
-		let errorMessages;
-
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			if (Array.isArray(error.response.body.errors)) {
-
-				const errors = error.response.body.errors;
-
-				errorMessages = errors.map((e: IDataObject) => e.message);
-			}
-
-			throw new Error(`Ghost error response [${error.statusCode}]: ${errorMessages?.join('|')}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index ab2a3ea22c..241ae39ec9 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -226,7 +227,7 @@ export class Ghost implements INodeType {
 						} else {
 							const mobileDoc = validateJSON(content);
 							if (mobileDoc === undefined) {
-								throw new Error('Content must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Content must be a valid JSON');
 							}
 							post.mobiledoc = content;
 						}
@@ -240,7 +241,7 @@ export class Ghost implements INodeType {
 						}
 
 						if (post.status === 'scheduled' && post.published_at === undefined) {
-							throw new Error('Published at must be define when status is scheduled');
+							throw new NodeOperationError(this.getNode(), 'Published at must be define when status is scheduled');
 						}
 
 						responseData = await ghostApiRequest.call(this, 'POST', '/admin/posts', { posts: [post] }, qs);
@@ -320,7 +321,7 @@ export class Ghost implements INodeType {
 						} else {
 							const mobileDoc = validateJSON(updateFields.contentJson as string || undefined);
 							if (mobileDoc === undefined) {
-								throw new Error('Content must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Content must be a valid JSON');
 							}
 							post.mobiledoc = updateFields.contentJson;
 							delete updateFields.contentJson;
@@ -335,7 +336,7 @@ export class Ghost implements INodeType {
 						}
 
 						if (post.status === 'scheduled' && post.published_at === undefined) {
-							throw new Error('Published at must be define when status is scheduled');
+							throw new NodeOperationError(this.getNode(), 'Published at must be define when status is scheduled');
 						}
 
 						post.updated_at = posts[0].updated_at;
diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index 10d9558b3e..4b1ec4d6c5 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -6,7 +6,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -41,7 +41,7 @@ export async function githubApiRequest(this: IHookFunctions | IExecuteFunctions,
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('githubApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const baseUrl = credentials!.server || 'https://api.github.com';
@@ -58,18 +58,7 @@ export async function githubApiRequest(this: IHookFunctions | IExecuteFunctions,
 			return await this.helpers.requestOAuth2.call(this, 'githubOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Github credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Github error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -95,7 +84,7 @@ export async function getFileSha(this: IHookFunctions | IExecuteFunctions, owner
 	const responseData = await githubApiRequest.call(this, 'GET', getEndpoint, getBody, {});
 
 	if (responseData.sha === undefined) {
-		throw new Error('Could not get the SHA of the file.');
+		throw new NodeOperationError(this.getNode(), 'Could not get the SHA of the file.');
 	}
 	return responseData.sha;
 }
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 77a5d5d24c..c1b27ffa02 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1804,13 +1805,13 @@ export class Github implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						// Currently internally n8n uses base64 and also Github expects it base64 encoded.
@@ -2125,7 +2126,7 @@ export class Github implements INodeType {
 				}
 
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			if (returnAll === true) {
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 3d38dc5a55..98388c45d1 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -350,8 +352,8 @@ export class GithubTrigger implements INodeType {
 
 				try {
 					await githubApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
-					if (e.message.includes('[404]:')) {
+				} catch (error) {
+					if (error.message.includes('[404]:')) {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;
@@ -360,7 +362,7 @@ export class GithubTrigger implements INodeType {
 					}
 
 					// Some error occured
-					throw e;
+					throw error;
 				}
 
 				// If it did not error then the webhook exists
@@ -370,7 +372,7 @@ export class GithubTrigger implements INodeType {
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
 				if (webhookUrl.includes('//localhost')) {
-					throw new Error('The Webhook can not work on "localhost". Please, either setup n8n on a custom domain or start with "--tunnel"!');
+					throw new NodeOperationError(this.getNode(), 'The Webhook can not work on "localhost". Please, either setup n8n on a custom domain or start with "--tunnel"!');
 				}
 
 				const owner = this.getNodeParameter('owner') as string;
@@ -396,8 +398,8 @@ export class GithubTrigger implements INodeType {
 				let responseData;
 				try {
 					responseData = await githubApiRequest.call(this, 'POST', endpoint, body);
-				} catch (e) {
-					if (e.message.includes('[422]:')) {
+				} catch (error) {
+					if (error.message.includes('[422]:')) {
 						// Webhook exists already
 
 						// Get the data of the already registered webhook
@@ -416,15 +418,15 @@ export class GithubTrigger implements INodeType {
 							}
 						}
 
-						throw new Error('A webhook with the identical URL probably exists already. Please delete it manually on Github!');
+						throw new NodeOperationError(this.getNode(), 'A webhook with the identical URL probably exists already. Please delete it manually on Github!');
 					}
 
-					throw e;
+					throw error;
 				}
 
 				if (responseData.id === undefined || responseData.active !== true) {
 					// Required data is missing so was not successful
-					throw new Error('Github webhook creation response did not contain the expected data.');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'Github webhook creation response did not contain the expected data.' });
 				}
 
 				webhookData.webhookId = responseData.id as string;
@@ -443,7 +445,7 @@ export class GithubTrigger implements INodeType {
 
 					try {
 						await githubApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index c25c051ef5..6f50af91ba 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 import { OptionsWithUri } from 'request';
 
@@ -41,7 +41,7 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('gitlabApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Private-Token'] = `${credentials.accessToken}`;
@@ -52,7 +52,7 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 		} else {
 			const credentials = this.getCredentials('gitlabOAuth2Api');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.uri = `${(credentials.server as string).replace(/\/$/, '')}/api/v4${endpoint}`;
@@ -60,18 +60,7 @@ export async function gitlabApiRequest(this: IHookFunctions | IExecuteFunctions,
 			return await this.helpers.requestOAuth2!.call(this, 'gitlabOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The GitLab credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Gitlab error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 08ff633af6..4b0f10d9fe 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1103,17 +1104,17 @@ export class Gitlab implements INodeType {
 				credentials = this.getCredentials('gitlabApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 			} else {
 				credentials = this.getCredentials('gitlabOAuth2Api');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 			}
 		} catch (error) {
-			throw new Error(error);
+			throw new NodeOperationError(this.getNode(), error);
 		}
 
 		// Operations which overwrite the returned data
@@ -1350,7 +1351,7 @@ export class Gitlab implements INodeType {
 					endpoint = `/users/${owner}/projects`;
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			if (returnAll === true) {
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 4a8688f6ee..7a8828b93e 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -176,8 +178,8 @@ export class GitlabTrigger implements INodeType {
 
 				try {
 					await gitlabApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
-					if (e.message.includes('[404]:')) {
+				} catch (error) {
+					if (error.message.includes('[404]:')) {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;
@@ -186,7 +188,7 @@ export class GitlabTrigger implements INodeType {
 					}
 
 					// Some error occured
-					throw e;
+					throw error;
 				}
 
 				// If it did not error then the webhook exists
@@ -231,13 +233,13 @@ export class GitlabTrigger implements INodeType {
 				let responseData;
 				try {
 					responseData = await gitlabApiRequest.call(this, 'POST', endpoint, body);
-				} catch (e) {
-					throw e;
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 
 				if (responseData.id === undefined) {
 					// Required data is missing so was not successful
-					throw new Error('GitLab webhook creation response did not contain the expected data.');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'GitLab webhook creation response did not contain the expected data.' });
 				}
 
 				const webhookData = this.getWorkflowStaticData('node');
@@ -260,7 +262,7 @@ export class GitlabTrigger implements INodeType {
 
 					try {
 						await gitlabApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index 6f35da1f8d..c28a0217c1 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -7,6 +7,7 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -71,19 +72,7 @@ export async function goToWebinarApiRequest(
 		// https://stackoverflow.com/questions/62190724/getting-gotowebinar-registrant
 		return losslessJSON.parse(response, convertLosslessNumber);
 	} catch (error) {
-
-		if (error?.response?.body) {
-			let errorMessage;
-			const body = JSON.parse(error.response.body);
-			if (Array.isArray(body.validationErrorCodes)) {
-				errorMessage = (body.validationErrorCodes as IDataObject[]).map((e) => e.description).join('|');
-			} else {
-				errorMessage = body.description;
-			}
-			throw new Error(`Go To Webinar error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 3fda2cd72c..409ce68cca 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -662,7 +663,7 @@ export class GoToWebinar implements INodeType {
 						Object.assign(body, updateFields);
 
 						if (isEmpty(updateFields)) {
-							throw new Error(`Please enter at least one field to update for the ${resource}.`);
+							throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 						}
 
 						const endpoint = `organizers/${organizerKey}/webinars/${webinarKey}`;
diff --git a/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
index ed2da34c56..14f4905d26 100644
--- a/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string,
@@ -36,25 +36,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		return await this.helpers.requestOAuth2.call(this, 'googleAnalyticsOAuth2', options);
 
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errorMessages;
-
-			if (error.response.body.error.errors) {
-				// Try to return the error prettier
-				errorMessages = error.response.body.error.errors;
-
-				errorMessages = errorMessages.map((errorItem: IDataObject) => errorItem.message);
-
-				errorMessages = errorMessages.join('|');
-
-			} else if (error.response.body.error.message) {
-				errorMessages = error.response.body.error.message;
-			}
-
-			throw new Error(`Google Analytics error response [${error.statusCode}]: ${errorMessages}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index ef3f6187e3..ac299b7261 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -40,7 +40,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const credentials = this.getCredentials('googleApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
@@ -53,24 +53,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			return await this.helpers.requestOAuth2.call(this, 'googleBooksOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors;
-
-			if (error.response.body.error.errors) {
-				errors = error.response.body.error.errors;
-
-				errors = errors.map((e: IDataObject) => e.message).join('|');
-
-			} else {
-				errors = error.response.body.error.message;
-			}
-			// Try to return the error prettier
-			throw new Error(
-				`Google Books error response [${error.statusCode}]: ${errors}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index edc841710c..4b9eff2928 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,17 +33,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleCalendarOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Google Calendar error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index e66f718ecb..755094916b 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -208,11 +210,7 @@ export class GoogleCalendar implements INodeType {
 					);
 
 					if (responseData.calendars[calendarId].errors) {
-						let errors = responseData.calendars[calendarId].errors;
-						errors = errors.map((e: IDataObject) => e.reason);
-						throw new Error(
-							`Google Calendar error response: ${errors.join('|')}`,
-						);
+						throw new NodeApiError(this.getNode(), responseData.calendars[calendarId]);
 					}
 
 					if (outputFormat === 'availability') {
@@ -328,7 +326,7 @@ export class GoogleCalendar implements INodeType {
 							additionalFields.repeatHowManyTimes &&
 							additionalFields.repeatUntil
 						) {
-							throw new Error(
+							throw new NodeOperationError(this.getNode(),
 								`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
 							);
 						}
@@ -573,7 +571,7 @@ export class GoogleCalendar implements INodeType {
 						body.recurrence = [`RRULE:${updateFields.rrule}`];
 					} else {
 						if (updateFields.repeatHowManyTimes && updateFields.repeatUntil) {
-							throw new Error(
+							throw new NodeOperationError(this.getNode(),
 								`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
 							);
 						}
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 02d521c9c4..b053381e9e 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string,
@@ -36,24 +36,6 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		return await this.helpers.requestOAuth2.call(this, 'googleCloudNaturalLanguageOAuth2Api', options);
 
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errorMessages;
-
-			if (error.response.body.error.errors) {
-				// Try to return the error prettier
-				errorMessages = error.response.body.error.errors;
-
-				errorMessages = errorMessages.map((errorItem: IDataObject) => errorItem.message);
-
-				errorMessages = errorMessages.join('|');
-
-			} else if (error.response.body.error.message) {
-				errorMessages = error.response.body.error.message;
-			}
-
-			throw new Error(`Google Cloud Natural Language error response [${error.statusCode}]: ${errorMessages}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 1493adeb24..a15861b1d6 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -34,26 +34,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleContactsOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors;
-
-			if (error.response.body.error.errors) {
-
-				errors = error.response.body.error.errors;
-
-				errors = errors.map((e: IDataObject) => e.message).join('|');
-
-			} else {
-				errors = error.response.body.error.message;
-			}
-
-			// Try to return the error prettier
-			throw new Error(
-				`Google Contacts error response [${error.statusCode}]: ${errors}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
index bf6d4a5c71..9d8a0ff13f 100644
--- a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -39,7 +39,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const credentials = this.getCredentials('googleApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
@@ -51,27 +51,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			return await this.helpers.requestOAuth2.call(this, 'googleDriveOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errorMessages;
-
-			if (error.response.body.error.errors) {
-				// Try to return the error prettier
-				errorMessages = error.response.body.error.errors;
-
-				errorMessages = errorMessages.map((errorItem: IDataObject) => errorItem.message);
-
-				errorMessages = errorMessages.join('|');
-
-			} else if (error.response.body.error.message) {
-				errorMessages = error.response.body.error.message;
-			} else if (error.response.body.error_description) {
-				errorMessages = error.response.body.error_description;
-			}
-
-			throw new Error(`Google Drive error response [${error.statusCode}]: ${errorMessages}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 3e776a1fe7..220aee7598 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -2146,13 +2147,13 @@ export class GoogleDrive implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						if (item.binary[propertyNameUpload].mimeType) {
@@ -2294,7 +2295,7 @@ export class GoogleDrive implements INodeType {
 					returnData.push(response as IDataObject);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index e347222e7e..3e0f7a31f3 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -10,6 +10,7 @@
 // 	INodeTypeDescription,
 // 	INodeType,
 // 	IWebhookResponseData,
+//  NodeOperationError,
 // } from 'n8n-workflow';
 
 // import { getAuthenticationClient } from './GoogleApi';
@@ -75,8 +76,8 @@
 
 // 				// try {
 // 				// 	await githubApiRequest.call(this, 'GET', endpoint, {});
-// 				// } catch (e) {
-// 				// 	if (e.message.includes('[404]:')) {
+// 				// } catch (error) {
+// 				// 	if (error.message.includes('[404]:')) {
 // 				// 		// Webhook does not exist
 // 				// 		delete webhookData.webhookId;
 // 				// 		delete webhookData.webhookEvents;
@@ -100,7 +101,7 @@
 // 				const credentials = this.getCredentials('googleApi');
 
 // 				if (credentials === undefined) {
-// 					throw new Error('No credentials got returned!');
+// 					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 // 				}
 
 // 				const scopes = [
@@ -165,9 +166,9 @@
 // 				// let responseData;
 // 				// try {
 // 				// 	responseData = await githubApiRequest.call(this, 'POST', endpoint, body);
-// 				// } catch (e) {
-// 				// 	if (e.message.includes('[422]:')) {
-// 				// 		throw new Error('A webhook with the identical URL exists already. Please delete it manually on Github!');
+// 				// } catch (error) {
+// 				// 	if (error.message.includes('[422]:')) {
+// 				// 		throw new NodeOperationError(this.getNode(), 'A webhook with the identical URL exists already. Please delete it manually on Github!');
 // 				// 	}
 
 // 				// 	throw e;
@@ -175,7 +176,7 @@
 
 // 				// if (responseData.id === undefined || responseData.active !== true) {
 // 				// 	// Required data is missing so was not successful
-// 				// 	throw new Error('Github webhook creation response did not contain the expected data.');
+// 				// 	throw new NodeOperationError(this.getNode(), 'Github webhook creation response did not contain the expected data.');
 // 				// }
 
 // 				// const webhookData = this.getWorkflowStaticData('node');
@@ -192,7 +193,7 @@
 // 				const credentials = this.getCredentials('googleApi');
 
 // 				if (credentials === undefined) {
-// 					throw new Error('No credentials got returned!');
+// 					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 // 				}
 
 // 				const scopes = [
@@ -234,7 +235,7 @@
 
 // 				// 	try {
 // 				// 		await githubApiRequest.call(this, 'DELETE', endpoint, body);
-// 				// 	} catch (e) {
+// 				// 	} catch (error) {
 // 				// 		return false;
 // 				// 	}
 
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index f78bbaa824..cb58d5c496 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri: string | null = null): Promise<any> { // tslint:disable-line:no-any
@@ -35,25 +35,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleFirebaseCloudFirestoreOAuth2Api', options);
 	} catch (error) {
-		let errors;
-
-		if (error.response && error.response.body) {
-
-			if (Array.isArray(error.response.body)) {
-
-				errors = error.response.body;
-
-				errors = errors.map((e: { error: { message: string } }) => e.error.message).join('|');
-			} else {
-				errors = error.response.body.error.message;
-			}
-
-			// Try to return the error prettier
-			throw new Error(
-				`Google Firebase error response [${error.statusCode}]: ${errors}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
index 66a38a0666..acb50b22f4 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, projectId: string, method: string, resource: string, body: any = {}, qs: IDataObject = {}, headers: IDataObject = {}, uri: string | null = null): Promise<any> { // tslint:disable-line:no-any
@@ -34,26 +34,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 
 		return await this.helpers.requestOAuth2!.call(this, 'googleFirebaseRealtimeDatabaseOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors;
-
-			if (error.response.body.error.errors) {
-
-				errors = error.response.body.error.errors;
-
-				errors = errors.map((e: IDataObject) => e.message).join('|');
-
-			} else {
-				errors = error.response.body.error.message;
-			}
-
-			// Try to return the error prettier
-			throw new Error(
-				`Google Firebase error response [${error.statusCode}]: ${errors}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.ts
index 38eaac6d0c..e28c9b8176 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/RealtimeDatabase.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -144,7 +146,7 @@ export class RealtimeDatabase implements INodeType {
 		//https://firebase.google.com/docs/reference/rest/database
 
 		if (['push', 'create', 'update'].includes(operation) && items.length === 1 && Object.keys(items[0].json).length === 0) {
-			throw new Error(`The ${operation} operation needs input data`);
+			throw new NodeOperationError(this.getNode(), `The ${operation} operation needs input data`);
 		}
 
 		for (let i = 0; i < length; i++) {
@@ -185,7 +187,7 @@ export class RealtimeDatabase implements INodeType {
 
 			if (responseData === null) {
 				if (operation === 'get') {
-					throw new Error(`Google Firebase error response: Requested entity was not found.`);
+					throw new NodeApiError(this.getNode(), responseData, { message: `Requested entity was not found.` });
 				} else if (method === 'DELETE') {
 					responseData = { success: true };
 				}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index 1c4d83a693..b0ba6f6658 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -328,7 +329,7 @@ export class GSuiteAdmin implements INodeType {
 					}
 
 					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
-						throw new Error('When projection is set to custom, the custom schemas field must be defined');
+						throw new NodeOperationError(this.getNode(), 'When projection is set to custom, the custom schemas field must be defined');
 					}
 
 					responseData = await googleApiRequest.call(
@@ -361,7 +362,7 @@ export class GSuiteAdmin implements INodeType {
 					}
 
 					if (qs.projection === 'custom' && qs.customFieldMask === undefined) {
-						throw new Error('When projection is set to custom, the custom schemas field must be defined');
+						throw new NodeOperationError(this.getNode(), 'When projection is set to custom, the custom schemas field must be defined');
 					}
 
 					if (returnAll) {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 81768cfba2..e95ecda637 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -10,6 +10,7 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,17 +34,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'gSuiteAdminOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`G Suite Admin error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 29490df7a0..1507eb520c 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -17,6 +17,8 @@ import {
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -58,7 +60,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const credentials = this.getCredentials('googleApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
@@ -72,27 +74,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		}
 
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errorMessages;
-
-			if (error.response.body.error.errors) {
-				// Try to return the error prettier
-				errorMessages = error.response.body.error.errors;
-
-				errorMessages = errorMessages.map((errorItem: IDataObject) => errorItem.message);
-
-				errorMessages = errorMessages.join('|');
-
-			} else if (error.response.body.error.message) {
-				errorMessages = error.response.body.error.message;
-			} else if (error.response.body.error_description) {
-				errorMessages = error.response.body.error_description;
-			}
-
-			throw new Error(`Gmail error response [${error.statusCode}]: ${errorMessages}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
index 80526a9ce1..91db4df182 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -40,7 +40,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const credentials = this.getCredentials('googleApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
@@ -53,11 +53,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			return await this.helpers.requestOAuth2.call(this, 'googleSheetsOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Google Sheet error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index 84453d7a77..479ab3cdd5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -1,5 +1,5 @@
 import {
-	IDataObject,
+	IDataObject, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -283,7 +283,7 @@ export class GoogleSheet {
 		const rangeEndSplit = rangeEnd.match(/([a-zA-Z]{1,10})([0-9]{0,10})/);
 
 		if (rangeStartSplit === null || rangeStartSplit.length !== 3 || rangeEndSplit === null || rangeEndSplit.length !== 3) {
-			throw new Error(`The range "${range}" is not valid.`);
+			throw new NodeOperationError(this.executeFunctions.getNode(), `The range "${range}" is not valid.`);
 		}
 
 		const keyRowRange = `${sheet ? sheet + '!' : ''}${rangeStartSplit[1]}${dataStartRowIndex}:${rangeEndSplit[1]}${dataStartRowIndex}`;
@@ -291,7 +291,7 @@ export class GoogleSheet {
 		const sheetDatakeyRow = await this.getData(this.encodeRange(keyRowRange), valueRenderMode);
 
 		if (sheetDatakeyRow === undefined) {
-			throw new Error('Could not retrieve the key row!');
+			throw new NodeOperationError(this.executeFunctions.getNode(), 'Could not retrieve the key row!');
 		}
 
 		const keyColumnOrder = sheetDatakeyRow[0];
@@ -299,7 +299,7 @@ export class GoogleSheet {
 		const keyIndex = keyColumnOrder.indexOf(indexKey);
 
 		if (keyIndex === -1) {
-			throw new Error(`Could not find column for key "${indexKey}"!`);
+			throw new NodeOperationError(this.executeFunctions.getNode(), `Could not find column for key "${indexKey}"!`);
 		}
 
 		const startRowIndex = rangeStartSplit[2] || '';
@@ -311,7 +311,7 @@ export class GoogleSheet {
 		const sheetDataKeyColumn = await this.getData(this.encodeRange(keyColumnRange), valueRenderMode);
 
 		if (sheetDataKeyColumn === undefined) {
-			throw new Error('Could not retrieve the key column!');
+			throw new NodeOperationError(this.executeFunctions.getNode(), 'Could not retrieve the key column!');
 		}
 
 		// TODO: The data till here can be cached optionally. Maybe add an option which can
@@ -397,7 +397,7 @@ export class GoogleSheet {
 
 		if (keyRowIndex < 0 || dataStartRowIndex < keyRowIndex || keyRowIndex >= inputData.length) {
 			// The key row does not exist so it is not possible to look up the data
-			throw new Error(`The key row does not exist!`);
+			throw new NodeOperationError(this.executeFunctions.getNode(), `The key row does not exist!`);
 		}
 
 		// Create the keys array
@@ -417,7 +417,7 @@ export class GoogleSheet {
 			returnColumnIndex = keys.indexOf(lookupValue.lookupColumn);
 
 			if (returnColumnIndex === -1) {
-				throw new Error(`The column "${lookupValue.lookupColumn}" could not be found!`);
+				throw new NodeOperationError(this.executeFunctions.getNode(), `The column "${lookupValue.lookupColumn}" could not be found!`);
 			}
 
 			// Loop over all the items and find the one with the matching value
@@ -460,7 +460,7 @@ export class GoogleSheet {
 		const keyColumnData = await this.getData(getRange, 'UNFORMATTED_VALUE');
 
 		if (keyColumnData === undefined) {
-			throw new Error('Could not retrieve the column data!');
+			throw new NodeOperationError(this.executeFunctions.getNode(), 'Could not retrieve the column data!');
 		}
 
 		const keyColumnOrder = keyColumnData[0];
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
index 58782e1e15..cb793ce0f4 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -987,7 +988,7 @@ export class GoogleSheets implements INodeType {
 				const responseData = await sheet.spreadsheetGetSheets();
 
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
index e25ec49e48..c580570032 100644
--- a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
@@ -9,6 +9,7 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -53,11 +54,7 @@ export async function googleApiRequest(
 			return await this.helpers.requestOAuth2!.call(this, 'googleSlidesOAuth2Api', options);
 		}
 	} catch (error) {
-
-		if (error?.response?.body?.message) {
-			throw new Error(`Google Slides error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index e3dffba256..737ba1be09 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -46,17 +46,7 @@ export async function googleApiRequest(
 			options,
 		);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Google Tasks error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
index 11ccf4d487..bd295e84c4 100644
--- a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -40,7 +40,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const credentials = this.getCredentials('googleApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
@@ -53,11 +53,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			return await this.helpers.requestOAuth2.call(this, 'googleTranslateOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Google Translate error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index c72b7fa8f9..518f8b6254 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,28 +33,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'youTubeOAuth2Api', options);
 	} catch (error) {
-
-		let errors;
-
-		if (error.response && error.response.body) {
-
-			if (resource === '/upload/youtube/v3/videos') {
-				error.response.body = JSON.parse(error.response.body);
-			}
-
-			if (error.response.body.error) {
-
-				errors = error.response.body.error.errors;
-
-				errors = errors.map((e: IDataObject) => e.message);
-			}
-
-			// Try to return the error prettier
-			throw new Error(
-				`YouTube error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 156d90d935..9179277488 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -414,11 +415,11 @@ export class YouTube implements INodeType {
 					const item = items[i];
 
 					if (item.binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					if (item.binary[binaryProperty] === undefined) {
-						throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryProperty}" does not exists on item!`);
 					}
 
 					if (item.binary[binaryProperty].mimeType) {
@@ -827,7 +828,7 @@ export class YouTube implements INodeType {
 					}
 
 					if (qs.relatedToVideoId && qs.forDeveloper !== undefined) {
-						throw new Error(`When using the parameter 'related to video' the parameter 'for developer' cannot be set`);
+						throw new NodeOperationError(this.getNode(), `When using the parameter 'related to video' the parameter 'for developer' cannot be set`);
 					}
 
 					if (returnAll) {
@@ -901,11 +902,11 @@ export class YouTube implements INodeType {
 					const item = items[i];
 
 					if (item.binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					if (item.binary[binaryProperty] === undefined) {
-						throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryProperty}" does not exists on item!`);
 					}
 
 					if (item.binary[binaryProperty].mimeType) {
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index ab694fe577..318f159ee4 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function gotifyApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, uri?: string | undefined, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -35,15 +35,7 @@ export async function gotifyApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.errorDescription) {
-			const message = error.response.body.errorDescription;
-			// Try to return the error prettier
-			throw new Error(
-				`Gotify error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index 167eda8e67..e18b2057d3 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -4,6 +4,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -241,8 +243,8 @@ export class GraphQL implements INodeType {
 					if (typeof requestOptions.body.variables === 'string') {
 						try {
 							requestOptions.body.variables = JSON.parse(requestOptions.body.variables || '{}');
-						} catch (e) {
-							throw new Error('Using variables failed:\n' + requestOptions.body.variables + '\n\nWith error message:\n' + e);
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), 'Using variables failed:\n' + requestOptions.body.variables + '\n\nWith error message:\n' + error);
 						}
 					}
 					if (requestOptions.body.operationName === '') {
@@ -267,8 +269,8 @@ export class GraphQL implements INodeType {
 				if (typeof response === 'string') {
 					try {
 						returnItems.push({ json: JSON.parse(response) });
-					} catch (e) {
-						throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 					}
 				} else {
 					returnItems.push({ json: response });
diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
index de7afa5b12..48dc63528c 100644
--- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
@@ -6,12 +6,12 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function gumroadApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('gumroadApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	body = Object.assign({ access_token: credentials.accessToken }, body);
 
@@ -30,6 +30,6 @@ export async function gumroadApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error('Gumroad Error: ' + error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
index 76fbdd3bb5..c94df5757d 100644
--- a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
@@ -6,13 +6,13 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
 	OptionsWithUri,
 } from 'request';
 
-
 /**
  * Make an API request to HackerNews
  *
@@ -33,13 +33,7 @@ export async function hackerNewsApiRequest(this: IHookFunctions | IExecuteFuncti
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.error) {
-			// Try to return the error prettier
-			throw new Error(`Hacker News error response [${error.statusCode}]: ${error.response.body.error}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index c607b1b6b1..95fe4eeec1 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -328,7 +329,7 @@ export class HackerNews implements INodeType {
 					endpoint = 'search?';
 
 				} else {
-					throw new Error(`The operation '${operation}' is unknown!`);
+					throw new NodeOperationError(this.getNode(), `The operation '${operation}' is unknown!`);
 				}
 			} else if (resource === 'article') {
 
@@ -339,7 +340,7 @@ export class HackerNews implements INodeType {
 					includeComments = additionalFields.includeComments as boolean;
 
 				} else {
-					throw new Error(`The operation '${operation}' is unknown!`);
+					throw new NodeOperationError(this.getNode(), `The operation '${operation}' is unknown!`);
 				}
 
 			} else if (resource === 'user') {
@@ -348,11 +349,11 @@ export class HackerNews implements INodeType {
 					endpoint = `users/${this.getNodeParameter('username', i)}`;
 
 				} else {
-					throw new Error(`The operation '${operation}' is unknown!`);
+					throw new NodeOperationError(this.getNode(), `The operation '${operation}' is unknown!`);
 				}
 
 			} else {
-				throw new Error(`The resource '${resource}' is unknown!`);
+				throw new NodeOperationError(this.getNode(), `The resource '${resource}' is unknown!`);
 			}
 
 
diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
index fd5ed8178c..67da0a7eb6 100644
--- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function harvestApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, qs: IDataObject = {}, path: string, body: IDataObject = {}, option: IDataObject = {}, uri?: string): Promise<any> { // tslint:disable-line:no-any
@@ -38,7 +38,7 @@ export async function harvestApiRequest(this: IHookFunctions | IExecuteFunctions
 			const credentials = this.getCredentials('harvestApi') as IDataObject;
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			//@ts-ignore
@@ -49,18 +49,7 @@ export async function harvestApiRequest(this: IHookFunctions | IExecuteFunctions
 			return await this.helpers.requestOAuth2!.call(this, 'harvestOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Harvest credentials are not valid!');
-		}
-
-		if (error.error && error.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Harvest error response [${error.statusCode}]: ${error.error.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw new Error(`Harvest error response: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 5874355607..8540a83093 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -367,7 +368,7 @@ export class Harvest implements INodeType {
 					returnData.push(responseData);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'client') {
@@ -435,7 +436,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'project') {
 				if (operation === 'get') {
@@ -506,7 +507,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'user') {
 				if (operation === 'get') {
@@ -587,7 +588,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'contact') {
 				if (operation === 'get') {
@@ -655,7 +656,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'company') {
 				if (operation === 'get') {
@@ -670,7 +671,7 @@ export class Harvest implements INodeType {
 					returnData.push(responseData);
 
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'task') {
 				if (operation === 'get') {
@@ -737,7 +738,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'invoice') {
 				if (operation === 'get') {
@@ -804,7 +805,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'expense') {
 				if (operation === 'get') {
@@ -873,7 +874,7 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else if (resource === 'estimate') {
 				if (operation === 'get') {
@@ -940,10 +941,10 @@ export class Harvest implements INodeType {
 					const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 					returnData.push(responseData);
 				} else {
-					throw new Error(`The resource "${resource}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index ffdde00d10..c48ea971c1 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -38,17 +38,7 @@ export async function helpscoutApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'helpScoutOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body
-			&& error.response.body._embedded
-			&& error.response.body._embedded.errors) {
-			// Try to return the error prettier
-			//@ts-ignore
-			throw new Error(`HelpScout error response [${error.statusCode}]: ${error.response.body.message} - ${error.response.body._embedded.errors.map(error => {
-				return `${error.path} ${error.message}`;
-			}).join('-')}`);
-		}
-
-		throw new Error(`HelpScout error response [${error.statusCode}]: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 54f2495682..73dab6fef1 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -203,12 +204,12 @@ export class HelpScout implements INodeType {
 						delete body.customerEmail;
 					}
 					if (body.customer === undefined) {
-						throw new Error('Either customer email or customer ID must be set');
+						throw new NodeOperationError(this.getNode(), 'Either customer email or customer ID must be set');
 					}
 					if (threads) {
 						for (let i = 0; i < threads.length; i++) {
 							if (threads[i].type === '' || threads[i].text === '') {
-								throw new Error('Chat Threads cannot be empty');
+								throw new NodeOperationError(this.getNode(), 'Chat Threads cannot be empty');
 							}
 							if (threads[i].type !== 'note') {
 								threads[i].customer = body.customer;
@@ -289,7 +290,7 @@ export class HelpScout implements INodeType {
 						body.websites = websites;
 					}
 					if (Object.keys(body).length === 0) {
-						throw new Error('You have to set at least one field');
+						throw new NodeOperationError(this.getNode(), 'You have to set at least one field');
 					}
 					responseData = await helpscoutApiRequest.call(this, 'POST', '/v2/customers', body, qs, undefined, { resolveWithFullResponse: true });
 					const id = responseData.headers['resource-id'];
@@ -335,7 +336,7 @@ export class HelpScout implements INodeType {
 						body.age = body.age.toString();
 					}
 					if (Object.keys(body).length === 0) {
-						throw new Error('You have to set at least one field');
+						throw new NodeOperationError(this.getNode(), 'You have to set at least one field');
 					}
 					responseData = await helpscoutApiRequest.call(this, 'PUT', `/v2/customers/${customerId}`, body, qs, undefined, { resolveWithFullResponse: true });
 					responseData = { success: true };
@@ -387,7 +388,7 @@ export class HelpScout implements INodeType {
 						delete body.customerEmail;
 					}
 					if (body.customer === undefined) {
-						throw new Error('Either customer email or customer ID must be set');
+						throw new NodeOperationError(this.getNode(), 'Either customer email or customer ID must be set');
 					}
 					if (attachments) {
 						if (attachments.attachmentsValues
@@ -406,7 +407,7 @@ export class HelpScout implements INodeType {
 										mimeType: binaryProperty.mimeType,
 									};
 								} else {
-									throw new Error(`Binary property ${value.property} does not exist on input`);
+									throw new NodeOperationError(this.getNode(), `Binary property ${value.property} does not exist on input`);
 								}
 							};
 							body.attachments?.push.apply(body.attachments, (attachments.attachmentsBinary as IDataObject[]).map(mapFunction) as IAttachment[]);
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 20a03de3f2..29bcbf8a19 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -169,7 +169,7 @@ export class HelpScoutTrigger implements INodeType {
 					const endpoint = `/v2/webhooks/${webhookData.webhookId}`;
 					try {
 						await helpscoutApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 4b70c5838f..0e5eb5e04c 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -5,6 +5,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 type Cheerio = ReturnType<typeof cheerio>;
@@ -228,15 +229,15 @@ export class HtmlExtract implements INodeType {
 			let htmlArray: string[] | string = [];
 			if (sourceData === 'json') {
 				if (item.json[dataPropertyName] === undefined) {
-					throw new Error(`No property named "${dataPropertyName}" exists!`);
+					throw new NodeOperationError(this.getNode(), `No property named "${dataPropertyName}" exists!`);
 				}
 				htmlArray = item.json[dataPropertyName] as string;
 			} else {
 				if (item.binary === undefined) {
-					throw new Error(`No item does not contain binary data!`);
+					throw new NodeOperationError(this.getNode(), `No item does not contain binary data!`);
 				}
 				if (item.binary[dataPropertyName] === undefined) {
-					throw new Error(`No property named "${dataPropertyName}" exists!`);
+					throw new NodeOperationError(this.getNode(), `No property named "${dataPropertyName}" exists!`);
 				}
 				htmlArray = Buffer.from(item.binary[dataPropertyName].data, 'base64').toString('utf8');
 			}
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index dfd7dff69a..936ea877a7 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -713,19 +715,19 @@ export class HttpRequest implements INodeType {
 							if (!contentTypesAllowed.includes(options.bodyContentType as string)) {
 								// As n8n-workflow.NodeHelpers.getParamterResolveOrder can not be changed
 								// easily to handle parameters in dot.notation simply error for now.
-								throw new Error('Sending binary data is only supported when option "Body Content Type" is set to "RAW/CUSTOM" or "FORM-DATA/MULTIPART"!');
+								throw new NodeOperationError(this.getNode(), 'Sending binary data is only supported when option "Body Content Type" is set to "RAW/CUSTOM" or "FORM-DATA/MULTIPART"!');
 							}
 
 							const item = items[itemIndex];
 
 							if (item.binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 
 							if (options.bodyContentType === 'raw') {
 								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex) as string;
 								if (item.binary[binaryPropertyName] === undefined) {
-									throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+									throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 								}
 								const binaryProperty = item.binary[binaryPropertyName] as IBinaryData;
 								requestOptions.body = Buffer.from(binaryProperty.data, BINARY_ENCODING);
@@ -742,11 +744,11 @@ export class HttpRequest implements INodeType {
 										propertyName = propertyDataParts[0];
 										binaryPropertyName = propertyDataParts[1];
 									} else if (binaryPropertyNames.length > 1) {
-										throw new Error('If more than one property should be send it is needed to define the in the format: "sendKey1:binaryProperty1,sendKey2:binaryProperty2"');
+										throw new NodeOperationError(this.getNode(), 'If more than one property should be send it is needed to define the in the format: "sendKey1:binaryProperty1,sendKey2:binaryProperty2"');
 									}
 
 									if (item.binary[binaryPropertyName] === undefined) {
-										throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+										throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 									}
 
 									const binaryProperty = item.binary[binaryPropertyName] as IBinaryData;
@@ -778,8 +780,8 @@ export class HttpRequest implements INodeType {
 						try {
 							// @ts-ignore
 							requestOptions[optionData.name] = JSON.parse(requestOptions[optionData.name]);
-						} catch (e) {
-							throw new Error(`The data in "${optionData.displayName}" is no valid JSON. Set Body Content Type to "RAW/Custom" for XML or other types of payloads`);
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), `The data in "${optionData.displayName}" is no valid JSON. Set Body Content Type to "RAW/Custom" for XML or other types of payloads`);
 						}
 					}
 				}
@@ -884,7 +886,7 @@ export class HttpRequest implements INodeType {
 			if (response!.status !== 'fulfilled') {
 				if (this.continueOnFail() !== true) {
 					// throw error;
-					throw new Error(response!.reason);
+					throw new NodeApiError(this.getNode(), response);
 				} else {
 					// Return the actual reason as error
 					returnItems.push(
@@ -974,8 +976,8 @@ export class HttpRequest implements INodeType {
 					if (responseFormat === 'json' && typeof returnItem.body === 'string') {
 						try {
 							returnItem.body = JSON.parse(returnItem.body);
-						} catch (e) {
-							throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 						}
 					}
 
@@ -984,8 +986,8 @@ export class HttpRequest implements INodeType {
 					if (responseFormat === 'json' && typeof response === 'string') {
 						try {
 							response = JSON.parse(response);
-						} catch (e) {
-							throw new Error('Response body is not valid JSON. Change "Response Format" to "String"');
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), 'Response body is not valid JSON. Change "Response Format" to "String"');
 						}
 					}
 
diff --git a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
index 5aec7790d8..dd98e667da 100644
--- a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
@@ -11,6 +11,7 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function hubspotApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, query: IDataObject = {}, uri?: string): Promise<any> { // tslint:disable-line:no-any
@@ -47,27 +48,7 @@ export async function hubspotApiRequest(this: IHookFunctions | IExecuteFunctions
 			return await this.helpers.requestOAuth2!.call(this, 'hubspotOAuth2Api', options, { tokenType: 'Bearer', includeCredentialsOnRefreshOnBody: true });
 		}
 	} catch (error) {
-		let errorMessages;
-
-		if (error.response && error.response.body) {
-
-			if (error.response.body.message) {
-
-				errorMessages = [error.response.body.message];
-
-			} else if (error.response.body.errors) {
-				// Try to return the error prettier
-				errorMessages = error.response.body.errors;
-
-				if (errorMessages[0].message) {
-					// @ts-ignore
-					errorMessages = errorMessages.map(errorItem => errorItem.message);
-				}
-			}
-			throw new Error(`Hubspot error response [${error.statusCode}]: ${errorMessages.join('|')}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 8f29418dac..6281780e20 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -10,6 +10,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -280,7 +282,7 @@ export class HubspotTrigger implements INodeType {
 				try {
 					const { targetUrl } = await hubspotApiRequest.call(this, 'GET', `/webhooks/v3/${appId}/settings`, {});
 					if (targetUrl !== currentWebhookUrl) {
-						throw new Error(`The APP ID ${appId} already has a target url ${targetUrl}. Delete it or use another APP ID before executing the trigger. Due to Hubspot API limitations, you can have just one trigger per APP.`);
+						throw new NodeOperationError(this.getNode(), `The APP ID ${appId} already has a target url ${targetUrl}. Delete it or use another APP ID before executing the trigger. Due to Hubspot API limitations, you can have just one trigger per APP.`);
 					}
 				} catch (error) {
 					if (error.statusCode === 404) {
@@ -316,7 +318,7 @@ export class HubspotTrigger implements INodeType {
 				endpoint = `/webhooks/v3/${appId}/subscriptions`;
 
 				if (Array.isArray(events) && events.length === 0) {
-					throw new Error(`You must define at least one event`);
+					throw new NodeOperationError(this.getNode(), `You must define at least one event`);
 				}
 
 				for (const event of events) {
@@ -344,7 +346,7 @@ export class HubspotTrigger implements INodeType {
 
 				try {
 					await hubspotApiRequest.call(this, 'DELETE', `/webhooks/v3/${appId}/settings`, {});
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
@@ -357,7 +359,7 @@ export class HubspotTrigger implements INodeType {
 		const credentials = this.getCredentials('hubspotDeveloperApi') as IDataObject;
 
 		if (credentials === undefined) {
-			throw new Error('No credentials found!');
+			throw new NodeOperationError(this.getNode(), 'No credentials found!');
 		}
 
 		const req = this.getRequestObject();
diff --git a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
index b2f785e13e..ac41db4ab7 100644
--- a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function humanticAiApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('humanticAiApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -40,20 +40,12 @@ export async function humanticAiApiRequest(this: IHookFunctions | IExecuteFuncti
 		const response = await this.helpers.request!(options);
 
 		if (response.data && response.data.status === 'error') {
-			throw new Error(`Humantic AI error response [400]: ${response.data.message}`);
+			throw new NodeApiError(this.getNode(), response.data);
 		}
 
 		return response;
 
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Humantic AI error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index 334a53ddb0..d72598be51 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -10,6 +10,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -81,7 +82,7 @@ export class HumanticAi implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const item = items[i].binary as IBinaryKeyData;
@@ -89,7 +90,7 @@ export class HumanticAi implements INodeType {
 						const binaryData = item[binaryPropertyName] as IBinaryData;
 
 						if (binaryData === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						responseData = await humanticAiApiRequest.call(
@@ -141,7 +142,7 @@ export class HumanticAi implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const item = items[i].binary as IBinaryKeyData;
@@ -149,7 +150,7 @@ export class HumanticAi implements INodeType {
 						const binaryData = item[binaryPropertyName] as IBinaryData;
 
 						if (binaryData === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						responseData = await humanticAiApiRequest.call(
diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
index 0cceacd771..a5385dd0b0 100644
--- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
@@ -5,12 +5,12 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function hunterApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('hunterApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	qs = Object.assign({ api_key: credentials.apiKey }, qs);
 	let options: OptionsWithUri = {
@@ -26,8 +26,8 @@ export async function hunterApiRequest(this: IHookFunctions | IExecuteFunctions
 	}
 	try {
 		return await this.helpers.request!(options);
-	} catch (err) {
-		throw new Error(err);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts
index ba7e5e4441..278162d606 100644
--- a/packages/nodes-base/nodes/If.node.ts
+++ b/packages/nodes-base/nodes/If.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeParameters,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 	NodeParameterValue,
 } from 'n8n-workflow';
 
@@ -326,7 +327,7 @@ export class If implements INodeType {
 		};
 
 		// Converts the input data of a dateTime into a number for easy compare
-		function convertDateTime(value: NodeParameterValue): number {
+		const convertDateTime = (value: NodeParameterValue): number => {
 			let returnValue: number | undefined = undefined;
 			if (typeof value === 'string') {
 				returnValue = new Date(value).getTime();
@@ -337,11 +338,11 @@ export class If implements INodeType {
 			}
 
 			if (returnValue === undefined || isNaN(returnValue)) {
-				throw new Error(`The value "${value}" is not a valid DateTime.`);
+				throw new NodeOperationError(this.getNode(), `The value "${value}" is not a valid DateTime.`);
 			}
 
 			return returnValue;
-		}
+		};
 
 		// The different dataTypes to check the values in
 		const dataTypes = [
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index 94a2f50f88..5f7602b56d 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -8,13 +8,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function intercomApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('intercomApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const headerWithAuthentication = Object.assign({},
@@ -32,12 +32,7 @@ export async function intercomApiRequest(this: IHookFunctions | IExecuteFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = error.response.body.message || error.response.body.Message;
-
-		if (errorMessage !== undefined) {
-			throw errorMessage;
-		}
-		throw error.response.body;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 181b37d96e..57903ca91d 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -8,6 +8,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	leadFields,
@@ -101,8 +103,8 @@ export class Intercom implements INodeType {
 				let companies, response;
 				try {
 					response = await intercomApiRequest.call(this, '/companies', 'GET');
-				} catch (err) {
-					throw new Error(`Intercom Error: ${err}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 				companies = response.companies;
 				for (const company of companies) {
@@ -214,8 +216,8 @@ export class Intercom implements INodeType {
 
 					try {
 						responseData = await intercomApiRequest.call(this, '/contacts', 'POST', body);
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'get') {
@@ -237,8 +239,8 @@ export class Intercom implements INodeType {
 							responseData = await intercomApiRequest.call(this, '/contacts', 'GET', {}, qs);
 							responseData = responseData.contacts;
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'getAll') {
@@ -254,8 +256,8 @@ export class Intercom implements INodeType {
 							responseData = await intercomApiRequest.call(this, '/contacts', 'GET', {}, qs);
 							responseData = responseData.contacts;
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'delete') {
@@ -268,8 +270,8 @@ export class Intercom implements INodeType {
 							qs.user_id = value;
 							responseData = await intercomApiRequest.call(this, '/contacts', 'DELETE', {}, qs);
 						}
-						} catch (err) {
-							throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+						} catch (error) {
+							throw new NodeApiError(this.getNode(), error);
 						}
 				}
 			}
@@ -378,8 +380,8 @@ export class Intercom implements INodeType {
 
 					try {
 						responseData = await intercomApiRequest.call(this, '/users', 'POST', body, qs);
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'get') {
@@ -394,8 +396,8 @@ export class Intercom implements INodeType {
 						} else {
 							responseData = await intercomApiRequest.call(this, '/users', 'GET', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'getAll') {
@@ -411,16 +413,16 @@ export class Intercom implements INodeType {
 							responseData = await intercomApiRequest.call(this, '/users', 'GET', {}, qs);
 							responseData = responseData.users;
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'delete') {
 					const id = this.getNodeParameter('id', i) as string;
 					try {
 						responseData = await intercomApiRequest.call(this, `/users/${id}`, 'DELETE');
-						} catch (err) {
-							throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
 						}
 				}
 			}
@@ -469,8 +471,8 @@ export class Intercom implements INodeType {
 					}
 					try {
 						responseData = await intercomApiRequest.call(this, '/companies', 'POST', body, qs);
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
 					}
 				}
 				if (operation === 'get') {
@@ -488,8 +490,8 @@ export class Intercom implements INodeType {
 						} else {
 							responseData = await intercomApiRequest.call(this, '/companies', 'GET', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
 					}
 				}
 				if (operation === 'getAll') {
@@ -505,8 +507,8 @@ export class Intercom implements INodeType {
 							responseData = await intercomApiRequest.call(this, '/companies', 'GET', {}, qs);
 							responseData = responseData.companies;
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
 					}
 				}
 				if (operation === 'users') {
@@ -522,8 +524,8 @@ export class Intercom implements INodeType {
 							qs.type = 'users';
 							responseData = await intercomApiRequest.call(this, '/companies', 'GET', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Intercom Error: ${JSON.stringify(err)}`);
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Interval.node.ts b/packages/nodes-base/nodes/Interval.node.ts
index 9abe96879a..cd7bcbd21e 100644
--- a/packages/nodes-base/nodes/Interval.node.ts
+++ b/packages/nodes-base/nodes/Interval.node.ts
@@ -3,6 +3,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -62,7 +63,7 @@ export class Interval implements INodeType {
 		const unit = this.getNodeParameter('unit') as string;
 
 		if (interval <= 0) {
-			throw new Error('The interval has to be set to at least 1 or higher!');
+			throw new NodeOperationError(this.getNode(), 'The interval has to be set to at least 1 or higher!');
 		}
 
 		let intervalValue = interval;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 947be4d0c3..a43a86ecd1 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -20,7 +20,7 @@ import {
 export async function invoiceNinjaApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('invoiceNinjaApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const baseUrl = credentials!.url || 'https://app.invoiceninja.com';
@@ -38,15 +38,7 @@ export async function invoiceNinjaApiRequest(this: IHookFunctions | IExecuteFunc
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-			// Try to return the error prettier
-			const errorMessages = Object.keys(error.response.body.errors).map(errorName => {
-				return (error.response.body.errors[errorName] as [string]).join('');
-			});
-			throw new Error(`Invoice Ninja error response [${error.statusCode}]: ${errorMessages.join(' | ')}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index b8fbe79a38..104c9d8949 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -112,7 +112,7 @@ export class InvoiceNinjaTrigger implements INodeType {
 
 					try {
 						await invoiceNinjaApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
index 35ec1e3420..e4d21f8adf 100644
--- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function iterableApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -38,16 +38,7 @@ export async function iterableApiRequest(this: IExecuteFunctions | IExecuteSingl
 		return await this.helpers.request.call(this, options);
 
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.msg) {
-
-			const message = error.response.body.msg;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Iterable error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index 46c1f47ad6..bde2a5acf2 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -123,7 +125,7 @@ export class Iterable implements INodeType {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
 					if (!additionalFields.email && !additionalFields.id) {
-						throw new Error('Either email or userId must be passed in to identify the user. Please add one of both via "Additional Fields". If both are passed in, email takes precedence.');
+						throw new NodeOperationError(this.getNode(), 'Either email or userId must be passed in to identify the user. Please add one of both via "Additional Fields". If both are passed in, email takes precedence.');
 					}
 
 					const body: IDataObject = {
@@ -191,7 +193,7 @@ export class Iterable implements INodeType {
 
 					if (this.continueOnFail() === false) {
 						if (responseData.code !== 'Success') {
-							throw new Error(
+							throw new NodeOperationError(this.getNode(),
 								`Iterable error response [400]: ${responseData.msg}`,
 							);
 						}
@@ -221,9 +223,7 @@ export class Iterable implements INodeType {
 
 					if (this.continueOnFail() === false) {
 						if (responseData.code !== 'Success') {
-							throw new Error(
-								`Iterable error response [400]: ${responseData.msg}`,
-							);
+							throw new NodeApiError(this.getNode(), responseData);
 						}
 					}
 
@@ -253,8 +253,8 @@ export class Iterable implements INodeType {
 
 					if (this.continueOnFail() === false) {
 						if (Object.keys(responseData).length === 0) {
-							throw new Error(
-								`Iterable error response [404]: User not found`,
+							throw new NodeApiError(this.getNode(), responseData,
+								{ message: `User not found`, httpCode: '404' },
 							);
 						}
 					}
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index 3ad028c680..8e384c1a76 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -12,6 +12,8 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -27,7 +29,7 @@ export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecut
 	}
 
 	if (jiraCredentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (jiraVersion === 'server') {
@@ -67,22 +69,7 @@ export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecut
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		let errorMessage = error.message;
-
-		if (error.response.body) {
-			if (error.response.body.errorMessages && error.response.body.errorMessages.length) {
-				errorMessage = JSON.stringify(error.response.body.errorMessages);
-			} else {
-				errorMessage = error.response.body.message || error.response.body.error || error.response.body.errors || error.message;
-			}
-		}
-
-		if (typeof errorMessage !== 'string') {
-			errorMessage = JSON.stringify(errorMessage);
-		}
-
-		throw new Error(`Jira error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -172,4 +159,4 @@ export const allEvents = [
 	'worklog_created',
 	'worklog_updated',
 	'worklog_deleted',
-];
\ No newline at end of file
+];
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index f11e6abc9a..2f73f3afa9 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -12,6 +12,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -457,7 +458,7 @@ export class Jira implements INodeType {
 					}
 					if (!additionalFields.parentIssueKey
 						&& subtaskIssues.includes(issueTypeId)) {
-						throw new Error('You must define a Parent Issue Key when Issue type is sub-task');
+						throw new NodeOperationError(this.getNode(), 'You must define a Parent Issue Key when Issue type is sub-task');
 
 					} else if (additionalFields.parentIssueKey
 						&& subtaskIssues.includes(issueTypeId)) {
@@ -531,7 +532,7 @@ export class Jira implements INodeType {
 					}
 					if (!updateFields.parentIssueKey
 						&& subtaskIssues.includes(updateFields.issueType)) {
-						throw new Error('You must define a Parent Issue Key when Issue type is sub-task');
+						throw new NodeOperationError(this.getNode(), 'You must define a Parent Issue Key when Issue type is sub-task');
 
 					} else if (updateFields.parentIssueKey
 						&& subtaskIssues.includes(updateFields.issueType)) {
@@ -737,7 +738,7 @@ export class Jira implements INodeType {
 					const issueKey = this.getNodeParameter('issueKey', i) as string;
 
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					const item = items[i].binary as IBinaryKeyData;
@@ -745,7 +746,7 @@ export class Jira implements INodeType {
 					const binaryData = item[binaryPropertyName] as IBinaryData;
 
 					if (binaryData === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					responseData = await jiraSoftwareCloudApiRequest.call(
@@ -860,7 +861,7 @@ export class Jira implements INodeType {
 						const commentJson = this.getNodeParameter('commentJson', i) as string;
 						const json = validateJSON(commentJson);
 						if (json === '') {
-							throw new Error('Document Format must be a valid JSON');
+							throw new NodeOperationError(this.getNode(), 'Document Format must be a valid JSON');
 						}
 
 						Object.assign(body, { body: json });
@@ -945,7 +946,7 @@ export class Jira implements INodeType {
 						const commentJson = this.getNodeParameter('commentJson', i) as string;
 						const json = validateJSON(commentJson);
 						if (json === '') {
-							throw new Error('Document Format must be a valid JSON');
+							throw new NodeOperationError(this.getNode(), 'Document Format must be a valid JSON');
 						}
 
 						Object.assign(body, { body: json });
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 68ada4ecf0..64ad396372 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -427,7 +427,7 @@ export class JiraTrigger implements INodeType {
 
 					try {
 						await jiraSoftwareCloudApiRequest.call(this, endpoint, 'DELETE', body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
index 85f6f0cee9..1f0bd6be97 100644
--- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
@@ -6,12 +6,12 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function jotformApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('jotFormApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: {
@@ -32,6 +32,6 @@ export async function jotformApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error('JotForm Error: ' + error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index c379ce3254..b118379a04 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -123,7 +123,7 @@ export class JotFormTrigger implements INodeType {
 
 					const webhookIds = Object.keys(responseData.content);
 					webhookData.webhookId = webhookIds[webhookUrls.indexOf(webhookUrl)];
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 2b7876a672..6270da679a 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -15,6 +15,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export class Kafka implements INodeType {
@@ -195,7 +196,7 @@ export class Kafka implements INodeType {
 
 		if (credentials.authentication === true) {
 			if(!(credentials.username && credentials.password)) {
-				throw new Error('Username and password are required for authentication');
+				throw new NodeOperationError(this.getNode(), 'Username and password are required for authentication');
 			}
 			config.sasl = {
 				username: credentials.username as string,
@@ -230,7 +231,7 @@ export class Kafka implements INodeType {
 				try {
 					headers = JSON.parse(headers);
 				} catch (exception) {
-					throw new Error('Headers must be a valid json');
+					throw new NodeOperationError(this.getNode(), 'Headers must be a valid json');
 				}
 			} else {
 				const values = (this.getNodeParameter('headersUi', i) as IDataObject).headerValues as IDataObject[];
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 0c7e91abf4..32f3b7a9c9 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -14,6 +14,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export class KafkaTrigger implements INodeType {
@@ -125,7 +126,7 @@ export class KafkaTrigger implements INodeType {
 
 		if (credentials.authentication === true) {
 			if(!(credentials.username && credentials.password)) {
-				throw new Error('Username and password are required for authentication');
+				throw new NodeOperationError(this.getNode(), 'Username and password are required for authentication');
 			}
 			config.sasl = {
 				username: credentials.username as string,
@@ -156,7 +157,7 @@ export class KafkaTrigger implements INodeType {
 					if (options.jsonParseMessage) {
 						try {
 							value = JSON.parse(value);
-						} catch (err) { }
+						} catch (error) { }
 					}
 
 					data.message = value;
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index c2a4c24970..63ad3ee0eb 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject
+	IDataObject, NodeApiError
 } from 'n8n-workflow';
 
 import {
@@ -39,11 +39,7 @@ export async function keapApiRequest(this: IWebhookFunctions | IHookFunctions |
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'keapOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Infusionsoft error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 59692d0df5..d250f3a825 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -708,7 +709,7 @@ export class Keap implements INodeType {
 						&& (attachmentsUi.attachmentsBinary as IDataObject).length) {
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 
 							for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
@@ -716,7 +717,7 @@ export class Keap implements INodeType {
 								const item = items[i].binary as IBinaryKeyData;
 
 								if (item[property as string] === undefined) {
-									throw new Error(`Binary data property "${property}" does not exists on item!`);
+									throw new NodeOperationError(this.getNode(), `Binary data property "${property}" does not exists on item!`);
 								}
 
 								attachments.push({
@@ -779,13 +780,13 @@ export class Keap implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const item = items[i].binary as IBinaryKeyData;
 
 						if (item[binaryPropertyName as string] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						body.file_data = item[binaryPropertyName as string].data;
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index fe608e58a1..17b037b104 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -140,7 +140,7 @@ export class KeapTrigger implements INodeType {
 
 					try {
 						await keapApiRequest.call(this, 'DELETE', `/hooks/${webhookData.webhookId}`);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index 1618f50b07..2d325b6e54 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -57,12 +58,7 @@ export async function lemlistApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error?.response?.body) {
-			throw new Error(`Lemlist error response [${error.statusCode}]: ${error?.response?.body}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Line/GenericFunctions.ts b/packages/nodes-base/nodes/Line/GenericFunctions.ts
index cc95fadd37..c8c0c392a3 100644
--- a/packages/nodes-base/nodes/Line/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Line/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function lineApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,15 +36,6 @@ export async function lineApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		return await this.helpers.requestOAuth2.call(this, 'lineNotifyOAuth2Api', options, { tokenType: 'Bearer' });
 
 	} catch (error) {
-
-		let errorMessage;
-
-		if (error.response && error.response.body && error.response.body.message) {
-
-			errorMessage = error.response.body.message;
-
-			throw new Error(`Line error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index 8c50baa354..b4681c3ec3 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -9,6 +9,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -108,11 +109,11 @@ export class Line implements INodeType {
 
 						if (image && image.binaryData === true) {
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 							//@ts-ignore
 							if (items[i].binary[image.binaryProperty] === undefined) {
-								throw new Error(`No binary data property "${image.binaryProperty}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${image.binaryProperty}" does not exists on item!`);
 							}
 
 							const binaryData = (items[i].binary as IBinaryKeyData)[image.binaryProperty as string];
diff --git a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
index 3a0f43fbb9..58a549edda 100644
--- a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function lingvaNexApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('lingvaNexApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -35,20 +35,12 @@ export async function lingvaNexApiRequest(this: IHookFunctions | IExecuteFunctio
 		const response = await this.helpers.request!(options);
 
 		if (response.err !== null) {
-			throw new Error(`LingvaNex error response [400]: ${response.err}`);
+			throw new NodeApiError(this.getNode(), response);
 		}
 
 		return response;
 
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`LingvaNex error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
index 09fe1e71f4..49879afaf2 100644
--- a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
@@ -7,6 +7,7 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
+import { NodeApiError } from 'n8n-workflow';
 
 export async function linkedInApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, binary?: boolean, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const options: OptionsWithUrl = {
@@ -33,10 +34,7 @@ export async function linkedInApiRequest(this: IHookFunctions | IExecuteFunction
 	try {
 		return await this.helpers.requestOAuth2!.call(this, 'linkedInOAuth2Api', options, { tokenType: 'Bearer' });
 	} catch (error) {
-		if (error.respose && error.response.body && error.response.body.detail) {
-			throw new Error(`Linkedin Error response [${error.statusCode}]: ${error.response.body.detail}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 81f01e5450..2f7d3e0da9 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import { linkedInApiRequest } from './GenericFunctions';
 import {
@@ -138,13 +139,13 @@ export class LinkedIn implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						// Buffer binary data
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
index 3a40941662..c99078e919 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	ITriggerResponse,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as mqtt from 'mqtt';
@@ -75,7 +76,7 @@ export class MqttTrigger implements INodeType {
 		const credentials = this.getCredentials('mqtt');
 
 		if (!credentials) {
-			throw new Error('Credentials are mandatory!');
+			throw new NodeOperationError(this.getNode(), 'Credentials are mandatory!');
 		}
 
 		const topics = (this.getNodeParameter('topics') as string).split(',');
@@ -83,7 +84,7 @@ export class MqttTrigger implements INodeType {
 		const options = this.getNodeParameter('options') as IDataObject;
 
 		if (!topics) {
-			throw new Error('Topics are mandatory!');
+			throw new NodeOperationError(this.getNode(), 'Topics are mandatory!');
 		}
 
 		const protocol = credentials.protocol as string || 'mqtt';
@@ -120,7 +121,7 @@ export class MqttTrigger implements INodeType {
 							if (options.jsonParseMessage) {
 								try {
 									message = JSON.parse(message.toString());
-								} catch (err) { }
+								} catch (error) { }
 							}
 
 							result.message = message;
diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
index c8c24cd57c..1ce5ae2338 100644
--- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
  } from 'n8n-workflow';
 
 export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, qs: IDataObject = {} ,headers?: object): Promise<any> { // tslint:disable-line:no-any
@@ -38,13 +38,13 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
 			const credentials = this.getCredentials('mailchimpApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers = Object.assign({}, headers, { Authorization: `apikey ${credentials.apiKey}` });
 
 			if (!(credentials.apiKey as string).includes('-')) {
-				throw new Error('The API key is not valid!');
+				throw new NodeOperationError(this.getNode(), 'The API key is not valid!');
 			}
 
 			const datacenter = (credentials.apiKey as string).split('-').pop();
@@ -61,10 +61,7 @@ export async function mailchimpApiRequest(this: IHookFunctions | IExecuteFunctio
 			return await this.helpers.requestOAuth2!.call(this, 'mailchimpOAuth2Api', options, { tokenType: 'Bearer' });
 		}
 	} catch (error) {
-		if (error.respose && error.response.body && error.response.body.detail) {
-			throw new Error(`Mailchimp Error response [${error.statusCode}]: ${error.response.body.detail}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index b0f25a882a..5784dd5937 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -10,6 +10,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	mailchimpApiRequest,
@@ -175,8 +177,8 @@ export class MailchimpTrigger implements INodeType {
 				try {
 					response = await mailchimpApiRequest.call(this, '/lists', 'GET');
 					lists = response.lists;
-				} catch (err) {
-					throw new Error(`Mailchimp Error: ${err}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 				for (const list of lists) {
 					const listName = list.name;
@@ -205,11 +207,11 @@ export class MailchimpTrigger implements INodeType {
 				const endpoint = `/lists/${listId}/webhooks/${webhookData.webhookId}`;
 				try {
 					await mailchimpApiRequest.call(this, endpoint, 'GET');
-				} catch (err) {
-					if (err.statusCode === 404) {
+				} catch (error) {
+					if (error.statusCode === 404) {
 						return false;
 					}
-					throw new Error(`Mailchimp Error: ${err}`);
+					throw new NodeApiError(this.getNode(), error);
 				}
 				return true;
 			},
@@ -236,8 +238,8 @@ export class MailchimpTrigger implements INodeType {
 				const endpoint = `/lists/${listId}/webhooks`;
 				try {
 					webhook = await mailchimpApiRequest.call(this, endpoint, 'POST', body);
-				} catch (e) {
-					throw e;
+				} catch (error) {
+					throw error;
 				}
 				if (webhook.id === undefined) {
 					return false;
@@ -256,7 +258,7 @@ export class MailchimpTrigger implements INodeType {
 					const endpoint = `/lists/${listId}/webhooks/${webhookData.webhookId}`;
 					try {
 						await mailchimpApiRequest.call(this, endpoint, 'DELETE', {});
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					delete webhookData.webhookId;
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index 388a75c594..b1ad7a5248 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function mailerliteApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -34,16 +34,7 @@ export async function mailerliteApiRequest(this: IExecuteFunctions | IExecuteSin
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const message = error.response.body.error.message;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Mailer Lite error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index 998da6ce24..658e059af0 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -162,7 +162,7 @@ export class MailerLiteTrigger implements INodeType {
 
 					try {
 						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 39eeffb8dd..ebd13dae9f 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -7,6 +7,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -127,7 +129,7 @@ export class Mailgun implements INodeType {
 			const credentials = this.getCredentials('mailgunApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const formData: IDataObject = {
@@ -182,7 +184,13 @@ export class Mailgun implements INodeType {
 				json: true,
 			};
 
-			const responseData = await this.helpers.request(options);
+		let responseData;
+
+		try {
+			responseData = await this.helpers.request(options);
+		} catch (error) {
+			throw new NodeApiError(this.getNode(), error);
+		}
 
 			returnData.push({
 				json: responseData,
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index aecdd5148a..6f101a1619 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject, IHookFunctions } from 'n8n-workflow';
+import { IDataObject, IHookFunctions, NodeApiError } from 'n8n-workflow';
 
 export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const emailApiCredentials = this.getCredentials('mailjetEmailApi');
@@ -35,10 +35,7 @@ export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingle
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response.body || error.response.body.ErrorMessage) {
-			throw new Error(`Mailjet Error: response [${error.statusCode}]: ${error.response.body.ErrorMessage}`);
-		}
-		throw new Error(error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index cf113c56c8..d7ae92907c 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -9,12 +9,13 @@ import {
 } from 'n8n-core';
 
 import * as _ from 'lodash';
+import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function mandrillApiRequest(this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions, resource: string, method: string, action: string, body: any = {}, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('mandrillApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const data = Object.assign({}, body, { key: credentials.apiKey });
@@ -33,19 +34,7 @@ export async function mandrillApiRequest(this: IExecuteFunctions | IHookFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = error.response.body.message || error.response.body.Message;
-		if (error.name === 'Invalid_Key') {
-			throw new Error('The provided API key is not a valid Mandrill API key');
-		} else if (error.name === 'ValidationError') {
-			throw new Error('The parameters passed to the API call are invalid or not provided when required');
-		} else if (error.name === 'GeneralError') {
-			throw new Error('An unexpected error occurred processing the request. Mandrill developers will be notified.');
-		}
-
-		if (errorMessage !== undefined) {
-			throw errorMessage;
-		}
-		throw error.response.body;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index c61173d183..c3fe7d14d6 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -708,8 +710,8 @@ export class Mandrill implements INodeType {
 				let templates;
 				try {
 					templates = await mandrillApiRequest.call(this, '/templates', 'POST', '/list');
-				} catch (err) {
-					throw new Error(`Mandrill Error: ${err}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 				for (const template of templates) {
 					const templateName = template.name;
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 8c54818b25..bed9eff1b4 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -2,7 +2,7 @@ import {
 	OptionsWithUri,
 } from 'request';
 
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 import {
 	BINARY_ENCODING,
@@ -52,7 +52,7 @@ export async function matrixApiRequest(this: IExecuteFunctions | IExecuteSingleF
 
 		const credentials = this.getCredentials('matrixApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		//@ts-ignore
 		options.uri = `${credentials.homeserverUrl}/_matrix/${option.overridePrefix || 'client'}/r0${resource}`;
@@ -65,18 +65,7 @@ export async function matrixApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return options.overridePrefix === 'media' ? JSON.parse(response) : response;
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('Matrix credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error) {
-			// Try to return the error prettier
-			throw new Error(`Matrix error response [${error.statusCode}]: ${error.response.body.error}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -201,7 +190,7 @@ export async function handleMatrixCall(this: IExecuteFunctions | IExecuteSingleF
 			if (item.binary === undefined
 				//@ts-ignore
 				|| item.binary[binaryPropertyName] === undefined) {
-				throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+				throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 			}
 
 			//@ts-ignore
@@ -243,5 +232,5 @@ export async function handleMatrixCall(this: IExecuteFunctions | IExecuteSingleF
 	}
 
 
-	throw new Error('Not implemented yet');
+	throw new NodeOperationError(this.getNode(), 'Not implemented yet');
 }
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 5109adc2ea..e7e503d2da 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -130,7 +130,7 @@ export class Matrix implements INodeType {
 							name: roomNameResponse.name,
 							value: roomId,
 						});
-					} catch (e) {
+					} catch (error) {
 						// TODO: Check, there is probably another way to get the name of this private-chats
 						returnData.push({
 							name: `Unknown: ${roomId}`,
diff --git a/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts b/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
index 735024e38a..eba84ade8e 100644
--- a/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mattermost/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export interface IAttachment {
@@ -34,7 +34,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	const credentials = this.getCredentials('mattermostApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -54,20 +54,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Mattermost credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Mattermost error response: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts b/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
index 5d6476a83b..3d06b20110 100644
--- a/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/Mattermost.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -1803,7 +1804,7 @@ export class Mattermost implements INodeType {
 				const responseData = await apiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1837,7 +1838,7 @@ export class Mattermost implements INodeType {
 				const responseData = await apiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1876,7 +1877,7 @@ export class Mattermost implements INodeType {
 				const responseData = await apiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1908,7 +1909,7 @@ export class Mattermost implements INodeType {
 				const responseData = await apiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1942,7 +1943,7 @@ export class Mattermost implements INodeType {
 		const credentials = this.getCredentials('mattermostApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		let operation: string;
@@ -2279,26 +2280,26 @@ export class Mattermost implements INodeType {
 
 							if (additionalFields.inTeam !== undefined
 								&& !validRules.inTeam.includes(snakeCase(additionalFields.sort as string))) {
-								throw new Error(`When In Team is set the only valid values for sorting are ${validRules.inTeam.join(',')}`);
+								throw new NodeOperationError(this.getNode(), `When In Team is set the only valid values for sorting are ${validRules.inTeam.join(',')}`);
 							}
 							if (additionalFields.inChannel !== undefined
 								&& !validRules.inChannel.includes(snakeCase(additionalFields.sort as string))) {
-								throw new Error(`When In Channel is set the only valid values for sorting are ${validRules.inChannel.join(',')}`);
+								throw new NodeOperationError(this.getNode(), `When In Channel is set the only valid values for sorting are ${validRules.inChannel.join(',')}`);
 							}
 							if (additionalFields.inChannel !== undefined
 								&& additionalFields.inChannel === ''
 								&& additionalFields.sort !== 'username') {
-								throw new Error('When sort is different than username In Channel must be set');
+								throw new NodeOperationError(this.getNode(), 'When sort is different than username In Channel must be set');
 							}
 
 							if (additionalFields.inTeam !== undefined
 								&& additionalFields.inTeam === ''
 								&& additionalFields.sort !== 'username') {
-								throw new Error('When sort is different than username In Team must be set');
+								throw new NodeOperationError(this.getNode(), 'When sort is different than username In Team must be set');
 							}
 
 						} else {
-							throw new Error(`When sort is defined either 'in team' or 'in channel' must be defined`);
+							throw new NodeOperationError(this.getNode(), `When sort is defined either 'in team' or 'in channel' must be defined`);
 						}
 					}
 
@@ -2359,7 +2360,7 @@ export class Mattermost implements INodeType {
 				}
 			}
 			else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			let responseData;
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index d36add52df..4136fc5956 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 interface OMauticErrorResponse {
@@ -20,17 +20,6 @@ interface OMauticErrorResponse {
 	}>;
 }
 
-export function getErrors(error: OMauticErrorResponse): string {
-	const returnErrors: string[] = [];
-
-	for (const errorItem of error.errors) {
-		returnErrors.push(errorItem.message);
-	}
-
-	return returnErrors.join(', ');
-}
-
-
 export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'credentials') as string;
 
@@ -68,15 +57,12 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
 
 		if (returnData.errors) {
 			// They seem to to sometimes return 200 status but still error.
-			throw new Error(getErrors(returnData));
+			throw new NodeApiError(this.getNode(), returnData);
 		}
 
 		return returnData;
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-			throw new Error('Mautic Error: ' + getErrors(error.response.body));
-		}
-		throw new Error(`Mautic Error: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 53915367fd..d3f30c036f 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -9,10 +9,11 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
-	getErrors,
 	mauticApiRequest,
 	mauticApiRequestAllItems,
 	validateJSON,
@@ -265,7 +266,7 @@ export class Mautic implements INodeType {
 						qs.start = 0;
 						responseData = await mauticApiRequest.call(this, 'GET', '/companies', {}, qs);
 						if (responseData.errors) {
-							throw new Error(getErrors(responseData));
+							throw new NodeApiError(this.getNode(), responseData);
 						}
 						responseData = responseData.companies;
 						responseData = Object.values(responseData);
@@ -306,7 +307,7 @@ export class Mautic implements INodeType {
 						if (json !== undefined) {
 							body = { ...json };
 						} else {
-							throw new Error('Invalid JSON');
+							throw new NodeOperationError(this.getNode(), 'Invalid JSON');
 						}
 					}
 					if (additionalFields.ipAddress) {
@@ -415,7 +416,7 @@ export class Mautic implements INodeType {
 						if (json !== undefined) {
 							body = { ...json };
 						} else {
-							throw new Error('Invalid JSON');
+							throw new NodeOperationError(this.getNode(), 'Invalid JSON');
 						}
 					}
 					if (updateFields.ipAddress) {
@@ -524,7 +525,7 @@ export class Mautic implements INodeType {
 						qs.start = 0;
 						responseData = await mauticApiRequest.call(this, 'GET', '/contacts', {}, qs);
 						if (responseData.errors) {
-							throw new Error(getErrors(responseData));
+							throw new NodeApiError(this.getNode(), responseData);
 						}
 						responseData = responseData.contacts;
 						responseData = Object.values(responseData);
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index b49d7f8bc2..239350bc50 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -144,7 +144,7 @@ export class MauticTrigger implements INodeType {
 				const endpoint = `/hooks/${webhookData.webhookId}`;
 				try {
 					await mauticApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Medium/GenericFunctions.ts b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
index 181002836d..fe6b5358e2 100644
--- a/packages/nodes-base/nodes/Medium/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function mediumApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, query: IDataObject = {}, uri?: string): Promise<any> { // tslint:disable-line:no-any
@@ -35,7 +35,7 @@ export async function mediumApiRequest(this: IHookFunctions | IExecuteFunctions
 			const credentials = this.getCredentials('mediumApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `Bearer ${credentials.accessToken}`;
@@ -46,9 +46,6 @@ export async function mediumApiRequest(this: IHookFunctions | IExecuteFunctions
 			return await this.helpers.requestOAuth2!.call(this, 'mediumOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			throw new Error('The Medium credentials are not valid!');
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.ts b/packages/nodes-base/nodes/Medium/Medium.node.ts
index d7fcf745a0..372852c216 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.ts
+++ b/packages/nodes-base/nodes/Medium/Medium.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -476,13 +477,13 @@ export class Medium implements INodeType {
 						bodyRequest.tags = tags.split(',').map(name => {
 							const returnValue = name.trim();
 							if (returnValue.length > 25) {
-								throw new Error(`The tag "${returnValue}" is to long. Maximum lenght of a tag is 25 characters.`);
+								throw new NodeOperationError(this.getNode(), `The tag "${returnValue}" is to long. Maximum lenght of a tag is 25 characters.`);
 							}
 							return returnValue;
 						});
 
 						if ((bodyRequest.tags as string[]).length > 5) {
-							throw new Error('To many tags got used. Maximum 5 can be set.');
+							throw new NodeOperationError(this.getNode(), 'To many tags got used. Maximum 5 can be set.');
 						}
 					}
 
diff --git a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
index ae2cbb80e6..3501cc9275 100644
--- a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -29,7 +29,7 @@ export async function messageBirdApiRequest(
 ): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('messageBirdApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials returned!');
 	}
 
 	const options: OptionsWithUri = {
@@ -49,18 +49,6 @@ export async function messageBirdApiRequest(
 		}
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			throw new Error('The Message Bird credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.errors) {
-			// Try to return the error prettier
-			const errorMessage = error.response.body.errors.map((e: IDataObject) => e.description);
-
-			throw new Error(`MessageBird Error response [${error.statusCode}]: ${errorMessage.join('|')}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index ab1b642135..d61b7ccb33 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -380,7 +381,7 @@ export class MessageBird implements INodeType {
 					});
 				}
 				else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'balance') {
@@ -388,7 +389,7 @@ export class MessageBird implements INodeType {
 				requestPath = '/balance';
 			}
 			else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const responseData = await messageBirdApiRequest.call(
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
index 9119c4c005..8dc0e4ee69 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 import {
-	IDataObject
+	IDataObject, NodeApiError
 } from 'n8n-workflow';
 
 export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -26,11 +26,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftExcelOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Microsoft error response [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 9953484b03..02f43789e0 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -297,7 +299,7 @@ export class MicrosoftExcel implements INodeType {
 					columns = columns.map((column: IDataObject) => column.name);
 
 					if (!columns.includes(lookupColumn)) {
-						throw new Error(`Column ${lookupColumn} does not exist on the table selected`);
+						throw new NodeApiError(this.getNode(), responseData, { message: `Column ${lookupColumn} does not exist on the table selected` });
 					}
 
 					result.length = 0;
@@ -398,7 +400,7 @@ export class MicrosoftExcel implements INodeType {
 						const keyRow = this.getNodeParameter('keyRow', i) as number;
 						const dataStartRow = this.getNodeParameter('dataStartRow', i) as number;
 						if (responseData.values === null) {
-							throw new Error('Range did not return data');
+							throw new NodeApiError(this.getNode(), responseData, { message: 'Range did not return data' });
 						}
 						const keyValues = responseData.values[keyRow];
 						for (let i = dataStartRow; i < responseData.values.length; i++) {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index b8cdc89cac..cc7ad8cd83 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject
+	IDataObject, NodeApiError
 } from 'n8n-workflow';
 
 export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}, option: IDataObject = { json: true }): Promise<any> { // tslint:disable-line:no-any
@@ -36,11 +36,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOneDriveOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Microsoft OneDrive response [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index a7bacc29fa..e36076bd65 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -9,6 +9,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -114,7 +116,7 @@ export class MicrosoftOneDrive implements INodeType {
 					const fileName = responseData.name;
 
 					if (responseData.file === undefined) {
-						throw new Error('The ID you provided does not belong to a file.');
+						throw new NodeApiError(this.getNode(), responseData, { message: 'The ID you provided does not belong to a file.' });
 					}
 
 					let mimeType: string | undefined;
@@ -181,11 +183,11 @@ export class MicrosoftOneDrive implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 						//@ts-ignore
 						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -197,7 +199,7 @@ export class MicrosoftOneDrive implements INodeType {
 					} else {
 						const body = this.getNodeParameter('fileContent', i) as string;
 						if (fileName === '') {
-							throw new Error('File name must be set!');
+							throw new NodeOperationError(this.getNode(), 'File name must be set!');
 						}
 						responseData = await microsoftApiRequest.call(this, 'PUT', `/drive/items/${parentId}:/${fileName}:/content`,  body , {}, undefined, { 'Content-Type': 'text/plain' } );
 						returnData.push(responseData as IDataObject);
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
index 8646ae08f2..4486605212 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
@@ -11,6 +11,7 @@ import {
 import {
 	IDataObject,
 	INodeExecutionData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}, option: IDataObject = { json: true }): Promise<any> { // tslint:disable-line:no-any
@@ -45,11 +46,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOutlookOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Microsoft error response [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index 0cbd784f52..1373ee6f41 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -10,6 +10,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -244,11 +246,11 @@ export class MicrosoftOutlook implements INodeType {
 							const binaryPropertyName = attachment.binaryPropertyName as string;
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 							//@ts-ignore
 							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 							}
 
 							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -338,11 +340,11 @@ export class MicrosoftOutlook implements INodeType {
 							const binaryPropertyName = attachment.binaryPropertyName as string;
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 							//@ts-ignore
 							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 							}
 
 							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -516,11 +518,11 @@ export class MicrosoftOutlook implements INodeType {
 							const binaryPropertyName = attachment.binaryPropertyName as string;
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 							//@ts-ignore
 							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 							}
 
 							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -558,11 +560,11 @@ export class MicrosoftOutlook implements INodeType {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 					//@ts-ignore
 					if (items[i].binary[binaryPropertyName] === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
@@ -571,7 +573,7 @@ export class MicrosoftOutlook implements INodeType {
 					const fileName = additionalFields.fileName === undefined ? binaryData.fileName : additionalFields.fileName;
 
 					if (!fileName) {
-						throw new Error('File name is not set. It has either to be set via "Additional Fields" or has to be set on the binary property!');
+						throw new NodeOperationError(this.getNode(), 'File name is not set. It has either to be set via "Additional Fields" or has to be set on the binary property!');
 					}
 
 					// Check if the file is over 3MB big
@@ -596,7 +598,7 @@ export class MicrosoftOutlook implements INodeType {
 						const uploadUrl = responseData.uploadUrl;
 
 						if (uploadUrl === undefined) {
-							throw new Error('Failed to get upload session');
+							throw new NodeApiError(this.getNode(), responseData, { message: 'Failed to get upload session' });
 						}
 
 						for (let bytesUploaded = 0; bytesUploaded < dataBuffer.length; bytesUploaded += chunkSize) {
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 16fdcce1dd..facc0dd3de 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -215,7 +216,7 @@ export class MicrosoftSql implements INodeType {
 		const credentials = this.getCredentials('microsoftSql');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const config = {
@@ -387,14 +388,14 @@ export class MicrosoftSql implements INodeType {
 				} as IDataObject);
 			} else {
 				await pool.close();
-				throw new Error(`The operation "${operation}" is not supported!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 			}
-		} catch (err) {
+		} catch (error) {
 			if (this.continueOnFail() === true) {
 				returnItems = items;
 			} else {
 				await pool.close();
-				throw err;
+				throw error;
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
index ff49f86ff7..1baab4f292 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -30,11 +30,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Microsoft error response [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
index d7ce39d3f3..7c02343462 100644
--- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function mindeeApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -47,17 +47,7 @@ export async function mindeeApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Mindee error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index 56dbf99045..be504e88c9 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -10,6 +10,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -133,7 +134,7 @@ export class Mindee implements INodeType {
 					const rawData = this.getNodeParameter('rawData', i) as boolean;
 
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					const item = items[i].binary as IBinaryKeyData;
@@ -141,7 +142,7 @@ export class Mindee implements INodeType {
 					const binaryData = item[binaryPropertyName] as IBinaryData;
 
 					if (binaryData === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					responseData = await mindeeApiRequest.call(
@@ -175,7 +176,7 @@ export class Mindee implements INodeType {
 					const rawData = this.getNodeParameter('rawData', i) as boolean;
 
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					const item = items[i].binary as IBinaryKeyData;
@@ -183,7 +184,7 @@ export class Mindee implements INodeType {
 					const binaryData = item[binaryPropertyName] as IBinaryData;
 
 					if (binaryData === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					responseData = await mindeeApiRequest.call(
diff --git a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
index 60f5373778..e415afc0b8 100644
--- a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -19,7 +19,7 @@ import {
 export async function moceanApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('moceanApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (query === undefined) {
@@ -47,22 +47,6 @@ export async function moceanApiRequest(this: IHookFunctions | IExecuteFunctions,
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('Authentication failed.');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			let errorMessage = error.response.body.message;
-			if (error.response.body.more_info) {
-				errorMessage += `errorMessage (${error.response.body.more_info})`;
-			}
-
-			throw new Error(`Mocean error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index f3b575a61d..3c2e9facfd 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {moceanApiRequest} from './GenericFunctions';
@@ -220,7 +221,7 @@ export class Mocean implements INodeType {
 				body['mocean-text'] = text;
 				endpoint = '/rest/2/sms';
 			} else {
-				throw new Error(`Unknown resource ${resource}`);
+				throw new NodeOperationError(this.getNode(), `Unknown resource ${resource}`);
 			}
 
 			if (operation === 'send') {
@@ -232,7 +233,7 @@ export class Mocean implements INodeType {
 				}
 
 			} else {
-				throw new Error(`Unknown operation ${operation}`);
+				throw new NodeOperationError(this.getNode(), `Unknown operation ${operation}`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index 030e4f2310..f835c856b3 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -10,7 +10,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -18,6 +20,7 @@ import {
 } from 'lodash';
 
 export async function mondayComApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, body: any = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
 	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
 
 	const endpoint = 'https://api.monday.com/v2/';
@@ -44,11 +47,7 @@ export async function mondayComApiRequest(this: IExecuteFunctions | IWebhookFunc
 			return await this.helpers.requestOAuth2!.call(this, 'mondayComOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response) {
-			const errorMessage = error.response.body.error_message;
-			throw new Error(`Monday error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index 389e9b19c8..0fa5568888 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -387,8 +388,8 @@ export class MondayCom implements INodeType {
 					if (additionalFields.defaults) {
 						try {
 							JSON.parse(additionalFields.defaults as string);
-						} catch (e) {
-							throw new Error('Defauls must be a valid JSON');
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), 'Defauls must be a valid JSON');
 						}
 						body.variables.defaults = JSON.stringify(JSON.parse(additionalFields.defaults as string));
 					}
@@ -532,8 +533,8 @@ export class MondayCom implements INodeType {
 
 					try {
 						JSON.parse(value);
-					} catch (e) {
-						throw new Error('Custom Values must be a valid JSON');
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), 'Custom Values must be a valid JSON');
 					}
 					body.variables.value = JSON.stringify(JSON.parse(value));
 
@@ -560,8 +561,8 @@ export class MondayCom implements INodeType {
 
 					try {
 						JSON.parse(columnValues);
-					} catch (e) {
-						throw new Error('Custom Values must be a valid JSON');
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), 'Custom Values must be a valid JSON');
 					}
 					body.variables.columnValues = JSON.stringify(JSON.parse(columnValues));
 
@@ -591,8 +592,8 @@ export class MondayCom implements INodeType {
 					if (additionalFields.columnValues) {
 						try {
 							JSON.parse(additionalFields.columnValues as string);
-						} catch (e) {
-							throw new Error('Custom Values must be a valid JSON');
+						} catch (error) {
+							throw new NodeOperationError(this.getNode(), 'Custom Values must be a valid JSON');
 						}
 						body.variables.columnValues = JSON.stringify(JSON.parse(additionalFields.columnValues as string));
 					}
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 30eefb02b1..ed42fb80af 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -6,7 +6,8 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError
 } from 'n8n-workflow';
 
 import {
@@ -29,6 +30,7 @@ export class MongoDb implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const { database, connectionString } = validateAndResolveMongoCredentials(
+			this,
 			this.getCredentials('mongoDb'),
 		);
 
@@ -157,7 +159,7 @@ export class MongoDb implements INodeType {
 			}
 			returnItems = this.helpers.returnJsonArray(updateItems as IDataObject[]);
 		} else {
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		client.close();
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
index 87fefd69b3..42dc4efcb0 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts
@@ -1,7 +1,9 @@
+import { IExecuteFunctions } from 'n8n-core';
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	IMongoCredentials,
@@ -28,9 +30,11 @@ function buildParameterizedConnString(
  * Build mongoDb connection string and resolve database name.
  * If a connection string override value is provided, that will be used in place of individual args
  *
+ * @param {IExecuteFunctions} self
  * @param {ICredentialDataDecryptedObject} credentials raw/input MongoDB credentials to use
  */
-function buildMongoConnectionParams(
+export function buildMongoConnectionParams(
+	self: IExecuteFunctions,
 	credentials: IMongoCredentialsType,
 ): IMongoCredentials {
 	const sanitizedDbName =
@@ -47,9 +51,7 @@ function buildMongoConnectionParams(
 				database: sanitizedDbName,
 			};
 		} else {
-			throw new Error(
-				'Cannot override credentials: valid MongoDB connection string not provided ',
-			);
+			throw new NodeOperationError(self.getNode(), 'Cannot override credentials: valid MongoDB connection string not provided ');
 		}
 	} else {
 		return {
@@ -62,15 +64,18 @@ function buildMongoConnectionParams(
 /**
  * Verify credentials. If ok, build mongoDb connection string and resolve database name.
  *
+ * @param {IExecuteFunctions} self
  * @param {ICredentialDataDecryptedObject} credentials raw/input MongoDB credentials to use
  */
 export function validateAndResolveMongoCredentials(
+	self: IExecuteFunctions,
 	credentials?: ICredentialDataDecryptedObject,
 ): IMongoCredentials {
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(self.getNode(), 'No credentials got returned!');
 	} else {
 		return buildMongoConnectionParams(
+			self,
 			credentials as unknown as IMongoCredentialsType,
 		);
 	}
diff --git a/packages/nodes-base/nodes/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData.node.ts
index 666f8c3790..79e74f8244 100644
--- a/packages/nodes-base/nodes/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData.node.ts
@@ -16,6 +16,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as iconv from 'iconv-lite';
@@ -486,7 +487,7 @@ export class MoveBinaryData implements INodeType {
 					}
 				}
 			} else {
-				throw new Error(`The operation "${mode}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${mode}" is not known!`);
 			}
 
 			returnData.push(newItem);
diff --git a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
index 3514916b02..a6d2e5a217 100644
--- a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -19,7 +19,7 @@ import {
 export async function msg91ApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('msg91Api');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (query === undefined) {
@@ -39,22 +39,6 @@ export async function msg91ApiRequest(this: IHookFunctions | IExecuteFunctions,
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The MSG91 credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			let errorMessage = `MSG91 error response [${error.statusCode}]: ${error.response.body.message}`;
-			if (error.response.body.more_info) {
-				errorMessage = `errorMessage (${error.response.body.more_info})`;
-			}
-
-			throw new Error(errorMessage);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 016d511fcb..6dc6b14b0a 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -167,10 +168,10 @@ export class Msg91 implements INodeType {
 					qs.message = this.getNodeParameter('message', i) as string;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const responseData = await msg91ApiRequest.call(this, requestMethod, endpoint, body, qs);
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 03549c9260..0e587ae4ad 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 // @ts-ignore
 import * as mysql2 from 'mysql2/promise';
@@ -215,7 +216,7 @@ export class MySql implements INodeType {
 		const credentials = this.getCredentials('mySql');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		// Destructuring SSL configuration
@@ -314,7 +315,7 @@ export class MySql implements INodeType {
 
 		} else {
 			await connection.end();
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		await connection.end();
diff --git a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
index 50331f8ad0..cc8764d1e1 100644
--- a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function nasaApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, qs: IDataObject, option: IDataObject = {}, uri?: string | undefined): Promise<any> { // tslint:disable-line:no-any
@@ -32,18 +32,7 @@ export async function nasaApiRequest(this: IHookFunctions | IExecuteFunctions, m
 		return await this.helpers.request(options);
 
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The NASA credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.msg) {
-			// Try to return the error prettier
-			throw new Error(`NASA error response [${error.statusCode}]: ${error.response.body.msg}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index c6a4f2e569..5b523c5bc0 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -981,7 +982,7 @@ export class Nasa implements INodeType {
 					endpoint = `/neo/rest/v1/neo/${asteroidId}`;
 
 				} else {
-					throw new Error(`The operation '${operation}' is unknown!`);
+					throw new NodeOperationError(this.getNode(), `The operation '${operation}' is unknown!`);
 				}
 
 			}
@@ -1000,7 +1001,7 @@ export class Nasa implements INodeType {
 					endpoint = `/neo/rest/v1/neo/browse`;
 
 				} else {
-					throw new Error(`The operation '${operation}' is unknown!`);
+					throw new NodeOperationError(this.getNode(), `The operation '${operation}' is unknown!`);
 				}
 
 			}
diff --git a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
index 68bc908f92..263e6dd38c 100644
--- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
@@ -2,6 +2,7 @@ import {
 	IExecuteFunctions,
 	IHookFunctions,
 } from 'n8n-core';
+import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 import {
 	OptionsWithUri,
@@ -39,7 +40,7 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('nextCloudApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.auth = {
@@ -56,7 +57,7 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
 		} else {
 			const credentials = this.getCredentials('nextCloudOAuth2Api');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`;
@@ -68,6 +69,6 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
 			return await this.helpers.requestOAuth2!.call(this, 'nextCloudOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new Error(`NextCloud Error. Status Code: ${error.statusCode}. Message: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index dd65e4d86b..55a7025d9f 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -591,7 +592,7 @@ export class NextCloud implements INodeType {
 		}
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const resource = this.getNodeParameter('resource', 0) as string;
@@ -627,14 +628,14 @@ export class NextCloud implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
 
 
 						if (item.binary[propertyNameUpload] === undefined) {
-							throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${propertyNameUpload}" does not exists on item!`);
 						}
 
 						body = Buffer.from(item.binary[propertyNameUpload].data, BINARY_ENCODING);
@@ -719,7 +720,7 @@ export class NextCloud implements INodeType {
 				}
 
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			// Make sure that the webdav URL does never have a trailing slash because
diff --git a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
index 5f50af03ef..ffed2ecc22 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function openThesaurusApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -31,14 +31,6 @@ export async function openThesaurusApiRequest(this: IHookFunctions | IExecuteFun
 
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`OpenThesaurus error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
index 7ad14ee88d..4aaa76a4bc 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
@@ -6,6 +6,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
@@ -209,7 +211,7 @@ export class OpenWeatherMap implements INodeType {
 		const credentials = this.getCredentials('openWeatherMapApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const operation = this.getNodeParameter('operation', 0) as string;
@@ -239,7 +241,7 @@ export class OpenWeatherMap implements INodeType {
 			} else if (locationSelection === 'zipCode') {
 				qs.zip = this.getNodeParameter('zipCode', i) as string;
 			} else {
-				throw new Error(`The locationSelection "${locationSelection}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The locationSelection "${locationSelection}" is not known!`);
 			}
 
 			// Get the language
@@ -261,7 +263,7 @@ export class OpenWeatherMap implements INodeType {
 
 				endpoint = 'forecast';
 			} else {
-				throw new Error(`The operation "${operation}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 			}
 
 			const options: OptionsWithUri = {
@@ -271,7 +273,13 @@ export class OpenWeatherMap implements INodeType {
 				json: true,
 			};
 
-			const responseData = await this.helpers.request(options);
+			let responseData;
+			try {
+				responseData = await this.helpers.request(options);
+			} catch (error) {
+				throw new NodeApiError(this.getNode(), error);
+			}
+
 
 			returnData.push(responseData as IDataObject);
 		}
diff --git a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
index d1a4d48bb3..f0d4713461 100644
--- a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -21,7 +21,7 @@ export async function orbitApiRequest(this: IHookFunctions | IExecuteFunctions |
 	try {
 		const credentials = this.getCredentials('orbitApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -38,15 +38,7 @@ export async function orbitApiRequest(this: IHookFunctions | IExecuteFunctions |
 
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Orbit error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
index cd52b4bb4d..acf877b855 100644
--- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
@@ -11,6 +11,8 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function ouraApiRequest(
@@ -25,7 +27,7 @@ export async function ouraApiRequest(
 
 	const credentials = this.getCredentials('ouraApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: {
@@ -51,13 +53,6 @@ export async function ouraApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		const errorMessage = error?.response?.body?.message;
-
-		if (errorMessage) {
-			throw new Error(`Oura error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index 72ae1d6a2b..0baed95f52 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -11,14 +11,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function paddleApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('paddleApi');
 
 	if (credentials === undefined) {
-		throw new Error('Could not retrieve credentials!');
+		throw new NodeOperationError(this.getNode(), 'Could not retrieve credentials!');
 	}
 
 	const options: OptionsWithUri = {
@@ -37,12 +37,12 @@ export async function paddleApiRequest(this: IHookFunctions | IExecuteFunctions
 		const response = await this.helpers.request!(options);
 
 		if (!response.success) {
-			throw new Error(`Code: ${response.error.code}. Message: ${response.error.message}`);
+			throw new NodeApiError(this.getNode(), response);
 		}
 
 		return response;
 	} catch (error) {
-		throw new Error(`ERROR: Code: ${error.code}. Message: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index a72526fe5c..6fdc69cf7b 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -139,7 +141,7 @@ export class Paddle implements INodeType {
 
 				// Alert user if there's no payments present to be loaded into payments property
 				if (paymentResponse.response === undefined || paymentResponse.response.length === 0) {
-					throw Error('No payments on account.');
+					throw new NodeApiError(this.getNode(), paymentResponse, { message: 'No payments on account.' });
 				}
 
 				for (const payment of paymentResponse.response) {
@@ -164,7 +166,7 @@ export class Paddle implements INodeType {
 
 				// Alert user if there's no products present to be loaded into payments property
 				if (products.length === 0) {
-					throw Error('No products on account.');
+					throw new NodeOperationError(this.getNode(), 'No products on account.');
 				}
 
 				for (const product of products) {
@@ -200,7 +202,7 @@ export class Paddle implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -285,7 +287,7 @@ export class Paddle implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -358,7 +360,7 @@ export class Paddle implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -475,7 +477,7 @@ export class Paddle implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 2ca0ce6251..8b514fbad7 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -11,6 +11,8 @@ import {
 	IDataObject,
 	IHookFunctions,
 	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -49,7 +51,7 @@ export async function pagerDutyApiRequest(this: IExecuteFunctions | IWebhookFunc
 			const credentials = this.getCredentials('pagerDutyApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `Token token=${credentials.apiToken}`;
@@ -59,14 +61,10 @@ export async function pagerDutyApiRequest(this: IExecuteFunctions | IWebhookFunc
 			return await this.helpers.requestOAuth2!.call(this, 'pagerDutyOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error && error.response.body.error.errors) {
-			// Try to return the error prettier
-				//@ts-ignore
-				throw new Error(`PagerDuty error response [${error.statusCode}]: ${error.response.body.error.errors.join(' | ')}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
+
 export async function pagerDutyApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const returnData: IDataObject[] = [];
diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
index 25b7278ea6..f3d0aa42b9 100644
--- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
@@ -10,10 +10,11 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function payPalApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
+
 	const credentials = this.getCredentials('payPalApi');
 	const env = getEnvironment(credentials!.env as string);
 	const tokenInfo =  await getAccessToken.call(this);
@@ -30,16 +31,7 @@ export async function payPalApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response.body) {
-			let errorMessage = error.response.body.message;
-			if (error.response.body.details) {
-				errorMessage += ` - Details: ${JSON.stringify(error.response.body.details)}`;
-			}
-			throw new Error(errorMessage);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -54,7 +46,7 @@ function getEnvironment(env: string): string {
 async function getAccessToken(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('payPalApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const env = getEnvironment(credentials!.env as string);
 	const data = Buffer.from(`${credentials!.clientId}:${credentials!.secret}`).toString(BINARY_ENCODING);
@@ -72,12 +64,7 @@ async function getAccessToken(this: IHookFunctions | IExecuteFunctions | IExecut
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = error.response.body.message || error.response.body.Message;
-
-		if (errorMessage !== undefined) {
-			throw new Error(errorMessage);
-		}
-		throw new Error(error.response.body);
+		throw new NodeOperationError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index f22e1c93f3..7b12c8d835 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -6,6 +6,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	payoutFields,
@@ -123,49 +124,34 @@ export class PayPal implements INodeType {
 							});
 							body.items = payoutItems;
 						} else {
-							throw new Error('You must have at least one item.');
+							throw new NodeOperationError(this.getNode(), 'You must have at least one item.');
 						}
 					} else {
 						const itemsJson = validateJSON(this.getNodeParameter('itemsJson', i) as string);
 						body.items = itemsJson;
 					}
-					try {
-						responseData = await payPalApiRequest.call(this, '/payments/payouts', 'POST', body);
-					} catch (err) {
-						throw new Error(`PayPal Error: ${JSON.stringify(err)}`);
-					}
+					responseData = await payPalApiRequest.call(this, '/payments/payouts', 'POST', body);
+
 				}
 				if (operation === 'get') {
 					const payoutBatchId = this.getNodeParameter('payoutBatchId', i) as string;
 					const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
-					try {
-						if (returnAll === true) {
-							responseData = await payPalApiRequestAllItems.call(this, 'items', `/payments/payouts/${payoutBatchId}`, 'GET', {}, qs);
-						} else {
-							qs.page_size = this.getNodeParameter('limit', i) as number;
-							responseData = await payPalApiRequest.call(this, `/payments/payouts/${payoutBatchId}`, 'GET', {}, qs);
-							responseData = responseData.items;
-						}
-					} catch (err) {
-						throw new Error(`PayPal Error: ${JSON.stringify(err)}`);
+					if (returnAll === true) {
+						responseData = await payPalApiRequestAllItems.call(this, 'items', `/payments/payouts/${payoutBatchId}`, 'GET', {}, qs);
+					} else {
+						qs.page_size = this.getNodeParameter('limit', i) as number;
+						responseData = await payPalApiRequest.call(this, `/payments/payouts/${payoutBatchId}`, 'GET', {}, qs);
+						responseData = responseData.items;
 					}
 				}
 			} else if (resource === 'payoutItem') {
 				if (operation === 'get') {
 					const payoutItemId = this.getNodeParameter('payoutItemId', i) as string;
-					try {
-						responseData = await payPalApiRequest.call(this,`/payments/payouts-item/${payoutItemId}`, 'GET', {}, qs);
-					} catch (err) {
-						throw new Error(`PayPal Error: ${JSON.stringify(err)}`);
-					}
+					responseData = await payPalApiRequest.call(this,`/payments/payouts-item/${payoutItemId}`, 'GET', {}, qs);
 				}
 				if (operation === 'cancel') {
 					const payoutItemId = this.getNodeParameter('payoutItemId', i) as string;
-					try {
-						responseData = await payPalApiRequest.call(this,`/payments/payouts-item/${payoutItemId}/cancel`, 'POST', {}, qs);
-					} catch (err) {
-						throw new Error(`PayPal Error: ${JSON.stringify(err)}`);
-					}
+					responseData = await payPalApiRequest.call(this,`/payments/payouts-item/${payoutItemId}/cancel`, 'POST', {}, qs);
 				}
 			}
 			if (Array.isArray(responseData)) {
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 94b69ade48..b25ce6e1e0 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -10,6 +10,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	payPalApiRequest,
@@ -76,8 +78,8 @@ export class PayPalTrigger implements INodeType {
 				try {
 					const endpoint = '/notifications/webhooks-event-types';
 					events = await payPalApiRequest.call(this, endpoint, 'GET');
-				} catch (err) {
-					throw new Error(`PayPal Error: ${err}`);
+				} catch (error) {
+					throw new NodeApiError(this.getNode(), error);
 				}
 				for (const event of events.event_types) {
 					const eventName = upperFist(event.name);
@@ -107,13 +109,13 @@ export class PayPalTrigger implements INodeType {
 				const endpoint = `/notifications/webhooks/${webhookData.webhookId}`;
 				try {
 					await payPalApiRequest.call(this, endpoint, 'GET');
-				} catch (err) {
-					if (err.response && err.response.name === 'INVALID_RESOURCE_ID') {
+				} catch (error) {
+					if (error.response && error.response.name === 'INVALID_RESOURCE_ID') {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						return false;
 					}
-					throw new Error(`PayPal Error: ${err}`);
+					throw new NodeApiError(this.getNode(), error);
 				}
 				return true;
 			},
@@ -131,8 +133,8 @@ export class PayPalTrigger implements INodeType {
 				const endpoint = '/notifications/webhooks';
 				try {
 					webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
-				} catch (e) {
-					throw e;
+				} catch (error) {
+					throw error;
 				}
 
 				if (webhook.id === undefined) {
@@ -149,7 +151,7 @@ export class PayPalTrigger implements INodeType {
 					const endpoint = `/notifications/webhooks/${webhookData.webhookId}`;
 					try {
 						await payPalApiRequest.call(this, endpoint, 'DELETE', {});
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					delete webhookData.webhookId;
@@ -183,8 +185,8 @@ export class PayPalTrigger implements INodeType {
 			};
 			try {
 				webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
-			} catch (e) {
-				throw e;
+			} catch (error) {
+				throw error;
 			}
 			if (webhook.verification_status !== 'SUCCESS') {
 				return {};
diff --git a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
index 8e1c339fd7..3ae4f2bdf9 100644
--- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function peekalinkApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('peekalinkApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -34,14 +34,6 @@ export async function peekalinkApiRequest(this: IHookFunctions | IExecuteFunctio
 
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Peekalink error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
index 1c15025abe..3be209ea32 100644
--- a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function phantombusterApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,24 +33,16 @@ export async function phantombusterApiRequest(this: IExecuteFunctions | IExecute
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const message = error.response.body.error;
-			// Try to return the error prettier
-			throw new Error(
-				`Phantombuster error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
-export function validateJSON(json: string | undefined, name: string): any { // tslint:disable-line:no-any
+export function validateJSON(self: IExecuteFunctions, json: string | undefined, name: string) {
 	let result;
 	try {
 		result = JSON.parse(json!);
 	} catch (exception) {
-		throw new Error(`${name} must provide a valid JSON`);
+		throw new NodeOperationError(self.getNode(), `${name} must provide a valid JSON`);
 	}
 	return result;
 }
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index c723066d86..8c1616b4fe 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -216,11 +216,12 @@ export class Phantombuster implements INodeType {
 
 					if (jsonParameters) {
 						if (additionalFields.argumentsJson) {
-							body.arguments = validateJSON(additionalFields.argumentsJson as string, 'Arguments');
+							body.arguments = validateJSON(this, additionalFields.argumentsJson as string, 'Arguments');
+
 							delete additionalFields.argumentsJson;
 						}
 						if (additionalFields.bonusArgumentJson) {
-							body.bonusArgument = validateJSON(additionalFields.bonusArgumentJson as string, 'Bonus Argument');
+							body.bonusArgument = validateJSON(this, additionalFields.bonusArgumentJson as string, 'Bonus Argument');
 							delete additionalFields.bonusArgumentJson;
 						}
 					} else {
diff --git a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
index 352777632d..b7bd4fd1ab 100644
--- a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function philipsHueApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -38,16 +38,7 @@ export async function philipsHueApiRequest(this: IExecuteFunctions | ILoadOption
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'philipsHueOAuth2Api', options, { tokenType: 'Bearer' });
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const errorMessage = error.response.body.error.description;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Philip Hue error response [${error.statusCode}]: ${errorMessage}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index 408a32b8fe..2352a7689e 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -6,6 +6,8 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -71,7 +73,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
 
 			const credentials = this.getCredentials('pipedriveApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			query.api_token = credentials.apiToken;
@@ -89,7 +91,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
 		}
 
 		if (responseData.success === false) {
-			throw new Error(`Pipedrive error response: ${responseData.error} (${responseData.error_info})`);
+			throw new NodeApiError(this.getNode(), responseData);
 		}
 
 		return {
@@ -97,22 +99,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
 			data: responseData.data,
 		};
 	} catch(error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Pipedrive credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error) {
-			// Try to return the error prettier
-			let errorMessage = `Pipedrive error response [${error.statusCode}]: ${error.response.body.error.message}`;
-			if (error.response.body.error_info) {
-				errorMessage += ` - ${error.response.body.error_info}`;
-			}
-			throw new Error(errorMessage);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -182,7 +169,7 @@ export async function pipedriveGetCustomProperties(this: IHookFunctions | IExecu
 	};
 
 	if (endpoints[resource] === undefined) {
-		throw new Error(`The resource "${resource}" is not supported for resolving custom values!`);
+		throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not supported for resolving custom values!`);
 	}
 
 	const requestMethod = 'GET';
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index c9aeda94ce..cc95485ab7 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -2707,13 +2708,13 @@ export class Pipedrive implements INodeType {
 					const item = items[i];
 
 					if (item.binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 
 					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
 
 					if (item.binary[binaryPropertyName] === undefined) {
-						throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 					}
 
 					const fileBufferData = Buffer.from(item.binary[binaryPropertyName].data, BINARY_ENCODING);
@@ -3014,7 +3015,7 @@ export class Pipedrive implements INodeType {
 
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			let responseData;
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index eb1b10f747..d9cdc3e542 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -300,7 +300,7 @@ export class PipedriveTrigger implements INodeType {
 
 					try {
 						await pipedriveApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
index 6af3a48acd..475b899c17 100644
--- a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
@@ -5,6 +5,8 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -27,7 +29,7 @@ export async function plivoApiRequest(
 	const credentials = this.getCredentials('plivoApi') as { authId: string, authToken: string };
 
 	if (!credentials) {
-		throw new Error('No credentials returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials returned!');
 	}
 
 	const options = {
@@ -45,18 +47,6 @@ export async function plivoApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			throw new Error('Invalid Plivo credentials');
-		}
-		if (error?.response?.body?.error) {
-			let errorMessage = `Plivo error response [${error.statusCode}]: ${error.response.body.error}`;
-			if (error.response.body.more_info) {
-				errorMessage = `errorMessage (${error.response.body.more_info})`;
-			}
-
-			throw new Error(errorMessage);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
index ad64cc006d..0b4cec52cc 100644
--- a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function posthogApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,15 +36,7 @@ export async function posthogApiRequest(this: IExecuteFunctions | ILoadOptionsFu
 		}
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-
-			const message = error.response.body.message;
-			// Try to return the error prettier
-			throw new Error(
-				`PosHog error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 1250236d78..9b62d57db5 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -3,7 +3,8 @@ import {
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as pgPromise from 'pg-promise';
@@ -197,7 +198,7 @@ export class Postgres implements INodeType {
 		const credentials = this.getCredentials('postgres');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const pgp = pgPromise();
@@ -260,7 +261,7 @@ export class Postgres implements INodeType {
 			returnItems = this.helpers.returnJsonArray(updateItems);
 		} else {
 			await pgp.end();
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		// Close the connection
diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
index 5b03ebf269..6caf415079 100644
--- a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -10,7 +10,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -18,7 +20,7 @@ export async function postmarkApiRequest(this: IExecuteFunctions | IWebhookFunct
 	const credentials = this.getCredentials('postmarkApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -40,7 +42,7 @@ export async function postmarkApiRequest(this: IExecuteFunctions | IWebhookFunct
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error(`Postmark: ${error.statusCode} Message: ${error.message}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index e6d86b5159..a66f099399 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -236,7 +236,7 @@ export class PostmarkTrigger implements INodeType {
 
 					try {
 						await postmarkApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
index 4561bbef59..5ad323fbc4 100644
--- a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
@@ -10,14 +10,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function profitWellApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	try {
 		const credentials = this.getCredentials('profitWellApi');
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 		let options: OptionsWithUri = {
 			headers: {
@@ -34,15 +34,7 @@ export async function profitWellApiRequest(this: IHookFunctions | IExecuteFuncti
 
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`ProfitWell error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
index bf412da333..6b152f5d34 100644
--- a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function pushbulletApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, uri?: string | undefined, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -30,16 +30,7 @@ export async function pushbulletApiRequest(this: IExecuteFunctions | ILoadOption
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'pushbulletOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const message = error.response.body.error.message;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Pushbullet error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 283715839b..8e38f2c45d 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -11,6 +11,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -486,11 +487,11 @@ export class Pushbullet implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 						//@ts-ignore
 						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
diff --git a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
index 269df83578..3804132044 100644
--- a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
@@ -10,6 +10,7 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 export async function pushcutApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, uri?: string | undefined, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,15 +37,6 @@ export async function pushcutApiRequest(this: IExecuteFunctions | ILoadOptionsFu
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const message = error.response.body.error;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Pushcut error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
index 024ca035d9..3e7e4df6c4 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
@@ -105,7 +105,7 @@ export class PushcutTrigger implements INodeType {
 
 					try {
 						await pushcutApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
index 1708288a36..4fe876538c 100644
--- a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function pushoverApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,16 +36,6 @@ export async function pushoverApiRequest(this: IExecuteFunctions | IExecuteSingl
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			let errors = error.response.body.errors;
-
-			errors = errors.map((e: IDataObject) => e);
-			// Try to return the error prettier
-			throw new Error(
-				`PushOver error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 3d290ecf00..10115f9bcb 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -12,6 +12,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -354,7 +355,7 @@ export class Pushover implements INodeType {
 							const binaryPropertyName = attachment.binaryPropertyName as string;
 
 							if (items[i].binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 
 							const item = items[i].binary as IBinaryKeyData;
@@ -362,7 +363,7 @@ export class Pushover implements INodeType {
 							const binaryData = item[binaryPropertyName] as IBinaryData;
 
 							if (binaryData === undefined) {
-								throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 							}
 
 							body.attachment = {
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index c4b9036f0e..e3f8b124bc 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as pgPromise from 'pg-promise';
@@ -128,7 +129,7 @@ export class QuestDb implements INodeType {
 		const credentials = this.getCredentials('questDb');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const pgp = pgPromise();
@@ -188,7 +189,7 @@ export class QuestDb implements INodeType {
 			returnItems = this.helpers.returnJsonArray(returnedItems as IDataObject[]);
 		} else {
 			await pgp.end();
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		// Close the connection
diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index 365ffb87d9..255d3d6d85 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function quickbaseApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -18,15 +18,15 @@ export async function quickbaseApiRequest(this: IExecuteFunctions | ILoadOptions
 	const credentials = this.getCredentials('quickbaseApi') as IDataObject;
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (!credentials.hostname) {
-		throw new Error('Hostname must be defined');
+		throw new NodeOperationError(this.getNode(), 'Hostname must be defined');
 	}
 
 	if (!credentials.userToken) {
-		throw new Error('User Token must be defined');
+		throw new NodeOperationError(this.getNode(), 'User Token must be defined');
 	}
 
 	try {
@@ -57,17 +57,7 @@ export async function quickbaseApiRequest(this: IExecuteFunctions | ILoadOptions
 		//@ts-ignore
 		return await this.helpers?.request(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.description) {
-
-			const message = error.response.body.description;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Quickbase error response [${error.statusCode}]: ${message} (qb-api-ray=${error.response.headers['qb-api-ray']})`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index c47cc05b2c..a3de7a4683 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -386,7 +387,7 @@ export class QuickBase implements INodeType {
 					}
 
 					if (items[i].json[updateKey] === undefined) {
-						throw new Error(`The update key ${updateKey} could not be found in the input`);
+						throw new NodeOperationError(this.getNode(), `The update key ${updateKey} could not be found in the input`);
 					}
 
 					record[fieldsLabelKey['Record ID#']] = { value: items[i].json[updateKey] };
@@ -457,7 +458,7 @@ export class QuickBase implements INodeType {
 					}
 
 					if (items[i].json[updateKey] === undefined) {
-						throw new Error(`The update key ${updateKey} could not be found in the input`);
+						throw new NodeOperationError(this.getNode(), `The update key ${updateKey} could not be found in the input`);
 					}
 
 					record[mergeFieldId] = { value: items[i].json[updateKey] };
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 9218f82bad..3d9953a216 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -8,6 +8,7 @@ import {
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -95,18 +96,7 @@ export async function quickBooksApiRequest(
 	try {
 		return await this.helpers.requestOAuth2!.call(this, 'quickBooksOAuth2Api', options);
 	} catch (error) {
-
-		const errors = error.error.Fault.Error;
-
-		if (errors && Array.isArray(errors)) {
-			const errorMessage = errors.map(
-				(e) => `QuickBooks error response [${e.code}]: ${e.Message} - Detail: ${e.Detail}`,
-			).join('|');
-
-			throw new Error(errorMessage);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 4fe8f983df..98645002ee 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -182,18 +183,18 @@ export class QuickBooks implements INodeType {
 					const lines = this.getNodeParameter('Line', i) as IDataObject[];
 
 					if (!lines.length) {
-						throw new Error(`Please enter at least one line for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one line for the ${resource}.`);
 					}
 
 					if (lines.some(line => line.DetailType === undefined || line.Amount === undefined || line.Description === undefined)) {
-						throw new Error('Please enter detail type, amount and description for every line.');
+						throw new NodeOperationError(this.getNode(), 'Please enter detail type, amount and description for every line.');
 					}
 
 					lines.forEach(line => {
 						if (line.DetailType === 'AccountBasedExpenseLineDetail' && line.accountId === undefined) {
-							throw new Error('Please enter an account ID for the associated line.');
+							throw new NodeOperationError(this.getNode(), 'Please enter an account ID for the associated line.');
 						} else if (line.DetailType === 'ItemBasedExpenseLineDetail' && line.itemId === undefined) {
-							throw new Error('Please enter an item ID for the associated line.');
+							throw new NodeOperationError(this.getNode(), 'Please enter an item ID for the associated line.');
 						}
 					});
 
@@ -273,7 +274,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -345,7 +346,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -416,7 +417,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -444,16 +445,16 @@ export class QuickBooks implements INodeType {
 					const lines = this.getNodeParameter('Line', i) as IDataObject[];
 
 					if (!lines.length) {
-						throw new Error(`Please enter at least one line for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one line for the ${resource}.`);
 					}
 
 					if (lines.some(line => line.DetailType === undefined || line.Amount === undefined || line.Description === undefined)) {
-						throw new Error('Please enter detail type, amount and description for every line.');
+						throw new NodeOperationError(this.getNode(), 'Please enter detail type, amount and description for every line.');
 					}
 
 					lines.forEach(line => {
 						if (line.DetailType === 'SalesItemLineDetail' && line.itemId === undefined) {
-							throw new Error('Please enter an item ID for the associated line.');
+							throw new NodeOperationError(this.getNode(), 'Please enter an item ID for the associated line.');
 						}
 					});
 
@@ -559,7 +560,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -587,16 +588,16 @@ export class QuickBooks implements INodeType {
 					const lines = this.getNodeParameter('Line', i) as IDataObject[];
 
 					if (!lines.length) {
-						throw new Error(`Please enter at least one line for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one line for the ${resource}.`);
 					}
 
 					if (lines.some(line => line.DetailType === undefined || line.Amount === undefined || line.Description === undefined)) {
-						throw new Error('Please enter detail type, amount and description for every line.');
+						throw new NodeOperationError(this.getNode(), 'Please enter detail type, amount and description for every line.');
 					}
 
 					lines.forEach(line => {
 						if (line.DetailType === 'SalesItemLineDetail' && line.itemId === undefined) {
-							throw new Error('Please enter an item ID for the associated line.');
+							throw new NodeOperationError(this.getNode(), 'Please enter an item ID for the associated line.');
 						}
 					});
 
@@ -702,7 +703,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -874,7 +875,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
@@ -962,7 +963,7 @@ export class QuickBooks implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					body = populateFields.call(this, body, updateFields, resource);
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index 3ce903d913..a4db2f278e 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -7,6 +7,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -333,7 +335,7 @@ export class RabbitMQ implements INodeType {
 					if (response!.status !== 'fulfilled') {
 
 						if (this.continueOnFail() !== true) {
-							throw new Error(response!.reason as string);
+							throw new NodeApiError(this.getNode(), response);
 						} else {
 							// Return the actual reason as error
 							returnItems.push(
@@ -398,7 +400,7 @@ export class RabbitMQ implements INodeType {
 					if (response!.status !== 'fulfilled') {
 
 						if (this.continueOnFail() !== true) {
-							throw new Error(response!.reason as string);
+							throw new NodeApiError(this.getNode(), response);
 						} else {
 							// Return the actual reason as error
 							returnItems.push(
@@ -422,7 +424,7 @@ export class RabbitMQ implements INodeType {
 				await channel.close();
 				await channel.connection.close();
 			} else {
-				throw new Error(`The operation "${mode}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${mode}" is not known!`);
 			}
 
 			return this.prepareOutputData(returnItems);
diff --git a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
index ff50006513..9b05f10b4a 100644
--- a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
@@ -6,6 +6,7 @@ import {
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -50,14 +51,7 @@ export async function raindropApiRequest(
 
 	try {
 		return await this.helpers.requestOAuth2!.call(this, 'raindropOAuth2Api', options);
-
 	} catch (error) {
-
-		if (error?.response?.body?.errorMessage) {
-			const errorMessage = error?.response?.body?.errorMessage;
-			throw new Error(`Raindrop error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 7792df40a8..084c22cf5d 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -10,6 +10,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -204,7 +205,7 @@ export class Raindrop implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					Object.assign(body, updateFields);
@@ -314,7 +315,7 @@ export class Raindrop implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					if (isEmpty(updateFields)) {
-						throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						throw new NodeOperationError(this.getNode(), `Please enter at least one field to update for the ${resource}.`);
 					}
 
 					if (updateFields.parentId) {
@@ -333,11 +334,11 @@ export class Raindrop implements INodeType {
 					if (updateFields.cover) {
 
 						if (!items[i].binary) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						if (!updateFields.cover) {
-							throw new Error('Please enter a binary property to upload a cover image.');
+							throw new NodeOperationError(this.getNode(), 'Please enter a binary property to upload a cover image.');
 						}
 
 						const binaryPropertyName = updateFields.cover as string;
diff --git a/packages/nodes-base/nodes/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
index bfabc72ba3..6b595d3b10 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
@@ -3,6 +3,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -66,7 +67,7 @@ export class ReadBinaryFile implements INodeType {
 				data = await fsReadFileAsync(filePath) as Buffer;
 			} catch (error) {
 				if (error.code === 'ENOENT') {
-					throw new Error(`The file "${filePath}" could not be found.`);
+					throw new NodeOperationError(this.getNode(), `The file "${filePath}" could not be found.`);
 				}
 
 				throw error;
diff --git a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
index 32aa3d899f..f9cb55b110 100644
--- a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -42,36 +42,18 @@ export async function redditApiRequest(
 	}
 
 	if (authRequired) {
-		let response;
-
 		try {
-			response = await this.helpers.requestOAuth2.call(this, 'redditOAuth2Api', options);
+			return await this.helpers.requestOAuth2.call(this, 'redditOAuth2Api', options);
 		} catch (error) {
-			if (error.response.body && error.response.body.message) {
-				const message = error.response.body.message;
-				throw new Error(`Reddit error response [${error.statusCode}]: ${message}`);
-			}
+			throw new NodeApiError(this.getNode(), error);
 		}
 
-		if ((response.errors && response.errors.length !== 0) || (response.json && response.json.errors && response.json.errors.length !== 0)) {
-			const errors = response?.errors || response?.json?.errors;
-			const errorMessage = errors.map((error: []) => error.join('-'));
-
-			throw new Error(`Reddit error response [400]: ${errorMessage.join('|')}`);
-		}
-
-		return response;
-
 	} else {
 
 		try {
 			return await this.helpers.request.call(this, options);
 		} catch (error) {
-			const errorMessage = error?.response?.body?.message;
-			if (errorMessage) {
-				throw new Error(`Reddit error response [${error.statusCode}]: ${errorMessage}`);
-			}
-			throw error;
+			throw new NodeApiError(this.getNode(), error);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index 093414e021..2d5257bf33 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -359,12 +360,12 @@ export class Reddit implements INodeType {
 					} else if (details === 'friends') {
 						responseData = responseData.data.children;
 						if (!responseData.length) {
-							throw new Error('Reddit error response [404]: Not Found');
+							throw new NodeApiError(this.getNode(), responseData);
 						}
 					} else if (details === 'karma') {
 						responseData = responseData.data;
 						if (!responseData.length) {
-							throw new Error('Reddit error response [404]: Not Found');
+							throw new NodeApiError(this.getNode(), responseData);
 						}
 					} else if (details === 'trophies') {
 						responseData = responseData.data.trophies.map((trophy: IDataObject) => trophy.data);
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 3d1aafa962..ab01f3a0b3 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -5,6 +5,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import { set } from 'lodash';
@@ -382,7 +383,7 @@ export class Redis implements INodeType {
 		}
 
 
-		async function setValue(client: redis.RedisClient, keyName: string, value: string | number | object | string[] | number[], expire: boolean, ttl: number, type?: string) {
+		const setValue = async (client: redis.RedisClient, keyName: string, value: string | number | object | string[] | number[], expire: boolean, ttl: number, type?: string) => {
 			if (type === undefined || type === 'automatic') {
 				// Request the type first
 				if (typeof value === 'string') {
@@ -392,7 +393,7 @@ export class Redis implements INodeType {
 				} else if (typeof value === 'object') {
 					type = 'hash';
 				} else {
-					throw new Error('Could not identify the type to set. Please set it manually!');
+					throw new NodeOperationError(this.getNode(), 'Could not identify the type to set. Please set it manually!');
 				}
 			}
 
@@ -417,7 +418,7 @@ export class Redis implements INodeType {
 				await clientExpire(keyName, ttl);
 			}
 			return;
-		}
+		};
 
 
 		return new Promise((resolve, reject) => {
@@ -428,7 +429,7 @@ export class Redis implements INodeType {
 			const credentials = this.getCredentials('redis');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const redisOptions: redis.ClientOpts = {
diff --git a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
index 2078470d13..5ed00d3601 100644
--- a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
@@ -7,12 +7,13 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
+import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function rocketchatApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, resource: string, method: string, operation: string, body: any = {}, headers?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('rocketchatApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const headerWithAuthentication = Object.assign({}, headers,
@@ -35,15 +36,7 @@ export async function rocketchatApiRequest(this: IExecuteFunctions | ILoadOption
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			const errorMessage = error.response.body.error;
-			// Try to return the error prettier
-			throw new Error(
-				`Rocketchat error response [${error.statusCode}]: ${errorMessage}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead.node.ts
index 503a2f0cf7..03e13dc822 100644
--- a/packages/nodes-base/nodes/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as Parser from 'rss-parser';
@@ -40,7 +41,7 @@ export class RssFeedRead implements INodeType {
 		const url = this.getNodeParameter('url', 0) as string;
 
 		if (!url) {
-			throw new Error('The parameter "URL" has to be set!');
+			throw new NodeOperationError(this.getNode(), 'The parameter "URL" has to be set!');
 		}
 		// TODO: Later add also check if the url has a valid format
 
@@ -49,12 +50,12 @@ export class RssFeedRead implements INodeType {
 		let feed: Parser.Output<IDataObject>;
 		try {
 			feed = await parser.parseURL(url);
-		} catch (e) {
-			if (e.code === 'ECONNREFUSED') {
-				throw new Error(`It was not possible to connect to the URL. Please make sure the URL "${url}" it is valid!`);
+		} catch (error) {
+			if (error.code === 'ECONNREFUSED') {
+				throw new NodeOperationError(this.getNode(), `It was not possible to connect to the URL. Please make sure the URL "${url}" it is valid!`);
 			}
 
-			throw e;
+			throw new NodeOperationError(this.getNode(), error);
 		}
 
 
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 342c3c4bc6..15a75c3c12 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import { RundeckApi } from './RundeckApi';
 
@@ -185,10 +186,10 @@ export class Rundeck implements INodeType {
 
 					returnData.push(response);
 				} else {
-					throw new Error(`The operation "${operation}" is not supported!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not supported!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not supported!`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index 80b3a91fea..890d595ccd 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -1,6 +1,6 @@
 import { OptionsWithUri } from 'request';
 import { IExecuteFunctions } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export interface RundeckCredentials {
 	url: string;
@@ -13,15 +13,15 @@ export class RundeckApi {
 
 
 	constructor(executeFunctions: IExecuteFunctions) {
-
 		const credentials = executeFunctions.getCredentials('rundeckApi');
 
+		this.executeFunctions = executeFunctions;
+
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.executeFunctions.getNode(), 'No credentials got returned!');
 		}
 
 		this.credentials = credentials as unknown as RundeckCredentials;
-		this.executeFunctions = executeFunctions;
 	}
 
 
@@ -43,12 +43,7 @@ export class RundeckApi {
 		try {
 			return await this.executeFunctions.helpers.request!(options);
 		} catch (error) {
-			let errorMessage = error.message;
-			if (error.response && error.response.body && error.response.body.message) {
-				errorMessage = error.response.body.message.replace('\n', '');
-			}
-
-			throw Error(`Rundeck Error [${error.statusCode}]: ${errorMessage}`);
+			throw new NodeApiError(this.executeFunctions.getNode(), error);
 		}
 	}
 
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index 111da29b85..1e53f85073 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -22,7 +22,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import { URL } from 'url';
@@ -34,11 +34,11 @@ export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | IL
 	credentials = this.getCredentials('s3');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (!(credentials.endpoint as string).startsWith('http')) {
-		throw new Error('HTTP(S) Scheme is required in endpoint definition');
+		throw new NodeOperationError(this.getNode(), 'HTTP(S) Scheme is required in endpoint definition');
 	}
 
 	const endpoint = new URL(credentials.endpoint as string);
@@ -80,17 +80,7 @@ export async function s3ApiRequest(this: IHookFunctions | IExecuteFunctions | IL
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		const errorMessage = error.response?.body.message || error.response?.body.Message || error.message;
-
-		if (error.statusCode === 403) {
-			if (errorMessage === 'The security token included in the request is invalid.') {
-				throw new Error('The S3 credentials are not valid!');
-			} else if (errorMessage.startsWith('The request signature we calculated does not match the signature you provided')) {
-				throw new Error('The S3 credentials are not valid!');
-			}
-		}
-
-		throw new Error(`S3 error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -98,7 +88,7 @@ export async function s3ApiRequestREST(this: IHookFunctions | IExecuteFunctions
 	const response = await s3ApiRequest.call(this, bucket, method, path, body, query, headers, options, region);
 	try {
 		return JSON.parse(response);
-	} catch (e) {
+	} catch (error) {
 		return response;
 	}
 }
@@ -114,8 +104,8 @@ export async function s3ApiRequestSOAP(this: IHookFunctions | IExecuteFunctions
 				resolve(data);
 			});
 		});
-	} catch (e) {
-		return e;
+	} catch (error) {
+		return error;
 	}
 }
 
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 7420f16f25..70c7f3dbd3 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -23,6 +23,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -119,7 +121,7 @@ export class S3 implements INodeType {
 					try {
 						credentials = this.getCredentials('s3');
 					} catch (error) {
-						throw new Error(error);
+						throw new NodeApiError(this.getNode(), error);
 					}
 
 					const name = this.getNodeParameter('name', i) as string;
@@ -430,7 +432,7 @@ export class S3 implements INodeType {
 					const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
 
 					if (fileKey.substring(fileKey.length - 1) === '/') {
-						throw new Error('Downloding a whole directory is not yet supported, please provide a file key');
+						throw new NodeOperationError(this.getNode(), 'Downloding a whole directory is not yet supported, please provide a file key');
 					}
 
 					let region = await s3ApiRequestSOAP.call(this, bucketName, 'GET', '', '', { location: '' });
@@ -597,11 +599,11 @@ export class S3 implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0) as string;
 
 						if (items[i].binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 
 						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 037b94afc1..54be4408c8 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -11,6 +11,7 @@ import {
 import {
 	IDataObject,
 	INodePropertyOptions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment-timezone';
@@ -41,11 +42,7 @@ export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSin
 			return await this.helpers.requestOAuth2.call(this, credentialsType, options);
 		}
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body[0] && error.response.body[0].message) {
-			// Try to return the error prettier
-			throw new Error(`Salesforce error response [${error.statusCode}]: ${error.response.body[0].message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 031280d0b3..9cbe6ee2c8 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -950,7 +952,7 @@ export class Salesforce implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 					const body: ILead = {};
 					if (!Object.keys(updateFields).length) {
-						throw new Error('You must add at least one update field');
+						throw new NodeOperationError(this.getNode(), 'You must add at least one update field');
 					}
 					if (updateFields.lastname !== undefined) {
 						body.LastName = updateFields.lastname as string;
@@ -1053,8 +1055,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Lead', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/delete-lead-id
@@ -1062,8 +1064,8 @@ export class Salesforce implements INodeType {
 					const leadId = this.getNodeParameter('leadId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/lead/${leadId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/get-lead
@@ -1220,7 +1222,7 @@ export class Salesforce implements INodeType {
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 					const body: IContact = {};
 					if (!Object.keys(updateFields).length) {
-						throw new Error('You must add at least one update field');
+						throw new NodeOperationError(this.getNode(), 'You must add at least one update field');
 					}
 					if (updateFields.fax !== undefined) {
 						body.Fax = updateFields.fax as string;
@@ -1341,8 +1343,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Contact', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/delete-contact-id
@@ -1350,8 +1352,8 @@ export class Salesforce implements INodeType {
 					const contactId = this.getNodeParameter('contactId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/contact/${contactId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/get-contact
@@ -1443,8 +1445,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, customObject, returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				if (operation === 'delete') {
@@ -1452,8 +1454,8 @@ export class Salesforce implements INodeType {
 					const recordId = this.getNodeParameter('recordId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/${customObject}/${recordId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
@@ -1589,8 +1591,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Opportunity', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/delete-opportunity-id
@@ -1598,8 +1600,8 @@ export class Salesforce implements INodeType {
 					const opportunityId = this.getNodeParameter('opportunityId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/opportunity/${opportunityId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/get-opportunity
@@ -1827,8 +1829,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Account', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/delete-account-id
@@ -1836,8 +1838,8 @@ export class Salesforce implements INodeType {
 					const accountId = this.getNodeParameter('accountId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/account/${accountId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/get-account
@@ -1987,8 +1989,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Case', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Case/delete-case-id
@@ -1996,8 +1998,8 @@ export class Salesforce implements INodeType {
 					const caseId = this.getNodeParameter('caseId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/case/${caseId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Case/get-case
@@ -2214,8 +2216,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Task', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Task/delete-task-id
@@ -2223,8 +2225,8 @@ export class Salesforce implements INodeType {
 					const taskId = this.getNodeParameter('taskId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/task/${taskId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Task/get-task
@@ -2247,7 +2249,7 @@ export class Salesforce implements INodeType {
 						body.Body = items[i].binary![binaryPropertyName].data;
 						body.ContentType = items[i].binary![binaryPropertyName].mimeType;
 					} else {
-						throw new Error(`The property ${binaryPropertyName} does not exist`);
+						throw new NodeOperationError(this.getNode(), `The property ${binaryPropertyName} does not exist`);
 					}
 					if (additionalFields.description !== undefined) {
 						body.Description = additionalFields.description as string;
@@ -2271,7 +2273,7 @@ export class Salesforce implements INodeType {
 							body.Body = items[i].binary![binaryPropertyName].data;
 							body.ContentType = items[i].binary![binaryPropertyName].mimeType;
 						} else {
-							throw new Error(`The property ${binaryPropertyName} does not exist`);
+							throw new NodeOperationError(this.getNode(), `The property ${binaryPropertyName} does not exist`);
 						}
 					}
 					if (updateFields.name !== undefined) {
@@ -2306,8 +2308,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'Attachment', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Attachment/delete-attachment-id
@@ -2315,8 +2317,8 @@ export class Salesforce implements INodeType {
 					const attachmentId = this.getNodeParameter('attachmentId', i) as string;
 					try {
 						responseData = await salesforceApiRequest.call(this, 'DELETE', `/sobjects/attachment/${attachmentId}`);
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Attachment/get-attachment-id
@@ -2343,8 +2345,8 @@ export class Salesforce implements INodeType {
 							qs.q = getQuery(options, 'User', returnAll, limit) as string;
 							responseData = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qs);
 						}
-					} catch (err) {
-						throw new Error(`Salesforce Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
index a56cce6ac8..f0a7694a85 100644
--- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
@@ -6,12 +6,12 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function salesmateApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('salesmateApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const options: OptionsWithUri = {
@@ -32,7 +32,7 @@ export async function salesmateApiRequest(this: IHookFunctions | IExecuteFunctio
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error('Salesmate Error: ' + error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index 634fe47519..735d89291e 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -8,6 +8,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	salesmateApiRequest,
@@ -313,7 +314,7 @@ export class Salesmate implements INodeType {
 					}
 					if (options.fields) {
 						if ((options.fields as string).trim() === '') {
-							throw new Error('You have to add at least one field');
+							throw new NodeOperationError(this.getNode(), 'You have to add at least one field');
 						}
 						body.fields = (options.fields as string).split(',') as string[];
 					} else {
@@ -478,7 +479,7 @@ export class Salesmate implements INodeType {
 					}
 					if (options.fields) {
 						if ((options.fields as string).trim() === '') {
-							throw new Error('You have to add at least one field');
+							throw new NodeOperationError(this.getNode(), 'You have to add at least one field');
 						}
 						body.fields = (options.fields as string).split(',') as string[];
 					} else {
@@ -670,7 +671,7 @@ export class Salesmate implements INodeType {
 					}
 					if (options.fields !== undefined) {
 						if ((options.fields as string).trim() === '') {
-							throw new Error('You have to add at least one field');
+							throw new NodeOperationError(this.getNode(), 'You have to add at least one field');
 						}
 						body.fields = (options.fields as string).split(',') as string[];
 					} else {
diff --git a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
index d8d5c0fa7c..c2255961fd 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
@@ -9,14 +9,14 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function scorecardApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('securityScorecardApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const headerWithAuthentication = { Authorization: `Token ${credentials.apiKey}` };
@@ -44,10 +44,7 @@ export async function scorecardApiRequest(this: IHookFunctions | IExecuteFunctio
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.error) {
-			const errorMessage = `SecurityScorecard error response [${error.statusCode}]: ${error.error.error ? error.error.error.message : error.error}`;
-			throw new Error(errorMessage);
-		} else throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
index d80bf5cf53..bb539d7966 100644
--- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
@@ -6,12 +6,12 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function segmentApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('segmentApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const base64Key =  Buffer.from(`${credentials.writekey}:`).toString('base64');
 	const options: OptionsWithUri = {
@@ -31,6 +31,6 @@ export async function segmentApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error('Segment Error: ' + error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
index 0e4c81713e..fe44dbf90f 100644
--- a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function sendGridApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, endpoint: string, method: string, body: any = {}, qs: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -41,17 +41,7 @@ export async function sendGridApiRequest(this: IHookFunctions | IExecuteFunction
 		//@ts-ignore
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			let errors = error.response.body.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`SendGrid error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index 9565aa8917..ba9a6c3608 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -9,7 +9,8 @@ import {
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError
 } from 'n8n-workflow';
 
 import {
@@ -382,7 +383,7 @@ export class SendGrid implements INodeType {
 
 						for (const property of binaryProperties) {
 							if (!items[i].binary?.hasOwnProperty(property)) {
-								throw new Error(`The binary property ${property} does not exist`);
+								throw new NodeOperationError(this.getNode(), `The binary property ${property} does not exist`);
 							}
 
 							const binaryProperty = items[i].binary![property];
diff --git a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
index 890c07cf31..4df80113e3 100644
--- a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function sendyApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -33,16 +33,6 @@ export async function sendyApiRequest(this: IExecuteFunctions | ILoadOptionsFunc
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Sendy error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index ada1dbac26..7a010b8165 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -7,6 +7,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -159,7 +161,7 @@ export class Sendy implements INodeType {
 					if (success.includes(responseData)) {
 						responseData = { message: responseData };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeApiError(this.getNode(), responseData, { httpCode: '400' });
 					}
 				}
 			}
@@ -190,7 +192,7 @@ export class Sendy implements INodeType {
 					if (responseData === '1') {
 						responseData = { success: true };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeOperationError(this.getNode(), `Sendy error response [${400}]: ${responseData}`);
 					}
 				}
 
@@ -220,7 +222,7 @@ export class Sendy implements INodeType {
 					if (!errors.includes(responseData)) {
 						responseData = { count: responseData };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeOperationError(this.getNode(), `Sendy error response [${400}]: ${responseData}`);
 					}
 				}
 
@@ -245,7 +247,7 @@ export class Sendy implements INodeType {
 					if (responseData === '1') {
 						responseData = { success: true };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeOperationError(this.getNode(), `Sendy error response [${400}]: ${responseData}`);
 					}
 				}
 
@@ -270,7 +272,7 @@ export class Sendy implements INodeType {
 					if (responseData === '1') {
 						responseData = { success: true };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeOperationError(this.getNode(), `Sendy error response [${400}]: ${responseData}`);
 					}
 				}
 
@@ -304,7 +306,7 @@ export class Sendy implements INodeType {
 					if (status.includes(responseData)) {
 						responseData = { status: responseData };
 					} else {
-						throw new Error(`Sendy error response [${400}]: ${responseData}`);
+						throw new NodeOperationError(this.getNode(), `Sendy error response [${400}]: ${responseData}`);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
index 326c49d471..caa5e7bb6f 100644
--- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function sentryIoApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -69,7 +69,7 @@ export async function sentryIoApiRequest(this: IHookFunctions | IExecuteFunction
 		}
 
 	} catch (error) {
-		throw new Error(`Sentry.io Error: ${error}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index 9d366f5b0e..51c3fc543e 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -21,7 +21,7 @@ import {
 export async function shopifyApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('shopifyApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const headerWithAuthentication = Object.assign({},
 		{ Authorization: `Basic ${Buffer.from(`${credentials.apiKey}:${credentials.password}`).toString(BINARY_ENCODING)}` });
@@ -47,20 +47,7 @@ export async function shopifyApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response.body && error.response.body.errors) {
-			let message = '';
-			if (typeof error.response.body.errors === 'object') {
-				for (const key of Object.keys(error.response.body.errors)) {
-					message += error.response.body.errors[key];
-				}
-			} else {
-				message = `${error.response.body.errors} |`;
-			}
-			const errorMessage = `Shopify error response [${error.statusCode}]: ${message}`;
-			throw new Error(errorMessage);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index 9ae04b7639..a289021f7f 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -139,7 +140,7 @@ export class Shopify implements INodeType {
 					const shipping = additionalFields.shippingAddressUi as IDataObject;
 					const lineItem = (this.getNodeParameter('limeItemsUi', i) as IDataObject).lineItemValues as IDataObject[];
 					if (lineItem === undefined) {
-						throw new Error('At least one line item has to be added');
+						throw new NodeOperationError(this.getNode(), 'At least one line item has to be added');
 					}
 					const body: IOrder = {
 						test: true,
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index e6c49d4cf0..75d8f674aa 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -304,7 +304,7 @@ export class ShopifyTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const endpoint = `/webhooks`;
-				
+
 				const { webhooks }  = await shopifyApiRequest.call(this, 'GET', endpoint, {}, { topic });
 				for (const webhook of webhooks) {
 					if (webhook.address === webhookUrl) {
@@ -328,7 +328,7 @@ export class ShopifyTrigger implements INodeType {
 				};
 
 				let responseData;
-				
+
 				responseData = await shopifyApiRequest.call(this, 'POST', endpoint, body);
 
 				if (responseData.webhook === undefined || responseData.webhook.id === undefined) {
@@ -345,7 +345,7 @@ export class ShopifyTrigger implements INodeType {
 					const endpoint = `/webhooks/${webhookData.webhookId}.json`;
 					try {
 						await shopifyApiRequest.call(this, 'DELETE', endpoint, {});
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					delete webhookData.webhookId;
diff --git a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
index 78e745e76c..0095542ab8 100644
--- a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
@@ -3,7 +3,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -51,11 +51,6 @@ export async function SIGNL4ApiRequest(this: IExecuteFunctions, method: string,
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.details) {
-			throw new Error(`SIGNL4 error response [${error.statusCode}]: ${error.response.body.details}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index 1a729502ab..e54d7d0425 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -9,6 +9,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -315,7 +316,7 @@ export class Signl4 implements INodeType {
 
 								if (!supportedFileExtension.includes(binaryProperty.fileExtension as string)) {
 
-									throw new Error(`Invalid extension, just ${supportedFileExtension.join(',')} are supported}`);
+									throw new NodeOperationError(this.getNode(), `Invalid extension, just ${supportedFileExtension.join(',')} are supported}`);
 								}
 
 								data.attachment = {
@@ -327,7 +328,7 @@ export class Signl4 implements INodeType {
 								};
 
 							} else {
-								throw new Error(`Binary property ${propertyName} does not exist on input`);
+								throw new NodeOperationError(this.getNode(), `Binary property ${propertyName} does not exist on input`);
 							}
 						}
 					}
diff --git a/packages/nodes-base/nodes/Slack/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/GenericFunctions.ts
index 43cc376b5c..70fbf195fd 100644
--- a/packages/nodes-base/nodes/Slack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/GenericFunctions.ts
@@ -11,6 +11,8 @@ import {
 import {
 	IDataObject,
 	IOAuth2Options,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as _ from 'lodash';
@@ -40,7 +42,7 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('slackApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 			options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
 			//@ts-ignore
@@ -56,23 +58,12 @@ export async function slackApiRequest(this: IExecuteFunctions | IExecuteSingleFu
 		}
 
 		if (response.ok === false) {
-			throw new Error('Slack error response: ' + JSON.stringify(response));
+			throw new NodeOperationError(this.getNode(), 'Slack error response: ' + JSON.stringify(response));
 		}
 
 		return response;
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Slack credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Slack error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 132f3b339d..7a73e14075 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -10,6 +10,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -569,10 +570,10 @@ export class Slack implements INodeType {
 										for (const elementUi of elementsUi) {
 											const element: Element = {};
 											if (elementUi.actionId === '') {
-												throw new Error('Action ID must be set');
+												throw new NodeOperationError(this.getNode(), 'Action ID must be set');
 											}
 											if (elementUi.text === '') {
-												throw new Error('Text must be set');
+												throw new NodeOperationError(this.getNode(), 'Text must be set');
 											}
 											element.action_id = elementUi.actionId as string;
 											element.type = elementUi.type as string;
@@ -649,7 +650,7 @@ export class Slack implements INodeType {
 										text.text = textUi.text as string;
 										block.text = text;
 									} else {
-										throw new Error('Property text must be defined');
+										throw new NodeOperationError(this.getNode(), 'Property text must be defined');
 									}
 									const fieldsUi = (blockUi.fieldsUi as IDataObject).fieldsValues as IDataObject[];
 									if (fieldsUi) {
@@ -744,10 +745,10 @@ export class Slack implements INodeType {
 						const attachmentsJson = this.getNodeParameter('attachmentsJson', i, '') as string;
 						const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
 						if (attachmentsJson !== '' && validateJSON(attachmentsJson) === undefined) {
-							throw new Error('Attachments it is not a valid json');
+							throw new NodeOperationError(this.getNode(), 'Attachments it is not a valid json');
 						}
 						if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
-							throw new Error('Blocks it is not a valid json');
+							throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json');
 						}
 						if (attachmentsJson !== '') {
 							body.attachments = attachmentsJson;
@@ -922,7 +923,7 @@ export class Slack implements INodeType {
 						if (items[i].binary === undefined
 							//@ts-ignore
 							|| items[i].binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property "${binaryPropertyName}" does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property "${binaryPropertyName}" does not exists on item!`);
 						}
 						body.file = {
 							//@ts-ignore
diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
index 30499b3b29..aa104b6297 100644
--- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
@@ -6,6 +6,8 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -21,7 +23,7 @@ import {
 export async function sms77ApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, form: IDataObject, qs?: IDataObject): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('sms77Api');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if ('GET' === method) {
@@ -38,7 +40,7 @@ export async function sms77ApiRequest(this: IHookFunctions | IExecuteFunctions,
 	});
 
 	if ('100' !== response.success) {
-		throw new Error('Invalid sms77 credentials or API error!');
+		throw new NodeApiError(this.getNode(), response, { message: 'Invalid sms77 credentials or API error!' });
 	}
 
 	return response;
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index 745563d715..75909cdc38 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -1,5 +1,5 @@
 import {IExecuteFunctions,} from 'n8n-core';
-import {IDataObject, INodeExecutionData, INodeType, INodeTypeDescription,} from 'n8n-workflow';
+import {IDataObject, INodeExecutionData, INodeType, INodeTypeDescription, NodeOperationError,} from 'n8n-workflow';
 import {sms77ApiRequest} from './GenericFunctions';
 
 export class Sms77 implements INodeType {
@@ -123,12 +123,12 @@ export class Sms77 implements INodeType {
 		for (let i = 0; i < this.getInputData().length; i++) {
 			const resource = this.getNodeParameter('resource', i);
 			if ('sms' !== resource) {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const operation = this.getNodeParameter('operation', i);
 			if ('send' !== operation) {
-				throw new Error(`The operation "${operation}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 			}
 
 			const responseData = await sms77ApiRequest.call(this, 'POST', 'sms', {}, {
diff --git a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
index cce7ccfc29..706b10d372 100644
--- a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function spontitApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -35,15 +35,6 @@ export async function spontitApiRequest(this: IExecuteFunctions | ILoadOptionsFu
 		//@ts-ignore
 		return await this.helpers?.request(options);
 	} catch (error) {
-
-		if (error.response && error.response.body && error.response.body.message) {
-
-			const messages = error.response.body.message;
-			// Try to return the error prettier
-			throw new Error(
-				`Spontit error response [${error.statusCode}]: ${messages}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 8c91c4957c..bce394c38a 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -9,6 +9,8 @@ import {
 
 import {
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -30,37 +32,19 @@ export async function spotifyApiRequest(this: IHookFunctions | IExecuteFunctions
 			'Content-Type': 'text/plain',
 			'Accept': ' application/json',
 		},
-		body,
 		qs: query,
 		uri: uri || `https://api.spotify.com/v1${endpoint}`,
 		json: true,
 	};
 
+	if (Object.keys(body).length > 0) {
+		options.body = body;
+	}
+
 	try {
-		const credentials = this.getCredentials('spotifyOAuth2Api');
-
-		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
-		}
-
-		if (Object.keys(body).length === 0) {
-			delete options.body;
-		}
-
 		return await this.helpers.requestOAuth2.call(this, 'spotifyOAuth2Api', options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Spotify credentials are not valid!');
-		}
-
-		if (error.error && error.error.error && error.error.error.message) {
-			// Try to return the error prettier
-			throw new Error(`Spotify error response [${error.error.error.status}]: ${error.error.error.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index b7bb5faaeb..bbbc136c46 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -334,13 +335,13 @@ export class SpreadsheetFile implements INodeType {
 				}
 
 				if (workbook.SheetNames.length === 0) {
-					throw new Error('Spreadsheet does not have any sheets!');
+					throw new NodeOperationError(this.getNode(), 'Spreadsheet does not have any sheets!');
 				}
 
 				let sheetName = workbook.SheetNames[0];
 				if (options.sheetName) {
 					if (!workbook.SheetNames.includes(options.sheetName as string)) {
-						throw new Error(`Spreadsheet does not contain sheet called "${options.sheetName}"!`);
+						throw new NodeOperationError(this.getNode(), `Spreadsheet does not contain sheet called "${options.sheetName}"!`);
 					}
 					sheetName = options.sheetName as string;
 				}
@@ -442,7 +443,7 @@ export class SpreadsheetFile implements INodeType {
 
 			return this.prepareOutputData(newItems);
 		} else {
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Stackby/GenericFunction.ts b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
index 05c11abdce..a39cb9be12 100644
--- a/packages/nodes-base/nodes/Stackby/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
@@ -11,6 +11,7 @@ import {
 import {
 	IDataObject,
 	IPollFunctions,
+	NodeApiError,
 } from 'n8n-workflow';
 
 /**
@@ -49,20 +50,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 		return await this.helpers.request!(options);
 
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The stackby credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error) {
-			// Try to return the error prettier
-			const message = error.response.body.error;
-
-			throw new Error(`Stackby error response [${error.statusCode}]: ${message}`);
-		}
-
-		// Expected error data did not get returned so rhow the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 8bf70d67a5..f06c6836de 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -230,7 +231,7 @@ export class Stackby implements INodeType {
 				const record: { [key: string]: any } = {};
 				for (const column of columnList) {
 					if (items[i].json[column] === undefined) {
-						throw new Error(`Column ${column} does not exist on input`);
+						throw new NodeOperationError(this.getNode(), `Column ${column} does not exist on input`);
 					} else {
 						record[column] = items[i].json[column];
 					}
diff --git a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
index 71ff1857b9..7ed4e462da 100644
--- a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function storyblokApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -50,14 +50,7 @@ export async function storyblokApiRequest(this: IHookFunctions | IExecuteFunctio
 	try {
 		return this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Storyblok error response [${error.statusCode}]: ${errorBody.message}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
index fbd7c57ff0..1164d6b021 100644
--- a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function strapiApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,19 +36,7 @@ export async function strapiApiRequest(this: IExecuteFunctions | ILoadOptionsFun
 		//@ts-ignore
 		return await this.helpers?.request(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-
-			let messages = error.response.body.message;
-
-			if (Array.isArray(error.response.body.message)) {
-				messages = messages[0].messages.map((e: IDataObject) => e.message).join('|');
-			}
-			// Try to return the error prettier
-			throw new Error(
-				`Strapi error response [${error.statusCode}]: ${messages}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 74849e6187..70e3357632 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -129,7 +130,7 @@ export class Strapi implements INodeType {
 						if (query !== undefined) {
 							qs._where = query;
 						} else {
-							throw new Error('Query must be a valid JSON');
+							throw new NodeOperationError(this.getNode(), 'Query must be a valid JSON');
 						}
 					}
 
diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
index 8f21ac7f82..f854b7ad3d 100644
--- a/packages/nodes-base/nodes/Strava/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function stravaApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -48,24 +48,7 @@ export async function stravaApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			return await this.helpers.requestOAuth2.call(this, 'stravaOAuth2Api', options, { includeCredentialsOnRefreshOnBody: true });
 		}
 	} catch (error) {
-
-		if (error.statusCode === 402) {
-			throw new Error(
-				`Strava error response [${error.statusCode}]: Payment Required`,
-			);
-		}
-
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			let errors = error.response.body.errors;
-
-			errors = errors.map((e: IDataObject) => `${e.code} -> ${e.field}`);
-			// Try to return the error prettier
-			throw new Error(
-				`Strava error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 34d66724c8..0e78a63555 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -161,8 +162,9 @@ export class StravaTrigger implements INodeType {
 				try {
 					responseData = await stravaApiRequest.call(this, 'POST', endpoint, body);
 				} catch (error) {
-					if (error.response && error.response.body && error.response.body.errors) {
-						const errors = error.response.body.errors;
+					const apiErrorResponse = error.cause.response;
+					if (apiErrorResponse?.body?.errors) {
+						const errors = apiErrorResponse.body.errors;
 						for (error of errors) {
 							// if there is a subscription already created
 							if (error.resource === 'PushSubscription' && error.code === 'already exists') {
@@ -181,24 +183,15 @@ export class StravaTrigger implements INodeType {
 
 									responseData = await stravaApiRequest.call(this, 'POST', `/push_subscriptions`, body);
 								} else {
-									throw new Error(`A subscription already exist [${webhooks[0].callback_url}].
-								If you want to delete this subcription and create a new one with the current parameters please go to options and set delete if exist to true`);
+									error.message = `A subscription already exists [${webhooks[0].callback_url}]. If you want to delete this subcription and create a new one with the current parameters please go to options and set delete if exist to true`;
+									throw error;
 								}
 							}
 						}
 					}
 
 					if (!responseData) {
-						let errorMessage = '';
-						if (error.response && error.response.body && error.response.body.message) {
-							errorMessage = error.response.body.message;
-						} else {
-							errorMessage = error.message;
-						}
-
-						throw new Error(
-							`Strava error response [${error.statusCode}]: ${errorMessage}`,
-						);
+						throw error;
 					}
 				}
 
@@ -218,7 +211,7 @@ export class StravaTrigger implements INodeType {
 
 					try {
 						await stravaApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 08e9a0e9ba..f29208c0ee 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -8,6 +8,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -817,8 +819,8 @@ export class StripeTrigger implements INodeType {
 
 				try {
 					await stripeApiRequest.call(this, 'GET', endpoint, {});
-				} catch (e) {
-					if (e.message.includes('resource_missing')) {
+				} catch (error) {
+					if (error.message.includes('resource_missing')) {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;
@@ -828,7 +830,7 @@ export class StripeTrigger implements INodeType {
 					}
 
 					// Some error occured
-					throw e;
+					throw error;
 				}
 
 				// If it did not error then the webhook exists
@@ -849,13 +851,13 @@ export class StripeTrigger implements INodeType {
 				let responseData;
 				try {
 					responseData = await stripeApiRequest.call(this, 'POST', endpoint, body);
-				} catch (e) {
-					throw e;
+				} catch (error) {
+					throw error;
 				}
 
 				if (responseData.id === undefined || responseData.secret === undefined || responseData.status !== 'enabled') {
 					// Required data is missing so was not successful
-					throw new Error('Stripe webhook creation response did not contain the expected data.');
+					throw new NodeApiError(this.getNode(), responseData, { message: 'Stripe webhook creation response did not contain the expected data.' });
 				}
 
 				const webhookData = this.getWorkflowStaticData('node');
@@ -874,7 +876,7 @@ export class StripeTrigger implements INodeType {
 
 					try {
 						await stripeApiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index f2c05eede5..0fb8ebdb97 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -2,6 +2,7 @@ import {
 	IExecuteFunctions,
 	IHookFunctions,
 } from 'n8n-core';
+import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 /**
  * Make an API request to Stripe
@@ -15,7 +16,7 @@ import {
 export async function stripeApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('stripeApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const options = {
@@ -32,17 +33,6 @@ export async function stripeApiRequest(this: IHookFunctions | IExecuteFunctions,
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Stripe credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Stripe error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
index 2c31a182d7..d09ba54b4c 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
@@ -10,7 +10,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function surveyMonkeyApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -42,7 +44,7 @@ export async function surveyMonkeyApiRequest(this: IExecuteFunctions | IWebhookF
 			const credentials = this.getCredentials('surveyMonkeyApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 			// @ts-ignore
 			options.headers['Authorization'] = `bearer ${credentials.accessToken}`;
@@ -53,11 +55,7 @@ export async function surveyMonkeyApiRequest(this: IExecuteFunctions | IWebhookF
 			return await this.helpers.requestOAuth2?.call(this, 'surveyMonkeyOAuth2Api', options);
 		}
 	} catch (error) {
-		const errorMessage =  error.response.body.error.message;
-		if (errorMessage !== undefined) {
-			throw new Error(`SurveyMonkey error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 0c14549d9b..72d030d3bf 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -11,6 +11,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -471,7 +473,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 
 					try {
 						await surveyMonkeyApiRequest.call(this, 'DELETE', endpoint);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
@@ -737,8 +739,8 @@ export class SurveyMonkeyTrigger implements INodeType {
 				});
 			});
 
-			req.on('error', (err) => {
-				throw new Error(err.message);
+			req.on('error', (error) => {
+				throw new NodeOperationError(this.getNode(), error);
 			});
 		});
 	}
diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts
index fe6213eb0d..9473fa8002 100644
--- a/packages/nodes-base/nodes/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch.node.ts
@@ -4,6 +4,7 @@ import {
 	INodeParameters,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 	NodeParameterValue,
 } from 'n8n-workflow';
 
@@ -594,7 +595,7 @@ export class Switch implements INodeType {
 		};
 
 		// Converts the input data of a dateTime into a number for easy compare
-		function convertDateTime(value: NodeParameterValue): number {
+		const convertDateTime = (value: NodeParameterValue): number => {
 			let returnValue: number | undefined = undefined;
 			if (typeof value === 'string') {
 				returnValue = new Date(value).getTime();
@@ -605,17 +606,17 @@ export class Switch implements INodeType {
 			}
 
 			if (returnValue === undefined || isNaN(returnValue)) {
-				throw new Error(`The value "${value}" is not a valid DateTime.`);
+				throw new NodeOperationError(this.getNode(), `The value "${value}" is not a valid DateTime.`);
 			}
 
 			return returnValue;
-		}
+		};
 
-		function checkIndexRange(index: number) {
+		const checkIndexRange = (index: number) => {
 			if (index < 0 || index >= returnData.length) {
-				throw new Error(`The ouput ${index} is not allowed. It has to be between 0 and ${returnData.length - 1}!`);
+				throw new NodeOperationError(this.getNode(), `The ouput ${index} is not allowed. It has to be between 0 and ${returnData.length - 1}!`);
 			}
-		}
+		};
 
 		const dataType = this.getNodeParameter('dataType', 0) as string;
 
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index ce5fcde5b8..2941bba021 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -13,6 +13,8 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -24,7 +26,7 @@ export async function getAuthorization(
 	credentials?: ICredentialDataDecryptedObject,
 ): Promise<string> {
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const { password, username } = credentials;
@@ -45,7 +47,7 @@ export async function getAuthorization(
 
 		return response.auth_token;
 	} catch (error) {
-		throw new Error('Taiga Error: ' + error.err || error);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -92,12 +94,7 @@ export async function taigaApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error;
-		if (error.response.body && error.response.body._error_message) {
-			errorMessage = error.response.body._error_message;
-		}
-
-		throw new Error(`Taigan error response [${error.statusCode}]: ${errorMessage}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
index 2eea6eac51..bcceb04d86 100644
--- a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function tapfiliateApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, qs: IDataObject = {}, uri?: string | undefined, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -37,23 +37,7 @@ export async function tapfiliateApiRequest(this: IHookFunctions | IExecuteFuncti
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 404) {
-			throw new Error(
-				`Tapfiliate error response [${error.statusCode}]: Not Found`,
-			);
-		}
-
-		if (error.response && error.response.body && error.response.body.errors) {
-
-			let errors = error.response.body.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Tapfiliate error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index ef25358307..43d5fc574d 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -8,7 +8,8 @@ import {
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -184,7 +185,7 @@ export class Tapfiliate implements INodeType {
 					const affiliateId = this.getNodeParameter('affiliateId', i) as string;
 					const metadata = (this.getNodeParameter('metadataUi', i) as IDataObject || {}).metadataValues as IDataObject[] || [];
 					if (metadata.length === 0) {
-						throw new Error('Metadata cannot be empty.');
+						throw new NodeOperationError(this.getNode(), 'Metadata cannot be empty.');
 					}
 					for (const { key, value } of metadata) {
 						await tapfiliateApiRequest.call(this, 'PUT', `/affiliates/${affiliateId}/meta-data/${key}/`, { value });
diff --git a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
index f59c8826bc..b5df173bf1 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 // Interface in n8n
@@ -146,7 +146,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	const credentials = this.getCredentials('telegramApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -176,20 +176,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Telegram credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.error_code) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Telegram error response [${errorBody.error_code}]: ${errorBody.description}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index e22d791c70..e55c477419 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -2013,7 +2014,7 @@ export class Telegram implements INodeType {
 
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
@@ -2025,7 +2026,7 @@ export class Telegram implements INodeType {
 					const credentials = this.getCredentials('telegramApi');
 
 					if (credentials === undefined) {
-						throw new Error('No credentials got returned!');
+						throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 					}
 					const file = await apiRequest.call(this, 'GET', '', {}, {}, { json: false, encoding: null, uri: `https://api.telegram.org/file/bot${credentials.accessToken}/${filePath}`, resolveWithFullResponse: true });
 
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index 69fab1d2ac..b55b4264e0 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -199,7 +199,7 @@ export class TelegramTrigger implements INodeType {
 
 				try {
 					await apiRequest.call(this, 'POST', endpoint, body);
-				} catch (e) {
+				} catch (error) {
 					return false;
 				}
 
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index 4a64dd36bb..18d22ec1df 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment';
@@ -18,7 +18,7 @@ export async function theHiveApiRequest(this: IHookFunctions | IExecuteFunctions
 	const credentials = this.getCredentials('theHiveApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const headerWithAuthentication = Object.assign({}, { Authorization: `Bearer ${credentials.ApiKey}` });
@@ -47,10 +47,7 @@ export async function theHiveApiRequest(this: IHookFunctions | IExecuteFunctions
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.error) {
-			const errorMessage = `TheHive error response [${error.statusCode}]: ${error.error.message || error.error.type}`;
-			throw new Error(errorMessage);
-		} else throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index dc40862a62..e3021879c0 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -11,7 +11,8 @@ import {
 	INodeParameters,
 	INodePropertyOptions,
 	INodeType,
-	INodeTypeDescription
+	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -389,13 +390,13 @@ export class TheHive implements INodeType {
 									const item = items[i];
 
 									if (item.binary === undefined) {
-										throw new Error('No binary data exists on item!');
+										throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 									}
 
 									const binaryPropertyName = artifactvalue.binaryProperty as string;
 
 									if (item.binary[binaryPropertyName] === undefined) {
-										throw new Error(`No binary data property '${binaryPropertyName}' does not exists on item!`);
+										throw new NodeOperationError(this.getNode(), `No binary data property '${binaryPropertyName}' does not exists on item!`);
 									}
 
 									const binaryData = item.binary[binaryPropertyName] as IBinaryData;
@@ -666,13 +667,13 @@ export class TheHive implements INodeType {
 									const item = items[i];
 
 									if (item.binary === undefined) {
-										throw new Error('No binary data exists on item!');
+										throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 									}
 
 									const binaryPropertyName = artifactvalue.binaryProperty as string;
 
 									if (item.binary[binaryPropertyName] === undefined) {
-										throw new Error(`No binary data property '${binaryPropertyName}' does not exists on item!`);
+										throw new NodeOperationError(this.getNode(), `No binary data property '${binaryPropertyName}' does not exists on item!`);
 									}
 
 									const binaryData = item.binary[binaryPropertyName] as IBinaryData;
@@ -868,13 +869,13 @@ export class TheHive implements INodeType {
 						const item = items[i];
 
 						if (item.binary === undefined) {
-							throw new Error('No binary data exists on item!');
+							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 						}
 
 						const binaryPropertyName = this.getNodeParameter('binaryProperty', i) as string;
 
 						if (item.binary[binaryPropertyName] === undefined) {
-							throw new Error(`No binary data property '${binaryPropertyName}' does not exists on item!`);
+							throw new NodeOperationError(this.getNode(), `No binary data property '${binaryPropertyName}' does not exists on item!`);
 						}
 
 						const binaryData = item.binary[binaryPropertyName] as IBinaryData;
@@ -1801,13 +1802,13 @@ export class TheHive implements INodeType {
 							const item = items[i];
 
 							if (item.binary === undefined) {
-								throw new Error('No binary data exists on item!');
+								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 							}
 
 							const binaryPropertyName = attachmentValues.binaryProperty as string;
 
 							if (item.binary[binaryPropertyName] === undefined) {
-								throw new Error(`No binary data property '${binaryPropertyName}' does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property '${binaryPropertyName}' does not exists on item!`);
 							}
 
 							const binaryData = item.binary[binaryPropertyName] as IBinaryData;
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 54dbc069e6..72bf645efe 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -223,7 +224,7 @@ export class TimescaleDb implements INodeType {
 		const credentials = this.getCredentials('timescaleDb');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		const pgp = pgPromise();
@@ -279,7 +280,7 @@ export class TimescaleDb implements INodeType {
 
 		} else {
 			await pgp.end();
-			throw new Error(`The operation "${operation}" is not supported!`);
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
 		}
 
 		// Close the connection
diff --git a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
index 31d8d85f99..a6f12e148d 100644
--- a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function todoistApiRequest(
@@ -52,12 +52,6 @@ export async function todoistApiRequest(
 		}
 
 	} catch (error) {
-		const errorMessage = error.response.body;
-
-		if (errorMessage !== undefined) {
-			throw new Error(errorMessage);
-		}
-
-		throw errorMessage;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index 534606adf6..8c4fd11306 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -10,13 +10,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function togglApiRequest(this: ITriggerFunctions | IPollFunctions | IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('togglApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const headerWithAuthentication = Object.assign({},
 		{ Authorization: ` Basic ${Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64')}` });
@@ -35,15 +35,6 @@ export async function togglApiRequest(this: ITriggerFunctions | IPollFunctions |
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 403) {
-			throw new Error('The Toggle credentials are probably invalid!');
-		}
-
-		const errorMessage = error.response.body && (error.response.body.message || error.response.body.Message);
-		if (errorMessage !== undefined) {
-			throw new Error(errorMessage);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index 2f92422157..c76e783351 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -4,6 +4,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as moment from 'moment';
@@ -55,7 +57,7 @@ export class TogglTrigger implements INodeType {
 		if (event === 'newTimeEntry') {
 			endpoint = '/time_entries';
 		} else {
-			throw new Error(`The defined event "${event}" is not supported`);
+			throw new NodeOperationError(this.getNode(), `The defined event "${event}" is not supported`);
 		}
 
 		const qs: IDataObject = {};
@@ -66,8 +68,8 @@ export class TogglTrigger implements INodeType {
 		try {
 			timeEntries = await togglApiRequest.call(this, 'GET', endpoint, {}, qs);
 			webhookData.lastTimeChecked = qs.end_date;
-		} catch (err) {
-			throw new Error(`Toggl Trigger Error: ${err}`);
+		} catch (error) {
+			throw new NodeApiError(this.getNode(), error);
 		}
 		if (Array.isArray(timeEntries) && timeEntries.length !== 0) {
 			return [this.helpers.returnJsonArray(timeEntries)];
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index 4ae3604995..2451eb9ed6 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -22,7 +22,7 @@ import * as querystring from 'querystring';
 export async function travisciApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('travisCiApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: {
@@ -43,14 +43,8 @@ export async function travisciApiRequest(this: IHookFunctions | IExecuteFunction
 	}
 	try {
 		return await this.helpers.request!(options);
-	} catch (err) {
-		if (err.response && err.response.body && err.response.body.error_message) {
-			// Try to return the error prettier
-			throw new Error(`TravisCI error response [${err.statusCode}]: ${err.response.body.error_message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw err;
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Trello/GenericFunctions.ts b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
index c36e1aef0b..a90d1e88f1 100644
--- a/packages/nodes-base/nodes/Trello/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'request';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -25,7 +25,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	const credentials = this.getCredentials('trelloApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -46,11 +46,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			throw new Error('The Trello credentials are not valid!');
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index 6781dbcca8..e40f8cec19 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -213,7 +214,7 @@ export class Trello implements INodeType {
 					Object.assign(qs, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'card') {
@@ -274,7 +275,7 @@ export class Trello implements INodeType {
 					Object.assign(qs, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'cardComment') {
@@ -322,7 +323,7 @@ export class Trello implements INodeType {
 					endpoint = `cards/${cardId}/actions/${commentId}/comments`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'list') {
@@ -423,7 +424,7 @@ export class Trello implements INodeType {
 					Object.assign(qs, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'attachment') {
@@ -488,7 +489,7 @@ export class Trello implements INodeType {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					Object.assign(qs, additionalFields);
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'checklist') {
@@ -622,7 +623,7 @@ export class Trello implements INodeType {
 					Object.assign(qs, additionalFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else if (resource === 'label') {
 
@@ -725,10 +726,10 @@ export class Trello implements INodeType {
 					endpoint = `/cards/${cardId}/idLabels/${id}`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index b756d0aa34..a98bb570ab 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -71,7 +72,7 @@ export class TrelloTrigger implements INodeType {
 				const credentials = this.getCredentials('trelloApi');
 
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				// Check all the webhooks which exist already if it is identical to the
@@ -99,7 +100,7 @@ export class TrelloTrigger implements INodeType {
 
 				const credentials = this.getCredentials('trelloApi');
 				if (credentials === undefined) {
-					throw new Error('No credentials got returned!');
+					throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 				}
 
 				const idModel = this.getNodeParameter('id') as string;
@@ -130,7 +131,7 @@ export class TrelloTrigger implements INodeType {
 				if (webhookData.webhookId !== undefined) {
 					const credentials = this.getCredentials('trelloApi');
 					if (credentials === undefined) {
-						throw new Error('No credentials got returned!');
+						throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 					}
 
 					const endpoint = `tokens/${credentials.apiToken}/webhooks/${webhookData.webhookId}`;
@@ -139,7 +140,7 @@ export class TrelloTrigger implements INodeType {
 
 					try {
 						await apiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 
@@ -172,7 +173,7 @@ export class TrelloTrigger implements INodeType {
 		const credentials = this.getCredentials('trelloApi');
 
 		if (credentials === undefined) {
-			throw new Error('No credentials got returned!');
+			throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 		}
 
 		// TODO: Check why that does not work as expected even though it gets done as described
diff --git a/packages/nodes-base/nodes/Twake/GenericFunctions.ts b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
index d756c9cf2b..141d7493e4 100644
--- a/packages/nodes-base/nodes/Twake/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
@@ -3,6 +3,7 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
+import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 import {
 	OptionsWithUri,
@@ -46,23 +47,8 @@ export async function twakeApiRequest(this: IHookFunctions | IExecuteFunctions |
 		return await this.helpers.request!(options);
 	} catch (error) {
 		if (error.error.code === 'ECONNREFUSED') {
-			throw new Error('Twake host is not accessible!');
-
+			throw new NodeApiError(this.getNode(), error, { message: 'Twake host is not accessible!' });
 		}
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Twake credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.errors) {
-			// Try to return the error prettier
-			const errorMessages = error.response.body.errors.map((errorData: { message: string }) => {
-				return errorData.message;
-			});
-			throw new Error(`Twake error response [${error.statusCode}]: ${errorMessages.join(' | ')}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Twake/Twake.node.ts b/packages/nodes-base/nodes/Twake/Twake.node.ts
index 7d1da31823..f9ef73ba34 100644
--- a/packages/nodes-base/nodes/Twake/Twake.node.ts
+++ b/packages/nodes-base/nodes/Twake/Twake.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -176,7 +177,7 @@ export class Twake implements INodeType {
 			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const responseData = await twakeApiRequest.call(this, 'POST', '/channel', {});
 				if (responseData === undefined) {
-					throw new Error('No data got returned');
+					throw new NodeOperationError(this.getNode(), 'No data got returned');
 				}
 
 				const returnData: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
index fba00a7e3d..e5eaf606e0 100644
--- a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
@@ -4,7 +4,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 /**
@@ -19,7 +19,7 @@ import {
 export async function twilioApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('twilioApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	if (query === undefined) {
@@ -41,22 +41,6 @@ export async function twilioApiRequest(this: IHookFunctions | IExecuteFunctions,
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Twilio credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			let errorMessage = `Twilio error response [${error.statusCode}]: ${error.response.body.message}`;
-			if (error.response.body.more_info) {
-				errorMessage = `errorMessage (${error.response.body.more_info})`;
-			}
-
-			throw new Error(errorMessage);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index f227c66687..3b3dd135ad 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -6,6 +6,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -199,10 +200,10 @@ export class Twilio implements INodeType {
 						body.To = `whatsapp:${body.To}`;
 					}
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else {
-				throw new Error(`The resource "${resource}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 
 			const responseData = await twilioApiRequest.call(this, requestMethod, endpoint, body, qs);
diff --git a/packages/nodes-base/nodes/Twist/GenericFunctions.ts b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
index 8a633ea5f0..cece7d263c 100644
--- a/packages/nodes-base/nodes/Twist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
@@ -8,7 +8,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function twistApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, qs: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,15 +36,6 @@ export async function twistApiRequest(this: IExecuteFunctions | ILoadOptionsFunc
 		return await this.helpers.requestOAuth2.call(this, 'twistOAuth2Api', options);
 
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error_string) {
-
-			const message = error.response.body.error_string;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Twist error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index f46017176d..d2fe9f18dd 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -12,6 +12,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -237,7 +238,7 @@ export class Twist implements INodeType {
 							const binaryData = item[binaryProperty] as IBinaryData;
 
 							if (binaryData === undefined) {
-								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+								throw new NodeOperationError(this.getNode(), `No binary data property "${binaryProperty}" does not exists on item!`);
 							}
 
 							attachments.push(await twistApiRequest.call(
diff --git a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
index 71d0aabeac..260f2ac3ca 100644
--- a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
@@ -14,6 +14,8 @@ import {
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function twitterApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -37,15 +39,7 @@ export async function twitterApiRequest(this: IExecuteFunctions | IExecuteSingle
 		//@ts-ignore
 		return await this.helpers.requestOAuth1.call(this, 'twitterOAuth1Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.errors) {
-			// Try to return the error prettier
-			const errorMessages = error.response.body.errors.map((error: IDataObject) => {
-				return error.message;
-			});
-			throw new Error(`Twitter error response [${error.statusCode}]: ${errorMessages.join(' | ')}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -92,7 +86,7 @@ export async function uploadAttachments(this: IExecuteFunctions, binaryPropertie
 		const binaryData = items[i].binary as IBinaryKeyData;
 
 		if (binaryData === undefined) {
-			throw new Error('No binary data set. So file can not be written!');
+			throw new NodeOperationError(this.getNode(), 'No binary data set. So file can not be written!');
 		}
 
 		if (!binaryData[binaryPropertyName]) {
@@ -107,7 +101,7 @@ export async function uploadAttachments(this: IExecuteFunctions, binaryPropertie
 		const isImage = binaryData[binaryPropertyName].mimeType.includes('image');
 
 		if (isImage && isAnimatedWebp) {
-			throw new Error('Animated .webp images are not supported use .gif instead');
+			throw new NodeOperationError(this.getNode(), 'Animated .webp images are not supported use .gif instead');
 		}
 
 		if (isImage) {
diff --git a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
index 11110ca4f1..c19c2ec2d8 100644
--- a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 } from 'n8n-core';
 
 import {
-	INodePropertyOptions,
+	INodePropertyOptions, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -68,7 +68,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 			const credentials = this.getCredentials('typeformApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['Authorization'] = `bearer ${credentials.accessToken}`;
@@ -78,19 +78,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 			return await this.helpers.requestOAuth2!.call(this, 'typeformOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Typeform credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.description) {
-			// Try to return the error prettier
-			const errorBody = error.response.body;
-			throw new Error(`Typeform error response [${error.statusCode} - errorBody.code]: ${errorBody.description}`);
-		}
-
-		// Expected error data did not get returned so throw the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -149,7 +137,7 @@ export async function getForms(this: ILoadOptionsFunctions): Promise<INodeProper
 	const responseData = await apiRequestAllItems.call(this, 'GET', endpoint, {});
 
 	if (responseData.items === undefined) {
-		throw new Error('No data got returned');
+		throw new NodeOperationError(this.getNode(), 'No data got returned');
 	}
 
 	const returnData: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 206a386468..4dd3327a6e 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -174,7 +175,7 @@ export class TypeformTrigger implements INodeType {
 					try {
 						const body = {};
 						await apiRequest.call(this, 'DELETE', endpoint, body);
-					} catch (e) {
+					} catch (error) {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
@@ -199,7 +200,7 @@ export class TypeformTrigger implements INodeType {
 			(bodyData.form_response as IDataObject).definition === undefined ||
 			(bodyData.form_response as IDataObject).answers === undefined
 		) {
-			throw new Error('Expected definition/answers data is missing!');
+			throw new NodeApiError(this.getNode(), bodyData, { message: 'Expected definition/answers data is missing!' });
 		}
 
 		const answers = (bodyData.form_response as IDataObject).answers as ITypeformAnswer[];
diff --git a/packages/nodes-base/nodes/UProc/GenericFunctions.ts b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
index c322249ec2..42b2eb535a 100644
--- a/packages/nodes-base/nodes/UProc/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
@@ -10,13 +10,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function uprocApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('uprocApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	const token = Buffer.from(`${credentials.email}:${credentials.apiKey}`).toString('base64');
 	const options: OptionsWithUri = {
@@ -34,17 +34,6 @@ export async function uprocApiRequest(this: IHookFunctions | IExecuteFunctions |
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 403) {
-			// Return a clear error
-			throw new Error('The uProc credentials are not valid!');
-		}
-
-		if (error.response.body && error.response.body.error && error.response.body.error.message) {
-			// Try to return the error prettier
-			throw new Error(`uProc Error [${error.statusCode}]: ${error.response.body.error.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw new Error('uProc Error: ' + error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index 2689b8dab9..d6278bd57e 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -43,7 +43,7 @@ export async function unleashedApiRequest(this: IHookFunctions | IExecuteFunctio
 	const credentials = this.getCredentials('unleashedSoftwareApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const signature = createHmac('sha256', (credentials.apiKey as string))
@@ -58,13 +58,10 @@ export async function unleashedApiRequest(this: IHookFunctions | IExecuteFunctio
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.description) {
-			throw new Error(`Unleashed Error response [${error.statusCode}]: ${error.response.body.description}`);
-		}
-
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
+
 export async function unleashedApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const returnData: IDataObject[] = [];
diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
index 176996342f..668c78d36a 100644
--- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
@@ -5,12 +5,12 @@ import {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function upleadApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('upleadApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		headers: { Authorization: credentials.apiKey },
@@ -26,7 +26,7 @@ export async function upleadApiRequest(this: IHookFunctions | IExecuteFunctions
 	}
 	try {
 		return await this.helpers.request!(options);
-	} catch (err) {
-		throw new Error(err);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
index dd3a7fcab1..faeded0600 100644
--- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
@@ -4,12 +4,12 @@ import {
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject } from 'n8n-workflow';
+import { IDataObject, NodeApiError, NodeOperationError, } from 'n8n-workflow';
 
 export async function veroApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('veroApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -30,12 +30,7 @@ export async function veroApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response.body) {
-			errorMessage = error.response.body.message || error.response.body.Message || error.message;
-		}
-
-		throw new Error(errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index 6eb28aa765..d7fd01cb08 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -6,6 +6,8 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	validateJSON,
@@ -110,8 +112,8 @@ export class Vero implements INodeType {
 					}
 					try {
 						responseData = await veroApiRequest.call(this, 'POST', '/users/track', body);
-					} catch (err) {
-						throw new Error(`Vero Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developers.getvero.com/?bash#users-alias
@@ -124,8 +126,8 @@ export class Vero implements INodeType {
 					};
 					try {
 						responseData = await veroApiRequest.call(this, 'PUT', '/users/reidentify', body);
-					} catch (err) {
-						throw new Error(`Vero Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developers.getvero.com/?bash#users-unsubscribe
@@ -140,8 +142,8 @@ export class Vero implements INodeType {
 					};
 					try {
 						responseData = await veroApiRequest.call(this, 'POST', `/users/${operation}`, body);
-					} catch (err) {
-						throw new Error(`Vero Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 				//https://developers.getvero.com/?bash#tags-add
@@ -163,8 +165,8 @@ export class Vero implements INodeType {
 					}
 					try {
 						responseData = await veroApiRequest.call(this, 'PUT', '/users/tags/edit', body);
-					} catch (err) {
-						throw new Error(`Vero Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
@@ -216,8 +218,8 @@ export class Vero implements INodeType {
 					}
 					try {
 						responseData = await veroApiRequest.call(this, 'POST', '/events/track', body);
-					} catch (err) {
-						throw new Error(`Vero Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
index 0427d36890..5cbdc40d39 100644
--- a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function vonageApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, path: string, body: any = {}, qs: IDataObject = {}, option = {}): Promise<any> { // tslint:disable-line:no-any
@@ -35,16 +35,6 @@ export async function vonageApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.error) {
-
-			let errors = error.response.body.error.errors;
-
-			errors = errors.map((e: IDataObject) => e.message);
-			// Try to return the error prettier
-			throw new Error(
-				`Vonage error response [${error.statusCode}]: ${errors.join('|')}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 4632ec93a5..4eea1dd057 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
  } from 'n8n-workflow';
 
 export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -36,7 +36,7 @@ export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('webflowApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.headers!['authorization'] = `Bearer ${credentials.accessToken}`;
@@ -46,9 +46,6 @@ export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions
 			return await this.helpers.requestOAuth2!.call(this, 'webflowOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.response.body.err) {
-			throw new Error(`Webflow Error: [${error.statusCode}]: ${error.response.body.err}`);
-		}
-		return error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index becb8a9622..f9fd7d8394 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -155,7 +155,7 @@ export class WebflowTrigger implements INodeType {
 				const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
 				try {
 					await webflowApiRequest.call(this, 'GET', endpoint);
-				} catch (err) {
+				} catch (error) {
 					return false;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index 351610fe70..ce8c80dcff 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -9,6 +9,8 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import * as basicAuth from 'basic-auth';
@@ -477,8 +479,8 @@ export class Webhook implements INodeType {
 					});
 				});
 
-				req.on('error', (err) => {
-					throw new Error(err.message);
+				req.on('error', (error) => {
+					throw new NodeOperationError(this.getNode(), error);
 				});
 			});
 		}
diff --git a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
index e771b1e59d..4a652f2f6d 100644
--- a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
@@ -13,6 +13,8 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function getAuthorization(
@@ -20,7 +22,7 @@ export async function getAuthorization(
 	credentials?: ICredentialDataDecryptedObject,
 ): Promise<IDataObject> {
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const { password, username } = credentials;
@@ -39,7 +41,7 @@ export async function getAuthorization(
 
 		return { token: response.token, userId: response.id };
 	} catch (error) {
-		throw new Error('Wekan Error: ' + error.error.reason);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -47,7 +49,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 	const credentials = this.getCredentials('wekanApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	query = query || {};
@@ -70,7 +72,7 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 		return await this.helpers.request!(options);
 	} catch (error) {
 		if (error.statusCode === 401) {
-			throw new Error('The Wekan credentials are not valid!');
+			throw new NodeOperationError(this.getNode(), 'The Wekan credentials are not valid!');
 		}
 
 		throw error;
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 168ed65936..87f99d9df2 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -305,7 +306,7 @@ export class Wekan implements INodeType {
 					endpoint = `users/${userId}/boards`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'card') {
@@ -395,7 +396,7 @@ export class Wekan implements INodeType {
 					Object.assign(body, updateFields);
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'cardComment') {
@@ -454,7 +455,7 @@ export class Wekan implements INodeType {
 					endpoint = `boards/${boardId}/cards/${cardId}/comments`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'list') {
@@ -509,7 +510,7 @@ export class Wekan implements INodeType {
 					endpoint = `boards/${boardId}/lists`;
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 
 			} else if (resource === 'checklist') {
@@ -618,7 +619,7 @@ export class Wekan implements INodeType {
 
 
 				} else {
-					throw new Error(`The operation "${operation}" is not known!`);
+					throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
 				}
 			} else if (resource === 'checklistItem') {
 
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index a4aa44f430..15e751c633 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -7,6 +7,7 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
+	NodeApiError,
 } from 'n8n-workflow';
 
 import {
@@ -60,15 +61,7 @@ export async function wiseApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
-		const errors = error.error.errors;
-
-		if (errors && Array.isArray(errors)) {
-			const errorMessage = errors.map((e) => e.message).join(' | ');
-			throw new Error(`Wise error response [${error.statusCode}]: ${errorMessage}`);
-		}
-
-		throw new Error(`Wise error response [${error.statusCode}]: ${error}`);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index 227f369c92..f08f6e272e 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import { 
+import {
 	OptionsWithUri,
 } from 'request';
 
@@ -12,6 +12,8 @@ import {
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -21,18 +23,18 @@ import {
 	IShoppingLine,
 } from './OrderInterface';
 
-import { 
+import {
 	createHash,
 } from 'crypto';
 
-import { 
+import {
 	snakeCase,
 } from 'change-case';
 
 export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('wooCommerceApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 	let options: OptionsWithUri = {
 		auth: {
@@ -49,22 +51,11 @@ export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunct
 		delete options.form;
 	}
 	options = Object.assign({}, options, option);
-	
+
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The WooCommerce credentials are not valid!');
-		}
-
-		if (error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`WooCommerce Error [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw new Error('WooCommerce Error: ' + error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
@@ -145,4 +136,4 @@ export function toSnakeCase(data:
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
index 61302655c8..5dfa4edfed 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -9,13 +9,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function wordpressApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('wordpressApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -40,12 +40,7 @@ export async function wordpressApiRequest(this: IExecuteFunctions | IExecuteSing
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		let errorMessage = error.message;
-		if (error.response && error.response.body) {
-			errorMessage = error.response.body.message || error.response.body.Message || error.message;
-		}
-
-		throw new Error('Wordpress Error: ' + errorMessage);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
index 9794283529..6c6f9a83ad 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
@@ -8,6 +8,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -71,11 +72,11 @@ export class WriteBinaryFile implements INodeType {
 			item = items[itemIndex];
 
 			if (item.binary === undefined) {
-				throw new Error('No binary data set. So file can not be written!');
+				throw new NodeOperationError(this.getNode(), 'No binary data set. So file can not be written!');
 			}
 
 			if (item.binary[dataPropertyName] === undefined) {
-				throw new Error(`The binary property "${dataPropertyName}" does not exist. So no file can be written!`);
+				throw new NodeOperationError(this.getNode(), `The binary property "${dataPropertyName}" does not exist. So no file can be written!`);
 			}
 
 			// Write the file to disk
diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
index 712a0aa639..e84164f311 100644
--- a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
@@ -10,13 +10,13 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function wufooApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('wufooApi');
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	let options: OptionsWithUri = {
@@ -40,6 +40,6 @@ export async function wufooApiRequest(this: IHookFunctions | IExecuteFunctions |
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new Error(error.message);
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
index 2678aa8f04..1ee4b040b9 100644
--- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
 export async function xeroApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -37,23 +37,7 @@ export async function xeroApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'xeroOAuth2Api', options);
 	} catch (error) {
-		let errorMessage;
-
-		if (error.response && error.response.body && error.response.body.Message) {
-
-			errorMessage = error.response.body.Message;
-
-			if (error.response.body.Elements) {
-				const elementErrors = [];
-				for (const element of error.response.body.Elements) {
-					elementErrors.push(element.ValidationErrors.map((error: IDataObject) =>  error.Message).join('|'));
-				}
-				errorMessage = elementErrors.join('-');
-			}
-			// Try to return the error prettier
-			throw new Error(`Xero error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Xml.node.ts b/packages/nodes-base/nodes/Xml.node.ts
index 914ed9da35..58717c2cc9 100644
--- a/packages/nodes-base/nodes/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml.node.ts
@@ -5,6 +5,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 
@@ -245,7 +246,7 @@ export class Xml implements INodeType {
 				const parser = new Parser(parserOptions);
 
 				if (item.json[dataPropertyName] === undefined) {
-					throw new Error(`No json property "${dataPropertyName}" does not exists on item!`);
+					throw new NodeOperationError(this.getNode(), `No json property "${dataPropertyName}" does not exists on item!`);
 				}
 
 				// @ts-ignore
@@ -260,7 +261,7 @@ export class Xml implements INodeType {
 					},
 				};
 			} else {
-				throw new Error(`The operation "${mode}" is not known!`);
+				throw new NodeOperationError(this.getNode(), `The operation "${mode}" is not known!`);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
index 3ba2f5e3c5..9d49a8b4ab 100644
--- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function yourlsApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, body: any = {}, qs: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -31,22 +31,13 @@ export async function yourlsApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		const response = await this.helpers.request.call(this, options);
 
 		if (response.status === 'fail') {
-			throw new Error(
+			throw new NodeOperationError(this.getNode(),
 				`Yourls error response [400]: ${response.message}`,
 			);
 		}
 
 		return response;
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.msg) {
-
-			const message = error.response.body.msg;
-
-			// Try to return the error prettier
-			throw new Error(
-				`Yourls error response [${error.statusCode}]: ${message}`,
-			);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
index 3a1447997f..a7048b6ad6 100644
--- a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
@@ -10,7 +10,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
  } from 'n8n-workflow';
 
 export async function zendeskApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -39,7 +39,7 @@ export async function zendeskApiRequest(this: IHookFunctions | IExecuteFunctions
 			const credentials = this.getCredentials('zendeskApi');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			const base64Key =  Buffer.from(`${credentials.email}/token:${credentials.apiToken}`).toString('base64');
@@ -51,24 +51,15 @@ export async function zendeskApiRequest(this: IHookFunctions | IExecuteFunctions
 			const credentials = this.getCredentials('zendeskOAuth2Api');
 
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 
 			options.uri = `https://${credentials.subdomain}.zendesk.com/api/v2${resource}.json`;
 
 			return await this.helpers.requestOAuth2!.call(this, 'zendeskOAuth2Api', options);
 		}
-	} catch(err) {
-
-		let errorMessage = err.message;
-		if (err.response && err.response.body && err.response.body.error) {
-			errorMessage = err.response.body.error;
-			if (typeof err.response.body.error !== 'string') {
-				errorMessage = JSON.stringify(errorMessage);
-			}
-		}
-
-		throw new Error(`Zendesk error response [${err.statusCode}]: ${errorMessage}`);
+	} catch(error) {
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index b74812daa5..f77b8cc9d8 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -9,6 +9,8 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -255,7 +257,7 @@ export class Zendesk implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -307,7 +309,7 @@ export class Zendesk implements INodeType {
 								Object.assign(body, JSON.parse(updateFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -377,8 +379,8 @@ export class Zendesk implements INodeType {
 					const ticketId = this.getNodeParameter('id', i) as string;
 					try {
 						responseData = await zendeskApiRequest.call(this, 'DELETE', `/tickets/${ticketId}`, {});
-					} catch (err) {
-						throw new Error(`Zendesk Error: ${err}`);
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 44cc34d9a9..393a2f98d7 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -14,6 +14,7 @@ import {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 import {
@@ -515,7 +516,7 @@ export class ZendeskTrigger implements INodeType {
 					const conditions = this.getNodeParameter('conditions') as IDataObject;
 					const options = this.getNodeParameter('options') as IDataObject;
 					if (Object.keys(conditions).length === 0) {
-						throw new Error('You must have at least one condition');
+						throw new NodeOperationError(this.getNode(), 'You must have at least one condition');
 					}
 					if (options.fields) {
 						// @ts-ignore
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index f70b13bb90..d21c84a9a3 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -5,7 +5,7 @@ import {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 import {
-	IDataObject
+	IDataObject, NodeApiError
 } from 'n8n-workflow';
 
 export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -27,11 +27,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'zohoOAuth2Api', options);
 	} catch (error) {
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Zoho error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
index 3d28b5790f..c85384274d 100644
--- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
@@ -9,7 +9,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject,
+	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function zoomApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object = {}, query: object = {}, headers: {} | undefined = undefined, option: {} = {}): Promise<any> { // tslint:disable-line:no-any
@@ -38,7 +38,7 @@ export async function zoomApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('zoomApi');
 			if (credentials === undefined) {
-				throw new Error('No credentials got returned!');
+				throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 			}
 			options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
 
@@ -49,18 +49,7 @@ export async function zoomApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 			return await this.helpers.requestOAuth2.call(this, 'zoomOAuth2Api', options);
 		}
 	} catch (error) {
-		if (error.statusCode === 401) {
-			// Return a clear error
-			throw new Error('The Zoom credentials are not valid!');
-		}
-
-		if (error.response && error.response.body && error.response.body.message) {
-			// Try to return the error prettier
-			throw new Error(`Zoom error response [${error.statusCode}]: ${error.response.body.message}`);
-		}
-
-		// If that data does not exist for some reason return the actual error
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
index cf588440ea..a922f77cd6 100644
--- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
@@ -8,7 +8,9 @@ import {
 import {
 	IDataObject,
 	IHookFunctions,
-	IWebhookFunctions
+	IWebhookFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
 export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -16,7 +18,7 @@ export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunction
 	const credentials = this.getCredentials('zulipApi');
 
 	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
 
 	const endpoint = `${credentials.url}/api/v1`;
@@ -45,11 +47,7 @@ export async function zulipApiRequest(this: IExecuteFunctions | IWebhookFunction
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		if (error.response) {
-			const errorMessage = error.response.body.message || error.response.body.description || error.message;
-			throw new Error(`Zulip error response [${error.statusCode}]: ${errorMessage}`);
-		}
-		throw error;
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 4c6a5d4002..15eadc4861 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -9,6 +9,7 @@ import {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	NodeOperationError,
 } from 'n8n-workflow';
 import {
 	zulipApiRequest,
@@ -210,11 +211,11 @@ export class Zulip implements INodeType {
 					const credentials = this.getCredentials('zulipApi');
 					const binaryProperty = this.getNodeParameter('dataBinaryProperty', i) as string;
 					if (items[i].binary === undefined) {
-						throw new Error('No binary data exists on item!');
+						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
 					}
 					//@ts-ignore
 					if (items[i].binary[binaryProperty] === undefined) {
-						throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+						throw new NodeOperationError(this.getNode(), `No binary data property "${binaryProperty}" does not exists on item!`);
 					}
 					const formData = {
 						file: {
@@ -283,7 +284,7 @@ export class Zulip implements INodeType {
 							if (validateJSON(additionalFieldsJson) !== undefined) {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
@@ -342,7 +343,7 @@ export class Zulip implements INodeType {
 								Object.assign(body, JSON.parse(additionalFieldsJson));
 
 							} else {
-								throw new Error('Additional fields must be a valid JSON');
+								throw new NodeOperationError(this.getNode(), 'Additional fields must be a valid JSON');
 							}
 						}
 
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index b57837379e..800dbb35a4 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,5 +1,7 @@
 import { Workflow } from './Workflow';
 import { WorkflowHooks } from './WorkflowHooks';
+import { WorkflowOperationError } from './WorkflowErrors';
+import { NodeApiError, NodeOperationError } from './NodeErrors';
 import * as express from 'express';
 
 export type IAllExecuteFunctions = IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions | IPollFunctions | ITriggerFunctions | IWebhookFunctions;
@@ -32,11 +34,7 @@ export interface IConnection {
 	index: number;
 }
 
-export interface IExecutionError {
-	message: string;
-	node?: string;
-	stack?: string;
-}
+export type ExecutionError = WorkflowOperationError | NodeOperationError | NodeApiError;
 
 // Get used to gives nodes access to credentials
 export interface IGetCredentials {
@@ -660,7 +658,7 @@ export interface IRunExecutionData {
 		runNodeFilter?: string[];
 	};
 	resultData: {
-		error?: IExecutionError;
+		error?: ExecutionError;
 		runData: IRunData;
 		lastNodeExecuted?: string;
 	};
@@ -683,7 +681,7 @@ export interface ITaskData {
 	startTime: number;
 	executionTime: number;
 	data?: ITaskDataConnections;
-	error?: IExecutionError;
+	error?: ExecutionError;
 }
 
 
@@ -761,7 +759,14 @@ export interface IWorkflowHooksOptionalParameters {
 	sessionId?: string;
 }
 
-
 export interface IWorkflowSettings {
 	[key: string]: IDataObject | string | number | boolean | undefined;
 }
+
+export interface IRawErrorObject {
+	[key: string]: string | object | number | boolean | undefined | null | string[] | object[] | number[] | boolean[];
+}
+
+export interface IStatusCodeMessages {
+	[key: string]: string;
+}
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
new file mode 100644
index 0000000000..ef4ac30b0f
--- /dev/null
+++ b/packages/workflow/src/NodeErrors.ts
@@ -0,0 +1,241 @@
+import { INode, IRawErrorObject, IStatusCodeMessages} from '.';
+import { parseString } from 'xml2js';
+
+/**
+ * Top-level properties where an error message can be found in an API response.
+ */
+const ERROR_MESSAGE_PROPERTIES = [
+	'error',
+	'message',
+	'Message',
+	'msg',
+	'messages',
+	'description',
+	'reason',
+	'detail',
+	'details',
+	'errors',
+	'errorMessage',
+	'errorMessages',
+	'ErrorMessage',
+	'error_message',
+	'_error_message',
+	'errorDescription',
+	'error_description',
+	'error_summary',
+	'title',
+	'text',
+	'field',
+	'err',
+	'type',
+];
+
+/**
+ * Top-level properties where an HTTP error code can be found in an API response.
+ */
+const ERROR_STATUS_PROPERTIES = ['statusCode', 'status', 'code', 'status_code', 'errorCode', 'error_code'];
+
+/**
+ * Properties where a nested object can be found in an API response.
+ */
+const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
+
+/**
+ * Base class for specific NodeError-types, with functionality for finding
+ * a value recursively inside an error object.
+ */
+abstract class NodeError extends Error {
+	description: string | null | undefined;
+	cause: Error | IRawErrorObject;
+	node: INode;
+	timestamp: number;
+
+	constructor(node: INode, error: Error | IRawErrorObject) {
+		super();
+		this.name = this.constructor.name;
+		this.cause = error;
+		this.node = node;
+		this.timestamp = Date.now();
+
+		if (error.message) {
+			this.message = error.message as string;
+		}
+	}
+
+	/**
+	 * Finds property through exploration based on potential keys and traversal keys.
+	 * Depth-first approach.
+	 *
+	 * This method iterates over `potentialKeys` and, if the value at the key is a
+	 * truthy value, the type of the value is checked:
+	 * (1) if a string or number, the value is returned as a string; or
+	 * (2) if an array,
+	 * 		its string or number elements are collected as a long string,
+	 * 		its object elements are traversed recursively (restart this function
+	 *    with each object as a starting point)
+	 *
+	 * If nothing found via `potentialKeys` this method iterates over `traversalKeys` and
+	 * if the value at the key is a traversable object, it restarts with the object as the
+	 * new starting point (recursion).
+	 * If nothing found for any of the `traversalKeys`, exploration continues with remaining
+	 * `traversalKeys`.
+	 *
+	 * Otherwise, if all the paths have been exhausted and no value is eligible, `null` is
+	 * returned.
+	 *
+	 * @param {IRawErrorObject} error
+	 * @param {string[]} potentialKeys
+	 * @param {string[]} traversalKeys
+	 * @returns {string | null}
+	 */
+	protected findProperty(
+		error: IRawErrorObject,
+		potentialKeys: string[],
+		traversalKeys: string[],
+	): string | null {
+		for(const key of potentialKeys) {
+			if (error[key]) {
+				if (typeof error[key] === 'string') return error[key] as string;
+				if (typeof error[key] === 'number') return error[key]!.toString();
+				if (Array.isArray(error[key])) {
+					// @ts-ignore
+					const resolvedErrors: string[] = error[key].map((error) => {
+							if (typeof error === 'string') return error;
+							if (typeof error === 'number') return error.toString();
+							if (this.isTraversableObject(error)) {
+								return this.findProperty(error, potentialKeys, traversalKeys);
+							}
+							return null;
+						})
+						.filter((errorValue: string | null) => errorValue !== null);
+
+					if (resolvedErrors.length === 0) {
+						return null;
+					}
+					return resolvedErrors.join(' | ');
+				}
+			}
+		}
+
+		for (const key of traversalKeys) {
+			if (this.isTraversableObject(error[key])) {
+				const property = this.findProperty(error[key] as IRawErrorObject, potentialKeys, traversalKeys);
+				if (property) {
+					return property;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Check if a value is an object with at least one key, i.e. it can be traversed.
+	 */
+	private isTraversableObject(value: any): value is IRawErrorObject { // tslint:disable-line:no-any
+		return value && typeof value === 'object' && !Array.isArray(value) && !!Object.keys(value).length;
+	}
+}
+
+/**
+ * Class for instantiating an operational error, e.g. an invalid credentials error.
+ */
+export class NodeOperationError extends NodeError {
+
+	constructor(node: INode, error: Error | string) {
+		if (typeof error === 'string') {
+			error = new Error(error);
+		}
+		super(node, error);
+	}
+}
+
+const STATUS_CODE_MESSAGES: IStatusCodeMessages = {
+	'4XX': 'Your request is invalid or could not be processed by the service',
+	'400': 'Bad request - please check your parameters',
+	'401': 'Authorization failed - please check your credentials',
+	'402': 'Payment required - perhaps check your payment details?',
+	'403': 'Forbidden - perhaps check your credentials?',
+	'404': 'The resource you are requesting could not be found',
+	'405': 'Method not allowed - please check you are using the right HTTP method',
+	'429': 'The service is receiving too many requests from you! Perhaps take a break?',
+
+	'5XX': 'The service failed to process your request',
+	'500': 'The service was not able to process your request',
+	'502': 'Bad gateway - the service failed to handle your request',
+	'503': 'Service unavailable - perhaps try again later?',
+	'504': 'Gateway timed out - perhaps try again later?',
+};
+
+const UNKNOWN_ERROR_MESSAGE = 'UNKNOWN ERROR - check the detailed error for more information';
+
+/**
+ * Class for instantiating an error in an API response, e.g. a 404 Not Found response,
+ * with an HTTP error code, an error message and a description.
+ */
+export class NodeApiError extends NodeError {
+	httpCode: string | null;
+
+	constructor(
+		node: INode,
+		error: IRawErrorObject,
+		{ message, description, httpCode, parseXml }: { message?: string, description?: string, httpCode?: string, parseXml?: boolean } = {},
+	) {
+		super(node, error);
+		if (message) {
+			this.message = message;
+			this.description = description;
+			this.httpCode = httpCode ?? null;
+			return;
+		}
+
+		this.httpCode = this.findProperty(error, ERROR_STATUS_PROPERTIES, ERROR_NESTING_PROPERTIES);
+		this.setMessage();
+
+		if (parseXml) {
+			this.setDescriptionFromXml(error.error as string);
+			return;
+		}
+
+		this.description = this.findProperty(error, ERROR_MESSAGE_PROPERTIES, ERROR_NESTING_PROPERTIES);
+	}
+
+	private setDescriptionFromXml(xml: string) {
+		parseString(xml, { explicitArray: false }, (_, result) => {
+			if (!result) return;
+
+			const topLevelKey = Object.keys(result)[0];
+			this.description = this.findProperty(result[topLevelKey], ERROR_MESSAGE_PROPERTIES, ['Error'].concat(ERROR_NESTING_PROPERTIES));
+		});
+	}
+
+	/**
+	 * Set the error's message based on the HTTP status code.
+	 *
+	 * @returns {void}
+	 */
+	private setMessage() {
+
+		if (!this.httpCode) {
+			this.httpCode = null;
+			this.message = UNKNOWN_ERROR_MESSAGE;
+			return;
+		}
+
+		if (STATUS_CODE_MESSAGES[this.httpCode]) {
+			this.message = STATUS_CODE_MESSAGES[this.httpCode];
+			return;
+		}
+
+		switch (this.httpCode.charAt(0)) {
+			case '4':
+				this.message = STATUS_CODE_MESSAGES['4XX'];
+				break;
+			case '5':
+				this.message = STATUS_CODE_MESSAGES['5XX'];
+				break;
+			default:
+				this.message = UNKNOWN_ERROR_MESSAGE;
+		}
+	}
+}
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index 026fa80086..fb4189d762 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -937,6 +937,7 @@ export class Workflow {
 			// The node did already fail. So throw an error here that it displays and logs it correctly.
 			// Does get used by webhook and trigger nodes in case they throw an error that it is possible
 			// to log the error and display in Editor-UI.
+
 			const error = new Error(runExecutionData.resultData.error.message);
 			error.stack = runExecutionData.resultData.error.stack;
 			throw error;
diff --git a/packages/workflow/src/WorkflowErrors.ts b/packages/workflow/src/WorkflowErrors.ts
new file mode 100644
index 0000000000..011a51224f
--- /dev/null
+++ b/packages/workflow/src/WorkflowErrors.ts
@@ -0,0 +1,16 @@
+import { INode } from '.';
+
+/**
+ * Class for instantiating an operational error, e.g. a timeout error.
+ */
+export class WorkflowOperationError extends Error {
+	node: INode | undefined;
+	timestamp: number;
+
+	constructor(message: string, node?: INode, ) {
+		super(message);
+		this.name = this.constructor.name;
+		this.node = node;
+		this.timestamp = Date.now();
+	}
+}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index b2c24d55fb..1248d7da9d 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -1,7 +1,9 @@
 export * from './Interfaces';
 export * from './Expression';
+export * from './NodeErrors';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
+export * from './WorkflowErrors';
 export * from './WorkflowHooks';
 
 import * as NodeHelpers from './NodeHelpers';

From 97999f94907c5c83ffe8b30001f251567645d1c7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 16 Apr 2021 19:02:01 +0200
Subject: [PATCH 030/231] :arrow_up: Set n8n-core@0.67.0 and
 n8n-workflow@0.55.0 on node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index b005de16d7..55fa3b59b1 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "^0.48.0",
-    "n8n-workflow": "^0.42.0",
+    "n8n-core": "^0.67.0",
+    "n8n-workflow": "^0.55.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 78936fd1dc4ff6696b64dee7463f112bdd479ec6 Mon Sep 17 00:00:00 2001
From: Harshil Agrawal <ghagrawal17@gmail.com>
Date: Fri, 16 Apr 2021 19:03:44 +0200
Subject: [PATCH 031/231] :zap: Add and update codex files (#1665)

---
 .../nodes-base/nodes/Aws/AwsSes.node.json     | 14 -------------
 .../nodes-base/nodes/Copper/Copper.node.json  | 21 +++++++++++++++++++
 .../nodes/ERPNext/ERPNext.node.json           | 21 +++++++++++++++++++
 packages/nodes-base/nodes/Function.node.json  |  5 +++++
 .../nodes-base/nodes/Github/Github.node.json  |  5 +++++
 .../nodes/Github/GithubTrigger.node.json      |  7 +++++++
 .../nodes/Google/Books/GoogleBooks.node.json  |  2 +-
 .../Google/Calendar/GoogleCalendar.node.json  |  5 +++++
 .../Google/Slides/GoogleSlides.node.json      | 20 ++++++++++++++++++
 .../nodes-base/nodes/HttpRequest.node.json    |  5 +++++
 packages/nodes-base/nodes/If.node.json        |  7 ++++++-
 packages/nodes-base/nodes/Jira/Jira.node.json |  5 +++++
 .../nodes/LingvaNex/LingvaNex.node.json       |  2 +-
 .../nodes/Mattermost/Mattermost.node.json     |  5 +++++
 packages/nodes-base/nodes/Nasa/NASA.node.json |  2 +-
 packages/nodes-base/nodes/NoOp.node.json      |  5 +++++
 .../nodes-base/nodes/OpenWeatherMap.node.json |  2 +-
 packages/nodes-base/nodes/Oura/Oura.node.json | 20 ++++++++++++++++++
 .../nodes/PhilipsHue/PhilipsHue.node.json     |  2 +-
 packages/nodes-base/nodes/Set.node.json       |  5 +++++
 .../nodes/Spotify/Spotify.node.json           |  2 +-
 .../nodes/Twitter/Twitter.node.json           |  7 +++++++
 .../nodes/Typeform/TypeformTrigger.node.json  |  5 +++++
 packages/nodes-base/nodes/Webhook.node.json   |  5 +++++
 24 files changed, 158 insertions(+), 21 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/Aws/AwsSes.node.json
 create mode 100644 packages/nodes-base/nodes/Copper/Copper.node.json
 create mode 100644 packages/nodes-base/nodes/ERPNext/ERPNext.node.json
 create mode 100644 packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
 create mode 100644 packages/nodes-base/nodes/Oura/Oura.node.json

diff --git a/packages/nodes-base/nodes/Aws/AwsSes.node.json b/packages/nodes-base/nodes/Aws/AwsSes.node.json
deleted file mode 100644
index d66f05252a..0000000000
--- a/packages/nodes-base/nodes/Aws/AwsSes.node.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "node": "n8n-nodes-base.awsSes",
-  "nodeVersion": "1.0",
-  "codexVersion": "1.0",
-  "categories": ["Communication", "Development"],
-  "resources": {
-    "credentialDocumentation": [
-      { "url": "https://docs.n8n.io/credentials/aws" }
-    ],
-    "primaryDocumentation": [
-      { "url": "https://docs.n8n.io/nodes/n8n-nodes-base.awsSes/" }
-    ]
-  }
-}
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.json b/packages/nodes-base/nodes/Copper/Copper.node.json
new file mode 100644
index 0000000000..08b57bd1a1
--- /dev/null
+++ b/packages/nodes-base/nodes/Copper/Copper.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.copper",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Marketing & Content",
+		"Sales"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/copper"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.copper/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.json b/packages/nodes-base/nodes/ERPNext/ERPNext.node.json
new file mode 100644
index 0000000000..f0874ef95e
--- /dev/null
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.erpNext",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Finance & Accounting",
+		"Data & Storage"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/erpnext"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.erpNext/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Function.node.json b/packages/nodes-base/nodes/Function.node.json
index 76a15f2bb8..a653d553cd 100644
--- a/packages/nodes-base/nodes/Function.node.json
+++ b/packages/nodes-base/nodes/Function.node.json
@@ -74,6 +74,11 @@
 				"icon": "👏",
 				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
 				"icon": "🗓",
diff --git a/packages/nodes-base/nodes/Github/Github.node.json b/packages/nodes-base/nodes/Github/Github.node.json
index 2c7175e832..04adb266ba 100644
--- a/packages/nodes-base/nodes/Github/Github.node.json
+++ b/packages/nodes-base/nodes/Github/Github.node.json
@@ -21,6 +21,11 @@
 				"label": "Automatically pulling and visualizing data with n8n",
 				"icon": "📈",
 				"url": "https://n8n.io/blog/automatically-pulling-and-visualizing-data-with-n8n/"
+			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.json b/packages/nodes-base/nodes/Github/GithubTrigger.node.json
index e1720e7725..48b9691c84 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.json
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.githubTrigger/"
 			}
+		],
+		"generic": [
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			}
 		]
 	}
 }
\ 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 b18e5384da..bff85e57fd 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous "
+		"Miscellaneous"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
index fd7f07fa50..0113380aea 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -27,6 +27,11 @@
 				"icon": "🎫",
 				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Tracking Time Spent in Meetings With Google Calendar, Twilio, and n8n",
 				"icon": "🗓",
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
new file mode 100644
index 0000000000..1a0b42647f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.googleSlides",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/google"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleSlides/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HttpRequest.node.json b/packages/nodes-base/nodes/HttpRequest.node.json
index d575d5102d..5ec62003a4 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.json
+++ b/packages/nodes-base/nodes/HttpRequest.node.json
@@ -58,6 +58,11 @@
 				"icon": "📱",
 				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "How to use the HTTP Request Node - The Swiss Army Knife for Workflow Automation",
 				"icon": "🧰",
diff --git a/packages/nodes-base/nodes/If.node.json b/packages/nodes-base/nodes/If.node.json
index fc33709670..c813d90ddc 100644
--- a/packages/nodes-base/nodes/If.node.json
+++ b/packages/nodes-base/nodes/If.node.json
@@ -2,7 +2,7 @@
 	"node": "n8n-nodes-base.if",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"details": "The IF node can be used to implement binary conditional logic in your workflow. You can setup one-to-many conditions to evalute 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.",
+	"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"
 	],
@@ -28,6 +28,11 @@
 				"icon": "🧬",
 				"url": "https://n8n.io/blog/why-business-process-automation-with-n8n-can-change-your-daily-life/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.json b/packages/nodes-base/nodes/Jira/Jira.node.json
index 6eb4b9c47d..f6c609e4d8 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.json
+++ b/packages/nodes-base/nodes/Jira/Jira.node.json
@@ -18,6 +18,11 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Creating Custom Incident Response Workflows with n8n",
 				"icon": "🚨",
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
index 18013d4b54..6ac2b29cb0 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous "
+		"Miscellaneous"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
index 37b2b95007..81bc236f37 100644
--- a/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
+++ b/packages/nodes-base/nodes/Mattermost/Mattermost.node.json
@@ -37,6 +37,11 @@
 				"icon": "📹",
 				"url": "https://n8n.io/blog/the-ultimate-guide-to-automate-your-video-collaboration-with-whereby-mattermost-and-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Creating Error Workflows in n8n",
 				"icon": "🌪",
diff --git a/packages/nodes-base/nodes/Nasa/NASA.node.json b/packages/nodes-base/nodes/Nasa/NASA.node.json
index f5aa2e59c9..95a8b23853 100644
--- a/packages/nodes-base/nodes/Nasa/NASA.node.json
+++ b/packages/nodes-base/nodes/Nasa/NASA.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous "
+		"Miscellaneous"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/NoOp.node.json b/packages/nodes-base/nodes/NoOp.node.json
index 9b504583da..2854126d41 100644
--- a/packages/nodes-base/nodes/NoOp.node.json
+++ b/packages/nodes-base/nodes/NoOp.node.json
@@ -22,6 +22,11 @@
 				"icon": "☀️",
 				"url": "https://n8n.io/blog/2021-the-year-to-automate-the-new-you-with-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Sending Automated Congratulations with Google Sheets, Twilio, and n8n ",
 				"icon": "🙌",
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.json b/packages/nodes-base/nodes/OpenWeatherMap.node.json
index 15585aff44..af49f98885 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.json
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous ",
+		"Miscellaneous",
 		"Utility"
 	],
 	"resources": {
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.json b/packages/nodes-base/nodes/Oura/Oura.node.json
new file mode 100644
index 0000000000..e362cedd39
--- /dev/null
+++ b/packages/nodes-base/nodes/Oura/Oura.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.oura",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Productivity"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/oura"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.oura/"
+			}
+		]
+	}
+}
\ 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 d28deec8a1..23c6e736fb 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous "
+		"Miscellaneous"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/Set.node.json b/packages/nodes-base/nodes/Set.node.json
index e9ba8f1747..deff800d35 100644
--- a/packages/nodes-base/nodes/Set.node.json
+++ b/packages/nodes-base/nodes/Set.node.json
@@ -47,6 +47,11 @@
 				"icon": "📹",
 				"url": "https://n8n.io/blog/the-ultimate-guide-to-automate-your-video-collaboration-with-whereby-mattermost-and-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Learn to Build Powerful API Endpoints Using Webhooks",
 				"icon": "🧰",
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.json b/packages/nodes-base/nodes/Spotify/Spotify.node.json
index 4ea20c6823..2f9042868a 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.json
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Miscellaneous "
+		"Miscellaneous"
 	],
 	"resources": {
 		"credentialDocumentation": [
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.json b/packages/nodes-base/nodes/Twitter/Twitter.node.json
index 390e21d13d..af68591607 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.json
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.twitter/"
 			}
+		],
+		"generic": [
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			}
 		]
 	}
 }
\ 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 fddeae12cd..985ede8d16 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.json
@@ -32,6 +32,11 @@
 				"icon": "📱",
 				"url": "https://n8n.io/blog/building-an-expense-tracking-app-in-10-minutes/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Automating Conference Organization Processes with n8n",
 				"icon": "🙋‍♀️",
diff --git a/packages/nodes-base/nodes/Webhook.node.json b/packages/nodes-base/nodes/Webhook.node.json
index 2e14614428..c89f88f670 100644
--- a/packages/nodes-base/nodes/Webhook.node.json
+++ b/packages/nodes-base/nodes/Webhook.node.json
@@ -38,6 +38,11 @@
 				"icon": "👏",
 				"url": "https://n8n.io/blog/how-to-automatically-give-kudos-to-contributors-with-github-slack-and-n8n/"
 			},
+			{
+				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"icon": "🤖",
+				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
+			},
 			{
 				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",

From fbb97cb90ff3bb0ee3d2f73542b20026348d8ce4 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 17 Apr 2021 03:25:51 -0400
Subject: [PATCH 032/231] :sparkles: Add Webflow Node (#1628)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :sparkles: Webflow Node

* :books: Add endpoint documentation URLs

* :zap: Simplify field name/type separator

* :zap: Simplify API call function signature

* :zap: Reposition query string object

* :pencil2: Edit parameter descriptions

* :zap: Improvements

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../WebflowOAuth2Api.credentials.ts           |   1 -
 .../nodes/Webflow/GenericFunctions.ts         |  54 ++-
 .../nodes/Webflow/ItemDescription.ts          | 450 ++++++++++++++++++
 .../nodes/Webflow/Webflow.node.json           |  20 +
 .../nodes-base/nodes/Webflow/Webflow.node.ts  | 262 ++++++++++
 .../nodes/Webflow/WebflowTrigger.node.ts      |  10 +-
 packages/nodes-base/nodes/Webflow/webflow.png | Bin 1286 -> 0 bytes
 packages/nodes-base/nodes/Webflow/webflow.svg |   1 +
 packages/nodes-base/package.json              |   1 +
 9 files changed, 787 insertions(+), 12 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Webflow/ItemDescription.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/Webflow.node.json
 create mode 100644 packages/nodes-base/nodes/Webflow/Webflow.node.ts
 delete mode 100644 packages/nodes-base/nodes/Webflow/webflow.png
 create mode 100644 packages/nodes-base/nodes/Webflow/webflow.svg

diff --git a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
index 5f0324c67d..c9533bc392 100644
--- a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
@@ -3,7 +3,6 @@ import {
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
-
 export class WebflowOAuth2Api implements ICredentialType {
 	name = 'webflowOAuth2Api';
 	extends = [
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 4eea1dd057..8be810d11a 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -4,17 +4,26 @@ import {
 
 import {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
 
 import {
-	IDataObject, NodeApiError, NodeOperationError,
- } from 'n8n-workflow';
+	IDataObject,
+	NodeApiError,
+	NodeOperationError,
+} from 'n8n-workflow';
 
-export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+export async function webflowApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
+	method: string,
+	resource: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	uri?: string,
+	option: IDataObject = {},
+) {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	let options: OptionsWithUri = {
@@ -24,14 +33,18 @@ export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions
 		method,
 		qs,
 		body,
-		uri: uri ||`https://api.webflow.com${resource}`,
+		uri: uri || `https://api.webflow.com${resource}`,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
+
+	if (Object.keys(options.qs).length === 0) {
+		delete options.qs;
+	}
+
 	if (Object.keys(options.body).length === 0) {
 		delete options.body;
 	}
-
 	try {
 		if (authenticationMethod === 'accessToken') {
 			const credentials = this.getCredentials('webflowApi');
@@ -49,3 +62,32 @@ export async function webflowApiRequest(this: IHookFunctions | IExecuteFunctions
 		throw new NodeApiError(this.getNode(), error);
 	}
 }
+
+export async function webflowApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	query: IDataObject = {},
+) {
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	query.limit = 100;
+	query.offset = 0;
+
+	do {
+		responseData = await webflowApiRequest.call(this, method, endpoint, body, query);
+		if (responseData.offset !== undefined) {
+			query.offset += query.limit;
+		}
+		returnData.push.apply(returnData, responseData.items);
+	} while (
+		returnData.length < responseData.total
+	);
+
+	return returnData;
+}
+
diff --git a/packages/nodes-base/nodes/Webflow/ItemDescription.ts b/packages/nodes-base/nodes/Webflow/ItemDescription.ts
new file mode 100644
index 0000000000..fcea401341
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/ItemDescription.ts
@@ -0,0 +1,450 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const itemOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const itemFields = [
+	// ----------------------------------
+	//         item: create
+	// ----------------------------------
+	{
+		displayName: 'Site ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'ID of the site containing the collection whose items to add to.',
+	},
+	{
+		displayName: 'Collection ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: [
+				'siteId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'ID of the collection to add an item to.',
+	},
+	{
+		displayName: 'Live',
+		name: 'live',
+		type: 'boolean',
+		required: true,
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'Whether the item should be published on the live site.',
+	},
+	{
+		displayName: 'Fields',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'fieldValues',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getFields',
+							loadOptionsDependsOn: [
+								'collectionId',
+							],
+						},
+						default: '',
+						description: 'Field to set for the item to create.',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the item to create.',
+					},
+				],
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         item: get
+	// ----------------------------------
+	{
+		displayName: 'Site ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		description: 'ID of the site containing the collection whose items to operate on.',
+	},
+	{
+		displayName: 'Collection ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: [
+				'siteId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		description: 'ID of the collection whose items to operate on.',
+	},
+	{
+		displayName: 'Item ID',
+		name: 'itemId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		description: 'ID of the item to operate on.',
+	},
+	// ----------------------------------
+	//         item: update
+	// ----------------------------------
+	{
+		displayName: 'Site ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'ID of the site containing the collection whose items to update.',
+	},
+	{
+		displayName: 'Collection ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: [
+				'siteId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'ID of the collection whose items to update.',
+	},
+	{
+		displayName: 'Item ID',
+		name: 'itemId',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'ID of the item to update.',
+	},
+	{
+		displayName: 'Live',
+		name: 'live',
+		type: 'boolean',
+		required: true,
+		default: false,
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'Whether the item should be published on the live site.',
+	},
+	{
+		displayName: 'Fields',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'fieldValues',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getFields',
+							loadOptionsDependsOn: [
+								'collectionId',
+							],
+						},
+						default: '',
+						description: 'Field to set for the item to update.',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the item to update.',
+					},
+				],
+			},
+		],
+	},
+	// ----------------------------------
+	//         item:getAll
+	// ----------------------------------
+	{
+		displayName: 'Site ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		description: 'ID of the site containing the collection whose items to retrieve.',
+	},
+	{
+		displayName: 'Collection ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: [
+				'siteId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		description: 'ID of the collection whose items to retrieve.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'item',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.json b/packages/nodes-base/nodes/Webflow/Webflow.node.json
new file mode 100644
index 0000000000..0fd6bce62c
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.webflow",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Marketing & Content"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/webflow"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.webflow/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
new file mode 100644
index 0000000000..8b71950d3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -0,0 +1,262 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	webflowApiRequest,
+	webflowApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	itemFields,
+	itemOperations,
+} from './ItemDescription';
+
+export class Webflow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Webflow',
+		name: 'webflow',
+		icon: 'file:webflow.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume the Webflow API',
+		defaults: {
+			name: 'Webflow',
+			color: '#245bf8',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'webflowApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'webflowOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
+		],
+		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'Method of authentication.',
+			},
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Item',
+						value: 'item',
+					},
+				],
+				default: 'item',
+				description: 'Resource to consume',
+			},
+			...itemOperations,
+			...itemFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getSites(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const sites = await webflowApiRequest.call(this, 'GET', '/sites');
+				for (const site of sites) {
+					returnData.push({
+						name: site.name,
+						value: site._id,
+					});
+				}
+				return returnData;
+			},
+			async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const siteId = this.getCurrentNodeParameter('siteId');
+				const collections = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
+				for (const collection of collections) {
+					returnData.push({
+						name: collection.name,
+						value: collection._id,
+					});
+				}
+				return returnData;
+			},
+			async getFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const collectionId = this.getCurrentNodeParameter('collectionId');
+				const { fields } = await webflowApiRequest.call(this, 'GET', `/collections/${collectionId}`);
+				for (const field of fields) {
+					returnData.push({
+						name: `${field.name} (${field.type}) ${(field.required) ? ' (required)' : ''}`,
+						value: field.slug,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const qs: IDataObject = {};
+		let responseData;
+		const returnData: IDataObject[] = [];
+
+		for (let i = 0; i < items.length; i++) {
+
+			if (resource === 'item') {
+
+				// *********************************************************************
+				//                             item
+				// *********************************************************************
+
+				// https://developers.webflow.com/#item-model
+
+				if (operation === 'create') {
+
+					// ----------------------------------
+					//         item: create
+					// ----------------------------------
+
+					// https://developers.webflow.com/#create-new-collection-item
+
+					const collectionId = this.getNodeParameter('collectionId', i) as string;
+
+					const properties = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
+
+					const live = this.getNodeParameter('live', i) as boolean;
+
+					const fields = {} as IDataObject;
+
+					properties.forEach(data => (fields[data.fieldId as string] = data.fieldValue));
+
+					const body: IDataObject = {
+						fields,
+					};
+
+					responseData = await webflowApiRequest.call(this, 'POST', `/collections/${collectionId}/items`, body, { live });
+
+				} else if (operation === 'delete') {
+
+					// ----------------------------------
+					//         item: delete
+					// ----------------------------------
+
+					// https://developers.webflow.com/#remove-collection-item
+
+					const collectionId = this.getNodeParameter('collectionId', i) as string;
+					const itemId = this.getNodeParameter('itemId', i) as string;
+					responseData = await webflowApiRequest.call(this, 'DELETE', `/collections/${collectionId}/items/${itemId}`);
+
+				} else if (operation === 'get') {
+
+					// ----------------------------------
+					//         item: get
+					// ----------------------------------
+
+					// https://developers.webflow.com/#get-single-item
+
+					const collectionId = this.getNodeParameter('collectionId', i) as string;
+					const itemId = this.getNodeParameter('itemId', i) as string;
+					responseData = await webflowApiRequest.call(this, 'GET', `/collections/${collectionId}/items/${itemId}`);
+					responseData = responseData.items;
+
+				} else if (operation === 'getAll') {
+
+					// ----------------------------------
+					//         item: getAll
+					// ----------------------------------
+
+					// https://developers.webflow.com/#get-all-items-for-a-collection
+
+					const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+					const collectionId = this.getNodeParameter('collectionId', i) as string;
+					const qs: IDataObject = {};
+
+					if (returnAll === true) {
+						responseData = await webflowApiRequestAllItems.call(this, 'GET', `/collections/${collectionId}/items`, {}, qs);
+					} else {
+						qs.limit = this.getNodeParameter('limit', 0) as number;
+						responseData = await webflowApiRequest.call(this, 'GET', `/collections/${collectionId}/items`, {}, qs);
+						responseData = responseData.items;
+					}
+
+				} else if (operation === 'update') {
+
+					// ----------------------------------
+					//         item: update
+					// ----------------------------------
+
+					// https://developers.webflow.com/#update-collection-item
+
+					const collectionId = this.getNodeParameter('collectionId', i) as string;
+
+					const itemId = this.getNodeParameter('itemId', i) as string;
+
+					const properties = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
+
+					const live = this.getNodeParameter('live', i) as boolean;
+
+					const fields = {} as IDataObject;
+
+					properties.forEach(data => (fields[data.fieldId as string] = data.fieldValue));
+
+					const body: IDataObject = {
+						fields,
+					};
+
+					responseData = await webflowApiRequest.call(this, 'PUT', `/collections/${collectionId}/items/${itemId}`, body, { live });
+				}
+			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index f9fd7d8394..94519e2328 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -20,7 +20,7 @@ export class WebflowTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Webflow Trigger',
 		name: 'webflowTrigger',
-		icon: 'file:webflow.png',
+		icon: 'file:webflow.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Webflow events via webhooks',
@@ -97,10 +97,6 @@ export class WebflowTrigger implements INodeType {
 				type: 'options',
 				required: true,
 				options: [
-					{
-						name: 'Form submission',
-						value: 'form_submission',
-					},
 					{
 						name: 'Ecomm Inventory Changed',
 						value: 'ecomm_inventory_changed',
@@ -113,6 +109,10 @@ export class WebflowTrigger implements INodeType {
 						name: 'Ecomm Order Changed',
 						value: 'ecomm_order_changed',
 					},
+					{
+						name: 'Form Submission',
+						value: 'form_submission',
+					},
 					{
 						name: 'Site Publish',
 						value: 'site_publish',
diff --git a/packages/nodes-base/nodes/Webflow/webflow.png b/packages/nodes-base/nodes/Webflow/webflow.png
deleted file mode 100644
index a4716f6b7a31049b467d285d2d1b91a049606956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmX|=e>~F(7{|X(X{}ZYb$(ti%8x82$B0EEHVv~aEzvUO)kJ>e<~Y`o>sSt_tCn9E
zPFECC=m$-fuyKWs{3=s%mI>=fhv(+*_3HI{p3mob-mlL;&mT_))yETq)<Yu*f+3UK
zX)1SKX_Wd3F}843*))~H*spRoI;d(Nc}0n|75!Z93?P1987o{x-2YP|16--#b{O3J
zKsBr2|49H?S^^J$ATd|MUWb7a0EihZEP#zCRMmhT8H}8v^C@86V1peXCLkLHf-g8y
z0I>$d66A6i8;1rFoEJh;8tiZd<p-FahN<^3^b&Y{;KqVK8)z)hu!ZjD&?W)#6S!Oi
zTO6RTABsvrkOS;UC@zEO1PBO&+PiS=1|WKXAaFWn!wuEVdT}%#I<oX>)xuR5k#c%!
zP}*8wl@voGZ`-QXl$F)*a&Hhp)GNsD`xvCwvP(bu%Uw0klC_=Y@;C>K?c%s!7^BnQ
z2E2sGsg5zz^XYAGLmk)DNcopfL&wGKW0C>Aq{2c2Q~Cp^v$t;Ndl?lKBq*flIS0bP
z&?qt5YS)3-hJgX+JuNPmYV_A!9qGn-i*Z;fZrUq0*eF7?5!E=-oI2(ITN4KR$Xb)t
zQDo+bPtTmy7;jg$e3+@jQBDNgU~VNhkY>wr-t|^-f&>S0jl$;tY#2$H33s`Y5j3c!
zJy$=%j*7Ihza^b8Uz?W^<n!KhKWiuZQjdId&i8~ZS8ItjEjC@_gWb&4_HX7AG#$w5
z%ddjX)Osd0`eF_VI`PYEMI&S7)$P`NREJLXhg_M4MK!Tlc4`}ieePt-2AN>%30=`i
zDVxxmEZ#_+zs}WF%jedg^*OlkGvlU%5aXPuOspk*r#$XT2|SWTOo=p;-p>{{D263^
zohQ2^7Bdd|DMIx#F@ole$*ZPK&6wW5>V^#Sjs^!-(2rp|jpT^3TrOs9+~HImq1D^I
zi=>&G9FG~UdQZJxPN<37(<w<%!%Hp{HwRRrH*?-$V~9sXaQ))Fz9zx_wTCV~X(Jr3
zEwrh_m(#jS_mT}fx&tWxkg9o}%*Ea_RjgQEOw;tNA%mX!m1*v#7gi~ZkD-Od$`ou*
z{QY<|HAVKu;ZaVBg|B`8O<CB)UREzI$ve<-vLrmxu-#_|&yK>Y|9X)rt!=C}7b_@n
z@05%mWW$fM?DHr2J+HA8&k%ztEe(V0q0~A{F$Z<gDdVrST%DK-1#haWayf11@ic$$
zkMYbV>P$bsar9{`!Wl|xW<L9SXLj?$h**kc!-Bk2?qV&p9quxz(^+iVp1<DYf!ag2
zGe%xlwrW+TL_QVX@e|YhnD=&J@Zannv*p}z%=egSi7H8u_-@X7b_{Q>2tMjR`ANMQ
zm)}-N&HXq*<_%ucMu$nNpFh_jEH_zs`9`s+n+zH9@jEV#Bf<25p2t@#bZZ9JO};SB
zR_a>@p(*s;%=IY#eCh>T+N{AJQ8#?UwS`;MqjXD3JoZ#DLxftwXhM**H=~Tx#zMFq
ziSn9M392v}Po1ch3lg7w@g=q~bUs=1Dx%Ml_(~FKkG?I?593ZOaqHXfmSu_VO9NkC
zKOEl0w-pUXbJmrkj&!-NAJmB|J$Jk1$%~=ahL-6M0~D^OR+BPI8JTW@4X;BA&YUPP
uIh83+Ea*%7*4liA_0y>6mzG4s#dXQQ?>^nAC_$;78zJxaajzsEOZ^uBu8R%;

diff --git a/packages/nodes-base/nodes/Webflow/webflow.svg b/packages/nodes-base/nodes/Webflow/webflow.svg
new file mode 100644
index 0000000000..fb80355245
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/webflow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="1" y="1"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z" fill="#4353ff"/><path d="M41.4 28.2l-2.9 9.14c0-.7-2-15.86-2-15.86-4.6 0-7.04 3.26-8.32 6.72l-3.54 9.16c0-.66-.5-9.08-.5-9.08a7.48 7.48 0 0 0-7.26-6.78l3.76 22.96c4.8 0 7.4-3.26 8.74-6.72l3-7.8c0 .32 2 14.52 2 14.52a9.24 9.24 0 0 0 8.8-6.46l6.8-16.52c-4.8 0-7.32 3.26-8.6 6.72z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index dbecf013b8..3025284dd7 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -530,6 +530,7 @@
       "dist/nodes/UProc/UProc.node.js",
       "dist/nodes/Vero/Vero.node.js",
       "dist/nodes/Vonage/Vonage.node.js",
+      "dist/nodes/Webflow/Webflow.node.js",
       "dist/nodes/Webflow/WebflowTrigger.node.js",
       "dist/nodes/Webhook.node.js",
       "dist/nodes/Wekan/Wekan.node.js",

From 38ee8f555796ad98955c4f6f6776774427419ab8 Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Sat, 17 Apr 2021 09:27:28 +0200
Subject: [PATCH 033/231] :bug: Fix rabbitMQ AMPQS Support PR 1598 (#1670)

---
 packages/nodes-base/credentials/RabbitMQ.credentials.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/credentials/RabbitMQ.credentials.ts b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
index 6c69dfc0cc..348c401360 100644
--- a/packages/nodes-base/credentials/RabbitMQ.credentials.ts
+++ b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
@@ -62,7 +62,7 @@ export class RabbitMQ implements ICredentialType {
 					],
 				},
 			},
-			default: false,
+			default: true,
 			description: 'Passwordless connection with certificates (SASL mechanism EXTERNAL)',
 		},
 		{

From db5bf69fd39a6b3402080d99259e88019afab30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 17 Apr 2021 09:59:11 +0200
Subject: [PATCH 034/231] :bug: Fix AWS SQS API version and casing (#1630)

* :wrench: Add API version and adjust casing

* :hammer: Refactor query string params into array

* :hammer: Add API version to resource loader

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index 63a5dd4ff9..38d02abf43 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -1,5 +1,4 @@
 import {
-	BINARY_ENCODING,
 	IExecuteFunctions,
 } from 'n8n-core';
 
@@ -23,6 +22,10 @@ import {
 	awsApiRequestSOAP,
 } from '../GenericFunctions';
 
+import {
+	pascalCase,
+} from 'change-case';
+
 export class AwsSqs implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AWS SQS',
@@ -268,10 +271,15 @@ export class AwsSqs implements INodeType {
 		loadOptions: {
 			// Get all the available queues to display them to user so that it can be selected easily
 			async getQueues(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const params = [
+					'Version=2012-11-05',
+					`Action=ListQueues`,
+				];
+
 				let data;
 				try {
 					// loads first 1000 queues from SQS
-					data = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `?Action=ListQueues`);
+					data = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `?${params.join('&')}`);
 				} catch (error) {
 					throw new NodeApiError(this.getNode(), error);
 				}
@@ -310,7 +318,11 @@ export class AwsSqs implements INodeType {
 		for (let i = 0; i < items.length; i++) {
 			const queueUrl = this.getNodeParameter('queue', i) as string;
 			const queuePath = new URL(queueUrl).pathname;
-			const params = [];
+
+			const params = [
+				'Version=2012-11-05',
+				`Action=${pascalCase(operation)}`,
+			];
 
 			const options = this.getNodeParameter('options', i, {}) as IDataObject;
 			const sendInputData = this.getNodeParameter('sendInputData', i) as boolean;
@@ -375,7 +387,7 @@ export class AwsSqs implements INodeType {
 
 			let responseData;
 			try {
-				responseData = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `${queuePath}/?Action=${operation}&` + params.join('&'));
+				responseData = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `${queuePath}?${params.join('&')}`);
 			} catch (error) {
 				throw new NodeApiError(this.getNode(), error);
 			}

From fbc11080c7453dddb327da4755d5fa8630d1a34f Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 17 Apr 2021 04:11:18 -0400
Subject: [PATCH 035/231] :bug: Fix issue loading custom fields on Salesforce
 Node (#1654)

---
 packages/nodes-base/nodes/Salesforce/AccountDescription.ts   | 4 ++--
 packages/nodes-base/nodes/Salesforce/ContactDescription.ts   | 4 ++--
 packages/nodes-base/nodes/Salesforce/LeadDescription.ts      | 4 ++--
 .../nodes-base/nodes/Salesforce/OpportunityDescription.ts    | 4 ++--
 packages/nodes-base/nodes/Salesforce/Salesforce.node.ts      | 5 +++--
 packages/nodes-base/nodes/Salesforce/TaskDescription.ts      | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
index 35af86a2ff..8399018e2d 100644
--- a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
@@ -171,7 +171,7 @@ export const accountFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
@@ -426,7 +426,7 @@ export const accountFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index aac14a6a75..68a9db7462 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -152,7 +152,7 @@ export const contactFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
@@ -441,7 +441,7 @@ export const contactFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 402c39792a..4f0c57d119 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -157,7 +157,7 @@ export const leadFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
@@ -408,7 +408,7 @@ export const leadFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
diff --git a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
index 0529207a48..4a693954f6 100644
--- a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
@@ -185,7 +185,7 @@ export const opportunityFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
@@ -381,7 +381,7 @@ export const opportunityFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 9cbe6ee2c8..e558234f84 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -322,10 +322,11 @@ export class Salesforce implements INodeType {
 			},
 			// Get all the lead custom fields to display them to user so that he can
 			// select them easily
-			async getLeadCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+			async getCustomFields(this: ILoadOptionsFunctions): Promise < INodePropertyOptions[] > {
 				const returnData: INodePropertyOptions[] = [];
+				const resource = this.getNodeParameter('resource', 0) as string;
 				// TODO: find a way to filter this object to get just the lead sources instead of the whole object
-				const { fields } = await salesforceApiRequest.call(this, 'GET', '/sobjects/lead/describe');
+				const { fields } = await salesforceApiRequest.call(this, 'GET', `/sobjects/${resource}/describe`);
 
 				for (const field of fields) {
 					if (field.custom === true) {
diff --git a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
index 2fb83f7579..2cd2b3fd5b 100644
--- a/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/TaskDescription.ts
@@ -165,7 +165,7 @@ export const taskFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',
@@ -517,7 +517,7 @@ export const taskFields = [
 								name: 'fieldId',
 								type: 'options',
 								typeOptions: {
-									loadOptionsMethod: 'getLeadCustomFields',
+									loadOptionsMethod: 'getCustomFields',
 								},
 								default: '',
 								description: 'The ID of the field to add custom field to.',

From 415928db3cc2a3b10129f2e1254bd50f75db95bc Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Sat, 17 Apr 2021 10:18:29 +0200
Subject: [PATCH 036/231] :sparkles: Add delete:Folder to Microsoft Drive node
 (#1636)

---
 .../nodes/Microsoft/OneDrive/FolderDescription.ts         | 8 +++++++-
 .../nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts    | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
index a33f1302d6..16f1ccdf4d 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/FolderDescription.ts
@@ -20,6 +20,11 @@ export const folderOperations = [
 				value: 'create',
 				description: 'Create a folder',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a folder',
+			},
 			{
 				name: 'Get Children',
 				value: 'getChildren',
@@ -91,7 +96,7 @@ export const folderFields = [
 		],
 	},
 /* -------------------------------------------------------------------------- */
-/*                                 folder:getChildren                         */
+/*                                 folder:getChildren/delete                  */
 /* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Folder ID',
@@ -100,6 +105,7 @@ export const folderFields = [
 		displayOptions: {
 			show: {
 				operation: [
+					'delete',
 					'getChildren',
 				],
 				resource: [
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index e36076bd65..6afe17aae2 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -222,6 +222,13 @@ export class MicrosoftOneDrive implements INodeType {
 					responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
 					returnData.push(responseData);
 				}
+				//https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_delete?view=odsp-graph-online
+				if (operation === 'delete') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					responseData = await microsoftApiRequest.call(this, 'DELETE', `/drive/items/${folderId}`);
+					responseData = { success: true };
+					returnData.push(responseData as IDataObject);
+				}
 				//https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_list_children?view=odsp-graph-online
 				if (operation === 'getChildren') {
 					const folderId = this.getNodeParameter('folderId', i) as string;

From a0f42708d4f93ff17e76b0180d15c5dec12633b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 17 Apr 2021 10:34:48 +0200
Subject: [PATCH 037/231] :sparkles: Add calculate functionality to DateTime
 Node (#1589)

* :zap: DateTime node improvements

* :hammer: Fix parsing format in date calculation

* :zap: Small improvements

* :pencil2: Rename params and add tooltips

* :hammer: Reorder params

* :zap: Set default values

* :zap: Set defaults and use same parameter name

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/nodes-base/nodes/DateTime.node.ts | 239 ++++++++++++++++++++-
 1 file changed, 231 insertions(+), 8 deletions(-)

diff --git a/packages/nodes-base/nodes/DateTime.node.ts b/packages/nodes-base/nodes/DateTime.node.ts
index a5dabb43a0..8279d654b4 100644
--- a/packages/nodes-base/nodes/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime.node.ts
@@ -1,7 +1,8 @@
-import * as moment from 'moment-timezone';
-import { set } from 'lodash';
 
-import { IExecuteFunctions } from 'n8n-core';
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
 import {
 	IDataObject,
 	ILoadOptionsFunctions,
@@ -12,6 +13,11 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
+import {
+	set,
+} from 'lodash';
+
+import * as moment from 'moment-timezone';
 
 export class DateTime implements INodeType {
 	description: INodeTypeDescription = {
@@ -21,6 +27,7 @@ export class DateTime implements INodeType {
 		group: ['transform'],
 		version: 1,
 		description: 'Allows you to manipulate date and time values',
+		subtitle: '={{$parameter["action"]}}',
 		defaults: {
 			name: 'Date & Time',
 			color: '#408000',
@@ -33,6 +40,11 @@ export class DateTime implements INodeType {
 				name: 'action',
 				type: 'options',
 				options: [
+					{
+						name: 'Calculate a Date',
+						description: 'Add or subtract time from a date',
+						value: 'calculate',
+					},
 					{
 						name: 'Format a Date',
 						description: 'Convert a date to a different format',
@@ -76,7 +88,7 @@ export class DateTime implements INodeType {
 				name: 'custom',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'format',
 						],
 					},
@@ -90,7 +102,7 @@ export class DateTime implements INodeType {
 				name: 'toFormat',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'format',
 						],
 						custom: [
@@ -109,10 +121,10 @@ export class DateTime implements INodeType {
 				type: 'options',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'format',
 						],
-						custom:[
+						custom: [
 							false,
 						],
 					},
@@ -162,7 +174,7 @@ export class DateTime implements INodeType {
 				name: 'options',
 				displayOptions: {
 					show: {
-						action:[
+						action: [
 							'format',
 						],
 					},
@@ -200,6 +212,156 @@ export class DateTime implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Date Value',
+				name: 'value',
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				type: 'string',
+				default: '',
+				description: 'The date string or timestamp from which you want to add/subtract time.',
+				required: true,
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				type: 'options',
+				options: [
+					{
+						name: 'Add',
+						value: 'add',
+						description: 'Add time to Date Value',
+					},
+					{
+						name: 'Subtract',
+						value: 'subtract',
+						description: 'Subtract time from Date Value',
+					},
+				],
+				default: 'add',
+				required: true,
+			},
+			{
+				displayName: 'Duration',
+				name: 'duration',
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+				required: true,
+				description: 'E.g. enter “10” then select “Days” if you want to add 10 days to Date Value.',
+			},
+			{
+				displayName: 'Time Unit',
+				name: 'timeUnit',
+				description: 'Time unit for Duration parameter above.',
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				type: 'options',
+				options: [
+					{
+						name: 'Quarters',
+						value: 'quarters',
+					},
+					{
+						name: 'Years',
+						value: 'years',
+					},
+					{
+						name: 'Months',
+						value: 'months',
+					},
+					{
+						name: 'Weeks',
+						value: 'weeks',
+					},
+					{
+						name: 'Days',
+						value: 'days',
+					},
+					{
+						name: 'Hours',
+						value: 'hours',
+					},
+					{
+						name: 'Minutes',
+						value: 'minutes',
+					},
+					{
+						name: 'Seconds',
+						value: 'seconds',
+					},
+					{
+						name: 'Milliseconds',
+						value: 'milliseconds',
+					},
+				],
+				default: 'days',
+				required: true,
+			},
+			{
+				displayName: 'Property Name',
+				name: 'dataPropertyName',
+				type: 'string',
+				default: 'data',
+				required: true,
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				description: 'Name of the output property to which to write the converted date.',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						action: [
+							'calculate',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'From Format',
+						name: 'fromFormat',
+						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.',
+					},
+				],
+			},
 		],
 	};
 
@@ -297,8 +459,69 @@ export class DateTime implements INodeType {
 
 				returnData.push(newItem);
 			}
+
+			if (action === 'calculate') {
+
+				const dateValue = this.getNodeParameter('value', i) as string;
+				const operation = this.getNodeParameter('operation', i) as 'add' | 'subtract';
+				const duration = this.getNodeParameter('duration', i) as number;
+				const timeUnit = this.getNodeParameter('timeUnit', i) as moment.DurationInputArg2;
+				const { fromFormat } = this.getNodeParameter('options', i) as { fromFormat?: string };
+				const dataPropertyName = this.getNodeParameter('dataPropertyName', i) as string;
+
+				const newDate = fromFormat
+					? parseDateByFormat(dateValue, fromFormat)
+					: parseDateByDefault(dateValue);
+
+				operation === 'add'
+					? newDate.add(duration, timeUnit).utc().format()
+					: newDate.subtract(duration, timeUnit).utc().format();
+
+				let newItem: INodeExecutionData;
+				if (dataPropertyName.includes('.')) {
+					// Uses dot notation so copy all data
+					newItem = {
+						json: JSON.parse(JSON.stringify(item.json)),
+					};
+				} else {
+					// Does not use dot notation so shallow copy is enough
+					newItem = {
+						json: { ...item.json },
+					};
+				}
+
+				if (item.binary !== undefined) {
+					newItem.binary = item.binary;
+				}
+
+				set(newItem, `json.${dataPropertyName}`, newDate);
+
+				returnData.push(newItem);
+			}
 		}
 
 		return this.prepareOutputData(returnData);
 	}
 }
+
+function parseDateByFormat(value: string, fromFormat: string) {
+	const date = moment(value, fromFormat, true);
+	if (moment(date).isValid()) return date;
+
+	throw new Error('Date input cannot be parsed. Please recheck the value and the "From Format" field.');
+}
+
+function parseDateByDefault(value: string) {
+	const isoValue = getIsoValue(value);
+	if (moment(isoValue).isValid()) return moment(isoValue);
+
+	throw new Error('Unrecognized date input. Please specify a format in the "From Format" field.');
+}
+
+function getIsoValue(value: string) {
+	try {
+		return new Date(value).toISOString(); // may throw due to unpredictable input
+	} catch (error) {
+		throw new Error('Unrecognized date input. Please specify a format in the "From Format" field.');
+	}
+}

From b0d3554ced4294a466eac81bb669b78f683215fb Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 17 Apr 2021 09:04:25 -0400
Subject: [PATCH 038/231] :sparkles: Add Google BigQuery node (#1635)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :sparkles: Google BigQuery node

* :hammer: Add comment dividers

* :zap: Add whitespace for readability

* :pencil2: Edit resource descriptions

* :zap: Improvements

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 .../GoogleBigQueryOAuth2Api.credentials.ts    |  25 ++
 .../nodes/Google/BigQuery/GenericFunctions.ts |  80 +++++
 .../Google/BigQuery/GoogleBigQuery.node.ts    | 250 +++++++++++++
 .../Google/BigQuery/RecordDescription.ts      | 339 ++++++++++++++++++
 .../nodes/Google/BigQuery/googleBigQuery.svg  |   1 +
 packages/nodes-base/package.json              |   2 +
 6 files changed, 697 insertions(+)
 create mode 100644 packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
 create mode 100644 packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
 create mode 100644 packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg

diff --git a/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..5349ceebba
--- /dev/null
+++ b/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
@@ -0,0 +1,25 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+const scopes = [
+	'https://www.googleapis.com/auth/bigquery',
+];
+
+export class GoogleBigQueryOAuth2Api implements ICredentialType {
+	name = 'googleBigQueryOAuth2Api';
+	extends = [
+		'googleOAuth2Api',
+	];
+	displayName = 'Google BigQuery OAuth2 API';
+	documentationUrl = 'google';
+	properties = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: scopes.join(' '),
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
new file mode 100644
index 0000000000..b212c0c981
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
@@ -0,0 +1,80 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+} from 'n8n-workflow';
+
+export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://bigquery.googleapis.com/bigquery${resource}`,
+		json: true,
+	};
+	try {
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		console.log(options);
+		//@ts-ignore
+		return await this.helpers.requestOAuth2.call(this, 'googleBigQueryOAuth2Api', options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.error) {
+
+			let errors = error.response.body.error.errors;
+
+			errors = errors.map((e: IDataObject) => e.message);
+			// Try to return the error prettier
+			throw new Error(
+				`Google BigQuery error response [${error.statusCode}]: ${errors.join('|')}`,
+			);
+		}
+		throw error;
+	}
+}
+
+export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query.maxResults = 100;
+
+	do {
+		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		query.pageToken = responseData['nextPageToken'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['nextPageToken'] !== undefined &&
+		responseData['nextPageToken'] !== ''
+	);
+
+	return returnData;
+}
+
+export function simplify(rows: IDataObject[], fields: string[]) {
+	const results = [];
+	for (const row of rows) {
+		const record: IDataObject = {};
+		for (const [index, field] of fields.entries()) {
+			record[field] = (row.f as IDataObject[])[index].v;
+		}
+		results.push(record);
+	}
+	return results;
+}
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
new file mode 100644
index 0000000000..9a848cd58f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -0,0 +1,250 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	googleApiRequest,
+	googleApiRequestAllItems,
+	simplify,
+} from './GenericFunctions';
+
+import {
+	recordFields,
+	recordOperations,
+} from './RecordDescription';
+
+import * as uuid from 'uuid';
+
+export class GoogleBigQuery implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Google BigQuery',
+		name: 'googleBigQuery',
+		icon: 'file:googleBigQuery.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Google BigQuery API.',
+		defaults: {
+			name: 'Google BigQuery',
+			color: '#3E87E4',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'googleBigQueryOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Record',
+						value: 'record',
+					},
+				],
+				default: 'record',
+				description: 'The resource to operate on.',
+			},
+			...recordOperations,
+			...recordFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getProjects(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { projects } = await googleApiRequest.call(
+					this,
+					'GET',
+					'/v2/projects',
+				);
+				for (const project of projects) {
+					returnData.push({
+						name: project.friendlyName as string,
+						value: project.id,
+					});
+				}
+				return returnData;
+			},
+			async getDatasets(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const projectId = this.getCurrentNodeParameter('projectId');
+				const returnData: INodePropertyOptions[] = [];
+				const { datasets } = await googleApiRequest.call(
+					this,
+					'GET',
+					`/v2/projects/${projectId}/datasets`,
+				);
+				for (const dataset of datasets) {
+					returnData.push({
+						name: dataset.datasetReference.datasetId as string,
+						value: dataset.datasetReference.datasetId,
+					});
+				}
+				return returnData;
+			},
+			async getTables(
+				this: ILoadOptionsFunctions,
+			): Promise<INodePropertyOptions[]> {
+				const projectId = this.getCurrentNodeParameter('projectId');
+				const datasetId = this.getCurrentNodeParameter('datasetId');
+				const returnData: INodePropertyOptions[] = [];
+				const { tables } = await googleApiRequest.call(
+					this,
+					'GET',
+					`/v2/projects/${projectId}/datasets/${datasetId}/tables`,
+				);
+				for (const table of tables) {
+					returnData.push({
+						name: table.tableReference.tableId as string,
+						value: table.tableReference.tableId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = (items.length as unknown) as number;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		if (resource === 'record') {
+
+			// *********************************************************************
+			//                               record
+			// *********************************************************************
+
+			if (operation === 'create') {
+
+				// ----------------------------------
+				//         record: create
+				// ----------------------------------
+
+				// https://cloud.google.com/bigquery/docs/reference/rest/v2/tabledata/insertAll
+
+				const projectId = this.getNodeParameter('projectId', 0) as string;
+				const datasetId = this.getNodeParameter('datasetId', 0) as string;
+				const tableId = this.getNodeParameter('tableId', 0) as string;
+				const rows: IDataObject[] = [];
+				const body: IDataObject = {};
+
+				for (let i = 0; i < length; i++) {
+
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					Object.assign(body, options);
+					if (body.traceId === undefined) {
+						body.traceId = uuid();
+					}
+					const columns = this.getNodeParameter('columns', i) as string;
+					const columnList = columns.split(',').map(column => column.trim());
+					const record: IDataObject = {};
+
+					for (const key of Object.keys(items[i].json)) {
+						if (columnList.includes(key)) {
+							record[`${key}`] = items[i].json[key];
+						}
+					}
+					rows.push({ json: record });
+				}
+
+				body.rows = rows;
+				responseData = await googleApiRequest.call(
+					this,
+					'POST',
+					`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}/insertAll`,
+					body,
+				);
+				returnData.push(responseData);
+
+			} else if (operation === 'getAll') {
+
+				// ----------------------------------
+				//         record: getAll
+				// ----------------------------------
+
+				// https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/get
+
+				const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+				const projectId = this.getNodeParameter('projectId', 0) as string;
+				const datasetId = this.getNodeParameter('datasetId', 0) as string;
+				const tableId = this.getNodeParameter('tableId', 0) as string;
+				const simple = this.getNodeParameter('simple', 0) as boolean;
+				let fields;
+
+				if (simple === true) {
+					const { schema } = await googleApiRequest.call(
+						this,
+						'GET',
+						`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}`,
+						{},
+					);
+					fields = schema.fields.map((field: IDataObject) => field.name);
+				}
+
+				for (let i = 0; i < length; i++) {
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					Object.assign(qs, options);
+
+					// if (qs.useInt64Timestamp !== undefined) {
+					// 	qs.formatOptions = {
+					// 		useInt64Timestamp: qs.useInt64Timestamp,
+					// 	};
+					// 	delete qs.useInt64Timestamp;
+					// }
+
+					if (qs.selectedFields) {
+						fields = (qs.selectedFields as string).split(',');
+					}
+
+					if (returnAll) {
+						responseData = await googleApiRequestAllItems.call(
+							this,
+							'rows',
+							'GET',
+							`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}/data`,
+							{},
+							qs,
+						);
+						returnData.push.apply(returnData, (simple) ? simplify(responseData, fields) : responseData);
+					} else {
+						qs.maxResults = this.getNodeParameter('limit', i) as number;
+						responseData = await googleApiRequest.call(
+							this,
+							'GET',
+							`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}/data`,
+							{},
+							qs,
+						);
+						returnData.push.apply(returnData, (simple) ? simplify(responseData.rows, fields) : responseData.rows);
+					}
+				}
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts b/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
new file mode 100644
index 0000000000..3f490ee648
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
@@ -0,0 +1,339 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const recordOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'record',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new record.',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Retrieve all records.',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform.',
+	},
+] as INodeProperties[];
+
+export const recordFields = [
+	// ----------------------------------
+	//         record: create
+	// ----------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the project to create the record in.',
+	},
+	{
+		displayName: 'Dataset ID',
+		name: 'datasetId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getDatasets',
+			loadOptionsDependsOn: [
+				'projectId',
+			],
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the dataset to create the record in.',
+	},
+	{
+		displayName: 'Table ID',
+		name: 'tableId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+			loadOptionsDependsOn: [
+				'projectId',
+				'datasetId',
+			],
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the table to create the record in.',
+	},
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'record',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		required: true,
+		placeholder: 'id,name,description',
+		description: 'Comma-separated list of the item properties to use as columns.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Options',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Ignore Unknown Values',
+				name: 'ignoreUnknownValues',
+				type: 'boolean',
+				default: false,
+				description: 'Ignore row values that do not match the schema.',
+			},
+			{
+				displayName: 'Skip Invalid Rows',
+				name: 'skipInvalidRows',
+				type: 'boolean',
+				default: false,
+				description: 'Skip rows with values that do not match the schema.',
+			},
+			{
+				displayName: 'Template Suffix',
+				name: 'templateSuffix',
+				type: 'string',
+				default: '',
+				description: 'Create a new table based on the destination table and insert rows into the new table. The new table will be named <code>{destinationTable}{templateSuffix}</code>.',
+			},
+			{
+				displayName: 'Trace ID',
+				name: 'traceId',
+				type: 'string',
+				default: '',
+				description: 'Unique ID for the request, for debugging only. It is case-sensitive, limited to up to 36 ASCII characters. A UUID is recommended.',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         record: getAll
+	// ----------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the project to retrieve all rows from.',
+	},
+	{
+		displayName: 'Dataset ID',
+		name: 'datasetId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getDatasets',
+			loadOptionsDependsOn: [
+				'projectId',
+			],
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the dataset to retrieve all rows from.',
+	},
+	{
+		displayName: 'Table ID',
+		name: 'tableId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+			loadOptionsDependsOn: [
+				'projectId',
+				'datasetId',
+			],
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: '',
+		description: 'ID of the table to retrieve all rows from.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'record',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: true,
+		description: 'Return a simplified version of the response instead of the raw data.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Options',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'record',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'selectedFields',
+				type: 'string',
+				default: '',
+				description: 'Subset of fields to return, supports select into sub fields. Example: <code>selectedFields = "a,e.d.f"</code>.',
+			},
+			// {
+			// 	displayName: 'Use Int64 Timestamp',
+			// 	name: 'useInt64Timestamp',
+			// 	type: 'boolean',
+			// 	default: false,
+			// 	description: 'Output timestamp as usec int64.',
+			// },
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
new file mode 100644
index 0000000000..b006a05d6a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 58" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M14.48 54.473L.558 30.359c-.744-1.288-.744-2.876 0-4.164L14.48 2.082C15.223.795 16.595.002 18.08 0h27.857c1.48.007 2.845.8 3.585 2.082l13.92 24.113c.744 1.288.744 2.876 0 4.164L49.52 54.473c-.743 1.287-2.115 2.08-3.6 2.082H18.07c-1.483-.005-2.85-.798-3.593-2.082z" fill="#4386fa"/><path d="M40.697 20.512s3.87 9.283-1.406 14.545-14.883 1.894-14.883 1.894L43.95 56.547h1.984c1.486-.002 2.858-.796 3.6-2.082l9.216-15.958z" fill="#000" opacity=".1"/><path d="M45.266 39.507L41 35.23a.67.67 0 0 0-.158-.12c3.767-4.852 3.111-11.798-1.499-15.859a11.63 11.63 0 0 0-16.396 16.436 11.63 11.63 0 0 0 15.863 1.46c.031.055.069.106.113.15l4.277 4.277a.67.67 0 0 0 .947 0l1.12-1.12a.67.67 0 0 0 0-.947zM31.64 36.741a8.75 8.75 0 0 1-6.188-14.937 8.75 8.75 0 0 1 14.937 6.188 8.75 8.75 0 0 1-8.749 8.749zm-5.593-9.216v3.616c.557.983 1.363 1.803 2.338 2.375v-6.013zm4.375-2.998v9.772a6.45 6.45 0 0 0 2.338 0v-9.772zm6.764 6.606v-2.142H34.85v4.5a6.43 6.43 0 0 0 2.338-2.368z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3025284dd7..ac3416f4ca 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -95,6 +95,7 @@
       "dist/credentials/GmailOAuth2Api.credentials.js",
       "dist/credentials/GoogleAnalyticsOAuth2Api.credentials.js",
       "dist/credentials/GoogleApi.credentials.js",
+      "dist/credentials/GoogleBigQueryOAuth2Api.credentials.js",
       "dist/credentials/GoogleBooksOAuth2Api.credentials.js",
       "dist/credentials/GoogleCalendarOAuth2Api.credentials.js",
       "dist/credentials/GoogleContactsOAuth2Api.credentials.js",
@@ -362,6 +363,7 @@
       "dist/nodes/Github/GithubTrigger.node.js",
       "dist/nodes/Gitlab/Gitlab.node.js",
       "dist/nodes/Gitlab/GitlabTrigger.node.js",
+      "dist/nodes/Google/BigQuery/GoogleBigQuery.node.js",
       "dist/nodes/Google/Books/GoogleBooks.node.js",
       "dist/nodes/Google/Analytics/GoogleAnalytics.node.js",
       "dist/nodes/Google/Calendar/GoogleCalendar.node.js",

From a7394daa6b12f855ebbbf5fcef2527a68de444e7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:08:13 +0200
Subject: [PATCH 039/231] :zap: Remove console.log

---
 packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
index b212c0c981..828f625f2e 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
@@ -30,7 +30,6 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-		console.log(options);
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleBigQueryOAuth2Api', options);
 	} catch (error) {

From 882e2f8e7434cb647a9367c34896f14fec48c049 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 17 Apr 2021 15:15:33 +0200
Subject: [PATCH 040/231] :zap: Addglobal timeout setting for all http requests
 except for http request node (#1650)

* Added a global timeout setting for all http requests except for http
node.

The http node explicitly sets a timeout that overrides the default
value.

This is to prevent behaviors when users were expecting that their quests
could take a very long time to execute.

* Removed unnecessary typing from code
---
 packages/core/src/NodeExecuteFunctions.ts     | 17 ++++++++++-------
 packages/nodes-base/nodes/HttpRequest.node.ts |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 9493e993b8..e77e1a3d94 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -52,6 +52,9 @@ import { createHmac } from 'crypto';
 import { fromBuffer } from 'file-type';
 import { lookup } from 'mime-types';
 
+const requestPromiseWithDefaults = requestPromise.defaults({
+	timeout: 300000, // 5 minutes
+});
 
 /**
  * Takes a buffer and converts it into the format n8n uses. It encodes the binary data as
@@ -577,7 +580,7 @@ export function getExecutePollFunctions(workflow: Workflow, node: INode, additio
 			},
 			helpers: {
 				prepareBinaryData,
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -643,7 +646,7 @@ export function getExecuteTriggerFunctions(workflow: Workflow, node: INode, addi
 			},
 			helpers: {
 				prepareBinaryData,
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -739,7 +742,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
 			prepareOutputData: NodeHelpers.prepareOutputData,
 			helpers: {
 				prepareBinaryData,
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -837,7 +840,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
 			},
 			helpers: {
 				prepareBinaryData,
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -893,7 +896,7 @@ export function getLoadOptionsFunctions(workflow: Workflow, node: INode, additio
 				return additionalData.restApiUrl;
 			},
 			helpers: {
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -963,7 +966,7 @@ export function getExecuteHookFunctions(workflow: Workflow, node: INode, additio
 				return workflow.getStaticData(type, node);
 			},
 			helpers: {
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
@@ -1063,7 +1066,7 @@ export function getExecuteWebhookFunctions(workflow: Workflow, node: INode, addi
 			prepareOutputData: NodeHelpers.prepareOutputData,
 			helpers: {
 				prepareBinaryData,
-				request: requestPromise,
+				request: requestPromiseWithDefaults,
 				requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: OptionsWithUri | requestPromise.RequestPromiseOptions, oAuth2Options?: IOAuth2Options): Promise<any> { // tslint:disable-line:no-any
 					return requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, oAuth2Options);
 				},
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index 936ea877a7..284a653c33 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -690,6 +690,8 @@ export class HttpRequest implements INodeType {
 			}
 			if (options.timeout !== undefined) {
 				requestOptions.timeout = options.timeout as number;
+			} else {
+				requestOptions.timeout = 3600000; // 1 hour
 			}
 
 			if (options.useQueryString === true) {

From 0c779de704c25f3d1850336c63f8c528b96f7a28 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 17 Apr 2021 16:44:07 +0200
Subject: [PATCH 041/231] :zap: Implement timeout for workers and corrected
 timeout for subworkflows (#1634)

* Implemented timeout for workers and corrected timeout for subworkflows

* Fixed issue with timeouts when running on separate processes

* Standardized timeouts across all n8n

Now the maxTimeout setting takes effect whenever a timeout is set
to any workflows.

This causes local timeouts (either set on a per-workflow basis or
via global settings) to be capped by the maximum timeout. This
behavior already existed but was not applied to all places.

Also changed the way n8n enforces timeouts for subworkflows, making
it work always.

In effect, with this change, if you have one workflow that calls others
only the main workflow's timeout is taken into consideration, limiting
the maximum time that other workflows combined can run.

* :zap: Fix timeout problem in "own" mode

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/cli/commands/worker.ts               |  13 ++-
 packages/cli/src/Interfaces.ts                |   9 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  26 +++--
 packages/cli/src/WorkflowRunner.ts            | 108 +++++++++++-------
 packages/cli/src/WorkflowRunnerProcess.ts     |  46 +++++++-
 packages/core/src/WorkflowExecute.ts          |   4 +
 packages/workflow/src/Interfaces.ts           |   1 +
 7 files changed, 145 insertions(+), 62 deletions(-)

diff --git a/packages/cli/commands/worker.ts b/packages/cli/commands/worker.ts
index 573014cf62..d7af9ac794 100644
--- a/packages/cli/commands/worker.ts
+++ b/packages/cli/commands/worker.ts
@@ -127,11 +127,22 @@ export class Worker extends Command {
 			staticData = workflowData.staticData;
 		}
 
+		let workflowTimeout = config.get('executions.timeout') as number; // initialize with default
+		if (currentExecutionDb.workflowData.settings && currentExecutionDb.workflowData.settings.executionTimeout) {
+			workflowTimeout = currentExecutionDb.workflowData.settings!.executionTimeout as number; // preference on workflow setting
+		}
+
+		let executionTimeoutTimestamp: number | undefined;
+		if (workflowTimeout > 0) {
+			workflowTimeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number);
+			executionTimeoutTimestamp = Date.now() + workflowTimeout * 1000;
+		}
+
 		const workflow = new Workflow({ id: currentExecutionDb.workflowData.id as string, name: currentExecutionDb.workflowData.name, nodes: currentExecutionDb.workflowData!.nodes, connections: currentExecutionDb.workflowData!.connections, active: currentExecutionDb.workflowData!.active, nodeTypes, staticData, settings: currentExecutionDb.workflowData!.settings });
 
 		const credentials = await WorkflowCredentials(currentExecutionDb.workflowData.nodes);
 
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(credentials);
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(credentials, undefined, executionTimeoutTimestamp);
 		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(currentExecutionDb.mode, job.data.executionId, currentExecutionDb.workflowData, { retryOf: currentExecutionDb.retryOf as string });
 
 		let workflowExecute: WorkflowExecute;
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index ceee653a15..464d140757 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -11,11 +11,12 @@ import {
 	ITaskData,
 	IWorkflowBase as IWorkflowBaseWorkflow,
 	IWorkflowCredentials,
+	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 
 import {
-	IDeferredPromise,
+	IDeferredPromise, WorkflowExecute,
 } from 'n8n-core';
 
 import * as PCancelable from 'p-cancelable';
@@ -410,3 +411,9 @@ export interface IWorkflowExecutionDataProcessWithExecution extends IWorkflowExe
 	executionId: string;
 	nodeTypeData: ITransferNodeTypes;
 }
+
+export interface IWorkflowExecuteProcess {
+	startedAt: Date,
+	workflow: Workflow;
+	workflowExecute: WorkflowExecute;
+}
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 970835a90c..8e0793385a 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -8,6 +8,7 @@ import {
 	IExecutionResponse,
 	IPushDataExecutionFinished,
 	IWorkflowBase,
+	IWorkflowExecuteProcess,
 	IWorkflowExecutionDataProcess,
 	NodeTypes,
 	Push,
@@ -569,7 +570,7 @@ export async function getWorkflowData(workflowInfo: IExecuteWorkflowInfo): Promi
  * @param {INodeExecutionData[]} [inputData]
  * @returns {(Promise<Array<INodeExecutionData[] | null>>)}
  */
-export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additionalData: IWorkflowExecuteAdditionalData, inputData?: INodeExecutionData[], parentExecutionId?: string, loadedWorkflowData?: IWorkflowBase, loadedRunData?: IWorkflowExecutionDataProcess): Promise<Array<INodeExecutionData[] | null> | IRun> {
+export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additionalData: IWorkflowExecuteAdditionalData, inputData?: INodeExecutionData[], parentExecutionId?: string, loadedWorkflowData?: IWorkflowBase, loadedRunData?: IWorkflowExecutionDataProcess): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
 	const externalHooks = ExternalHooks();
 	await externalHooks.init();
 
@@ -605,10 +606,19 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	// This one already contains changes to talk to parent process
 	// and get executionID from `activeExecutions` running on main process
 	additionalDataIntegrated.executeWorkflow = additionalData.executeWorkflow;
+	additionalDataIntegrated.executionTimeoutTimestamp = additionalData.executionTimeoutTimestamp;
 
 
 	// Execute the workflow
 	const workflowExecute = new WorkflowExecute(additionalDataIntegrated, runData.executionMode, runExecutionData);
+	if (parentExecutionId !== undefined) {
+		// Must be changed to become typed
+		return {
+			startedAt: new Date(),
+			workflow,
+			workflowExecute,
+		};
+	}
 	const data = await workflowExecute.processRunExecutionData(workflow);
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData]);
@@ -616,14 +626,9 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	if (data.finished === true) {
 		// Workflow did finish successfully
 
-		if (parentExecutionId !== undefined) {
-			return data;
-		} else {
-			await ActiveExecutions.getInstance().remove(executionId, data);
-
-			const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
-			return returnData!.data!.main;
-		}
+		await ActiveExecutions.getInstance().remove(executionId, data);
+		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
+		return returnData!.data!.main;
 	} else {
 		await ActiveExecutions.getInstance().remove(executionId, data);
 		// Workflow did fail
@@ -644,7 +649,7 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
  * @param {INodeParameters} currentNodeParameters
  * @returns {Promise<IWorkflowExecuteAdditionalData>}
  */
-export async function getBase(credentials: IWorkflowCredentials, currentNodeParameters?: INodeParameters): Promise<IWorkflowExecuteAdditionalData> {
+export async function getBase(credentials: IWorkflowCredentials, currentNodeParameters?: INodeParameters, executionTimeoutTimestamp?: number): Promise<IWorkflowExecuteAdditionalData> {
 	const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
 
 	const timezone = config.get('generic.timezone') as string;
@@ -666,6 +671,7 @@ export async function getBase(credentials: IWorkflowCredentials, currentNodePara
 		webhookBaseUrl,
 		webhookTestBaseUrl,
 		currentNodeParameters,
+		executionTimeoutTimestamp,
 	};
 }
 
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 386f1c51f7..b86df1c122 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -158,8 +158,22 @@ export class WorkflowRunner {
 
 		const nodeTypes = NodeTypes();
 
+
+		// Soft timeout to stop workflow execution after current running node
+		// Changes were made by adding the `workflowTimeout` to the `additionalData`
+		// So that the timeout will also work for executions with nested workflows.
+		let executionTimeout: NodeJS.Timeout;
+		let workflowTimeout = config.get('executions.timeout') as number; // initialize with default
+		if (data.workflowData.settings && data.workflowData.settings.executionTimeout) {
+			workflowTimeout = data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
+		}
+
+		if (workflowTimeout > 0) {
+			workflowTimeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number);
+		}
+
 		const workflow = new Workflow({ id: data.workflowData.id as string | undefined, name: data.workflowData.name, nodes: data.workflowData!.nodes, connections: data.workflowData!.connections, active: data.workflowData!.active, nodeTypes, staticData: data.workflowData!.staticData });
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(data.credentials);
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(data.credentials, undefined, workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000);
 
 		// Register the active execution
 		const executionId = await this.activeExecutions.add(data, undefined);
@@ -184,12 +198,6 @@ export class WorkflowRunner {
 
 		this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
 
-		// Soft timeout to stop workflow execution after current running node
-		let executionTimeout: NodeJS.Timeout;
-		let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default
-		if (data.workflowData.settings && data.workflowData.settings.executionTimeout) {
-			workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
-		}
 
 		if (workflowTimeout) {
 			const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
@@ -280,7 +288,6 @@ export class WorkflowRunner {
 				 * the database.                                 *
 				*************************************************/
 				let watchDogInterval: NodeJS.Timeout | undefined;
-				let resolved = false;
 
 				const watchDog = new Promise((res) => {
 					watchDogInterval = setInterval(async () => {
@@ -301,28 +308,9 @@ export class WorkflowRunner {
 					}
 				};
 
-				await new Promise((res, rej) => {
-					jobData.then((data) => {
-						if (!resolved) {
-							resolved = true;
-							clearWatchdogInterval();
-							res(data);
-						}
-					}).catch((e) => {
-						if(!resolved) {
-							resolved = true;
-							clearWatchdogInterval();
-							rej(e);
-						}
-					});
-					watchDog.then((data) => {
-						if (!resolved) {
-							resolved = true;
-							clearWatchdogInterval();
-							res(data);
-						}
-					});
-				});
+				await Promise.race([jobData, watchDog]);
+				clearWatchdogInterval();
+
 			} else {
 				await jobData;
 			}
@@ -364,7 +352,7 @@ export class WorkflowRunner {
 				// We don't want errors here to crash n8n. Just log and proceed.
 				console.log('Error removing saved execution from database. More details: ', err);
 			}
-			
+
 			resolve(runData);
 		});
 
@@ -383,7 +371,7 @@ export class WorkflowRunner {
 	 * @memberof WorkflowRunner
 	 */
 	async runSubprocess(data: IWorkflowExecutionDataProcess, loadStaticData?: boolean): Promise<string> {
-		const startedAt = new Date();
+		let startedAt = new Date();
 		const subprocess = fork(pathJoin(__dirname, 'WorkflowRunnerProcess.js'));
 
 		if (loadStaticData === true && data.workflowData.id) {
@@ -426,7 +414,6 @@ export class WorkflowRunner {
 			}
 		}
 
-
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).executionId = executionId;
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).nodeTypeData = nodeTypeData;
 		(data as unknown as IWorkflowExecutionDataProcessWithExecution).credentialsOverwrite = credentialsOverwrites;
@@ -439,24 +426,40 @@ export class WorkflowRunner {
 
 		// Start timeout for the execution
 		let executionTimeout: NodeJS.Timeout;
-		let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default
+		let workflowTimeout = config.get('executions.timeout') as number; // initialize with default
 		if (data.workflowData.settings && data.workflowData.settings.executionTimeout) {
-			workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
+			workflowTimeout = data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
 		}
 
-		if (workflowTimeout) {
-			const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
-			executionTimeout = setTimeout(() => {
-				this.activeExecutions.stopExecution(executionId, 'timeout');
-
-				executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)); // minimum 5 seconds
-			}, timeout);
+		const processTimeoutFunction = (timeout: number) => {
+			this.activeExecutions.stopExecution(executionId, 'timeout');
+			executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)); // minimum 5 seconds
 		}
 
+		if (workflowTimeout > 0) {
+			workflowTimeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
+			// Start timeout already now but give process at least 5 seconds to start.
+			// Without it could would it be possible that the workflow executions times out before it even got started if
+			// the timeout time is very short as the process start time can be quite long.
+			executionTimeout = setTimeout(processTimeoutFunction, Math.max(5000, workflowTimeout), workflowTimeout);
+		}
+
+		// Create a list of child spawned executions
+		// If after the child process exits we have
+		// outstanding executions, we remove them
+		const childExecutionIds: string[] = [];
 
 		// Listen to data from the subprocess
 		subprocess.on('message', async (message: IProcessMessage) => {
-			if (message.type === 'end') {
+			if (message.type === 'start') {
+				// Now that the execution actually started set the timeout again so that does not time out to early.
+				startedAt = new Date();
+				if (workflowTimeout > 0) {
+					clearTimeout(executionTimeout);
+					executionTimeout = setTimeout(processTimeoutFunction, workflowTimeout, workflowTimeout);
+				}
+
+			} else if (message.type === 'end') {
 				clearTimeout(executionTimeout);
 				this.activeExecutions.remove(executionId!, message.data.runData);
 
@@ -474,14 +477,20 @@ export class WorkflowRunner {
 				this.processError(timeoutError, startedAt, data.executionMode, executionId);
 			} else if (message.type === 'startExecution') {
 				const executionId = await this.activeExecutions.add(message.data.runData);
+				childExecutionIds.push(executionId);
 				subprocess.send({ type: 'executionId', data: {executionId} } as IProcessMessage);
 			} else if (message.type === 'finishExecution') {
+				const executionIdIndex = childExecutionIds.indexOf(message.data.executionId);
+				if (executionIdIndex !== -1) {
+					childExecutionIds.splice(executionIdIndex, 1);
+				}
+
 				await this.activeExecutions.remove(message.data.executionId, message.data.result);
 			}
 		});
 
 		// Also get informed when the processes does exit especially when it did crash or timed out
-		subprocess.on('exit', (code, signal) => {
+		subprocess.on('exit', async (code, signal) => {
 			if (signal === 'SIGTERM'){
 				// Execution timed out and its process has been terminated
 				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
@@ -493,6 +502,17 @@ export class WorkflowRunner {
 
 				this.processError(executionError, startedAt, data.executionMode, executionId);
 			}
+
+			for(const executionId of childExecutionIds) {
+				// When the child process exits, if we still have
+				// pending child executions, we mark them as finished
+				// They will display as unknown to the user
+				// Instead of pending forever as executing when it
+				// actually isn't anymore.
+				await this.activeExecutions.remove(executionId);
+			}
+
+
 			clearTimeout(executionTimeout);
 		});
 
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index b263fa864f..f3c381fb7d 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -4,6 +4,7 @@ import {
 	CredentialTypes,
 	Db,
 	ExternalHooks,
+	IWorkflowExecuteProcess,
 	IWorkflowExecutionDataProcessWithExecution,
 	NodeTypes,
 	WorkflowExecuteAdditionalData,
@@ -40,6 +41,9 @@ export class WorkflowRunnerProcess {
 	workflow: Workflow | undefined;
 	workflowExecute: WorkflowExecute | undefined;
 	executionIdCallback: (executionId: string) => void | undefined;
+	childExecutions: {
+		[key: string]: IWorkflowExecuteProcess,
+	} = {};
 
 	static async stopProcess() {
 		setTimeout(() => {
@@ -107,8 +111,18 @@ export class WorkflowRunnerProcess {
 			await Db.init();
 		}
 
+		// Start timeout for the execution
+		let workflowTimeout = config.get('executions.timeout') as number; // initialize with default
+		if (this.data.workflowData.settings && this.data.workflowData.settings.executionTimeout) {
+			workflowTimeout = this.data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
+		}
+
+		if (workflowTimeout > 0) {
+			workflowTimeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number);
+		}
+
 		this.workflow = new Workflow({ id: this.data.workflowData.id as string | undefined, name: this.data.workflowData.name, nodes: this.data.workflowData!.nodes, connections: this.data.workflowData!.connections, active: this.data.workflowData!.active, nodeTypes, staticData: this.data.workflowData!.staticData, settings: this.data.workflowData!.settings });
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(this.data.credentials);
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(this.data.credentials, undefined, workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000);
 		additionalData.hooks = this.getProcessForwardHooks();
 
 		const executeWorkflowFunction = additionalData.executeWorkflow;
@@ -123,14 +137,20 @@ export class WorkflowRunnerProcess {
 			});
 			let result: IRun;
 			try {
-				result = await executeWorkflowFunction(workflowInfo, additionalData, inputData, executionId, workflowData, runData);
+				const executeWorkflowFunctionOutput = await executeWorkflowFunction(workflowInfo, additionalData, inputData, executionId, workflowData, runData) as {workflowExecute: WorkflowExecute, workflow: Workflow} as IWorkflowExecuteProcess;
+				const workflowExecute = executeWorkflowFunctionOutput.workflowExecute;
+				this.childExecutions[executionId] = executeWorkflowFunctionOutput;
+				const workflow = executeWorkflowFunctionOutput.workflow;
+				result = await workflowExecute.processRunExecutionData(workflow) as IRun;
+				await externalHooks.run('workflow.postExecute', [result, workflowData]);
+				await sendToParentProcess('finishExecution', { executionId, result });
+				delete this.childExecutions[executionId];
 			} catch (e) {
 				await sendToParentProcess('finishExecution', { executionId });
-				// Throw same error we had 
-				throw e;	
+				delete this.childExecutions[executionId];
+				// Throw same error we had
+				throw e;
 			}
-			
-			await sendToParentProcess('finishExecution', { executionId, result });
 
 			const returnData = WorkflowHelpers.getDataLastExecutedNodeData(result);
 			return returnData!.data!.main;
@@ -254,6 +274,8 @@ const workflowRunner = new WorkflowRunnerProcess();
 process.on('message', async (message: IProcessMessage) => {
 	try {
 		if (message.type === 'startWorkflow') {
+			await sendToParentProcess('start', {});
+
 			const runData = await workflowRunner.runWorkflow(message.data);
 
 			await sendToParentProcess('end', {
@@ -267,6 +289,18 @@ process.on('message', async (message: IProcessMessage) => {
 			let runData: IRun;
 
 			if (workflowRunner.workflowExecute !== undefined) {
+
+				const executionIds = Object.keys(workflowRunner.childExecutions);
+
+				for (const executionId of executionIds) {
+					const childWorkflowExecute = workflowRunner.childExecutions[executionId];
+					runData = childWorkflowExecute.workflowExecute.getFullRunData(workflowRunner.childExecutions[executionId].startedAt);
+					const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : undefined;
+
+					// If there is any data send it to parent process, if execution timedout add the error
+					await childWorkflowExecute.workflowExecute.processSuccessExecution(workflowRunner.childExecutions[executionId].startedAt, childWorkflowExecute.workflow, timeOutError);
+				}
+
 				// Workflow started already executing
 				runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt);
 
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 210711aee7..40fe227d33 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -550,6 +550,10 @@ export class WorkflowExecute {
 				executionLoop:
 				while (this.runExecutionData.executionData!.nodeExecutionStack.length !== 0) {
 
+					if (this.additionalData.executionTimeoutTimestamp !== undefined && Date.now() >= this.additionalData.executionTimeoutTimestamp) {
+						gotCancel = true;
+					}
+
 					// @ts-ignore
 					if (gotCancel === true) {
 						return Promise.resolve();
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 800dbb35a4..ba78499b5a 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -748,6 +748,7 @@ export interface IWorkflowExecuteAdditionalData {
 	webhookBaseUrl: string;
 	webhookTestBaseUrl: string;
 	currentNodeParameters?: INodeParameters;
+	executionTimeoutTimestamp?: number;
 }
 
 export type WorkflowExecuteMode = 'cli' | 'error' | 'integrated' | 'internal' | 'manual' | 'retry' | 'trigger' | 'webhook';

From 3fe52c84d58f6e30ed65415c2d88b32946c0efa9 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 17 Apr 2021 10:52:56 -0400
Subject: [PATCH 042/231] :bug: Fix issue sending parameter Opt In Reason on
 Keap Node (#1674)

---
 .../nodes-base/nodes/Keap/GenericFunctions.ts |  8 ++---
 packages/nodes-base/nodes/Keap/Keap.node.ts   | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 63ad3ee0eb..61e6130877 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import {
 	OptionsWithUri,
- } from 'request';
+} from 'request';
 
 import {
 	IExecuteFunctions,
@@ -15,7 +15,7 @@ import {
 
 import {
 	snakeCase,
- } from 'change-case';
+} from 'change-case';
 
 export async function keapApiRequest(this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	let options: OptionsWithUri = {
@@ -43,7 +43,7 @@ export async function keapApiRequest(this: IWebhookFunctions | IHookFunctions |
 	}
 }
 
-export async function keapApiRequestAllItems(this: IHookFunctions| IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+export async function keapApiRequestAllItems(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const returnData: IDataObject[] = [];
 
@@ -62,7 +62,7 @@ export async function keapApiRequestAllItems(this: IHookFunctions| IExecuteFunct
 	return returnData;
 }
 
-export function keysToSnakeCase(elements: IDataObject[] | IDataObject) : IDataObject[] {
+export function keysToSnakeCase(elements: IDataObject[] | IDataObject): IDataObject[] {
 	if (!Array.isArray(elements)) {
 		elements = [elements];
 	}
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index d250f3a825..8ddcf53f13 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -57,7 +57,7 @@ import {
 import {
 	companyFields,
 	companyOperations,
- } from './CompanyDescription';
+} from './CompanyDescription';
 
 import {
 	IAddress,
@@ -78,9 +78,9 @@ import {
 } from './ContactNoteInterface';
 
 import {
-	 IEcommerceOrder,
-	 IItem,
-	 IShippingAddress,
+	IEcommerceOrder,
+	IItem,
+	IShippingAddress,
 } from './EcommerceOrderInterface';
 
 import {
@@ -310,9 +310,9 @@ export class Keap implements INodeType {
 					keysToSnakeCase(additionalFields);
 					Object.assign(body, additionalFields);
 					if (addresses) {
-						body.address = keysToSnakeCase(addresses)[0] ;
-					 }
-					 if (faxes) {
+						body.address = keysToSnakeCase(addresses)[0];
+					}
+					if (faxes) {
 						body.fax_number = faxes[0];
 					}
 					if (phones) {
@@ -407,13 +407,16 @@ export class Keap implements INodeType {
 					if (additionalFields.companyId) {
 						body.company = { id: additionalFields.companyId as number };
 					}
+					if (additionalFields.optInReason) {
+						body.opt_in_reason = additionalFields.optInReason as string;
+					}
 					if (addresses) {
 						body.addresses = keysToSnakeCase(addresses) as IAddress[];
-					 }
-					 if (emails) {
-						 body.email_addresses = emails as IEmailContact[];
-					 }
-					 if (faxes) {
+					}
+					if (emails) {
+						body.email_addresses = emails as IEmailContact[];
+					}
+					if (faxes) {
 						body.fax_numbers = faxes as IFax[];
 					}
 					if (socialAccounts) {
@@ -706,7 +709,7 @@ export class Keap implements INodeType {
 							attachments = attachmentsUi.attachmentsValues as IAttachment[];
 						}
 						if (attachmentsUi.attachmentsBinary
-						&& (attachmentsUi.attachmentsBinary as IDataObject).length) {
+							&& (attachmentsUi.attachmentsBinary as IDataObject).length) {
 
 							if (items[i].binary === undefined) {
 								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');

From 73da7998cff36091d5b4a5db48fff578a5500aa0 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 17 Apr 2021 17:01:27 +0200
Subject: [PATCH 043/231] :bug: Fix attempt to reconnect and make IMAP node
 stable (#1667)

---
 .../nodes-base/nodes/EmailReadImap.node.ts    | 61 +++++++++++--------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index fed766849d..6c9f18bf31 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -354,35 +354,48 @@ export class EmailReadImap implements INodeType {
 			return newEmails;
 		};
 
-		let connection: ImapSimple;
+		const establishConnection = (): Promise<ImapSimple> => {
+			const config: ImapSimpleOptions = {
+				imap: {
+					user: credentials.user as string,
+					password: credentials.password as string,
+					host: credentials.host as string,
+					port: credentials.port as number,
+					tls: credentials.secure as boolean,
+					authTimeout: 20000,
+				},
+				onmail: async () => {
+					if (connection) {
+						const returnData = await getNewEmails(connection, searchCriteria);
 
-		const config: ImapSimpleOptions = {
-			imap: {
-				user: credentials.user as string,
-				password: credentials.password as string,
-				host: credentials.host as string,
-				port: credentials.port as number,
-				tls: credentials.secure as boolean,
-				authTimeout: 20000,
-			},
-			onmail: async () => {
-				const returnData = await getNewEmails(connection, searchCriteria);
+						if (returnData.length) {
+							this.emit([returnData]);
+						}
+					}
+				},
+			};
 
-				if (returnData.length) {
-					this.emit([returnData]);
-				}
-			},
+			if (options.allowUnauthorizedCerts === true) {
+				config.imap.tlsOptions = {
+					rejectUnauthorized: false,
+				};
+			}
+
+			// Connect to the IMAP server and open the mailbox
+			// that we get informed whenever a new email arrives
+			return imapConnect(config).then(async conn => {
+				conn.on('error', async err => {
+					if (err.code.toUpperCase() === 'ECONNRESET') {
+						connection = await establishConnection();
+					}
+					throw err;
+				});
+				return conn;
+			});
 		};
 
-		if (options.allowUnauthorizedCerts === true) {
-			config.imap.tlsOptions = {
-				rejectUnauthorized: false,
-			};
-		}
+		let connection: ImapSimple = await establishConnection();
 
-		// Connect to the IMAP server and open the mailbox
-		// that we get informed whenever a new email arrives
-		connection = await imapConnect(config);
 		await connection.openBox(mailbox);
 
 		// When workflow and so node gets set to inactive close the connectoin

From e46242faf560e7390c7dfb0ee7d7a8f2a4deff8d Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 17 Apr 2021 18:05:53 +0300
Subject: [PATCH 044/231] :arrow_up: Upgrade moment from 2.28.0 to 2.29.1
 (#1672)

Snyk has created this PR to upgrade moment from 2.28.0 to 2.29.1.

See this package in npm:
https://www.npmjs.com/package/moment

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ac3416f4ca..4f9fdc3ff3 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -611,7 +611,7 @@
     "lodash.unset": "^4.5.2",
     "lossless-json": "^1.0.4",
     "mailparser": "^3.2.0",
-    "moment": "2.28.0",
+    "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
     "mongodb": "3.6.3",
     "mqtt": "4.2.1",

From c80b0ebfd968d05cb0e2f333dc9a2f1771442f2f Mon Sep 17 00:00:00 2001
From: Bart Vollebregt <3983932+bartvollebregt@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:08:07 +0200
Subject: [PATCH 045/231] :bug: Fix bug in Zendesk Trigger node with wrong
 conditions (#1668)

---
 packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 393a2f98d7..85ff81ef1e 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -442,11 +442,11 @@ export class ZendeskTrigger implements INodeType {
 				const conditionsAll = conditions.all as [IDataObject];
 
 				let endpoint = '';
-				const aux: IDataObject = {};
 				const resultAll = [], resultAny = [];
 
 				if (conditionsAll) {
 					for (const conditionAll of conditionsAll) {
+						const aux: IDataObject = {};
 						aux.field = conditionAll.field;
 						aux.operator = conditionAll.operation;
 						if (conditionAll.operation !== 'changed'
@@ -462,6 +462,7 @@ export class ZendeskTrigger implements INodeType {
 				const conditionsAny = conditions.any as [IDataObject];
 				if (conditionsAny) {
 					for (const conditionAny of conditionsAny) {
+						const aux: IDataObject = {};
 						aux.field = conditionAny.field;
 						aux.operator = conditionAny.operation;
 						if (conditionAny.operation !== 'changed'
@@ -510,7 +511,6 @@ export class ZendeskTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const service = this.getNodeParameter('service') as string;
 				if (service === 'support') {
-					const aux: IDataObject = {};
 					const message: IDataObject = {};
 					const resultAll = [], resultAny = [];
 					const conditions = this.getNodeParameter('conditions') as IDataObject;
@@ -530,6 +530,7 @@ export class ZendeskTrigger implements INodeType {
 					const conditionsAll = conditions.all as [IDataObject];
 					if (conditionsAll) {
 						for (const conditionAll of conditionsAll) {
+							const aux: IDataObject = {};
 							aux.field = conditionAll.field;
 							aux.operator = conditionAll.operation;
 							if (conditionAll.operation !== 'changed'
@@ -544,6 +545,7 @@ export class ZendeskTrigger implements INodeType {
 					const conditionsAny = conditions.any as [IDataObject];
 					if (conditionsAny) {
 						for (const conditionAny of conditionsAny) {
+							const aux: IDataObject = {};
 							aux.field = conditionAny.field;
 							aux.operator = conditionAny.operation;
 							if (conditionAny.operation !== 'changed'

From 5e7f27d1378b5f2f9a3b3488acc8d0b7723d97aa Mon Sep 17 00:00:00 2001
From: Konstantin Nosov <nosovk@gmail.com>
Date: Sat, 17 Apr 2021 18:17:16 +0300
Subject: [PATCH 046/231] :zap: Optimize svg (#1653)

* add optimize-svg command to npm scripts

* run svgo over all svg assets in repo
---
 package.json                                  |   3 +-
 .../nodes-base/nodes/Airtable/airtable.svg    |  22 +---
 .../nodes/ApiTemplateIo/apiTemplateIo.svg     | 103 +---------------
 packages/nodes-base/nodes/Asana/asana.svg     |  19 +--
 .../nodes-base/nodes/Autopilot/autopilot.svg  |   9 +-
 .../nodes/Aws/Comprehend/comprehend.svg       |   2 +-
 .../nodes/Aws/Rekognition/rekognition.svg     |   2 +-
 packages/nodes-base/nodes/Aws/SES/ses.svg     |   2 +-
 packages/nodes-base/nodes/Aws/SQS/sqs.svg     |   2 +-
 .../nodes-base/nodes/Bitwarden/bitwarden.svg  |   2 +-
 packages/nodes-base/nodes/Bubble/bubble.svg   |   2 +-
 .../nodes-base/nodes/Clearbit/clearbit.svg    |  22 +---
 packages/nodes-base/nodes/ClickUp/clickup.svg |   2 +-
 packages/nodes-base/nodes/Copper/copper.svg   |  26 +---
 packages/nodes-base/nodes/Cortex/cortex.svg   |   2 +-
 packages/nodes-base/nodes/DeepL/deepl.svg     |   2 +-
 packages/nodes-base/nodes/Demio/demio.svg     |   2 +-
 .../nodes-base/nodes/Discourse/discourse.svg  |   2 +-
 packages/nodes-base/nodes/Dropbox/dropbox.svg |   2 +-
 packages/nodes-base/nodes/ERPNext/erpnext.svg |   9 +-
 packages/nodes-base/nodes/Emelia/emelia.svg   |   2 +-
 packages/nodes-base/nodes/Github/github.svg   |   2 +-
 packages/nodes-base/nodes/Gitlab/gitlab.svg   |  16 +--
 .../nodes/GoToWebinar/gotowebinar.svg         |  32 +----
 .../nodes/Google/Analytics/analytics.svg      |  17 +--
 .../nodes/Google/Books/googlebooks.svg        |  38 +-----
 .../nodes/Google/Calendar/googleCalendar.svg  |   2 +-
 .../nodes/Google/Drive/googleDrive.svg        |   2 +-
 .../nodes-base/nodes/Google/Gmail/gmail.svg   |  11 +-
 .../nodes/Google/Sheet/googleSheets.svg       |  21 +---
 .../nodes/Google/Slides/googleslides.svg      |   2 +-
 .../nodes-base/nodes/HelpScout/helpScout.svg  |   7 +-
 packages/nodes-base/nodes/Hubspot/hubspot.svg |   2 +-
 .../nodes/InvoiceNinja/invoiceNinja.svg       |   2 +-
 packages/nodes-base/nodes/Jira/jira.svg       |   2 +-
 packages/nodes-base/nodes/Kafka/kafka.svg     |   2 +-
 packages/nodes-base/nodes/Lemlist/lemlist.svg |  24 +---
 .../nodes-base/nodes/Mailchimp/mailchimp.svg  |  20 +--
 .../nodes/Mattermost/mattermost.svg           |   2 +-
 .../nodes/MessageBird/messagebird.svg         |  12 +-
 .../nodes/Microsoft/Excel/excel.svg           |  35 +-----
 .../nodes/Microsoft/Outlook/outlook.svg       |   2 +-
 .../nodes-base/nodes/Microsoft/Sql/mssql.svg  | 116 +-----------------
 .../nodes/Microsoft/Teams/teams.svg           |  22 +---
 packages/nodes-base/nodes/Mindee/mindee.svg   |   4 +-
 .../nodes-base/nodes/MondayCom/mondayCom.svg  |  12 +-
 packages/nodes-base/nodes/MongoDb/mongodb.svg |   2 +-
 packages/nodes-base/nodes/Orbit/orbit.svg     |  10 +-
 packages/nodes-base/nodes/Oura/oura.svg       |  17 +--
 packages/nodes-base/nodes/PayPal/paypal.svg   |  13 +-
 packages/nodes-base/nodes/Plivo/plivo.svg     |  16 +--
 packages/nodes-base/nodes/PostHog/postHog.svg |   2 +-
 .../nodes/Pushbullet/pushbullet.svg           |   2 +-
 .../nodes/QuickBooks/quickbooks.svg           |   2 +-
 .../nodes-base/nodes/Raindrop/raindrop.svg    |   2 +-
 packages/nodes-base/nodes/Reddit/reddit.svg   |   2 +-
 packages/nodes-base/nodes/Redis/redis.svg     |  18 +--
 .../nodes/Salesforce/salesforce.svg           |   2 +-
 .../SecurityScorecard/securityScorecard.svg   |  20 +--
 .../nodes-base/nodes/SendGrid/sendGrid.svg    |   2 +-
 .../nodes-base/nodes/SentryIo/sentryio.svg    |   2 +-
 packages/nodes-base/nodes/Slack/slack.svg     |   2 +-
 packages/nodes-base/nodes/Spotify/spotify.svg |   2 +-
 .../nodes-base/nodes/Storyblok/storyblok.svg  |  18 +--
 packages/nodes-base/nodes/Strapi/strapi.svg   |  73 +----------
 packages/nodes-base/nodes/Strava/strava.svg   |   2 +-
 .../nodes/Tapfiliate/tapfiliate.svg           |   2 +-
 .../nodes-base/nodes/Telegram/telegram.svg    |   2 +-
 packages/nodes-base/nodes/TheHive/thehive.svg |   2 +-
 .../nodes/TimescaleDb/timescale.svg           |   4 +-
 packages/nodes-base/nodes/Trello/trello.svg   |  23 +---
 .../nodes-base/nodes/Typeform/typeform.svg    |   7 +-
 packages/nodes-base/nodes/Wise/wise.svg       |   5 +-
 packages/nodes-base/nodes/Xero/xero.svg       |  17 +--
 74 files changed, 75 insertions(+), 842 deletions(-)

diff --git a/package.json b/package.json
index 30fcfb7959..716e4d64d8 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
     "start:windows": "cd packages/cli/bin && n8n",
     "test": "lerna run test",
     "tslint": "lerna exec npm run tslint",
-    "watch": "lerna run --parallel watch"
+    "watch": "lerna run --parallel watch",
+    "optimize-svg": "find ./packages -name '*.svg' -print0 | xargs -0 -P16 -L20 npx svgo"
   },
   "devDependencies": {
     "lerna": "^3.13.1",
diff --git a/packages/nodes-base/nodes/Airtable/airtable.svg b/packages/nodes-base/nodes/Airtable/airtable.svg
index c38de2b550..0fc86fa2a4 100644
--- a/packages/nodes-base/nodes/Airtable/airtable.svg
+++ b/packages/nodes-base/nodes/Airtable/airtable.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 200 170" style="enable-background:new 0 0 200 170;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FCB400;}
-	.st1{fill:#18BFFF;}
-	.st2{fill:#F82B60;}
-	.st3{fill:#BA1E45;}
-</style>
-<g>
-	<path class="st0" d="M89,4.8L16.2,34.9c-4.1,1.7-4,7.4,0.1,9.1l73.2,29c6.4,2.6,13.6,2.6,20,0l73.2-29c4.1-1.6,4.1-7.4,0.1-9.1
-		L109.8,4.8C103.2,2,95.7,2,89,4.8"/>
-	<path class="st1" d="M105.9,88.9v72.5c0,3.4,3.5,5.8,6.7,4.5l81.6-31.7c1.9-0.7,3.1-2.5,3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5
-		L109,84.3C107.1,85.1,105.9,86.9,105.9,88.9"/>
-	<path class="st2" d="M86.9,92.6l-24.2,11.7l-2.5,1.2L9.1,130c-3.2,1.6-7.4-0.8-7.4-4.4V57.5c0-1.3,0.7-2.4,1.6-3.3
-		c0.4-0.4,0.8-0.7,1.2-0.9c1.2-0.7,3-0.9,4.4-0.3l77.5,30.7C90.4,85.2,90.7,90.8,86.9,92.6"/>
-	<path class="st3" d="M86.9,92.6l-24.2,11.7L3.3,54.3c0.4-0.4,0.8-0.7,1.2-0.9c1.2-0.7,3-0.9,4.4-0.3l77.5,30.7
-		C90.4,85.2,90.7,90.8,86.9,92.6"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170" style="enable-background:new 0 0 200 170" xml:space="preserve"><path d="M89 4.8 16.2 34.9c-4.1 1.7-4 7.4.1 9.1l73.2 29c6.4 2.6 13.6 2.6 20 0l73.2-29c4.1-1.6 4.1-7.4.1-9.1l-73-30.1C103.2 2 95.7 2 89 4.8" style="fill:#fcb400"/><path d="M105.9 88.9v72.5c0 3.4 3.5 5.8 6.7 4.5l81.6-31.7c1.9-.7 3.1-2.5 3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5L109 84.3c-1.9.8-3.1 2.6-3.1 4.6" style="fill:#18bfff"/><path d="m86.9 92.6-24.2 11.7-2.5 1.2L9.1 130c-3.2 1.6-7.4-.8-7.4-4.4V57.5c0-1.3.7-2.4 1.6-3.3.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.5 4.3 7.1.5 8.9" style="fill:#f82b60"/><path d="m86.9 92.6-24.2 11.7-59.4-50c.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.4 4.3 7 .5 8.8" style="fill:#ba1e45"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
index 5ccaf179a9..f3fbeb03f6 100755
--- a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
+++ b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
@@ -1,102 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="80"
-   height="80"
-   viewBox="0 0 23.166659 21.166671"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0.1 (1.0.1+r75)"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/mnt/shared/bktan81@gmail.com/Companies/AlphaCloud/APITemplate.io/export/favicon-color.png"
-   inkscape:export-xdpi="614.40002"
-   inkscape:export-ydpi="614.40002">
-  <defs
-     id="defs2">
-    <rect
-       x="5.5194178"
-       y="6.7918406"
-       width="82.495544"
-       height="30.566183"
-       id="rect835" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6962788"
-     inkscape:cx="84.04094"
-     inkscape:cy="31.651389"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1014"
-     inkscape:window-x="0"
-     inkscape:window-y="36"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       style="fill:#000000"
-       id="g944"
-       transform="matrix(0.26072249,-0.0450346,0.0450346,0.26072249,-4.4090493,0.80238047)">
-      <path
-         fill="#91bce5"
-         d="m 85.926965,13.698648 -63.285045,30.243807 15.697805,11.196666 1.472218,15.148608 13.242212,-6.250661 9.822444,5.345054 z"
-         id="path918" />
-      <path
-         fill="#1f212b"
-         d="m 39.778008,71.288154 c -0.158903,-0.0056 -0.31648,-0.04907 -0.45874,-0.130089 -0.283589,-0.159995 -0.470626,-0.448698 -0.501329,-0.772967 L 37.38898,55.688275 22.06215,44.756717 c -0.288015,-0.205176 -0.446151,-0.547904 -0.415808,-0.901061 0.03035,-0.353155 0.245283,-0.662843 0.564816,-0.815784 L 85.495203,12.796029 c 0.373477,-0.179075 0.817321,-0.109542 1.119534,0.176179 0.301247,0.284686 0.393931,0.72519 0.235443,1.108892 L 63.800813,69.764609 c -0.108224,0.262384 -0.32346,0.465996 -0.589929,0.560754 -0.268434,0.09369 -0.562801,0.0704 -0.811249,-0.06435 l -9.376677,-5.101349 -12.782391,6.034577 c -0.147425,0.0669 -0.305655,0.09939 -0.462559,0.09391 z M 24.604162,44.11304 38.920495,54.324893 c 0.235269,0.168314 0.386237,0.429742 0.414198,0.717894 l 1.33547,13.734974 11.957261,-5.644136 c 0.287923,-0.136035 0.624788,-0.126272 0.904658,0.02559 l 8.84643,4.812668 21.627569,-52.247035 z"
-         id="path920" />
-      <path
-         fill="#3a84c1"
-         d="M 40.73124,69.46431 46.129963,59.222484 85.897126,14.553126 39.059778,54.433821 Z"
-         id="path922" />
-      <path
-         fill="#1f212b"
-         d="m 40.71279,69.963971 c -0.07296,-0.0026 -0.146351,-0.02112 -0.215122,-0.05754 -0.244661,-0.128616 -0.338162,-0.431064 -0.208546,-0.675689 l 5.398723,-10.241827 c 0.01925,-0.03535 0.04242,-0.06856 0.06852,-0.09967 L 80.940068,19.368061 38.684781,54.856992 c -0.211297,0.176733 -0.526545,0.149715 -0.705278,-0.06165 -0.177698,-0.212332 -0.149715,-0.526547 0.06165,-0.705279 L 85.574314,14.169627 c 0.201987,-0.168053 0.497667,-0.153725 0.680201,0.03476 0.182533,0.188486 0.189157,0.485899 0.01525,0.680947 L 46.544181,59.510112 41.173361,69.69788 c -0.09216,0.17489 -0.27468,0.272579 -0.460568,0.266088 z"
-         id="path924" />
-      <path
-         fill="#1f212b"
-         d="m 28.066921,71.78593 c -4.37019,-0.64391 -8.339996,-2.867809 -10.598292,-6.766997 -1.432549,-2.473502 -1.528128,-6.298167 2.122716,-6.172679 3.274075,0.112327 4.26409,2.596776 4.740567,5.406801 1.694711,8.06304 -1.290339,11.045322 -9.002137,14.829352 -0.594821,0.242389 -0.134492,1.113471 0.457295,0.871978 5.181377,-2.944492 7.754842,-4.282847 9.399081,-7.76557 1.370916,-4.981188 0.489139,-11.773963 -2.947089,-13.689368 -3.921594,-2.143168 -8.01567,0.59562 -6.601411,4.939623 1.751362,5.378399 7.074496,8.562112 12.394405,9.345251 0.635099,0.09422 0.665001,-0.905343 0.03486,-0.998391 z"
-         id="path926"
-         sodipodi:nodetypes="cccccccccccc" />
-      <path
-         fill="#1f212b"
-         d="m 32.211855,72.060754 c -0.960938,-0.01857 -1.924304,-0.08221 -2.882497,-0.15069 -0.64277,-0.04646 -0.676671,0.952965 -0.0349,0.999392 0.958193,0.06848 1.921524,0.133135 2.882497,0.150689 0.642958,0.01242 0.679856,-0.986875 0.0349,-0.999391 z m 4.771615,-1.109149 c -1.135251,0.302564 -2.280575,0.549744 -3.442445,0.726303 -0.635768,0.09687 -0.401574,1.069637 0.232195,0.972696 1.16187,-0.176559 2.307194,-0.423738 3.442444,-0.726302 0.620118,-0.164459 0.391991,-1.139015 -0.232194,-0.972697 z"
-         id="path928" />
-      <path
-         fill="#1f212b"
-         d="m 54.069217,64.636113 c -0.08695,-0.003 -0.175091,-0.02913 -0.253366,-0.07989 l -7.481853,-4.834056 c -0.231899,-0.150184 -0.298138,-0.459685 -0.148952,-0.69162 0.150185,-0.231899 0.460683,-0.298103 0.691619,-0.148953 l 7.481852,4.834058 c 0.231899,0.150184 0.298139,0.459686 0.148953,0.69162 -0.09943,0.153622 -0.268357,0.234778 -0.438253,0.228845 z"
-         id="path926-0"
-         sodipodi:nodetypes="sccccccs"
-         style="fill:#000000" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 23.167 21.167"><g style="fill:#000"><path fill="#91bce5" d="M18.611.504 3.473 11.24l4.597 2.213 1.066 3.883 3.171-2.226 2.802.951z"/><path fill="#1f212b" d="M9.172 17.597a.264.264 0 0 1-.29-.192l-1.035-3.767-4.488-2.16a.265.265 0 0 1-.039-.454L18.458.288a.264.264 0 0 1 .41.274l-3.5 15.556a.265.265 0 0 1-.344.193l-2.674-.908-3.061 2.15a.273.273 0 0 1-.117.044zm-5.18-6.401 4.193 2.017c.069.034.12.095.14.169l.967 3.52 2.863-2.01a.265.265 0 0 1 .237-.033l2.524.856L18.2 1.119z"/><path fill="#3a84c1" d="m9.339 17.079.946-2.913L18.642.728 8.226 13.235z"/><path fill="#1f212b" d="M9.356 17.21a.132.132 0 0 1-.143-.172l.946-2.913a.16.16 0 0 1 .014-.03l7.393-11.888-9.419 11.156a.133.133 0 0 1-.202-.171L18.54.642a.132.132 0 0 1 .214.156l-8.348 13.424-.941 2.898a.132.132 0 0 1-.109.09zM6.141 18.255c-1.168.029-2.303-.373-3.067-1.287-.485-.58-.683-1.574.275-1.705.859-.119 1.229.485 1.48 1.196.804 2.026.16 2.938-1.68 4.272-.144.09.015.296.159.206 1.218-1 1.829-1.466 2.1-2.448.134-1.36-.402-3.091-1.384-3.436-1.12-.382-2.063.516-1.499 1.585.699 1.324 2.23 1.914 3.652 1.878.17-.004.133-.266-.036-.261z"/><path fill="#1f212b" d="M7.235 18.14c-.252.038-.506.065-.759.09-.17.017-.133.279.036.262.253-.025.507-.052.758-.09.169-.026.133-.288-.035-.262zm1.194-.504c-.283.13-.57.246-.865.344-.162.054-.057.297.104.243.295-.098.583-.214.865-.344.154-.071.05-.315-.104-.243z"/><path fill="#1f212b" d="M54.07 64.636a.497.497 0 0 1-.254-.08l-7.482-4.834a.501.501 0 0 1 .543-.84l7.482 4.834a.501.501 0 0 1-.29.92z" style="fill:#000" transform="scale(.26458) rotate(-9.8 9.355 98.706)"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Asana/asana.svg b/packages/nodes-base/nodes/Asana/asana.svg
index 8d5b10f3e4..4a585afdff 100644
--- a/packages/nodes-base/nodes/Asana/asana.svg
+++ b/packages/nodes-base/nodes/Asana/asana.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>asana_node_icon</title>
-    <defs>
-        <radialGradient cx="50%" cy="55%" fx="50%" fy="55%" r="72.5074481%" gradientTransform="translate(0.500000,0.550000),scale(0.924043,1.000000),translate(-0.500000,-0.550000)" id="radialGradient-1">
-            <stop stop-color="#FFB900" offset="0%"></stop>
-            <stop stop-color="#F95D8F" offset="60%"></stop>
-            <stop stop-color="#F95353" offset="99.91%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="asana_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="asana" transform="translate(0.000000, 2.000000)" fill="url(#radialGradient-1)">
-            <g id="Group" transform="translate(0.731707, 0.731707)">
-                <path d="M45.5941463,28.5 C38.5995187,28.50323 32.9300593,34.1726894 32.9268293,41.1673171 C32.9300593,48.1619448 38.5995187,53.8314041 45.5941463,53.8346341 C52.588774,53.8314041 58.2582334,48.1619448 58.2614634,41.1673171 C58.2582334,34.1726894 52.588774,28.50323 45.5941463,28.5 L45.5941463,28.5 Z M12.6673171,28.5014634 C5.67268939,28.5046934 0.00323002946,34.1741528 -1.40700459e-15,41.1687805 C0.00323002946,48.1634082 5.67268939,53.8328675 12.6673171,53.8360976 C19.6619448,53.8328675 25.3314041,48.1634082 25.3346341,41.1687805 C25.3314041,34.1741528 19.6619448,28.5046934 12.6673171,28.5014634 L12.6673171,28.5014634 Z M41.7892683,12.6673171 C41.7868464,19.6619451 36.118042,25.3320595 29.1234146,25.3360976 C22.1282158,25.3328669 16.4585201,19.6625162 16.4560976,12.6673171 C16.4593276,5.67268939 22.128787,0.00323002946 29.1234146,-1.40700459e-15 C36.1174708,0.0040373938 41.7860389,5.67326048 41.7892683,12.6673171 L41.7892683,12.6673171 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><defs><radialGradient cx="50%" cy="55%" fx="50%" fy="55%" r="72.507%" gradientTransform="matrix(.92404 0 0 1 .038 0)" id="a"><stop stop-color="#FFB900" offset="0%"/><stop stop-color="#F95D8F" offset="60%"/><stop stop-color="#F95353" offset="99.91%"/></radialGradient></defs><path d="M45.594 28.5c-6.994.003-12.664 5.673-12.667 12.667.003 6.995 5.673 12.664 12.667 12.668 6.995-.004 12.664-5.673 12.667-12.668-.003-6.994-5.672-12.664-12.667-12.667zm-32.927.001C5.673 28.505.003 34.174 0 41.17c.003 6.994 5.673 12.664 12.667 12.667 6.995-.003 12.664-5.673 12.668-12.667-.004-6.995-5.673-12.664-12.668-12.668zM41.79 12.667c-.002 6.995-5.671 12.665-12.666 12.67-6.995-.004-12.664-5.674-12.667-12.67C16.46 5.673 22.13.003 29.123 0c6.994.004 12.663 5.673 12.666 12.667z" transform="translate(.732 2.732)" fill="url(#a)" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Autopilot/autopilot.svg b/packages/nodes-base/nodes/Autopilot/autopilot.svg
index 84edb88d2a..93e5c925a0 100644
--- a/packages/nodes-base/nodes/Autopilot/autopilot.svg
+++ b/packages/nodes-base/nodes/Autopilot/autopilot.svg
@@ -1,8 +1 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="38 26 35 35">
-<circle cx="50" cy="50" r="40" stroke="#18d4b2" stroke-width="3" fill="#18d4b2" />
-<g>
-	<g>
-		<path fill="#ffffff" d="M45.4,42.6h19.9l3.4-4.8H42L45.4,42.6z M48.5,50.9h13.1l3.4-4.8H45.4L48.5,50.9z M102.5,50.2"/>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="38 26 35 35"><circle cx="50" cy="50" r="40" stroke="#18d4b2" stroke-width="3" fill="#18d4b2"/><path fill="#fff" d="M45.4 42.6h19.9l3.4-4.8H42l3.4 4.8zm3.1 8.3h13.1l3.4-4.8H45.4l3.1 4.8zm54-.7"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
index 3e2b415731..add34ba328 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
+++ b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 75"><defs><style>.cls-1{fill:url(#TurquoiseGradient);}.cls-2{fill:#fff;}</style><linearGradient id="TurquoiseGradient" x1="617.46" y1="-674.53" x2="723.53" y2="-568.46" gradientTransform="translate(659 708) rotate(-90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><title>Amazon-Comprehend</title><g id="Reference"><rect id="Turquoise_Gradient" data-name="Turquoise Gradient" class="cls-1" width="75" height="75"/><g id="Icon_Test" data-name="Icon Test"><path class="cls-2" d="M44.5,34.2V24.5a1,1,0,0,0-.29-.71l-11-11a1,1,0,0,0-.71-.29h-19a1,1,0,0,0-1,1v43a1,1,0,0,0,1,1h30a1,1,0,0,0,1-1V52.06a11.8,11.8,0,0,1-2-2.3V55.5h-28v-41h17v10a1,1,0,0,0,1,1h10v11A11.56,11.56,0,0,1,44.5,34.2Zm-11-10.7V15.91l7.59,7.59Zm-10,8h-6v-2h6Zm16,0h-14v-2h14Zm0,6h-22v-2h22Zm15.44,25H50.06a1,1,0,0,1-.93-.62l-1.21-3a1,1,0,0,1,.09-.94,1,1,0,0,1,.83-.44h7.32a1,1,0,0,1,.83.44,1,1,0,0,1,.09.94l-1.21,3A1,1,0,0,1,54.94,62.5Zm-4.21-2h3.54l.4-1H50.33Zm11.64-19A10,10,0,0,0,42.5,43.12a10,10,0,0,0,4.28,8.2,3.88,3.88,0,0,1,.72.59V55.5a1,1,0,0,0,1,1h8a1,1,0,0,0,1-1V51.9a4.33,4.33,0,0,1,.71-.57,9.92,9.92,0,0,0,4.29-8.2A10.19,10.19,0,0,0,62.37,41.48ZM57.05,49.7c-.58.4-1.55,1.07-1.55,2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2V51.82c0-1-1-1.73-1.58-2.14A8,8,0,1,1,58,37.32a7.89,7.89,0,0,1,2.39,4.47A8,8,0,0,1,57.05,49.7ZM28.5,25.5h-11v-2h11Zm1,18h-12v-2h12Zm10,0h-8v-2h8Zm-9,6h-13v-2h13Z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 75"><defs><linearGradient id="a" x1="617.46" y1="-674.53" x2="723.53" y2="-568.46" gradientTransform="rotate(-90 683.5 24.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><path data-name="Turquoise Gradient" style="fill:url(#a)" d="M0 0h75v75H0z"/><path d="M44.5 34.2v-9.7a1 1 0 0 0-.29-.71l-11-11a1 1 0 0 0-.71-.29h-19a1 1 0 0 0-1 1v43a1 1 0 0 0 1 1h30a1 1 0 0 0 1-1v-4.44a11.8 11.8 0 0 1-2-2.3v5.74h-28v-41h17v10a1 1 0 0 0 1 1h10v11a11.56 11.56 0 0 1 2-2.3zm-11-10.7v-7.59l7.59 7.59zm-10 8h-6v-2h6zm16 0h-14v-2h14zm0 6h-22v-2h22zm15.44 25h-4.88a1 1 0 0 1-.93-.62l-1.21-3a1 1 0 0 1 .09-.94 1 1 0 0 1 .83-.44h7.32a1 1 0 0 1 .83.44 1 1 0 0 1 .09.94l-1.21 3a1 1 0 0 1-.93.62zm-4.21-2h3.54l.4-1h-4.34zm11.64-19a10 10 0 0 0-19.87 1.62 10 10 0 0 0 4.28 8.2 3.88 3.88 0 0 1 .72.59v3.59a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3.6a4.33 4.33 0 0 1 .71-.57 9.92 9.92 0 0 0 4.29-8.2 10.19 10.19 0 0 0-.13-1.65zm-5.32 8.2c-.58.4-1.55 1.07-1.55 2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2v-2.68c0-1-1-1.73-1.58-2.14A8 8 0 1 1 58 37.32a7.89 7.89 0 0 1 2.39 4.47 8 8 0 0 1-3.34 7.91zM28.5 25.5h-11v-2h11zm1 18h-12v-2h12zm10 0h-8v-2h8zm-9 6h-13v-2h13z" style="fill:#fff" data-name="Icon Test"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
index 00d357a0c5..1e08488699 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
+++ b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M2.886 52.8L16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="M67.207 28.898l-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966L35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24L0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478L0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566L35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26L34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="M67.64 51.142l-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="M67.207 51.103l-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40L35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376L35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435L35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75L70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M2.886 52.8 16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="m67.207 28.898-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966 35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24 0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478 0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566 35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26 34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="m67.64 51.142-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="m67.207 51.103-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40 35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376 35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435 35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75 70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/SES/ses.svg b/packages/nodes-base/nodes/Aws/SES/ses.svg
index 4417f91394..c17810926f 100644
--- a/packages/nodes-base/nodes/Aws/SES/ses.svg
+++ b/packages/nodes-base/nodes/Aws/SES/ses.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g stroke="none"><path d="M16.558 12.75L0 38.591l16.558 25.841 13.227-3.324.654-44.869-13.881-3.489z" fill="#876929"/><path d="M35.049 59.786l-18.491 4.645V12.75l18.491 4.645v42.391z" fill="#d9a741"/><g fill="#876929"><path d="M32.849 21.614L35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="M46.184 33.149l10.906-.632 10.778-19.164L40.612 0 30.439 4.364l15.745 28.785z"/></g><path d="M40.612 0l27.256 13.353-10.778 19.164L40.612 0z" fill="#d9a741"/><path d="M35.049 5.539L57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64l10.46-4.101z" fill="#876929"/><path d="M69.991 19.251L70 62.867 35.05 80V5.539l22.041 39.203 12.899-25.491z" fill="#d9a741"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M16.558 12.75 0 38.591l16.558 25.841 13.227-3.324.654-44.869-13.881-3.489z" fill="#876929"/><path d="m35.049 59.786-18.491 4.645V12.75l18.491 4.645v42.391z" fill="#d9a741"/><g fill="#876929"><path d="M32.849 21.614 35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="m46.184 33.149 10.906-.632 10.778-19.164L40.612 0 30.439 4.364l15.745 28.785z"/></g><path d="m40.612 0 27.256 13.353L57.09 32.517 40.612 0z" fill="#d9a741"/><path d="M35.049 5.539 57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64l10.46-4.101z" fill="#876929"/><path d="M69.991 19.251 70 62.867 35.05 80V5.539l22.041 39.203L69.99 19.251z" fill="#d9a741"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/SQS/sqs.svg b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
index 5d51fef2a8..2de0d76300 100644
--- a/packages/nodes-base/nodes/Aws/SQS/sqs.svg
+++ b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-5 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.188" y="2.5"/><symbol id="A" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938L.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56v9.378z"/><path d="M.021 54.062l34.98 9.942V80L.021 63.44v-9.378z"/><path d="M4.465 65.549L0 63.431V16.56l4.475-2.109-.01 51.098z"/></g><path d="M40.255 50.564l-35.79 4.762.01-30.661 35.78 4.772v21.127zM70 25.948l-35-9.951V0l35 16.57v9.378zm-.02 28.124L35 64.004V80l34.98-16.56v-9.368z" stroke="none" fill="#d9a741"/><path d="M22.109 48.581l12.892 1.526V29.815L22.109 31.36v17.221zM9.125 47.065l8.365.982V31.924l-8.365 1.001v14.14z" stroke="none" fill="#876929"/><path d="M4.475 24.665L35 15.996l35 9.951-29.745 3.489-35.78-4.772z" fill="#624a1e" stroke="none"/><path d="M4.465 55.326L35 64.004l34.98-9.932-29.724-3.508-35.79 4.762z" fill="#fad791" stroke="none"/><path d="M69.98 45.918L35 50.107V29.815l34.98 4.218v11.885z" fill="#d9a741" stroke="none"/></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-5 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56v9.378z"/><path d="m.021 54.062 34.98 9.942V80L.021 63.44v-9.378z"/><path d="M4.465 65.549 0 63.431V16.56l4.475-2.109-.01 51.098z"/></g><path d="m40.255 50.564-35.79 4.762.01-30.661 35.78 4.772v21.127zM70 25.948l-35-9.951V0l35 16.57v9.378zm-.02 28.124L35 64.004V80l34.98-16.56v-9.368z" stroke="none" fill="#d9a741"/><path d="m22.109 48.581 12.892 1.526V29.815L22.109 31.36v17.221zM9.125 47.065l8.365.982V31.924l-8.365 1.001v14.14z" stroke="none" fill="#876929"/><path d="M4.475 24.665 35 15.996l35 9.951-29.745 3.489-35.78-4.772z" fill="#624a1e" stroke="none"/><path d="M4.465 55.326 35 64.004l34.98-9.932-29.724-3.508-35.79 4.762z" fill="#fad791" stroke="none"/><path d="M69.98 45.918 35 50.107V29.815l34.98 4.218v11.885z" fill="#d9a741" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
index d5d8ddadaa..55453b1917 100644
--- a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
+++ b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M53.333 2.667v32c0 2.388-.465 4.756-1.396 7.103s-2.084 4.43-3.458 6.25-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834c-.333.166-.695.25-1.083.25a2.4 2.4 0 0 1-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23c-1.61-1.14-3.368-2.57-5.27-4.292s-3.54-3.492-4.916-5.312-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 0 1 .791.792 2.56 2.56 0 0 1 2.666 0h48c.72 0 1.346.264 1.874.792a2.56 2.56 0 0 1 .792 1.875m-8 32V8H26.666v47.375c3.305-1.75 6.264-3.653 8.875-5.708 6.527-5.11 9.79-10.11 9.79-15" stroke="none" fill="#3c8dbc" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M53.333 2.667v32c0 2.388-.465 4.756-1.396 7.103s-2.084 4.43-3.458 6.25-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834c-.333.166-.695.25-1.083.25a2.4 2.4 0 0 1-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23c-1.61-1.14-3.368-2.57-5.27-4.292s-3.54-3.492-4.916-5.312-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 0 1 .791.792 2.56 2.56 0 0 1 2.666 0h48c.72 0 1.346.264 1.874.792a2.56 2.56 0 0 1 .792 1.875m-8 32V8H26.666v47.375c3.305-1.75 6.264-3.653 8.875-5.708 6.527-5.11 9.79-10.11 9.79-15" stroke="none" fill="#3c8dbc" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bubble/bubble.svg b/packages/nodes-base/nodes/Bubble/bubble.svg
index 005a8e5820..2c50a4f59c 100644
--- a/packages/nodes-base/nodes/Bubble/bubble.svg
+++ b/packages/nodes-base/nodes/Bubble/bubble.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -10 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337c0 8.461-6.86 15.337-15.337 15.337zm56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337zM69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579zM243.101 66.27h-9.674V0h9.674v66.27zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511c-.034 1.331-.118 2.916-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337z" fill="#000" fill-rule="nonzero" stroke="none"/><path d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169-2.751 6.169-6.168 6.169S0 64.648 0 61.231z" fill="#00f" fill-rule="nonzero" stroke="none"/></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -10 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337c0 8.461-6.86 15.337-15.337 15.337zm56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337zM69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579zM243.101 66.27h-9.674V0h9.674v66.27zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511a39.392 39.392 0 0 1-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337z" fill="#000" fill-rule="nonzero" stroke="none"/><path d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169S9.586 67.4 6.169 67.4 0 64.648 0 61.231z" fill="#00f" fill-rule="nonzero" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Clearbit/clearbit.svg b/packages/nodes-base/nodes/Clearbit/clearbit.svg
index ca57f95378..72b8343f42 100644
--- a/packages/nodes-base/nodes/Clearbit/clearbit.svg
+++ b/packages/nodes-base/nodes/Clearbit/clearbit.svg
@@ -1,21 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
-  <defs>
-    <linearGradient id="color-a" x1="50%" x2="100%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#DEF2FE"/>
-      <stop offset="100%" stop-color="#DBF1FE"/>
-    </linearGradient>
-    <linearGradient id="color-b" x1="0%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#57BCFD"/>
-      <stop offset="100%" stop-color="#51B5FD"/>
-    </linearGradient>
-    <linearGradient id="color-c" x1="37.5%" x2="62.5%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#1CA7FD"/>
-      <stop offset="100%" stop-color="#148CFC"/>
-    </linearGradient>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <path fill="url(#color-a)" d="M72,36 L72,52.770861 L71.9958819,53.6375008 C71.9369091,59.6728148 71.2457056,61.9905403 69.9965047,64.3263428 C68.6892015,66.7707872 66.7707872,68.6892015 64.3263428,69.9965047 L64.0001583,70.1671829 C61.6579559,71.3643165 59.1600786,72 52.770861,72 L36,72 L36,36 L72,36 Z"/>
-    <path fill="url(#color-b)" d="M64.3263428,2.00349528 C66.7707872,3.31079847 68.6892015,5.22921278 69.9965047,7.67365722 L70.1671829,7.99984171 C71.3643165,10.3420441 72,12.8399214 72,19.229139 L72,36 L36,36 L36,0 L52.770861,0 C59.4572515,0 61.8818983,0.696192084 64.3263428,2.00349528 Z"/>
-    <path fill="url(#color-c)" d="M36,0 L36,72 L19.229139,72 L18.3624992,71.9958819 C12.3271852,71.9369091 10.0094597,71.2457056 7.67365722,69.9965047 C5.22921278,68.6892015 3.31079847,66.7707872 2.00349528,64.3263428 L1.83281705,64.0001583 C0.635683537,61.6579559 0,59.1600786 0,52.770861 L0,19.229139 C0,12.5427485 0.696192084,10.1181017 2.00349528,7.67365722 C3.31079847,5.22921278 5.22921278,3.31079847 7.67365722,2.00349528 L7.99984171,1.83281705 C10.3420441,0.635683537 12.8399214,0 19.229139,0 L36,0 Z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72"><defs><linearGradient id="a" x1="50%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DEF2FE"/><stop offset="100%" stop-color="#DBF1FE"/></linearGradient><linearGradient id="b" x1="0%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#57BCFD"/><stop offset="100%" stop-color="#51B5FD"/></linearGradient><linearGradient id="c" x1="37.5%" x2="62.5%" y1="0%" y2="100%"><stop offset="0%" stop-color="#1CA7FD"/><stop offset="100%" stop-color="#148CFC"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M72 36v16.77l-.004.868c-.06 6.035-.75 8.353-2 10.688a13.63 13.63 0 0 1-5.67 5.67l-.326.171C61.658 71.364 59.16 72 52.77 72H36V36h36z"/><path fill="url(#b)" d="M64.326 2.003a13.63 13.63 0 0 1 5.67 5.67l.171.327C71.364 10.342 72 12.84 72 19.23V36H36V0h16.77c6.687 0 9.112.696 11.556 2.003z"/><path fill="url(#c)" d="M36 0v72H19.23l-.868-.004c-6.035-.06-8.353-.75-10.688-2a13.63 13.63 0 0 1-5.67-5.67L1.832 64C.636 61.658 0 59.16 0 52.77V19.23c0-6.687.696-9.112 2.003-11.556a13.63 13.63 0 0 1 5.67-5.67L8 1.832C10.342.636 12.84 0 19.23 0H36z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ClickUp/clickup.svg b/packages/nodes-base/nodes/ClickUp/clickup.svg
index 18f875d5cc..a95779b2c1 100644
--- a/packages/nodes-base/nodes/ClickUp/clickup.svg
+++ b/packages/nodes-base/nodes/ClickUp/clickup.svg
@@ -1 +1 @@
-<svg width="130" height="155" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="a"><stop stop-color="#8930FD" offset="0%"/><stop stop-color="#49CCF9" offset="100%"/></linearGradient><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="b"><stop stop-color="#FF02F0" offset="0%"/><stop stop-color="#FFC800" offset="100%"/></linearGradient></defs><g fill-rule="nonzero" fill="none"><path d="M.4 119.12l23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88z" fill="url(#a)"/><path fill="url(#b)" d="M65.18 39.84L22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
+<svg width="130" height="155" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="a"><stop stop-color="#8930FD" offset="0%"/><stop stop-color="#49CCF9" offset="100%"/></linearGradient><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="b"><stop stop-color="#FF02F0" offset="0%"/><stop stop-color="#FFC800" offset="100%"/></linearGradient></defs><g fill="none"><path d="m.4 119.12 23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88z" fill="url(#a)"/><path fill="url(#b)" d="M65.18 39.84 22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Copper/copper.svg b/packages/nodes-base/nodes/Copper/copper.svg
index b01642b46f..19c4ac4da4 100644
--- a/packages/nodes-base/nodes/Copper/copper.svg
+++ b/packages/nodes-base/nodes/Copper/copper.svg
@@ -1,25 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="364.000000pt" height="364.000000pt" viewBox="0 0 364.000000 364.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,364.000000) scale(0.100000,-0.100000)"
-fill="#ff2564" stroke="none">
-<path d="M1620 3625 c-215 -26 -398 -80 -585 -171 -386 -188 -678 -482 -856
--859 -133 -284 -197 -628 -170 -912 15 -159 37 -268 90 -444 39 -128 167 -375
-264 -504 63 -85 246 -271 342 -347 116 -93 277 -184 460 -263 109 -47 348
--100 519 -116 104 -10 162 -10 267 0 604 54 1107 362 1422 871 191 310 291
-723 258 1072 -13 148 -47 314 -91 447 -151 458 -507 859 -940 1058 -52 24
--102 48 -110 52 -19 10 -198 65 -260 80 -204 48 -409 61 -610 36z m585 -783
-c160 -44 330 -143 420 -244 25 -29 66 -93 90 -143 95 -196 77 -380 -49 -506
--70 -70 -106 -83 -226 -84 -92 0 -111 3 -153 24 -69 36 -139 114 -166 186 -34
-89 -31 174 10 316 65 224 39 339 -91 404 -42 22 -149 25 -202 6 -81 -27 -176
--132 -234 -256 -66 -143 -101 -343 -91 -529 11 -220 63 -371 172 -507 154
--190 412 -266 693 -203 117 26 232 88 345 187 55 48 72 58 92 53 14 -4 25 -12
-25 -19 0 -19 -85 -180 -137 -262 -117 -180 -302 -347 -468 -420 -167 -74 -397
--99 -607 -65 -199 32 -403 136 -548 280 -294 295 -372 774 -191 1174 137 303
-433 538 776 616 119 27 427 22 540 -8z"/>
-</g>
-</svg>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="485.333" height="485.333" viewBox="0 0 364 364"><path d="M162 1.5c-21.5 2.6-39.8 8-58.5 17.1-38.6 18.8-67.8 48.2-85.6 85.9-13.3 28.4-19.7 62.8-17 91.2 1.5 15.9 3.7 26.8 9 44.4 3.9 12.8 16.7 37.5 26.4 50.4 6.3 8.5 24.6 27.1 34.2 34.7 11.6 9.3 27.7 18.4 46 26.3 10.9 4.7 34.8 10 51.9 11.6 10.4 1 16.2 1 26.7 0 60.4-5.4 110.7-36.2 142.2-87.1 19.1-31 29.1-72.3 25.8-107.2-1.3-14.8-4.7-31.4-9.1-44.7-15.1-45.8-50.7-85.9-94-105.8-5.2-2.4-10.2-4.8-11-5.2-1.9-1-19.8-6.5-26-8C202.6.3 182.1-1 162 1.5zm58.5 78.3c16 4.4 33 14.3 42 24.4 2.5 2.9 6.6 9.3 9 14.3 9.5 19.6 7.7 38-4.9 50.6-7 7-10.6 8.3-22.6 8.4-9.2 0-11.1-.3-15.3-2.4-6.9-3.6-13.9-11.4-16.6-18.6-3.4-8.9-3.1-17.4 1-31.6 6.5-22.4 3.9-33.9-9.1-40.4-4.2-2.2-14.9-2.5-20.2-.6-8.1 2.7-17.6 13.2-23.4 25.6-6.6 14.3-10.1 34.3-9.1 52.9 1.1 22 6.3 37.1 17.2 50.7 15.4 19 41.2 26.6 69.3 20.3 11.7-2.6 23.2-8.8 34.5-18.7 5.5-4.8 7.2-5.8 9.2-5.3 1.4.4 2.5 1.2 2.5 1.9 0 1.9-8.5 18-13.7 26.2-11.7 18-30.2 34.7-46.8 42-16.7 7.4-39.7 9.9-60.7 6.5-19.9-3.2-40.3-13.6-54.8-28-29.4-29.5-37.2-77.4-19.1-117.4 13.7-30.3 43.3-53.8 77.6-61.6 11.9-2.7 42.7-2.2 54 .8z" fill="#ff2564"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Cortex/cortex.svg b/packages/nodes-base/nodes/Cortex/cortex.svg
index a843f22ba7..eebfd08aeb 100644
--- a/packages/nodes-base/nodes/Cortex/cortex.svg
+++ b/packages/nodes-base/nodes/Cortex/cortex.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-1{fill:#54c4c4;}.cls-2{fill:#fff;}</style></defs><title>cortex-logo</title><path class="cls-1" d="M290,150A140,140,0,1,1,150,10,140,140,0,0,1,290,150"/><path class="cls-2" d="M231.17,159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9,1.9,0,0,1,.08-1.46,1.93,1.93,0,0,1,3.55.2c4.22,12.09,14,13.1,23.5,14.09,4.68.48,10,1,14.12,3.4a1.4,1.4,0,0,0,1.45,0,1.39,1.39,0,0,0,.64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.47,35.47,0,0,0-12.07-5.8,1.39,1.39,0,0,0-1.56,2,49.56,49.56,0,0,1,4,11c2.18,7.91,4.06,14.74,12.62,16.44a1.93,1.93,0,0,1,1.51,2.26,1.93,1.93,0,0,1-1.88,1.55,1.58,1.58,0,0,1-.38,0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29.19,29.19,0,0,0-4.05.27,18.5,18.5,0,0,0-9.68,4.07,1.41,1.41,0,0,0-.47,1,1.38,1.38,0,0,0,.37,1,73.85,73.85,0,0,1,11.13,16.84,1.92,1.92,0,0,1-.85,2.58,2,2,0,0,1-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12h0l0,0c-6.31-6-11.94-7.25-15.56-7.25a14.73,14.73,0,0,0-2.85.27c-5.1,1-8.5,4.35-9.51,7a1.44,1.44,0,0,0,.12,1.23,32.6,32.6,0,0,1,2.62,5.94c2.32,6.38,4.51,12.4,15.48,12.91a1.88,1.88,0,0,1,1.33.62,1.91,1.91,0,0,1,.5,1.39,1.89,1.89,0,0,1-2,1.83h0c-13.53-.62-16.52-8.84-18.91-15.44a25.62,25.62,0,0,0-2.62-5.75,1,1,0,0,0-.14-.16,2,2,0,0,1-.24-.32,1.84,1.84,0,0,0-.17-.22,5.88,5.88,0,0,0-4.76-1.9c-4.69,0-8.26,1.47-10.62,4.4a13.45,13.45,0,0,0-2.12,3.84,2,2,0,0,0-.07.26,2.16,2.16,0,0,1-.15.5.87.87,0,0,0-.07.17,25.75,25.75,0,0,0-.3,12.29c1.6,7.48,6.24,16.89,19.27,19.25a22.45,22.45,0,0,0,3.92.32,70.9,70.9,0,0,0,9.77-1,83.59,83.59,0,0,1,12-1.12,33.73,33.73,0,0,1,17,4.21,1.43,1.43,0,0,0,1.16.1,1.41,1.41,0,0,0,.83-.81c2.3-5.79,5.74-9.55,8.51-12.57,5.55-6.06,9.56-10.44,3.79-25.68a1.92,1.92,0,0,1,.05-1.47,1.9,1.9,0,0,1,1.07-1A2,2,0,0,1,175.07,93c6.6,17.45,1.43,23.1-4.56,29.65-3,3.23-6.32,6.89-8.31,12.79a1.4,1.4,0,0,0,.51,1.58c13.47,9.74,20.52,13,27.92,13a25.17,25.17,0,0,0,2.83-.16,1.93,1.93,0,0,1,1.7,3.12,1.88,1.88,0,0,1-1.29.7,30.3,30.3,0,0,1-3.33.19c-8.5,0-16.58-3.82-32-15.17a29.36,29.36,0,0,0-18.21-5.8A79.71,79.71,0,0,0,128.78,134a73.31,73.31,0,0,1-10.3,1,25.76,25.76,0,0,1-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7,33.7,0,0,1-.69-6.26,1.41,1.41,0,0,0-2.36-1c-11,10.25-11.68,20.34-11.09,25.44.93,8.21,5.87,14.26,10.27,16a13,13,0,0,0,4.89.84,47.14,47.14,0,0,0,6.16-.58,61.45,61.45,0,0,1,8.46-.72c8.41,0,16.19,2.86,24.51,9a1.92,1.92,0,0,1,.42,2.68,2,2,0,0,1-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a57.85,57.85,0,0,0-8,.69,50.8,50.8,0,0,1-6.68.6,16.82,16.82,0,0,1-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48A1.4,1.4,0,0,0,73,133.67a1.38,1.38,0,0,0-1.41.81c-5.25,11.33-2.3,22.75,3,29a19,19,0,0,0,14.9,7.15,26.43,26.43,0,0,0,13-3.8,1.38,1.38,0,0,0,.67-.88,25.77,25.77,0,0,1,2.83-7,2,2,0,0,1,2.64-.65,1.93,1.93,0,0,1,.65,2.64c-3.74,6.18-4.8,16.88.58,24.55,4.11,5.85,11,8.82,20.56,8.82.83,0,1.68,0,2.55-.07a1.42,1.42,0,0,0,1.2-.82A1.37,1.37,0,0,0,134,192c-4.91-6.44.5-13.39,5.74-20.11s10.6-13.6,8.48-21.23a1.92,1.92,0,0,1,1.33-2.36,1.94,1.94,0,0,1,2.37,1.33c2.64,9.49-3.9,17.88-9.15,24.62-5.94,7.63-9.1,12.15-4.85,16.4a6.77,6.77,0,0,0,5,2.35c2.73,0,5.92-1.69,12-5.46,5.24-3.23,12.41-7.66,21.64-10.41a1.41,1.41,0,0,0,.2-2.61,16.22,16.22,0,0,1-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2,2,0,0,1,2.33-1.39,1.93,1.93,0,0,1,1.4,2.34c-.81,3.19-.4,5.86,1.21,7.93,2,2.64,7.28,6,20.7,6.82,2.23,0,4.41,0,6.69.2a54.18,54.18,0,0,0,19.34-3.53,1.4,1.4,0,0,0,.52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93,1.93,0,0,1,1.73-2.11,1.91,1.91,0,0,1,2.1,1.73c.41,4.29,3.25,5.5,6.86,7,2.53,1.08,5.68,2.41,7.72,5.3a1.41,1.41,0,0,0,2,.28c2.95-2.4,4.45-5.21,4.45-8.34"/><path class="cls-2" d="M200,177.4c-1.1,0-2.15-.09-3.29-.15-17.52.28-29,7.36-37.35,12.52a65.71,65.71,0,0,1-8.53,4.69,1.4,1.4,0,0,0-.22,2.47,37.57,37.57,0,0,0,4.61,2.42,19.8,19.8,0,0,0,5.63,1.44c5,.74,9,1.33,10.77,15.26a1.4,1.4,0,0,0,1.39,1.22h9.87a1.4,1.4,0,0,0,1.39-1.6c-1.93-13.8-.17-14.81,3.71-17a28,28,0,0,0,4.37-2.93c3.83-3.23,7.8-6.56,9-16.75a1.38,1.38,0,0,0-.33-1.08,1.39,1.39,0,0,0-1-.48"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140" style="fill:#54c4c4"/><path class="cls-2" d="M231.17 159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9 1.9 0 0 1 .08-1.46 1.93 1.93 0 0 1 3.55.2c4.22 12.09 14 13.1 23.5 14.09 4.68.48 10 1 14.12 3.4a1.4 1.4 0 0 0 1.45 0 1.39 1.39 0 0 0 .64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.47 35.47 0 0 0-12.07-5.8 1.39 1.39 0 0 0-1.56 2 49.56 49.56 0 0 1 4 11c2.18 7.91 4.06 14.74 12.62 16.44a1.93 1.93 0 0 1 1.51 2.26 1.93 1.93 0 0 1-1.88 1.55 1.58 1.58 0 0 1-.38 0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29.19 29.19 0 0 0-4.05.27 18.5 18.5 0 0 0-9.68 4.07 1.41 1.41 0 0 0-.47 1 1.38 1.38 0 0 0 .37 1 73.85 73.85 0 0 1 11.13 16.84 1.92 1.92 0 0 1-.85 2.58 2 2 0 0 1-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12-6.31-6-11.94-7.25-15.56-7.25a14.73 14.73 0 0 0-2.85.27c-5.1 1-8.5 4.35-9.51 7a1.44 1.44 0 0 0 .12 1.23 32.6 32.6 0 0 1 2.62 5.94c2.32 6.38 4.51 12.4 15.48 12.91a1.88 1.88 0 0 1 1.33.62 1.91 1.91 0 0 1 .5 1.39 1.89 1.89 0 0 1-2 1.83c-13.53-.62-16.52-8.84-18.91-15.44a25.62 25.62 0 0 0-2.62-5.75 1 1 0 0 0-.14-.16 2 2 0 0 1-.24-.32 1.84 1.84 0 0 0-.17-.22 5.88 5.88 0 0 0-4.76-1.9c-4.69 0-8.26 1.47-10.62 4.4a13.45 13.45 0 0 0-2.12 3.84 2 2 0 0 0-.07.26 2.16 2.16 0 0 1-.15.5.87.87 0 0 0-.07.17 25.75 25.75 0 0 0-.3 12.29c1.6 7.48 6.24 16.89 19.27 19.25a22.45 22.45 0 0 0 3.92.32 70.9 70.9 0 0 0 9.77-1 83.59 83.59 0 0 1 12-1.12 33.73 33.73 0 0 1 17 4.21 1.43 1.43 0 0 0 1.16.1 1.41 1.41 0 0 0 .83-.81c2.3-5.79 5.74-9.55 8.51-12.57 5.55-6.06 9.56-10.44 3.79-25.68a1.92 1.92 0 0 1 .05-1.47 1.9 1.9 0 0 1 1.07-1 2 2 0 0 1 2.34 1.05c6.6 17.45 1.43 23.1-4.56 29.65-3 3.23-6.32 6.89-8.31 12.79a1.4 1.4 0 0 0 .51 1.58c13.47 9.74 20.52 13 27.92 13a25.17 25.17 0 0 0 2.83-.16 1.93 1.93 0 0 1 1.7 3.12 1.88 1.88 0 0 1-1.29.7 30.3 30.3 0 0 1-3.33.19c-8.5 0-16.58-3.82-32-15.17a29.36 29.36 0 0 0-18.21-5.8 79.71 79.71 0 0 0-11.55 1.1 73.31 73.31 0 0 1-10.3 1 25.76 25.76 0 0 1-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7 33.7 0 0 1-.69-6.26 1.41 1.41 0 0 0-2.36-1c-11 10.25-11.68 20.34-11.09 25.44.93 8.21 5.87 14.26 10.27 16a13 13 0 0 0 4.89.84 47.14 47.14 0 0 0 6.16-.58 61.45 61.45 0 0 1 8.46-.72c8.41 0 16.19 2.86 24.51 9a1.92 1.92 0 0 1 .42 2.68 2 2 0 0 1-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a57.85 57.85 0 0 0-8 .69 50.8 50.8 0 0 1-6.68.6 16.82 16.82 0 0 1-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48a1.4 1.4 0 0 0-1.2-1.02 1.38 1.38 0 0 0-1.41.81c-5.25 11.33-2.3 22.75 3 29a19 19 0 0 0 14.9 7.15 26.43 26.43 0 0 0 13-3.8 1.38 1.38 0 0 0 .67-.88 25.77 25.77 0 0 1 2.83-7 2 2 0 0 1 2.64-.65 1.93 1.93 0 0 1 .65 2.64c-3.74 6.18-4.8 16.88.58 24.55 4.11 5.85 11 8.82 20.56 8.82.83 0 1.68 0 2.55-.07a1.42 1.42 0 0 0 1.2-.82A1.37 1.37 0 0 0 134 192c-4.91-6.44.5-13.39 5.74-20.11s10.6-13.6 8.48-21.23a1.92 1.92 0 0 1 1.33-2.36 1.94 1.94 0 0 1 2.37 1.33c2.64 9.49-3.9 17.88-9.15 24.62-5.94 7.63-9.1 12.15-4.85 16.4a6.77 6.77 0 0 0 5 2.35c2.73 0 5.92-1.69 12-5.46 5.24-3.23 12.41-7.66 21.64-10.41a1.41 1.41 0 0 0 .2-2.61 16.22 16.22 0 0 1-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2 2 0 0 1 2.33-1.39 1.93 1.93 0 0 1 1.4 2.34c-.81 3.19-.4 5.86 1.21 7.93 2 2.64 7.28 6 20.7 6.82 2.23 0 4.41 0 6.69.2a54.18 54.18 0 0 0 19.34-3.53 1.4 1.4 0 0 0 .52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93 1.93 0 0 1 1.73-2.11 1.91 1.91 0 0 1 2.1 1.73c.41 4.29 3.25 5.5 6.86 7 2.53 1.08 5.68 2.41 7.72 5.3a1.41 1.41 0 0 0 2 .28c2.95-2.4 4.45-5.21 4.45-8.34"/><path class="cls-2" d="M200 177.4c-1.1 0-2.15-.09-3.29-.15-17.52.28-29 7.36-37.35 12.52a65.71 65.71 0 0 1-8.53 4.69 1.4 1.4 0 0 0-.22 2.47 37.57 37.57 0 0 0 4.61 2.42 19.8 19.8 0 0 0 5.63 1.44c5 .74 9 1.33 10.77 15.26a1.4 1.4 0 0 0 1.39 1.22h9.87a1.4 1.4 0 0 0 1.39-1.6c-1.93-13.8-.17-14.81 3.71-17a28 28 0 0 0 4.37-2.93c3.83-3.23 7.8-6.56 9-16.75a1.38 1.38 0 0 0-.33-1.08 1.39 1.39 0 0 0-1-.48"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/DeepL/deepl.svg b/packages/nodes-base/nodes/DeepL/deepl.svg
index 706dacab12..fd01fb99fd 100644
--- a/packages/nodes-base/nodes/DeepL/deepl.svg
+++ b/packages/nodes-base/nodes/DeepL/deepl.svg
@@ -1 +1 @@
-<svg enable-background="new 0 0 64 64" height="64" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m2.7 28.8-16.3 9.3c-1.1.6-2.5.6-3.6 0l-16.3-9.3c-1.1-.6-1.8-1.8-1.8-3.1v-19c0-1.3.7-2.5 1.8-3.1l28.1-16.2v11.5l8.1 4.7c1.1.6 1.8 1.8 1.8 3.1v19c.1 1.3-.7 2.5-1.8 3.1zm-20.6-20.9c0-1.9-1.5-3.4-3.4-3.4s-3.4 1.5-3.4 3.4 1.5 3.4 3.4 3.4c.9 0 1.6-.3 2.2-.8l6 3.4c.3-.7.7-1.4 1.1-2l-6-3.4c.1-.2.1-.4.1-.6zm10.4 4.5c-1.9 0-3.4 1.5-3.4 3.4 0 .2 0 .4.1.6l-8.2 4.7c-.6-.5-1.4-.8-2.2-.8-1.9 0-3.4 1.5-3.4 3.4s1.5 3.4 3.4 3.4 3.4-1.5 3.4-3.4c0-.2 0-.4-.1-.6l8.2-4.7c.6.5 1.4.9 2.3.9 1.9 0 3.4-1.5 3.4-3.4-.1-1.9-1.6-3.5-3.5-3.5z" fill="#042b48" transform="matrix(1.25 0 0 -1.25 51.203755 48.267815)"/></svg>
\ No newline at end of file
+<svg height="64" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M54.579 12.268 34.204.643a4.781 4.781 0 0 0-4.5 0L9.329 12.268c-1.375.75-2.25 2.25-2.25 3.875v23.75c0 1.625.875 3.125 2.25 3.875l35.125 20.25V49.643l10.125-5.875c1.375-.75 2.25-2.25 2.25-3.875v-23.75c.125-1.625-.875-3.125-2.25-3.875zm-25.75 26.125c0 2.375-1.875 4.25-4.25 4.25s-4.25-1.875-4.25-4.25 1.875-4.25 4.25-4.25c1.125 0 2 .375 2.75 1l7.5-4.25c.375.875.875 1.75 1.375 2.5l-7.5 4.25c.125.25.125.5.125.75zm13-5.625a4.215 4.215 0 0 1-4.25-4.25c0-.25 0-.5.125-.75l-10.25-5.875c-.75.625-1.75 1-2.75 1-2.375 0-4.25-1.875-4.25-4.25s1.875-4.25 4.25-4.25 4.25 1.875 4.25 4.25c0 .25 0 .5-.125.75l10.25 5.875c.75-.625 1.75-1.125 2.875-1.125a4.215 4.215 0 0 1 4.25 4.25c-.125 2.375-2 4.375-4.375 4.375z" fill="#042b48"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Demio/demio.svg b/packages/nodes-base/nodes/Demio/demio.svg
index 93889f1d02..7e64136ba8 100644
--- a/packages/nodes-base/nodes/Demio/demio.svg
+++ b/packages/nodes-base/nodes/Demio/demio.svg
@@ -1 +1 @@
-<svg id="svg" version="1.1" viewBox="45 55 310 310" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ><g id="svgg"><path id="path0" d="" stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path1" d="" stroke="none" fill="#008080" fill-rule="evenodd"></path><path id="path2" d="M186.014 72.737 C 181.003 73.280,176.461 74.004,176.024 74.329 C 175.804 74.492,173.969 74.925,171.946 75.291 C 168.511 75.913,155.888 79.728,155.445 80.278 C 155.335 80.414,154.256 80.869,153.047 81.289 C 150.964 82.012,142.638 85.945,140.060 87.423 C 136.659 89.374,131.644 92.457,131.469 92.705 C 131.359 92.860,130.819 93.221,130.270 93.506 C 128.933 94.200,124.650 97.300,122.123 99.401 C 120.999 100.336,119.483 101.594,118.753 102.198 C 115.955 104.513,103.853 116.806,103.279 117.915 C 102.948 118.556,102.516 119.081,102.320 119.081 C 102.124 119.081,101.601 119.665,101.158 120.380 C 100.715 121.094,99.989 122.067,99.545 122.541 C 99.101 123.016,98.102 124.397,97.326 125.612 C 96.549 126.826,95.729 127.933,95.503 128.073 C 95.278 128.212,94.742 129.014,94.313 129.856 C 93.884 130.697,93.302 131.629,93.020 131.926 C 92.738 132.224,91.978 133.455,91.331 134.661 C 90.684 135.868,89.760 137.439,89.276 138.151 C 88.792 138.864,88.063 140.259,87.655 141.251 C 87.247 142.242,86.805 143.055,86.673 143.055 C 86.541 143.056,85.936 144.271,85.329 145.754 C 84.721 147.238,83.615 149.724,82.871 151.279 C 82.127 152.833,81.518 154.365,81.518 154.681 C 81.518 154.998,81.166 155.914,80.736 156.717 C 80.305 157.521,79.485 159.856,78.913 161.906 C 78.341 163.957,77.706 165.994,77.503 166.434 C 76.930 167.670,76.094 171.235,75.346 175.624 C 74.972 177.822,74.498 179.980,74.294 180.420 C 72.524 184.222,71.254 293.723,72.871 303.092 C 74.128 310.379,77.727 316.019,84.950 322.026 C 88.135 324.674,93.779 326.726,99.375 327.270 C 104.482 327.767,192.290 327.773,202.797 327.278 C 210.980 326.892,219.753 325.950,221.179 325.304 C 221.618 325.105,223.147 324.734,224.575 324.480 C 228.110 323.852,233.876 322.449,234.366 322.098 C 234.585 321.941,236.204 321.401,237.962 320.900 C 239.720 320.398,241.698 319.745,242.358 319.449 C 243.017 319.153,245.081 318.354,246.944 317.674 C 248.807 316.993,250.425 316.311,250.540 316.157 C 250.655 316.003,251.828 315.450,253.147 314.929 C 254.466 314.407,255.994 313.697,256.543 313.351 C 257.093 313.004,258.711 312.129,260.140 311.406 C 261.568 310.682,263.996 309.293,265.534 308.319 C 267.073 307.345,269.276 305.983,270.430 305.292 C 271.583 304.602,272.527 303.871,272.527 303.667 C 272.527 303.463,272.715 303.297,272.944 303.297 C 273.173 303.297,274.365 302.532,275.593 301.598 C 276.820 300.664,278.206 299.633,278.672 299.307 C 279.139 298.982,280.959 297.475,282.717 295.959 C 290.558 289.199,297.614 281.676,303.570 273.726 C 304.476 272.517,305.549 270.976,305.955 270.301 C 306.361 269.625,307.580 267.737,308.664 266.105 C 309.747 264.472,311.154 262.106,311.789 260.845 C 312.424 259.585,313.084 258.467,313.255 258.361 C 313.426 258.255,314.170 256.769,314.908 255.058 C 315.646 253.348,316.363 251.858,316.502 251.748 C 316.640 251.638,317.258 250.200,317.875 248.551 C 318.491 246.903,319.158 245.346,319.357 245.092 C 319.730 244.613,321.678 238.732,321.678 238.084 C 321.678 237.883,322.028 236.951,322.455 236.014 C 322.882 235.076,323.711 231.894,324.296 228.943 C 324.881 225.991,325.513 223.217,325.700 222.777 C 327.288 219.038,328.174 199.123,327.250 187.934 C 326.606 180.133,323.855 165.730,322.458 162.837 C 322.245 162.398,321.638 160.599,321.109 158.841 C 320.117 155.546,316.928 147.407,316.490 147.053 C 316.354 146.943,315.929 146.044,315.546 145.055 C 315.163 144.066,314.543 142.697,314.168 142.014 C 313.793 141.330,312.789 139.442,311.937 137.818 C 311.085 136.194,310.256 134.775,310.095 134.665 C 309.934 134.555,309.481 133.836,309.090 133.067 C 308.698 132.298,307.594 130.567,306.636 129.220 C 305.679 127.873,304.895 126.579,304.895 126.343 C 304.895 126.107,304.654 125.770,304.359 125.594 C 304.064 125.419,303.484 124.735,303.070 124.076 C 300.499 119.978,289.069 107.576,283.701 103.059 C 279.619 99.624,277.058 97.603,276.222 97.155 C 275.763 96.910,275.105 96.426,274.759 96.081 C 273.881 95.203,267.060 90.709,266.606 90.709 C 266.400 90.709,266.045 90.484,265.816 90.209 C 265.588 89.933,264.172 89.085,262.670 88.324 C 261.169 87.563,259.845 86.809,259.729 86.647 C 259.613 86.486,258.174 85.785,256.532 85.090 C 254.890 84.396,253.352 83.671,253.115 83.480 C 252.878 83.289,251.440 82.664,249.919 82.092 C 248.397 81.519,246.203 80.617,245.043 80.086 C 243.883 79.555,242.783 79.121,242.600 79.121 C 242.416 79.121,240.477 78.519,238.290 77.784 C 236.102 77.049,232.257 76.042,229.744 75.546 C 227.231 75.050,224.815 74.480,224.376 74.280 C 221.276 72.870,194.664 71.800,186.014 72.737 M207.422 119.323 C 210.924 119.920,219.008 122.837,220.579 124.070 C 220.909 124.328,222.042 125.033,223.096 125.635 C 225.418 126.961,232.617 133.787,233.825 135.808 C 234.303 136.608,235.014 137.622,235.405 138.062 C 236.868 139.708,239.759 146.162,240.598 149.650 C 241.073 151.628,241.663 153.679,241.910 154.206 C 242.590 155.665,242.541 205.467,241.858 205.694 C 241.583 205.786,241.359 206.252,241.359 206.729 C 241.359 213.958,231.684 228.966,224.187 233.367 C 223.251 233.916,222.158 234.669,221.758 235.039 C 221.358 235.410,219.715 236.285,218.108 236.986 C 216.500 237.686,215.005 238.396,214.785 238.565 C 210.211 242.079,190.978 241.474,182.724 237.557 C 181.110 236.791,179.645 236.164,179.467 236.164 C 179.290 236.164,178.819 235.804,178.422 235.365 C 178.024 234.925,177.543 234.565,177.352 234.565 C 176.699 234.565,173.647 232.368,172.496 231.069 C 171.864 230.355,171.095 229.770,170.788 229.770 C 170.481 229.770,170.230 229.627,170.230 229.451 C 170.230 229.276,169.555 228.420,168.731 227.551 C 166.514 225.211,164.075 221.825,162.832 219.360 C 162.228 218.163,161.604 217.093,161.446 216.983 C 161.031 216.695,159.634 212.756,159.037 210.190 C 158.755 208.981,158.384 207.899,158.212 207.786 C 157.021 207.003,156.595 157.729,157.746 153.846 C 160.597 144.225,160.474 144.552,162.838 140.274 C 163.623 138.854,164.394 137.595,164.551 137.477 C 164.709 137.359,165.342 136.518,165.959 135.608 C 167.154 133.847,171.271 129.681,174.198 127.273 C 175.817 125.941,176.675 125.403,180.372 123.401 C 188.008 119.266,198.131 117.740,207.422 119.323 M193.007 133.910 C 189.354 134.879,187.340 135.595,186.829 136.105 C 186.522 136.412,186.164 136.663,186.034 136.663 C 185.684 136.663,182.651 138.710,181.298 139.860 C 179.125 141.706,175.579 146.501,174.623 148.885 C 174.102 150.185,173.528 151.351,173.346 151.475 C 171.905 152.466,170.991 196.403,172.250 204.161 C 173.728 213.272,181.571 222.361,190.210 224.974 C 191.858 225.473,193.639 226.081,194.167 226.327 C 195.463 226.929,204.704 226.912,205.438 226.306 C 205.744 226.053,206.682 225.717,207.523 225.560 C 209.521 225.187,212.456 224.064,213.309 223.346 C 213.682 223.033,214.436 222.573,214.985 222.323 C 219.081 220.462,226.174 211.149,226.174 207.634 C 226.174 207.318,226.350 207.000,226.566 206.926 C 228.343 206.322,228.345 152.647,226.568 152.647 C 226.406 152.647,226.165 152.105,226.033 151.442 C 225.705 149.806,223.807 145.854,223.348 145.854 C 223.144 145.854,222.977 145.568,222.977 145.219 C 222.977 144.253,216.507 138.063,214.635 137.236 C 213.728 136.837,212.987 136.389,212.987 136.241 C 212.987 135.873,209.834 134.699,207.073 134.039 C 204.480 133.420,195.178 133.334,193.007 133.910 M203.980 161.688 C 207.069 164.047,206.993 163.495,206.993 183.668 L 206.993 201.528 205.977 203.262 C 203.323 207.790,196.378 207.647,193.927 203.013 L 193.007 201.273 193.007 183.541 C 193.007 163.819,192.976 164.069,195.653 161.971 C 198.623 159.642,201.186 159.555,203.980 161.688 M269.770 217.411 C 273.599 220.138,274.720 224.211,272.705 228.074 C 272.390 228.677,272.132 229.401,272.130 229.683 C 272.124 231.091,269.088 238.703,267.155 242.158 C 264.986 246.035,263.561 248.300,262.717 249.210 C 262.179 249.791,261.738 250.417,261.738 250.601 C 261.738 251.539,250.948 262.465,247.552 264.966 C 244.378 267.303,238.114 271.329,237.653 271.329 C 237.451 271.329,236.753 271.708,236.102 272.172 C 235.451 272.636,233.540 273.546,231.856 274.194 C 230.173 274.842,228.610 275.522,228.384 275.704 C 227.647 276.298,218.085 278.987,213.986 279.753 C 205.759 281.292,191.484 281.152,183.616 279.458 C 182.078 279.126,180.639 278.820,180.420 278.777 C 180.200 278.734,179.840 278.590,179.620 278.457 C 179.401 278.323,177.718 277.828,175.881 277.355 C 174.044 276.882,171.886 276.164,171.086 275.758 C 170.285 275.353,168.372 274.526,166.833 273.922 C 165.295 273.317,163.766 272.603,163.437 272.335 C 163.107 272.067,161.767 271.326,160.459 270.689 C 159.151 270.052,157.765 269.223,157.379 268.848 C 156.993 268.472,155.950 267.794,155.062 267.341 C 154.173 266.888,153.447 266.369,153.447 266.187 C 153.447 266.005,153.097 265.694,152.669 265.496 C 150.030 264.271,141.427 255.596,137.253 249.951 C 135.948 248.185,131.868 241.516,131.868 241.147 C 131.868 241.019,131.328 239.825,130.667 238.493 C 125.417 227.911,125.491 221.310,130.882 219.209 C 135.621 217.363,139.448 219.723,141.042 225.474 C 142.080 229.222,144.254 234.203,146.587 238.181 C 149.704 243.496,159.193 253.746,160.997 253.746 C 161.240 253.746,161.439 253.918,161.439 254.129 C 161.439 254.340,162.293 254.999,163.337 255.594 C 164.381 256.189,165.594 256.983,166.034 257.359 C 167.080 258.252,174.882 262.013,176.424 262.368 C 177.083 262.519,178.354 262.969,179.249 263.367 C 184.604 265.749,205.005 267.008,212.388 265.412 C 217.152 264.382,219.988 263.650,220.380 263.350 C 220.599 263.181,221.768 262.728,222.977 262.344 C 225.599 261.511,232.662 258.014,234.403 256.687 C 235.083 256.168,235.818 255.744,236.035 255.744 C 236.252 255.744,236.955 255.210,237.596 254.557 C 238.237 253.903,238.949 253.364,239.178 253.358 C 240.002 253.336,249.059 244.131,250.394 241.958 C 250.799 241.299,251.255 240.668,251.406 240.556 C 251.686 240.351,253.912 236.566,255.047 234.366 C 256.081 232.362,256.943 230.176,256.943 229.557 C 256.943 229.235,257.096 228.971,257.283 228.971 C 257.471 228.971,257.933 227.757,258.312 226.274 C 260.020 219.581,260.041 219.542,262.959 217.612 C 265.384 216.007,267.703 215.939,269.770 217.411 " stroke="none" fill="#00bf6f" fill-rule="evenodd"></path><path id="path3" d="" stroke="none" fill="#00ff00" fill-rule="evenodd"></path><path id="path4" d="" stroke="none" fill="#00ffff" fill-rule="evenodd"></path></g></svg>
+<svg viewBox="45 55 310 310" xmlns="http://www.w3.org/2000/svg"><path d="M186.014 72.737c-5.011.543-9.553 1.267-9.99 1.592-.22.163-2.055.596-4.078.962-3.435.622-16.058 4.437-16.501 4.987-.11.136-1.189.591-2.398 1.011-2.083.723-10.409 4.656-12.987 6.134-3.401 1.951-8.416 5.034-8.591 5.282-.11.155-.65.516-1.199.801-1.337.694-5.62 3.794-8.147 5.895-1.124.935-2.64 2.193-3.37 2.797-2.798 2.315-14.9 14.608-15.474 15.717-.331.641-.763 1.166-.959 1.166-.196 0-.719.584-1.162 1.299-.443.714-1.169 1.687-1.613 2.161-.444.475-1.443 1.856-2.219 3.071-.777 1.214-1.597 2.321-1.823 2.461-.225.139-.761.941-1.19 1.783-.429.841-1.011 1.773-1.293 2.07-.282.298-1.042 1.529-1.689 2.735-.647 1.207-1.571 2.778-2.055 3.49-.484.713-1.213 2.108-1.621 3.1-.408.991-.85 1.804-.982 1.804-.132.001-.737 1.216-1.344 2.699a127.76 127.76 0 0 1-2.458 5.525c-.744 1.554-1.353 3.086-1.353 3.402 0 .317-.352 1.233-.782 2.036-.431.804-1.251 3.139-1.823 5.189-.572 2.051-1.207 4.088-1.41 4.528-.573 1.236-1.409 4.801-2.157 9.19-.374 2.198-.848 4.356-1.052 4.796-1.77 3.802-3.04 113.303-1.423 122.672 1.257 7.287 4.856 12.927 12.079 18.934 3.185 2.648 8.829 4.7 14.425 5.244 5.107.497 92.915.503 103.422.008 8.183-.386 16.956-1.328 18.382-1.974.439-.199 1.968-.57 3.396-.824 3.535-.628 9.301-2.031 9.791-2.382.219-.157 1.838-.697 3.596-1.198 1.758-.502 3.736-1.155 4.396-1.451.659-.296 2.723-1.095 4.586-1.775 1.863-.681 3.481-1.363 3.596-1.517.115-.154 1.288-.707 2.607-1.228 1.319-.522 2.847-1.232 3.396-1.578.55-.347 2.168-1.222 3.597-1.945 1.428-.724 3.856-2.113 5.394-3.087a287.642 287.642 0 0 1 4.896-3.027c1.153-.69 2.097-1.421 2.097-1.625 0-.204.188-.37.417-.37.229 0 1.421-.765 2.649-1.699a141.244 141.244 0 0 1 3.079-2.291c.467-.325 2.287-1.832 4.045-3.348 7.841-6.76 14.897-14.283 20.853-22.233.906-1.209 1.979-2.75 2.385-3.425.406-.676 1.625-2.564 2.709-4.196 1.083-1.633 2.49-3.999 3.125-5.26.635-1.26 1.295-2.378 1.466-2.484.171-.106.915-1.592 1.653-3.303.738-1.71 1.455-3.2 1.594-3.31.138-.11.756-1.548 1.373-3.197.616-1.648 1.283-3.205 1.482-3.459.373-.479 2.321-6.36 2.321-7.008 0-.201.35-1.133.777-2.07.427-.938 1.256-4.12 1.841-7.071.585-2.952 1.217-5.726 1.404-6.166 1.588-3.739 2.474-23.654 1.55-34.843-.644-7.801-3.395-22.204-4.792-25.097-.213-.439-.82-2.238-1.349-3.996-.992-3.295-4.181-11.434-4.619-11.788-.136-.11-.561-1.009-.944-1.998-.383-.989-1.003-2.358-1.378-3.041a363.68 363.68 0 0 1-2.231-4.196c-.852-1.624-1.681-3.043-1.842-3.153-.161-.11-.614-.829-1.005-1.598-.392-.769-1.496-2.5-2.454-3.847-.957-1.347-1.741-2.641-1.741-2.877 0-.236-.241-.573-.536-.749-.295-.175-.875-.859-1.289-1.518-2.571-4.098-14.001-16.5-19.369-21.017-4.082-3.435-6.643-5.456-7.479-5.904a7.471 7.471 0 0 1-1.463-1.074c-.878-.878-7.699-5.372-8.153-5.372-.206 0-.561-.225-.79-.5-.228-.276-1.644-1.124-3.146-1.885-1.501-.761-2.825-1.515-2.941-1.677-.116-.161-1.555-.862-3.197-1.557-1.642-.694-3.18-1.419-3.417-1.61-.237-.191-1.675-.816-3.196-1.388-1.522-.573-3.716-1.475-4.876-2.006-1.16-.531-2.26-.965-2.443-.965-.184 0-2.123-.602-4.31-1.337-2.188-.735-6.033-1.742-8.546-2.238-2.513-.496-4.929-1.066-5.368-1.266-3.1-1.41-29.712-2.48-38.362-1.543m21.408 46.586c3.502.597 11.586 3.514 13.157 4.747.33.258 1.463.963 2.517 1.565 2.322 1.326 9.521 8.152 10.729 10.173.478.8 1.189 1.814 1.58 2.254 1.463 1.646 4.354 8.1 5.193 11.588.475 1.978 1.065 4.029 1.312 4.556.68 1.459.631 51.261-.052 51.488-.275.092-.499.558-.499 1.035 0 7.229-9.675 22.237-17.172 26.638-.936.549-2.029 1.302-2.429 1.672-.4.371-2.043 1.246-3.65 1.947-1.608.7-3.103 1.41-3.323 1.579-4.574 3.514-23.807 2.909-32.061-1.008-1.614-.766-3.079-1.393-3.257-1.393-.177 0-.648-.36-1.045-.799-.398-.44-.879-.8-1.07-.8-.653 0-3.705-2.197-4.856-3.496-.632-.714-1.401-1.299-1.708-1.299-.307 0-.558-.143-.558-.319 0-.175-.675-1.031-1.499-1.9-2.217-2.34-4.656-5.726-5.899-8.191-.604-1.197-1.228-2.267-1.386-2.377-.415-.288-1.812-4.227-2.409-6.793-.282-1.209-.653-2.291-.825-2.404-1.191-.783-1.617-50.057-.466-53.94 2.851-9.621 2.728-9.294 5.092-13.572.785-1.42 1.556-2.679 1.713-2.797.158-.118.791-.959 1.408-1.869 1.195-1.761 5.312-5.927 8.239-8.335 1.619-1.332 2.477-1.87 6.174-3.872 7.636-4.135 17.759-5.661 27.05-4.078m-14.415 14.587c-3.653.969-5.667 1.685-6.178 2.195-.307.307-.665.558-.795.558-.35 0-3.383 2.047-4.736 3.197-2.173 1.846-5.719 6.641-6.675 9.025-.521 1.3-1.095 2.466-1.277 2.59-1.441.991-2.355 44.928-1.096 52.686 1.478 9.111 9.321 18.2 17.96 20.813 1.648.499 3.429 1.107 3.957 1.353 1.296.602 10.537.585 11.271-.021.306-.253 1.244-.589 2.085-.746 1.998-.373 4.933-1.496 5.786-2.214.373-.313 1.127-.773 1.676-1.023 4.096-1.861 11.189-11.174 11.189-14.689 0-.316.176-.634.392-.708 1.777-.604 1.779-54.279.002-54.279-.162 0-.403-.542-.535-1.205-.328-1.636-2.226-5.588-2.685-5.588-.204 0-.371-.286-.371-.635 0-.966-6.47-7.156-8.342-7.983-.907-.399-1.648-.847-1.648-.995 0-.368-3.153-1.542-5.914-2.202-2.593-.619-11.895-.705-14.066-.129m10.973 27.778c3.089 2.359 3.013 1.807 3.013 21.98v17.86l-1.016 1.734c-2.654 4.528-9.599 4.385-12.05-.249l-.92-1.74v-17.732c0-19.722-.031-19.472 2.646-21.57 2.97-2.329 5.533-2.416 8.327-.283m65.79 55.723c3.829 2.727 4.95 6.8 2.935 10.663-.315.603-.573 1.327-.575 1.609-.006 1.408-3.042 9.02-4.975 12.475-2.169 3.877-3.594 6.142-4.438 7.052-.538.581-.979 1.207-.979 1.391 0 .938-10.79 11.864-14.186 14.365-3.174 2.337-9.438 6.363-9.899 6.363-.202 0-.9.379-1.551.843-.651.464-2.562 1.374-4.246 2.022-1.683.648-3.246 1.328-3.472 1.51-.737.594-10.299 3.283-14.398 4.049-8.227 1.539-22.502 1.399-30.37-.295a413.861 413.861 0 0 0-3.196-.681 2.975 2.975 0 0 1-.8-.32c-.219-.134-1.902-.629-3.739-1.102-1.837-.473-3.995-1.191-4.795-1.597-.801-.405-2.714-1.232-4.253-1.836-1.538-.605-3.067-1.319-3.396-1.587-.33-.268-1.67-1.009-2.978-1.646-1.308-.637-2.694-1.466-3.08-1.841-.386-.376-1.429-1.054-2.317-1.507-.889-.453-1.615-.972-1.615-1.154 0-.182-.35-.493-.778-.691-2.639-1.225-11.242-9.9-15.416-15.545-1.305-1.766-5.385-8.435-5.385-8.804 0-.128-.54-1.322-1.201-2.654-5.25-10.582-5.176-17.183.215-19.284 4.739-1.846 8.566.514 10.16 6.265 1.038 3.748 3.212 8.729 5.545 12.707 3.117 5.315 12.606 15.565 14.41 15.565.243 0 .442.172.442.383 0 .211.854.87 1.898 1.465 1.044.595 2.257 1.389 2.697 1.765 1.046.893 8.848 4.654 10.39 5.009.659.151 1.93.601 2.825.999 5.355 2.382 25.756 3.641 33.139 2.045 4.764-1.03 7.6-1.762 7.992-2.062.219-.169 1.388-.622 2.597-1.006 2.622-.833 9.685-4.33 11.426-5.657.68-.519 1.415-.943 1.632-.943.217 0 .92-.534 1.561-1.187.641-.654 1.353-1.193 1.582-1.199.824-.022 9.881-9.227 11.216-11.4.405-.659.861-1.29 1.012-1.402.28-.205 2.506-3.99 3.641-6.19 1.034-2.004 1.896-4.19 1.896-4.809 0-.322.153-.586.34-.586.188 0 .65-1.214 1.029-2.697 1.708-6.693 1.729-6.732 4.647-8.662 2.425-1.605 4.744-1.673 6.811-.201" fill="#00bf6f" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Discourse/discourse.svg b/packages/nodes-base/nodes/Discourse/discourse.svg
index 73e7d63ece..f568d23ff6 100644
--- a/packages/nodes-base/nodes/Discourse/discourse.svg
+++ b/packages/nodes-base/nodes/Discourse/discourse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#fff9ae;}.cls-3{fill:#00aeef;}.cls-4{fill:#00a94f;}.cls-5{fill:#f15d22;}.cls-6{fill:#e31b23;}</style></defs><title>Discourse_logo</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><path class="cls-1" d="M51.87,0C23.71,0,0,22.83,0,51c0,.91,0,52.81,0,52.81l51.86-.05c28.16,0,51-23.71,51-51.87S80,0,51.87,0Z"/><path class="cls-2" d="M52.37,19.74A31.62,31.62,0,0,0,24.58,66.41l-5.72,18.4L39.4,80.17a31.61,31.61,0,1,0,13-60.43Z"/><path class="cls-3" d="M77.45,32.12a31.6,31.6,0,0,1-38.05,48L18.86,84.82l20.91-2.47A31.6,31.6,0,0,0,77.45,32.12Z"/><path class="cls-4" d="M71.63,26.29A31.6,31.6,0,0,1,38.8,78L18.86,84.82,39.4,80.17A31.6,31.6,0,0,0,71.63,26.29Z"/><path class="cls-5" d="M26.47,67.11a31.61,31.61,0,0,1,51-35A31.61,31.61,0,0,0,24.58,66.41l-5.72,18.4Z"/><path class="cls-6" d="M24.58,66.41A31.61,31.61,0,0,1,71.63,26.29a31.61,31.61,0,0,0-49,39.63l-3.76,18.9Z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><g data-name="Layer 2"><g data-name="Layer 3"><path d="M51.87 0C23.71 0 0 22.83 0 51v52.81l51.86-.05c28.16 0 51-23.71 51-51.87S80 0 51.87 0z" style="fill:#231f20"/><path d="M52.37 19.74a31.62 31.62 0 0 0-27.79 46.67l-5.72 18.4 20.54-4.64a31.61 31.61 0 1 0 13-60.43z" style="fill:#fff9ae"/><path d="M77.45 32.12a31.6 31.6 0 0 1-38.05 48l-20.54 4.7 20.91-2.47a31.6 31.6 0 0 0 37.68-50.23z" style="fill:#00aeef"/><path d="M71.63 26.29A31.6 31.6 0 0 1 38.8 78l-19.94 6.82 20.54-4.65a31.6 31.6 0 0 0 32.23-53.88z" style="fill:#00a94f"/><path d="M26.47 67.11a31.61 31.61 0 0 1 51-35 31.61 31.61 0 0 0-52.89 34.3l-5.72 18.4z" style="fill:#f15d22"/><path d="M24.58 66.41a31.61 31.61 0 0 1 47.05-40.12 31.61 31.61 0 0 0-49 39.63l-3.76 18.9z" style="fill:#e31b23"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Dropbox/dropbox.svg b/packages/nodes-base/nodes/Dropbox/dropbox.svg
index d6896df517..0701c5a726 100644
--- a/packages/nodes-base/nodes/Dropbox/dropbox.svg
+++ b/packages/nodes-base/nodes/Dropbox/dropbox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 62" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="1" y="1"/><symbol id="A" overflow="visible"><path d="M18.874.02L0 12.18l13.066 10.526L32 11.032m-32 22l18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28L45.188 0 32 11.01l18.994 11.674M32.06 36.778L18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69" stroke="none" fill="#007ee5" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 62" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><path d="M18.874.02 0 12.18l13.066 10.526L32 11.032m-32 22 18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28 45.188 0 32 11.01l18.994 11.674M32.06 36.778 18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69" stroke="none" fill="#007ee5" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ERPNext/erpnext.svg b/packages/nodes-base/nodes/ERPNext/erpnext.svg
index 3bf4e10dbd..cbe9c55edc 100644
--- a/packages/nodes-base/nodes/ERPNext/erpnext.svg
+++ b/packages/nodes-base/nodes/ERPNext/erpnext.svg
@@ -1,8 +1 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g>
-	<path fill="#7574FF" d="M512,448c0,35.2-28.8,64-64,64H64c-35.2,0-64-28.8-64-64V64C0,28.8,28.8,0,64,0h384c35.2,0,64,28.8,64,64   V448z"/>
-</g>
-<g>
-	<path fill="#FFFFFF" d="M150.483,371.684V141.15c0-15.167,9.534-25.133,23.833-25.133h162.5c13.866,0,20.8,6.933,20.8,18.633v2.6   c0,12.133-6.934,18.633-20.8,18.633h-141.7v78.434h109.634c14.3,0,20.8,6.066,20.8,17.767v1.3c0,12.133-6.934,18.633-20.8,18.633   H195.117v84.934h144.3c13.867,0,20.367,6.066,20.367,17.767v2.167c0,12.566-6.5,19.5-20.367,19.5h-165.1   C160.017,396.384,150.483,386.851,150.483,371.684z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" xml:space="preserve"><path fill="#7574FF" d="M512 448c0 35.2-28.8 64-64 64H64c-35.2 0-64-28.8-64-64V64C0 28.8 28.8 0 64 0h384c35.2 0 64 28.8 64 64v384z"/><path fill="#FFF" d="M150.483 371.684V141.15c0-15.167 9.534-25.133 23.833-25.133h162.5c13.866 0 20.8 6.933 20.8 18.633v2.6c0 12.133-6.934 18.633-20.8 18.633h-141.7v78.434H304.75c14.3 0 20.8 6.066 20.8 17.767v1.3c0 12.133-6.934 18.633-20.8 18.633H195.117v84.934h144.3c13.867 0 20.367 6.066 20.367 17.767v2.167c0 12.566-6.5 19.5-20.367 19.5h-165.1c-14.3-.001-23.834-9.534-23.834-24.701z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Emelia/emelia.svg b/packages/nodes-base/nodes/Emelia/emelia.svg
index 2344b9b6a3..fd34e9de0c 100644
--- a/packages/nodes-base/nodes/Emelia/emelia.svg
+++ b/packages/nodes-base/nodes/Emelia/emelia.svg
@@ -1 +1 @@
-<svg viewBox="-2 2 45 45" xmlns="http://www.w3.org/2000/svg"><path d="M29.714 6.539H9.078a2.109 2.109 0 00-2.007 2.762l5.484 16.863 4.219-1.817a2.69 2.69 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2416.71 2416.71 0 01-4.415 2.545l5.156 15.852a.865.865 0 001.645 0l11.48-35.293a2.026 2.026 0 00-1.925-2.653z" opacity="0.9" fill="#f4b454"></path><path d="M37.154 21.261L1.071 12.577a.865.865 0 00-.861 1.4l10.909 12.8 5.656-2.436a2.694 2.694 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2178.15 2178.15 0 01-4.86 2.8l11.291 13.255a2.11 2.11 0 003.4-.264l10.8-17.586a2.026 2.026 0 00-1.251-3.026z" fill="#ef6d4a" opacity="0.9"></path><path d="M37.636 12.577L1.553 21.261A2.025 2.025 0 00.301 24.29l3.472 5.656 13-5.6a2.689 2.689 0 01-.024-.34 2.641 2.641 0 111.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 003.4.264l23.995-28.161a.865.865 0 00-.855-1.401z" fill="#20354c" opacity="0.9"></path></svg>
+<svg viewBox="-2 2 45 45" xmlns="http://www.w3.org/2000/svg"><path d="M29.714 6.539H9.078a2.109 2.109 0 0 0-2.007 2.762l5.484 16.863 4.219-1.817a2.69 2.69 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2416.71 2416.71 0 0 1-4.415 2.545l5.156 15.852a.865.865 0 0 0 1.645 0l11.48-35.293a2.026 2.026 0 0 0-1.925-2.653z" opacity=".9" fill="#f4b454"/><path d="M37.154 21.261 1.071 12.577a.865.865 0 0 0-.861 1.4l10.909 12.8 5.656-2.436a2.694 2.694 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2178.15 2178.15 0 0 1-4.86 2.8l11.291 13.255a2.11 2.11 0 0 0 3.4-.264l10.8-17.586a2.026 2.026 0 0 0-1.251-3.026z" fill="#ef6d4a" opacity=".9"/><path d="M37.636 12.577 1.553 21.261A2.025 2.025 0 0 0 .301 24.29l3.472 5.656 13-5.6a2.689 2.689 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 0 0 3.4.264l23.995-28.161a.865.865 0 0 0-.855-1.401z" fill="#20354c" opacity=".9"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Github/github.svg b/packages/nodes-base/nodes/Github/github.svg
index 811c46c1c9..c83db1cbb9 100644
--- a/packages/nodes-base/nodes/Github/github.svg
+++ b/packages/nodes-base/nodes/Github/github.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 148.744 150.744" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".872" y=".872"/><symbol id="A" overflow="visible"><path d="M73.256 0C32.801 0 0 34.029 0 76.001c0 33.586 20.988 62.069 50.1 72.115 3.663.698 4.999-1.652 4.999-3.656l-.105-14.149c-20.372 4.593-24.677-8.961-24.677-8.961-3.335-8.777-8.133-11.114-8.133-11.114-6.658-4.713.523-4.622.523-4.622 7.355.529 11.227 7.831 11.227 7.831 6.537 11.616 17.151 8.257 21.319 6.309.666-4.901 2.564-8.257 4.65-10.151-16.261-1.919-33.366-8.442-33.366-37.565 0-8.302 2.857-15.075 7.535-20.396-.747-1.929-3.269-9.663.724-20.123 0 0 6.143-2.041 20.145 7.793 5.84-1.692 12.105-2.529 18.314-2.555 6.223.028 12.492.872 18.34 2.564 13.978-9.844 20.128-7.793 20.128-7.793 4.006 10.47 1.483 18.192.733 20.114 4.695 5.32 7.53 12.093 7.53 20.396 0 29.198-17.133 35.627-33.453 37.509 2.639 2.355 4.971 6.977 4.971 14.065l-.098 20.855c0 2.023 1.333 4.388 5.044 3.663 29.091-10.078 50.062-38.561 50.062-72.129C146.512 34.029 113.71 0 73.256 0z" fill="#000" stroke="none"/></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 148.744 150.744" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".872" y=".872"/><symbol id="a" overflow="visible"><path d="M73.256 0C32.801 0 0 34.029 0 76.001c0 33.586 20.988 62.069 50.1 72.115 3.663.698 4.999-1.652 4.999-3.656l-.105-14.149c-20.372 4.593-24.677-8.961-24.677-8.961-3.335-8.777-8.133-11.114-8.133-11.114-6.658-4.713.523-4.622.523-4.622 7.355.529 11.227 7.831 11.227 7.831 6.537 11.616 17.151 8.257 21.319 6.309.666-4.901 2.564-8.257 4.65-10.151-16.261-1.919-33.366-8.442-33.366-37.565 0-8.302 2.857-15.075 7.535-20.396-.747-1.929-3.269-9.663.724-20.123 0 0 6.143-2.041 20.145 7.793 5.84-1.692 12.105-2.529 18.314-2.555 6.223.028 12.492.872 18.34 2.564 13.978-9.844 20.128-7.793 20.128-7.793 4.006 10.47 1.483 18.192.733 20.114 4.695 5.32 7.53 12.093 7.53 20.396 0 29.198-17.133 35.627-33.453 37.509 2.639 2.355 4.971 6.977 4.971 14.065l-.098 20.855c0 2.023 1.333 4.388 5.044 3.663 29.091-10.078 50.062-38.561 50.062-72.129C146.512 34.029 113.71 0 73.256 0z" fill="#000" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Gitlab/gitlab.svg b/packages/nodes-base/nodes/Gitlab/gitlab.svg
index 9f0f809743..7cebf4c16b 100644
--- a/packages/nodes-base/nodes/Gitlab/gitlab.svg
+++ b/packages/nodes-base/nodes/Gitlab/gitlab.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>gitlab_node_icon</title>
-    <g id="gitlab_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Group" transform="translate(1.000000, 3.000000)">
-            <polygon id="Path" fill="#E24329" points="29.5 53.9670508 40.363375 20.7643729 18.636625 20.7643729"></polygon>
-            <polygon id="Path" fill="#FC6D26" points="29.5 53.9670508 18.636625 20.7643729 3.4109375 20.7643729"></polygon>
-            <path d="M3.4109375,20.7643729 L0.110625,30.8596271 C-0.190581485,31.779688 0.139159543,32.7876713 0.92740625,33.3564407 L29.5,53.9670508 L3.4109375,20.7643729 Z" id="Path" fill="#FCA326"></path>
-            <path d="M3.4109375,20.7643729 L18.6357031,20.7643729 L12.0931562,0.780711864 C11.7566719,-0.248033898 10.2908906,-0.248033898 9.95440625,0.780711864 L3.4109375,20.7643729 Z" id="Path" fill="#E24329"></path>
-            <polygon id="Path" fill="#FC6D26" points="29.5 53.9670508 40.363375 20.7643729 55.5890625 20.7643729"></polygon>
-            <path d="M55.5890625,20.7643729 L58.889375,30.8504746 C59.1905815,31.7705355 58.8608405,32.7785188 58.0725937,33.3472881 L29.5,53.9670508 L55.5890625,20.7643729 Z" id="Path" fill="#FCA326"></path>
-            <path d="M55.5890625,20.7643729 L40.363375,20.7643729 L46.9068438,0.771559322 C47.2433281,-0.257186441 48.7091094,-0.257186441 49.0455937,0.771559322 L55.5890625,20.7643729 Z" id="Path" fill="#E24329"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#E24329" d="m30.5 56.967 10.863-33.203H19.637z"/><path fill="#FC6D26" d="M30.5 56.967 19.637 23.764H4.41z"/><path d="M4.41 23.764 1.11 33.86c-.3.92.03 1.928.817 2.496L30.5 56.967 4.41 23.764z" fill="#FCA326"/><path d="M4.41 23.764h15.226L13.093 3.781c-.336-1.029-1.802-1.029-2.139 0L4.411 23.764z" fill="#E24329"/><path fill="#FC6D26" d="m30.5 56.967 10.863-33.203H56.59z"/><path d="m56.59 23.764 3.3 10.086a2.224 2.224 0 0 1-.817 2.497L30.5 56.967l26.09-33.203z" fill="#FCA326"/><path d="M56.59 23.764H41.362l6.544-19.992c.336-1.03 1.802-1.03 2.139 0l6.543 19.992z" fill="#E24329"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
index 9241f4fa93..a6e5c354b7 100644
--- a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
+++ b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
@@ -1,31 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 36.601563 0.101563 L 42.898438 0.101563 L 42.898438 0.199219 L 36.601563 0.199219 Z M 36.101563 0.199219 L 43.398438 0.199219 L 43.398438 0.300781 L 36.101563 0.300781 Z M 35.5 0.300781 L 44 0.300781 L 44 0.398438 L 35.5 0.398438 Z M 34.898438 0.398438 L 44.5 0.398438 L 44.5 0.5 L 34.898438 0.5 Z M 34.398438 0.5 L 45.101563 0.5 L 45.101563 0.601563 L 34.398438 0.601563 Z M 33.898438 0.601563 L 45.5 0.601563 L 45.5 0.699219 L 33.898438 0.699219 Z M 33.601563 0.699219 L 45.898438 0.699219 L 45.898438 0.800781 L 33.601563 0.800781 Z M 33.300781 0.800781 L 46.199219 0.800781 L 46.199219 0.898438 L 33.300781 0.898438 Z M 33 0.898438 L 46.5 0.898438 L 46.5 1 L 33 1 Z M 32.699219 1 L 46.800781 1 L 46.800781 1.101563 L 32.699219 1.101563 Z M 32.300781 1.101563 L 47.101563 1.101563 L 47.101563 1.199219 L 32.300781 1.199219 Z M 32 1.199219 L 47.398438 1.199219 L 47.398438 1.300781 L 32 1.300781 Z M 31.699219 1.300781 L 47.800781 1.300781 L 47.800781 1.398438 L 31.699219 1.398438 Z M 31.398438 1.398438 L 48 1.398438 L 48 1.5 L 31.398438 1.5 Z M 31.199219 1.5 L 48.300781 1.5 L 48.300781 1.601563 L 31.199219 1.601563 Z M 31 1.601563 L 48.5 1.601563 L 48.5 1.699219 L 31 1.699219 Z M 30.800781 1.699219 L 48.699219 1.699219 L 48.699219 1.800781 L 30.800781 1.800781 Z M 30.601563 1.800781 L 48.898438 1.800781 L 48.898438 1.898438 L 30.601563 1.898438 Z M 30.300781 1.898438 L 49.101563 1.898438 L 49.101563 2 L 30.300781 2 Z M 30.101563 2 L 49.300781 2 L 49.300781 2.101563 L 30.101563 2.101563 Z M 29.898438 2.101563 L 49.601563 2.101563 L 49.601563 2.199219 L 29.898438 2.199219 Z M 29.699219 2.199219 L 49.800781 2.199219 L 49.800781 2.300781 L 29.699219 2.300781 Z M 29.5 2.300781 L 50 2.300781 L 50 2.398438 L 29.5 2.398438 Z M 29.300781 2.398438 L 50.199219 2.398438 L 50.199219 2.5 L 29.300781 2.5 Z M 29.101563 2.5 L 50.398438 2.5 L 50.398438 2.601563 L 29.101563 2.601563 Z M 28.898438 2.601563 L 50.601563 2.601563 L 50.601563 2.699219 L 28.898438 2.699219 Z M 28.699219 2.699219 L 50.699219 2.699219 L 50.699219 2.800781 L 28.699219 2.800781 Z M 28.601563 2.800781 L 50.898438 2.800781 L 50.898438 2.898438 L 28.601563 2.898438 Z M 28.398438 2.898438 L 51 2.898438 L 51 3 L 28.398438 3 Z M 28.300781 3 L 51.199219 3 L 51.199219 3.101563 L 28.300781 3.101563 Z M 28.101563 3.101563 L 51.300781 3.101563 L 51.300781 3.199219 L 28.101563 3.199219 Z M 27.898438 3.199219 L 51.5 3.199219 L 51.5 3.300781 L 27.898438 3.300781 Z M 27.800781 3.300781 L 51.699219 3.300781 L 51.699219 3.398438 L 27.800781 3.398438 Z M 27.601563 3.398438 L 51.800781 3.398438 L 51.800781 3.5 L 27.601563 3.5 Z M 27.5 3.5 L 52 3.5 L 52 3.601563 L 27.5 3.601563 Z M 27.300781 3.601563 L 52.101563 3.601563 L 52.101563 3.699219 L 27.300781 3.699219 Z M 27.199219 3.699219 L 52.300781 3.699219 L 52.300781 3.800781 L 27.199219 3.800781 Z M 27 3.800781 L 52.5 3.800781 L 52.5 3.898438 L 27 3.898438 Z M 26.800781 3.898438 L 52.601563 3.898438 L 52.601563 4 L 26.800781 4 Z M 26.699219 4 L 52.699219 4 L 52.699219 4.101563 L 26.699219 4.101563 Z M 26.601563 4.101563 L 52.898438 4.101563 L 52.898438 4.199219 L 26.601563 4.199219 Z M 26.5 4.199219 L 53 4.199219 L 53 4.300781 L 26.5 4.300781 Z M 26.398438 4.300781 L 53.101563 4.300781 L 53.101563 4.398438 L 26.398438 4.398438 Z M 26.199219 4.398438 L 53.199219 4.398438 L 53.199219 4.5 L 26.199219 4.5 Z M 26.101563 4.5 L 53.300781 4.5 L 53.300781 4.601563 L 26.101563 4.601563 Z M 26 4.601563 L 53.5 4.601563 L 53.5 4.699219 L 26 4.699219 Z M 25.898438 4.699219 L 53.601563 4.699219 L 53.601563 4.800781 L 25.898438 4.800781 Z M 25.699219 4.800781 L 53.699219 4.800781 L 53.699219 4.898438 L 25.699219 4.898438 Z M 25.601563 4.898438 L 53.800781 4.898438 L 53.800781 5 L 25.601563 5 Z M 25.5 5 L 54 5 L 54 5.101563 L 25.5 5.101563 Z M 25.398438 5.101563 L 54.101563 5.101563 L 54.101563 5.199219 L 25.398438 5.199219 Z M 25.300781 5.199219 L 54.199219 5.199219 L 54.199219 5.300781 L 25.300781 5.300781 Z M 25.101563 5.300781 L 54.300781 5.300781 L 54.300781 5.398438 L 25.101563 5.398438 Z M 25 5.398438 L 54.398438 5.398438 L 54.398438 5.5 L 25 5.5 Z M 24.898438 5.5 L 54.601563 5.5 L 54.601563 5.601563 L 24.898438 5.601563 Z M 24.800781 5.601563 L 54.699219 5.601563 L 54.699219 5.699219 L 24.800781 5.699219 Z M 24.699219 5.699219 L 54.800781 5.699219 L 54.800781 5.800781 L 24.699219 5.800781 Z M 24.601563 5.800781 L 54.898438 5.800781 L 54.898438 5.898438 L 24.601563 5.898438 Z M 24.5 5.898438 L 55 5.898438 L 55 6 L 24.5 6 Z M 24.398438 6 L 55.101563 6 L 55.101563 6.101563 L 24.398438 6.101563 Z M 24.300781 6.101563 L 55.199219 6.101563 L 55.199219 6.199219 L 24.300781 6.199219 Z M 24.199219 6.199219 L 55.300781 6.199219 L 55.300781 6.300781 L 24.199219 6.300781 Z M 24.101563 6.300781 L 55.398438 6.300781 L 55.398438 6.398438 L 24.101563 6.398438 Z M 24 6.398438 L 55.5 6.398438 L 55.5 6.5 L 24 6.5 Z M 23.898438 6.5 L 55.601563 6.5 L 55.601563 6.601563 L 23.898438 6.601563 Z M 23.800781 6.601563 L 55.699219 6.601563 L 55.699219 6.699219 L 23.800781 6.699219 Z M 23.699219 6.699219 L 55.699219 6.699219 L 55.699219 6.800781 L 23.699219 6.800781 Z M 23.601563 6.800781 L 55.800781 6.800781 L 55.800781 6.898438 L 23.601563 6.898438 Z M 23.5 6.898438 L 55.898438 6.898438 L 55.898438 7 L 23.5 7 Z M 23.398438 7 L 56 7 L 56 7.101563 L 23.398438 7.101563 Z M 23.300781 7.101563 L 56.101563 7.101563 L 56.101563 7.199219 L 23.300781 7.199219 Z M 23.199219 7.199219 L 56.199219 7.199219 L 56.199219 7.300781 L 23.199219 7.300781 Z M 23.101563 7.300781 L 56.300781 7.300781 L 56.300781 7.398438 L 23.101563 7.398438 Z M 23 7.398438 L 56.398438 7.398438 L 56.398438 7.5 L 23 7.5 Z M 22.898438 7.5 L 56.5 7.5 L 56.5 7.601563 L 22.898438 7.601563 Z M 22.800781 7.601563 L 56.601563 7.601563 L 56.601563 7.699219 L 22.800781 7.699219 Z M 22.800781 7.699219 L 56.699219 7.699219 L 56.699219 7.800781 L 22.800781 7.800781 Z M 22.699219 7.800781 L 56.800781 7.800781 L 56.800781 7.898438 L 22.699219 7.898438 Z M 22.601563 7.898438 L 56.898438 7.898438 L 56.898438 8 L 22.601563 8 Z M 22.5 8 L 56.898438 8 L 56.898438 8.101563 L 22.5 8.101563 Z M 22.398438 8.101563 L 57 8.101563 L 57 8.199219 L 22.398438 8.199219 Z M 22.398438 8.199219 L 57.101563 8.199219 L 57.101563 8.300781 L 22.398438 8.300781 Z M 22.300781 8.300781 L 57.199219 8.300781 L 57.199219 8.398438 L 22.300781 8.398438 Z M 22.199219 8.398438 L 57.300781 8.398438 L 57.300781 8.5 L 22.199219 8.5 Z M 22.101563 8.5 L 57.300781 8.5 L 57.300781 8.601563 L 22.101563 8.601563 Z M 22 8.601563 L 57.398438 8.601563 L 57.398438 8.699219 L 22 8.699219 Z M 22 8.699219 L 57.5 8.699219 L 57.5 8.800781 L 22 8.800781 Z M 21.898438 8.800781 L 57.601563 8.800781 L 57.601563 8.898438 L 21.898438 8.898438 Z M 21.800781 8.898438 L 57.699219 8.898438 L 57.699219 9 L 21.800781 9 Z M 21.699219 9 L 57.699219 9 L 57.699219 9.101563 L 21.699219 9.101563 Z M 21.601563 9.101563 L 57.800781 9.101563 L 57.800781 9.199219 L 21.601563 9.199219 Z M 21.601563 9.199219 L 57.898438 9.199219 L 57.898438 9.300781 L 21.601563 9.300781 Z M 21.5 9.300781 L 58 9.300781 L 58 9.398438 L 21.5 9.398438 Z M 21.398438 9.398438 L 58 9.398438 L 58 9.5 L 21.398438 9.5 Z M 21.300781 9.5 L 58.101563 9.5 L 58.101563 9.601563 L 21.300781 9.601563 Z M 21.300781 9.601563 L 58.199219 9.601563 L 58.199219 9.699219 L 21.300781 9.699219 Z M 21.199219 9.699219 L 58.300781 9.699219 L 58.300781 9.800781 L 21.199219 9.800781 Z M 21.101563 9.800781 L 58.398438 9.800781 L 58.398438 9.898438 L 21.101563 9.898438 Z M 20.300781 9.898438 L 59.601563 9.898438 L 59.601563 10 L 20.300781 10 Z M 19.601563 10 L 60.398438 10 L 60.398438 10.101563 L 19.601563 10.101563 Z M 18.898438 10.101563 L 61.199219 10.101563 L 61.199219 10.199219 L 18.898438 10.199219 Z M 18.199219 10.199219 L 61.601563 10.199219 L 61.601563 10.300781 L 18.199219 10.300781 Z M 17.800781 10.300781 L 62.101563 10.300781 L 62.101563 10.398438 L 17.800781 10.398438 Z M 17.398438 10.398438 L 62.5 10.398438 L 62.5 10.5 L 17.398438 10.5 Z M 17 10.5 L 62.898438 10.5 L 62.898438 10.601563 L 17 10.601563 Z M 16.601563 10.601563 L 63.398438 10.601563 L 63.398438 10.699219 L 16.601563 10.699219 Z M 16.199219 10.699219 L 63.800781 10.699219 L 63.800781 10.800781 L 16.199219 10.800781 Z M 15.800781 10.800781 L 64.101563 10.800781 L 64.101563 10.898438 L 15.800781 10.898438 Z M 15.398438 10.898438 L 64.398438 10.898438 L 64.398438 11 L 15.398438 11 Z M 15.101563 11 L 64.601563 11 L 64.601563 11.101563 L 15.101563 11.101563 Z M 14.898438 11.101563 L 64.898438 11.101563 L 64.898438 11.199219 L 14.898438 11.199219 Z M 14.601563 11.199219 L 65.199219 11.199219 L 65.199219 11.300781 L 14.601563 11.300781 Z M 14.398438 11.300781 L 65.398438 11.300781 L 65.398438 11.398438 L 14.398438 11.398438 Z M 14.101563 11.398438 L 65.699219 11.398438 L 65.699219 11.5 L 14.101563 11.5 Z M 13.800781 11.5 L 66 11.5 L 66 11.601563 L 13.800781 11.601563 Z M 13.601563 11.601563 L 66.300781 11.601563 L 66.300781 11.699219 L 13.601563 11.699219 Z M 13.300781 11.699219 L 66.5 11.699219 L 66.5 11.800781 L 13.300781 11.800781 Z M 13.101563 11.800781 L 66.699219 11.800781 L 66.699219 11.898438 L 13.101563 11.898438 Z M 12.800781 11.898438 L 66.898438 11.898438 L 66.898438 12 L 12.800781 12 Z M 12.601563 12 L 67.101563 12 L 67.101563 12.101563 L 12.601563 12.101563 Z M 12.398438 12.101563 L 67.300781 12.101563 L 67.300781 12.199219 L 12.398438 12.199219 Z M 12.199219 12.199219 L 67.5 12.199219 L 67.5 12.300781 L 12.199219 12.300781 Z M 12 12.300781 L 67.699219 12.300781 L 67.699219 12.398438 L 12 12.398438 Z M 11.898438 12.398438 L 67.898438 12.398438 L 67.898438 12.5 L 11.898438 12.5 Z M 11.699219 12.5 L 68 12.5 L 68 12.601563 L 11.699219 12.601563 Z M 11.5 12.601563 L 68.199219 12.601563 L 68.199219 12.699219 L 11.5 12.699219 Z M 11.300781 12.699219 L 68.398438 12.699219 L 68.398438 12.800781 L 11.300781 12.800781 Z M 11.101563 12.800781 L 68.601563 12.800781 L 68.601563 12.898438 L 11.101563 12.898438 Z M 10.898438 12.898438 L 68.800781 12.898438 L 68.800781 13 L 10.898438 13 Z M 10.800781 13 L 69 13 L 69 13.101563 L 10.800781 13.101563 Z M 10.601563 13.101563 L 69.101563 13.101563 L 69.101563 13.199219 L 10.601563 13.199219 Z M 10.398438 13.199219 L 69.300781 13.199219 L 69.300781 13.300781 L 10.398438 13.300781 Z M 10.199219 13.300781 L 69.398438 13.300781 L 69.398438 13.398438 L 10.199219 13.398438 Z M 10.101563 13.398438 L 69.5 13.398438 L 69.5 13.5 L 10.101563 13.5 Z M 9.898438 13.5 L 69.699219 13.5 L 69.699219 13.601563 L 9.898438 13.601563 Z M 9.800781 13.601563 L 69.800781 13.601563 L 69.800781 13.699219 L 9.800781 13.699219 Z M 9.699219 13.699219 L 70 13.699219 L 70 13.800781 L 9.699219 13.800781 Z M 9.5 13.800781 L 70.101563 13.800781 L 70.101563 13.898438 L 9.5 13.898438 Z M 9.398438 13.898438 L 70.300781 13.898438 L 70.300781 14 L 9.398438 14 Z M 9.199219 14 L 70.398438 14 L 70.398438 14.101563 L 9.199219 14.101563 Z M 9.101563 14.101563 L 70.601563 14.101563 L 70.601563 14.199219 L 9.101563 14.199219 Z M 9 14.199219 L 70.699219 14.199219 L 70.699219 14.300781 L 9 14.300781 Z M 8.800781 14.300781 L 70.898438 14.300781 L 70.898438 14.398438 L 8.800781 14.398438 Z M 8.699219 14.398438 L 71 14.398438 L 71 14.5 L 8.699219 14.5 Z M 8.5 14.5 L 71.101563 14.5 L 71.101563 14.601563 L 8.5 14.601563 Z M 8.398438 14.601563 L 71.199219 14.601563 L 71.199219 14.699219 L 8.398438 14.699219 Z M 8.300781 14.699219 L 71.300781 14.699219 L 71.300781 14.800781 L 8.300781 14.800781 Z M 8.101563 14.800781 L 71.5 14.800781 L 71.5 14.898438 L 8.101563 14.898438 Z M 8 14.898438 L 71.601563 14.898438 L 71.601563 15 L 8 15 Z M 7.898438 15 L 71.699219 15 L 71.699219 15.101563 L 7.898438 15.101563 Z M 7.800781 15.101563 L 71.800781 15.101563 L 71.800781 15.199219 L 7.800781 15.199219 Z M 7.699219 15.199219 L 71.898438 15.199219 L 71.898438 15.300781 L 7.699219 15.300781 Z M 7.601563 15.300781 L 72 15.300781 L 72 15.398438 L 7.601563 15.398438 Z M 7.5 15.398438 L 72.101563 15.398438 L 72.101563 15.5 L 7.5 15.5 Z M 7.300781 15.5 L 72.300781 15.5 L 72.300781 15.601563 L 7.300781 15.601563 Z M 7.199219 15.601563 L 72.398438 15.601563 L 72.398438 15.699219 L 7.199219 15.699219 Z M 7.101563 15.699219 L 72.5 15.699219 L 72.5 15.800781 L 7.101563 15.800781 Z M 7 15.800781 L 72.601563 15.800781 L 72.601563 15.898438 L 7 15.898438 Z M 6.898438 15.898438 L 72.699219 15.898438 L 72.699219 16 L 6.898438 16 Z M 6.800781 16 L 72.800781 16 L 72.800781 16.101563 L 6.800781 16.101563 Z M 6.699219 16.101563 L 72.898438 16.101563 L 72.898438 16.199219 L 6.699219 16.199219 Z M 6.601563 16.199219 L 73 16.199219 L 73 16.300781 L 6.601563 16.300781 Z M 6.5 16.300781 L 73.101563 16.300781 L 73.101563 16.398438 L 6.5 16.398438 Z M 6.398438 16.398438 L 73.199219 16.398438 L 73.199219 16.5 L 6.398438 16.5 Z M 6.199219 16.5 L 73.300781 16.5 L 73.300781 16.601563 L 6.199219 16.601563 Z M 6.101563 16.601563 L 73.398438 16.601563 L 73.398438 16.699219 L 6.101563 16.699219 Z M 6.101563 16.699219 L 73.5 16.699219 L 73.5 16.800781 L 6.101563 16.800781 Z M 6 16.800781 L 73.601563 16.800781 L 73.601563 16.898438 L 6 16.898438 Z M 5.898438 16.898438 L 73.699219 16.898438 L 73.699219 17 L 5.898438 17 Z M 5.800781 17 L 73.699219 17 L 73.699219 17.101563 L 5.800781 17.101563 Z M 5.699219 17.101563 L 73.800781 17.101563 L 73.800781 17.199219 L 5.699219 17.199219 Z M 5.601563 17.199219 L 73.898438 17.199219 L 73.898438 17.300781 L 5.601563 17.300781 Z M 5.5 17.300781 L 74 17.300781 L 74 17.398438 L 5.5 17.398438 Z M 5.5 17.398438 L 74.101563 17.398438 L 74.101563 17.5 L 5.5 17.5 Z M 5.398438 17.5 L 74.199219 17.5 L 74.199219 17.601563 L 5.398438 17.601563 Z M 5.300781 17.601563 L 74.300781 17.601563 L 74.300781 17.699219 L 5.300781 17.699219 Z M 5.199219 17.699219 L 74.398438 17.699219 L 74.398438 17.800781 L 5.199219 17.800781 Z M 5.101563 17.800781 L 74.5 17.800781 L 74.5 17.898438 L 5.101563 17.898438 Z M 5 17.898438 L 74.601563 17.898438 L 74.601563 18 L 5 18 Z M 4.898438 18 L 74.601563 18 L 74.601563 18.101563 L 4.898438 18.101563 Z M 4.800781 18.101563 L 74.699219 18.101563 L 74.699219 18.199219 L 4.800781 18.199219 Z M 4.800781 18.199219 L 74.800781 18.199219 L 74.800781 18.300781 L 4.800781 18.300781 Z M 4.699219 18.300781 L 74.898438 18.300781 L 74.898438 18.398438 L 4.699219 18.398438 Z M 4.601563 18.398438 L 74.898438 18.398438 L 74.898438 18.5 L 4.601563 18.5 Z M 4.5 18.5 L 75 18.5 L 75 18.601563 L 4.5 18.601563 Z M 4.398438 18.601563 L 75.101563 18.601563 L 75.101563 18.699219 L 4.398438 18.699219 Z M 4.398438 18.699219 L 75.199219 18.699219 L 75.199219 18.800781 L 4.398438 18.800781 Z M 4.300781 18.800781 L 75.199219 18.800781 L 75.199219 18.898438 L 4.300781 18.898438 Z M 4.199219 18.898438 L 75.300781 18.898438 L 75.300781 19 L 4.199219 19 Z M 4.101563 19 L 75.398438 19 L 75.398438 19.199219 L 4.101563 19.199219 Z M 4 19.199219 L 75.5 19.199219 L 75.5 19.300781 L 4 19.300781 Z M 3.898438 19.300781 L 75.601563 19.300781 L 75.601563 19.5 L 3.898438 19.5 Z M 3.800781 19.5 L 75.699219 19.5 L 75.699219 19.601563 L 3.800781 19.601563 Z M 3.699219 19.601563 L 75.800781 19.601563 L 75.800781 19.800781 L 3.699219 19.800781 Z M 3.601563 19.800781 L 75.898438 19.800781 L 75.898438 19.898438 L 3.601563 19.898438 Z M 3.5 19.898438 L 76 19.898438 L 76 20 L 3.5 20 Z M 3.5 20 L 76.101563 20 L 76.101563 20.101563 L 3.5 20.101563 Z M 3.398438 20.101563 L 76.101563 20.101563 L 76.101563 20.199219 L 3.398438 20.199219 Z M 3.300781 20.199219 L 76.199219 20.199219 L 76.199219 20.300781 L 3.300781 20.300781 Z M 3.300781 20.300781 L 76.300781 20.300781 L 76.300781 20.398438 L 3.300781 20.398438 Z M 3.199219 20.398438 L 76.300781 20.398438 L 76.300781 20.5 L 3.199219 20.5 Z M 3.101563 20.5 L 76.398438 20.5 L 76.398438 20.699219 L 3.101563 20.699219 Z M 3 20.699219 L 76.5 20.699219 L 76.5 20.800781 L 3 20.800781 Z M 2.898438 20.800781 L 76.5 20.800781 L 76.5 20.898438 L 2.898438 20.898438 Z M 2.898438 20.898438 L 76.601563 20.898438 L 76.601563 21 L 2.898438 21 Z M 2.800781 21 L 76.601563 21 L 76.601563 21.101563 L 2.800781 21.101563 Z M 2.800781 21.101563 L 76.699219 21.101563 L 76.699219 21.199219 L 2.800781 21.199219 Z M 2.699219 21.199219 L 76.699219 21.199219 L 76.699219 21.300781 L 2.699219 21.300781 Z M 2.699219 21.300781 L 76.800781 21.300781 L 76.800781 21.398438 L 2.699219 21.398438 Z M 2.601563 21.398438 L 76.800781 21.398438 L 76.800781 21.5 L 2.601563 21.5 Z M 2.601563 21.5 L 76.898438 21.5 L 76.898438 21.601563 L 2.601563 21.601563 Z M 2.5 21.601563 L 77 21.601563 L 77 21.800781 L 2.5 21.800781 Z M 2.398438 21.800781 L 77.101563 21.800781 L 77.101563 22 L 2.398438 22 Z M 2.300781 22 L 77.199219 22 L 77.199219 22.199219 L 2.300781 22.199219 Z M 2.199219 22.199219 L 77.300781 22.199219 L 77.300781 22.398438 L 2.199219 22.398438 Z M 2.101563 22.398438 L 77.398438 22.398438 L 77.398438 22.601563 L 2.101563 22.601563 Z M 2 22.601563 L 77.5 22.601563 L 77.5 22.800781 L 2 22.800781 Z M 1.898438 22.800781 L 77.601563 22.800781 L 77.601563 23 L 1.898438 23 Z M 1.800781 23 L 77.601563 23 L 77.601563 23.101563 L 1.800781 23.101563 Z M 1.800781 23.101563 L 77.699219 23.101563 L 77.699219 23.199219 L 1.800781 23.199219 Z M 1.699219 23.199219 L 77.699219 23.199219 L 77.699219 23.300781 L 1.699219 23.300781 Z M 1.699219 23.300781 L 77.800781 23.300781 L 77.800781 23.5 L 1.699219 23.5 Z M 1.601563 23.5 L 77.800781 23.5 L 77.800781 23.601563 L 1.601563 23.601563 Z M 1.601563 23.601563 L 77.898438 23.601563 L 77.898438 23.699219 L 1.601563 23.699219 Z M 1.5 23.699219 L 77.898438 23.699219 L 77.898438 23.898438 L 1.5 23.898438 Z M 1.5 23.898438 L 78 23.898438 L 78 24 L 1.5 24 Z M 1.398438 24 L 78 24 L 78 24.101563 L 1.398438 24.101563 Z M 1.398438 24.101563 L 78.101563 24.101563 L 78.101563 24.300781 L 1.398438 24.300781 Z M 1.300781 24.300781 L 78.101563 24.300781 L 78.101563 24.398438 L 1.300781 24.398438 Z M 1.300781 24.398438 L 78.199219 24.398438 L 78.199219 24.5 L 1.300781 24.5 Z M 1.199219 24.5 L 78.199219 24.5 L 78.199219 24.699219 L 1.199219 24.699219 Z M 1.199219 24.699219 L 78.300781 24.699219 L 78.300781 24.800781 L 1.199219 24.800781 Z M 1.101563 24.800781 L 78.300781 24.800781 L 78.300781 24.898438 L 1.101563 24.898438 Z M 1.101563 24.898438 L 78.398438 24.898438 L 78.398438 25.101563 L 1.101563 25.101563 Z M 1 25.101563 L 78.398438 25.101563 L 78.398438 25.199219 L 1 25.199219 Z M 1 25.199219 L 78.5 25.199219 L 78.5 25.398438 L 1 25.398438 Z M 0.898438 25.398438 L 78.5 25.398438 L 78.5 25.601563 L 0.898438 25.601563 Z M 0.800781 25.601563 L 78.601563 25.601563 L 78.601563 26 L 0.800781 26 Z M 0.800781 26 L 78.699219 26 L 78.699219 26.101563 L 0.800781 26.101563 Z M 0.699219 26.101563 L 78.699219 26.101563 L 78.699219 26.398438 L 0.699219 26.398438 Z M 0.699219 26.398438 L 78.800781 26.398438 L 78.800781 26.5 L 0.699219 26.5 Z M 0.601563 26.5 L 78.800781 26.5 L 78.800781 26.800781 L 0.601563 26.800781 Z M 0.601563 26.800781 L 78.898438 26.800781 L 78.898438 26.898438 L 0.601563 26.898438 Z M 0.5 26.898438 L 78.898438 26.898438 L 78.898438 27.199219 L 0.5 27.199219 Z M 0.5 27.199219 L 79 27.199219 L 79 27.398438 L 0.5 27.398438 Z M 0.398438 27.398438 L 79 27.398438 L 79 27.601563 L 0.398438 27.601563 Z M 0.398438 27.601563 L 79.101563 27.601563 L 79.101563 27.800781 L 0.398438 27.800781 Z M 0.300781 27.800781 L 79.101563 27.800781 L 79.101563 28.199219 L 0.300781 28.199219 Z M 0.199219 28.199219 L 79.101563 28.199219 L 79.101563 28.398438 L 0.199219 28.398438 Z M 0.199219 28.398438 L 79.199219 28.398438 L 79.199219 29.199219 L 0.199219 29.199219 Z M 0.101563 29.199219 L 79.300781 29.199219 L 79.300781 30.101563 L 0.101563 30.101563 Z M 0.101563 30.101563 L 79.398438 30.101563 L 79.398438 30.199219 L 0.101563 30.199219 Z M 0 30.199219 L 79.398438 30.199219 L 79.398438 33.300781 L 0 33.300781 Z M 0 33.300781 L 79.300781 33.300781 L 79.300781 33.699219 L 0 33.699219 Z M 0.101563 33.699219 L 79.300781 33.699219 L 79.300781 34 L 0.101563 34 Z M 0.101563 34 L 79.199219 34 L 79.199219 34.398438 L 0.101563 34.398438 Z M 0.199219 34.398438 L 79.199219 34.398438 L 79.199219 34.699219 L 0.199219 34.699219 Z M 0.199219 34.699219 L 79.101563 34.699219 L 79.101563 35 L 0.199219 35 Z M 0.300781 35 L 79.101563 35 L 79.101563 35.398438 L 0.300781 35.398438 Z M 0.300781 35.398438 L 79 35.398438 L 79 35.699219 L 0.300781 35.699219 Z M 0.398438 35.699219 L 79 35.699219 L 79 36.101563 L 0.398438 36.101563 Z M 0.398438 36.101563 L 78.898438 36.101563 L 78.898438 36.300781 L 0.398438 36.300781 Z M 0.5 36.300781 L 78.898438 36.300781 L 78.898438 36.5 L 0.5 36.5 Z M 0.5 36.5 L 78.800781 36.5 L 78.800781 36.699219 L 0.5 36.699219 Z M 0.601563 36.699219 L 78.800781 36.699219 L 78.800781 36.800781 L 0.601563 36.800781 Z M 0.601563 36.800781 L 78.699219 36.800781 L 78.699219 37 L 0.601563 37 Z M 0.699219 37 L 78.699219 37 L 78.699219 37.199219 L 0.699219 37.199219 Z M 0.699219 37.199219 L 78.601563 37.199219 L 78.601563 37.398438 L 0.699219 37.398438 Z M 0.800781 37.398438 L 78.601563 37.398438 L 78.601563 37.601563 L 0.800781 37.601563 Z M 0.800781 37.601563 L 78.5 37.601563 L 78.5 37.699219 L 0.800781 37.699219 Z M 0.898438 37.699219 L 78.5 37.699219 L 78.5 37.898438 L 0.898438 37.898438 Z M 0.898438 37.898438 L 78.398438 37.898438 L 78.398438 38.101563 L 0.898438 38.101563 Z M 1 38.101563 L 78.398438 38.101563 L 78.398438 38.300781 L 1 38.300781 Z M 1 38.300781 L 78.300781 38.300781 L 78.300781 38.398438 L 1 38.398438 Z M 1.101563 38.398438 L 78.300781 38.398438 L 78.300781 38.699219 L 1.101563 38.699219 Z M 1.199219 38.699219 L 78.199219 38.699219 L 78.199219 39 L 1.199219 39 Z M 1.199219 39 L 78.101563 39 L 78.101563 39.101563 L 1.199219 39.101563 Z M 1.300781 39.101563 L 78.101563 39.101563 L 78.101563 39.199219 L 1.300781 39.199219 Z M 1.300781 39.199219 L 78 39.199219 L 78 39.300781 L 1.300781 39.300781 Z M 1.398438 39.300781 L 78 39.300781 L 78 39.5 L 1.398438 39.5 Z M 1.398438 39.5 L 77.898438 39.5 L 77.898438 39.601563 L 1.398438 39.601563 Z M 1.5 39.601563 L 77.898438 39.601563 L 77.898438 39.699219 L 1.5 39.699219 Z M 1.5 39.699219 L 77.800781 39.699219 L 77.800781 39.800781 L 1.5 39.800781 Z M 1.601563 39.800781 L 77.800781 39.800781 L 77.800781 40 L 1.601563 40 Z M 1.601563 40 L 77.699219 40 L 77.699219 40.101563 L 1.601563 40.101563 Z M 1.699219 40.101563 L 77.699219 40.101563 L 77.699219 40.199219 L 1.699219 40.199219 Z M 1.699219 40.199219 L 77.601563 40.199219 L 77.601563 40.300781 L 1.699219 40.300781 Z M 1.800781 40.300781 L 77.601563 40.300781 L 77.601563 40.5 L 1.800781 40.5 Z M 1.898438 40.5 L 77.5 40.5 L 77.5 40.800781 L 1.898438 40.800781 Z M 2 40.800781 L 77.398438 40.800781 L 77.398438 41 L 2 41 Z M 2.101563 41 L 77.300781 41 L 77.300781 41.199219 L 2.101563 41.199219 Z M 2.199219 41.199219 L 77.199219 41.199219 L 77.199219 41.398438 L 2.199219 41.398438 Z M 2.300781 41.398438 L 77.101563 41.398438 L 77.101563 41.601563 L 2.300781 41.601563 Z M 2.398438 41.601563 L 77 41.601563 L 77 41.699219 L 2.398438 41.699219 Z M 2.398438 41.699219 L 77.101563 41.699219 L 77.101563 41.800781 L 2.398438 41.800781 Z M 2.300781 41.800781 L 77.101563 41.800781 L 77.101563 41.898438 L 2.300781 41.898438 Z M 2.300781 41.898438 L 77.199219 41.898438 L 77.199219 42.101563 L 2.300781 42.101563 Z M 2.199219 42.101563 L 77.300781 42.101563 L 77.300781 42.300781 L 2.199219 42.300781 Z M 2.101563 42.300781 L 77.398438 42.300781 L 77.398438 42.5 L 2.101563 42.5 Z M 2 42.5 L 77.398438 42.5 L 77.398438 42.601563 L 2 42.601563 Z M 2 42.601563 L 77.5 42.601563 L 77.5 42.800781 L 2 42.800781 Z M 1.898438 42.800781 L 77.601563 42.800781 L 77.601563 43 L 1.898438 43 Z M 1.800781 43 L 77.601563 43 L 77.601563 43.101563 L 1.800781 43.101563 Z M 1.800781 43.101563 L 77.699219 43.101563 L 77.699219 43.300781 L 1.800781 43.300781 Z M 1.699219 43.300781 L 77.800781 43.300781 L 77.800781 43.5 L 1.699219 43.5 Z M 1.601563 43.5 L 77.800781 43.5 L 77.800781 43.601563 L 1.601563 43.601563 Z M 1.601563 43.601563 L 77.898438 43.601563 L 77.898438 43.699219 L 1.601563 43.699219 Z M 1.5 43.699219 L 77.898438 43.699219 L 77.898438 43.800781 L 1.5 43.800781 Z M 1.5 43.800781 L 78 43.800781 L 78 44 L 1.5 44 Z M 1.398438 44 L 78 44 L 78 44.101563 L 1.398438 44.101563 Z M 1.398438 44.101563 L 78.101563 44.101563 L 78.101563 44.199219 L 1.398438 44.199219 Z M 1.300781 44.199219 L 78.101563 44.199219 L 78.101563 44.300781 L 1.300781 44.300781 Z M 1.300781 44.300781 L 78.199219 44.300781 L 78.199219 44.601563 L 1.300781 44.601563 Z M 1.199219 44.601563 L 78.199219 44.601563 L 78.199219 44.699219 L 1.199219 44.699219 Z M 1.199219 44.699219 L 78.300781 44.699219 L 78.300781 44.898438 L 1.199219 44.898438 Z M 1.101563 44.898438 L 78.300781 44.898438 L 78.300781 45 L 1.101563 45 Z M 1.101563 45 L 78.398438 45 L 78.398438 45.199219 L 1.101563 45.199219 Z M 1 45.199219 L 78.398438 45.199219 L 78.398438 45.300781 L 1 45.300781 Z M 1 45.300781 L 78.5 45.300781 L 78.5 45.601563 L 1 45.601563 Z M 0.898438 45.601563 L 78.5 45.601563 L 78.5 45.699219 L 0.898438 45.699219 Z M 0.898438 45.699219 L 78.601563 45.699219 L 78.601563 45.898438 L 0.898438 45.898438 Z M 0.800781 45.898438 L 78.601563 45.898438 L 78.601563 46 L 0.800781 46 Z M 0.800781 46 L 78.699219 46 L 78.699219 46.199219 L 0.800781 46.199219 Z M 0.699219 46.199219 L 78.699219 46.199219 L 78.699219 46.300781 L 0.699219 46.300781 Z M 0.699219 46.300781 L 78.800781 46.300781 L 78.800781 46.601563 L 0.699219 46.601563 Z M 0.601563 46.601563 L 78.800781 46.601563 L 78.800781 46.699219 L 0.601563 46.699219 Z M 0.601563 46.699219 L 78.898438 46.699219 L 78.898438 46.898438 L 0.601563 46.898438 Z M 0.5 46.898438 L 78.898438 46.898438 L 78.898438 47.101563 L 0.5 47.101563 Z M 0.5 47.101563 L 79 47.101563 L 79 47.398438 L 0.5 47.398438 Z M 0.398438 47.398438 L 79 47.398438 L 79 47.699219 L 0.398438 47.699219 Z M 0.398438 47.699219 L 79.101563 47.699219 L 79.101563 48 L 0.398438 48 Z M 0.300781 48 L 79.101563 48 L 79.101563 48.199219 L 0.300781 48.199219 Z M 0.300781 48.199219 L 79.199219 48.199219 L 79.199219 48.601563 L 0.300781 48.601563 Z M 0.199219 48.601563 L 79.199219 48.601563 L 79.199219 48.800781 L 0.199219 48.800781 Z M 0.199219 48.800781 L 79.300781 48.800781 L 79.300781 49.101563 L 0.199219 49.101563 Z M 0.101563 49.101563 L 79.300781 49.101563 L 79.300781 49.398438 L 0.101563 49.398438 Z M 0.101563 49.398438 L 79.398438 49.398438 L 79.398438 50.199219 L 0.101563 50.199219 Z M 0 50.199219 L 79.398438 50.199219 L 79.398438 51 L 0 51 Z M 0 51 L 79.5 51 L 79.5 52.898438 L 0 52.898438 Z M 0 52.898438 L 79.398438 52.898438 L 79.398438 53.398438 L 0 53.398438 Z M 0.101563 53.398438 L 79.398438 53.398438 L 79.398438 54.101563 L 0.101563 54.101563 Z M 0.101563 54.101563 L 79.300781 54.101563 L 79.300781 54.601563 L 0.101563 54.601563 Z M 0.199219 54.601563 L 79.300781 54.601563 L 79.300781 55 L 0.199219 55 Z M 0.199219 55 L 79.199219 55 L 79.199219 55.199219 L 0.199219 55.199219 Z M 0.300781 55.199219 L 79.199219 55.199219 L 79.199219 55.5 L 0.300781 55.5 Z M 0.300781 55.5 L 79.101563 55.5 L 79.101563 55.699219 L 0.300781 55.699219 Z M 0.398438 55.699219 L 79.101563 55.699219 L 79.101563 55.898438 L 0.398438 55.898438 Z M 0.398438 55.898438 L 79 55.898438 L 79 56.101563 L 0.398438 56.101563 Z M 0.5 56.101563 L 79 56.101563 L 79 56.398438 L 0.5 56.398438 Z M 0.5 56.398438 L 78.898438 56.398438 L 78.898438 56.601563 L 0.5 56.601563 Z M 0.601563 56.601563 L 78.898438 56.601563 L 78.898438 56.800781 L 0.601563 56.800781 Z M 0.601563 56.800781 L 78.800781 56.800781 L 78.800781 57 L 0.601563 57 Z M 0.699219 57 L 78.800781 57 L 78.800781 57.300781 L 0.699219 57.300781 Z M 0.699219 57.300781 L 78.699219 57.300781 L 78.699219 57.5 L 0.699219 57.5 Z M 0.800781 57.5 L 78.699219 57.5 L 78.699219 57.601563 L 0.800781 57.601563 Z M 0.800781 57.601563 L 78.601563 57.601563 L 78.601563 57.699219 L 0.800781 57.699219 Z M 0.898438 57.699219 L 78.601563 57.699219 L 78.601563 57.898438 L 0.898438 57.898438 Z M 0.898438 57.898438 L 78.5 57.898438 L 78.5 58 L 0.898438 58 Z M 1 58 L 78.5 58 L 78.5 58.199219 L 1 58.199219 Z M 1 58.199219 L 78.398438 58.199219 L 78.398438 58.300781 L 1 58.300781 Z M 1.101563 58.300781 L 78.398438 58.300781 L 78.398438 58.5 L 1.101563 58.5 Z M 1.101563 58.5 L 78.300781 58.5 L 78.300781 58.601563 L 1.101563 58.601563 Z M 1.199219 58.601563 L 78.300781 58.601563 L 78.300781 58.699219 L 1.199219 58.699219 Z M 1.199219 58.699219 L 78.199219 58.699219 L 78.199219 58.800781 L 1.199219 58.800781 Z M 1.300781 58.800781 L 78.199219 58.800781 L 78.199219 59 L 1.300781 59 Z M 1.300781 59 L 78.101563 59 L 78.101563 59.101563 L 1.300781 59.101563 Z M 1.398438 59.101563 L 78.101563 59.101563 L 78.101563 59.300781 L 1.398438 59.300781 Z M 1.398438 59.300781 L 78 59.300781 L 78 59.398438 L 1.398438 59.398438 Z M 1.5 59.398438 L 78 59.398438 L 78 59.601563 L 1.5 59.601563 Z M 1.5 59.601563 L 77.898438 59.601563 L 77.898438 59.699219 L 1.5 59.699219 Z M 1.601563 59.699219 L 77.898438 59.699219 L 77.898438 59.800781 L 1.601563 59.800781 Z M 1.601563 59.800781 L 77.800781 59.800781 L 77.800781 59.898438 L 1.601563 59.898438 Z M 1.699219 59.898438 L 77.800781 59.898438 L 77.800781 60.101563 L 1.699219 60.101563 Z M 1.699219 60.101563 L 77.699219 60.101563 L 77.699219 60.199219 L 1.699219 60.199219 Z M 1.800781 60.199219 L 77.699219 60.199219 L 77.699219 60.300781 L 1.800781 60.300781 Z M 1.800781 60.300781 L 77.601563 60.300781 L 77.601563 60.398438 L 1.800781 60.398438 Z M 1.898438 60.398438 L 77.601563 60.398438 L 77.601563 60.5 L 1.898438 60.5 Z M 1.898438 60.5 L 77.5 60.5 L 77.5 60.601563 L 1.898438 60.601563 Z M 2 60.601563 L 77.5 60.601563 L 77.5 60.699219 L 2 60.699219 Z M 2 60.699219 L 77.398438 60.699219 L 77.398438 60.800781 L 2 60.800781 Z M 2.101563 60.800781 L 77.398438 60.800781 L 77.398438 60.898438 L 2.101563 60.898438 Z M 2.101563 60.898438 L 77.300781 60.898438 L 77.300781 61 L 2.101563 61 Z M 2.199219 61 L 77.300781 61 L 77.300781 61.101563 L 2.199219 61.101563 Z M 2.199219 61.101563 L 77.199219 61.101563 L 77.199219 61.199219 L 2.199219 61.199219 Z M 2.300781 61.199219 L 77.199219 61.199219 L 77.199219 61.300781 L 2.300781 61.300781 Z M 2.300781 61.300781 L 77.101563 61.300781 L 77.101563 61.398438 L 2.300781 61.398438 Z M 2.398438 61.398438 L 77.101563 61.398438 L 77.101563 61.5 L 2.398438 61.5 Z M 2.398438 61.5 L 77 61.5 L 77 61.601563 L 2.398438 61.601563 Z M 2.5 61.601563 L 77 61.601563 L 77 61.699219 L 2.5 61.699219 Z M 2.5 61.699219 L 76.898438 61.699219 L 76.898438 61.800781 L 2.5 61.800781 Z M 2.601563 61.800781 L 76.898438 61.800781 L 76.898438 61.898438 L 2.601563 61.898438 Z M 2.601563 61.898438 L 76.800781 61.898438 L 76.800781 62 L 2.601563 62 Z M 2.699219 62 L 76.800781 62 L 76.800781 62.101563 L 2.699219 62.101563 Z M 2.699219 62.101563 L 76.699219 62.101563 L 76.699219 62.199219 L 2.699219 62.199219 Z M 2.800781 62.199219 L 76.699219 62.199219 L 76.699219 62.300781 L 2.800781 62.300781 Z M 2.898438 62.300781 L 76.601563 62.300781 L 76.601563 62.398438 L 2.898438 62.398438 Z M 2.898438 62.398438 L 76.5 62.398438 L 76.5 62.5 L 2.898438 62.5 Z M 3 62.5 L 76.5 62.5 L 76.5 62.601563 L 3 62.601563 Z M 3 62.601563 L 76.398438 62.601563 L 76.398438 62.699219 L 3 62.699219 Z M 3.101563 62.699219 L 76.398438 62.699219 L 76.398438 62.800781 L 3.101563 62.800781 Z M 3.199219 62.800781 L 76.300781 62.800781 L 76.300781 62.898438 L 3.199219 62.898438 Z M 3.199219 62.898438 L 76.199219 62.898438 L 76.199219 63 L 3.199219 63 Z M 3.300781 63 L 76.199219 63 L 76.199219 63.101563 L 3.300781 63.101563 Z M 3.300781 63.101563 L 76.101563 63.101563 L 76.101563 63.199219 L 3.300781 63.199219 Z M 3.398438 63.199219 L 76.101563 63.199219 L 76.101563 63.300781 L 3.398438 63.300781 Z M 3.5 63.300781 L 76 63.300781 L 76 63.398438 L 3.5 63.398438 Z M 3.5 63.398438 L 75.898438 63.398438 L 75.898438 63.5 L 3.5 63.5 Z M 3.601563 63.5 L 75.898438 63.5 L 75.898438 63.601563 L 3.601563 63.601563 Z M 3.699219 63.601563 L 75.800781 63.601563 L 75.800781 63.699219 L 3.699219 63.699219 Z M 3.800781 63.699219 L 75.699219 63.699219 L 75.699219 63.800781 L 3.800781 63.800781 Z M 3.800781 63.800781 L 75.601563 63.800781 L 75.601563 63.898438 L 3.800781 63.898438 Z M 3.898438 63.898438 L 75.601563 63.898438 L 75.601563 64 L 3.898438 64 Z M 4 64 L 75.5 64 L 75.5 64.101563 L 4 64.101563 Z M 4 64.101563 L 75.398438 64.101563 L 75.398438 64.199219 L 4 64.199219 Z M 4.101563 64.199219 L 75.398438 64.199219 L 75.398438 64.300781 L 4.101563 64.300781 Z M 4.199219 64.300781 L 75.300781 64.300781 L 75.300781 64.398438 L 4.199219 64.398438 Z M 4.300781 64.398438 L 75.199219 64.398438 L 75.199219 64.5 L 4.300781 64.5 Z M 4.300781 64.5 L 75.101563 64.5 L 75.101563 64.601563 L 4.300781 64.601563 Z M 4.398438 64.601563 L 75.101563 64.601563 L 75.101563 64.699219 L 4.398438 64.699219 Z M 4.5 64.699219 L 75 64.699219 L 75 64.800781 L 4.5 64.800781 Z M 4.5 64.800781 L 74.898438 64.800781 L 74.898438 64.898438 L 4.5 64.898438 Z M 4.601563 64.898438 L 74.898438 64.898438 L 74.898438 65 L 4.601563 65 Z M 4.699219 65 L 74.800781 65 L 74.800781 65.101563 L 4.699219 65.101563 Z M 4.800781 65.101563 L 74.699219 65.101563 L 74.699219 65.199219 L 4.800781 65.199219 Z M 4.898438 65.199219 L 74.601563 65.199219 L 74.601563 65.300781 L 4.898438 65.300781 Z M 4.898438 65.300781 L 74.5 65.300781 L 74.5 65.398438 L 4.898438 65.398438 Z M 5 65.398438 L 74.398438 65.398438 L 74.398438 65.5 L 5 65.5 Z M 5.101563 65.5 L 74.300781 65.5 L 74.300781 65.601563 L 5.101563 65.601563 Z M 5.199219 65.601563 L 74.300781 65.601563 L 74.300781 65.699219 L 5.199219 65.699219 Z M 5.300781 65.699219 L 74.199219 65.699219 L 74.199219 65.800781 L 5.300781 65.800781 Z M 5.398438 65.800781 L 74.101563 65.800781 L 74.101563 65.898438 L 5.398438 65.898438 Z M 5.5 65.898438 L 74 65.898438 L 74 66 L 5.5 66 Z M 5.601563 66 L 73.898438 66 L 73.898438 66.101563 L 5.601563 66.101563 Z M 5.699219 66.101563 L 73.800781 66.101563 L 73.800781 66.199219 L 5.699219 66.199219 Z M 5.699219 66.199219 L 73.699219 66.199219 L 73.699219 66.300781 L 5.699219 66.300781 Z M 5.800781 66.300781 L 73.601563 66.300781 L 73.601563 66.398438 L 5.800781 66.398438 Z M 5.898438 66.398438 L 73.601563 66.398438 L 73.601563 66.5 L 5.898438 66.5 Z M 6 66.5 L 73.5 66.5 L 73.5 66.601563 L 6 66.601563 Z M 6.101563 66.601563 L 73.398438 66.601563 L 73.398438 66.699219 L 6.101563 66.699219 Z M 6.199219 66.699219 L 73.300781 66.699219 L 73.300781 66.800781 L 6.199219 66.800781 Z M 6.300781 66.800781 L 73.199219 66.800781 L 73.199219 66.898438 L 6.300781 66.898438 Z M 6.398438 66.898438 L 73.101563 66.898438 L 73.101563 67 L 6.398438 67 Z M 6.398438 67 L 73 67 L 73 67.101563 L 6.398438 67.101563 Z M 6.601563 67.101563 L 72.898438 67.101563 L 72.898438 67.199219 L 6.601563 67.199219 Z M 6.699219 67.199219 L 72.800781 67.199219 L 72.800781 67.300781 L 6.699219 67.300781 Z M 6.800781 67.300781 L 72.699219 67.300781 L 72.699219 67.398438 L 6.800781 67.398438 Z M 6.898438 67.398438 L 72.601563 67.398438 L 72.601563 67.5 L 6.898438 67.5 Z M 7 67.5 L 72.5 67.5 L 72.5 67.601563 L 7 67.601563 Z M 7.101563 67.601563 L 72.398438 67.601563 L 72.398438 67.699219 L 7.101563 67.699219 Z M 7.199219 67.699219 L 72.199219 67.699219 L 72.199219 67.800781 L 7.199219 67.800781 Z M 7.300781 67.800781 L 72.101563 67.800781 L 72.101563 67.898438 L 7.300781 67.898438 Z M 7.5 67.898438 L 72 67.898438 L 72 68 L 7.5 68 Z M 7.601563 68 L 71.898438 68 L 71.898438 68.101563 L 7.601563 68.101563 Z M 7.699219 68.101563 L 71.800781 68.101563 L 71.800781 68.199219 L 7.699219 68.199219 Z M 7.800781 68.199219 L 71.699219 68.199219 L 71.699219 68.300781 L 7.800781 68.300781 Z M 7.898438 68.300781 L 71.601563 68.300781 L 71.601563 68.398438 L 7.898438 68.398438 Z M 8 68.398438 L 71.398438 68.398438 L 71.398438 68.5 L 8 68.5 Z M 8.101563 68.5 L 71.300781 68.5 L 71.300781 68.601563 L 8.101563 68.601563 Z M 8.300781 68.601563 L 71.199219 68.601563 L 71.199219 68.699219 L 8.300781 68.699219 Z M 8.398438 68.699219 L 71.101563 68.699219 L 71.101563 68.800781 L 8.398438 68.800781 Z M 8.5 68.800781 L 71 68.800781 L 71 68.898438 L 8.5 68.898438 Z M 8.601563 68.898438 L 70.800781 68.898438 L 70.800781 69 L 8.601563 69 Z M 8.800781 69 L 70.699219 69 L 70.699219 69.101563 L 8.800781 69.101563 Z M 8.898438 69.101563 L 70.5 69.101563 L 70.5 69.199219 L 8.898438 69.199219 Z M 9.101563 69.199219 L 70.398438 69.199219 L 70.398438 69.300781 L 9.101563 69.300781 Z M 9.199219 69.300781 L 70.199219 69.300781 L 70.199219 69.398438 L 9.199219 69.398438 Z M 9.398438 69.398438 L 70.101563 69.398438 L 70.101563 69.5 L 9.398438 69.5 Z M 9.5 69.5 L 69.898438 69.5 L 69.898438 69.601563 L 9.5 69.601563 Z M 9.699219 69.601563 L 69.800781 69.601563 L 69.800781 69.699219 L 9.699219 69.699219 Z M 9.800781 69.699219 L 69.601563 69.699219 L 69.601563 69.800781 L 9.800781 69.800781 Z M 10 69.800781 L 69.5 69.800781 L 69.5 69.898438 L 10 69.898438 Z M 10.101563 69.898438 L 69.300781 69.898438 L 69.300781 70 L 10.101563 70 Z M 10.300781 70 L 69.199219 70 L 69.199219 70.101563 L 10.300781 70.101563 Z M 10.398438 70.101563 L 69 70.101563 L 69 70.199219 L 10.398438 70.199219 Z M 10.601563 70.199219 L 68.898438 70.199219 L 68.898438 70.300781 L 10.601563 70.300781 Z M 10.800781 70.300781 L 68.699219 70.300781 L 68.699219 70.398438 L 10.800781 70.398438 Z M 11 70.398438 L 68.5 70.398438 L 68.5 70.5 L 11 70.5 Z M 11.199219 70.5 L 68.300781 70.5 L 68.300781 70.601563 L 11.199219 70.601563 Z M 11.398438 70.601563 L 68.101563 70.601563 L 68.101563 70.699219 L 11.398438 70.699219 Z M 11.601563 70.699219 L 67.898438 70.699219 L 67.898438 70.800781 L 11.601563 70.800781 Z M 11.800781 70.800781 L 67.699219 70.800781 L 67.699219 70.898438 L 11.800781 70.898438 Z M 12 70.898438 L 67.5 70.898438 L 67.5 71 L 12 71 Z M 12.199219 71 L 67.300781 71 L 67.300781 71.101563 L 12.199219 71.101563 Z M 12.398438 71.101563 L 67.101563 71.101563 L 67.101563 71.199219 L 12.398438 71.199219 Z M 12.601563 71.199219 L 66.898438 71.199219 L 66.898438 71.300781 L 12.601563 71.300781 Z M 12.800781 71.300781 L 66.699219 71.300781 L 66.699219 71.398438 L 12.800781 71.398438 Z M 13 71.398438 L 66.5 71.398438 L 66.5 71.5 L 13 71.5 Z M 13.199219 71.5 L 66.199219 71.5 L 66.199219 71.601563 L 13.199219 71.601563 Z M 13.5 71.601563 L 66 71.601563 L 66 71.699219 L 13.5 71.699219 Z M 13.800781 71.699219 L 65.699219 71.699219 L 65.699219 71.800781 L 13.800781 71.800781 Z M 14.101563 71.800781 L 65.398438 71.800781 L 65.398438 71.898438 L 14.101563 71.898438 Z M 14.398438 71.898438 L 65.101563 71.898438 L 65.101563 72 L 14.398438 72 Z M 14.601563 72 L 64.800781 72 L 64.800781 72.101563 L 14.601563 72.101563 Z M 14.898438 72.101563 L 64.601563 72.101563 L 64.601563 72.199219 L 14.898438 72.199219 Z M 15.199219 72.199219 L 64.300781 72.199219 L 64.300781 72.300781 L 15.199219 72.300781 Z M 15.5 72.300781 L 64 72.300781 L 64 72.398438 L 15.5 72.398438 Z M 15.898438 72.398438 L 63.601563 72.398438 L 63.601563 72.5 L 15.898438 72.5 Z M 16.300781 72.5 L 63.199219 72.5 L 63.199219 72.601563 L 16.300781 72.601563 Z M 16.699219 72.601563 L 62.800781 72.601563 L 62.800781 72.699219 L 16.699219 72.699219 Z M 17.199219 72.699219 L 62.300781 72.699219 L 62.300781 72.800781 L 17.199219 72.800781 Z M 17.601563 72.800781 L 61.898438 72.800781 L 61.898438 72.898438 L 17.601563 72.898438 Z M 18 72.898438 L 61.5 72.898438 L 61.5 73 L 18 73 Z M 18.5 73 L 61 73 L 61 73.101563 L 18.5 73.101563 Z M 19.199219 73.101563 L 60.300781 73.101563 L 60.300781 73.199219 L 19.199219 73.199219 Z M 19.898438 73.199219 L 59.601563 73.199219 L 59.601563 73.300781 L 19.898438 73.300781 Z M 20.800781 73.300781 L 58.800781 73.300781 L 58.800781 73.398438 L 20.800781 73.398438 Z M 21.101563 73.398438 L 58.398438 73.398438 L 58.398438 73.5 L 21.101563 73.5 Z M 21.199219 73.5 L 58.300781 73.5 L 58.300781 73.601563 L 21.199219 73.601563 Z M 21.300781 73.601563 L 58.300781 73.601563 L 58.300781 73.699219 L 21.300781 73.699219 Z M 21.300781 73.699219 L 58.199219 73.699219 L 58.199219 73.800781 L 21.300781 73.800781 Z M 21.398438 73.800781 L 58.101563 73.800781 L 58.101563 73.898438 L 21.398438 73.898438 Z M 21.5 73.898438 L 58 73.898438 L 58 74.101563 L 21.5 74.101563 Z M 21.601563 74.101563 L 57.898438 74.101563 L 57.898438 74.199219 L 21.601563 74.199219 Z M 21.699219 74.199219 L 57.800781 74.199219 L 57.800781 74.300781 L 21.699219 74.300781 Z M 21.800781 74.300781 L 57.699219 74.300781 L 57.699219 74.398438 L 21.800781 74.398438 Z M 21.898438 74.398438 L 57.699219 74.398438 L 57.699219 74.5 L 21.898438 74.5 Z M 21.898438 74.5 L 57.601563 74.5 L 57.601563 74.601563 L 21.898438 74.601563 Z M 22 74.601563 L 57.5 74.601563 L 57.5 74.699219 L 22 74.699219 Z M 22.101563 74.699219 L 57.398438 74.699219 L 57.398438 74.800781 L 22.101563 74.800781 Z M 22.199219 74.800781 L 57.300781 74.800781 L 57.300781 74.898438 L 22.199219 74.898438 Z M 22.300781 74.898438 L 57.300781 74.898438 L 57.300781 75 L 22.300781 75 Z M 22.398438 75 L 57.199219 75 L 57.199219 75.101563 L 22.398438 75.101563 Z M 22.398438 75.101563 L 57.101563 75.101563 L 57.101563 75.199219 L 22.398438 75.199219 Z M 22.5 75.199219 L 57 75.199219 L 57 75.300781 L 22.5 75.300781 Z M 22.601563 75.300781 L 56.898438 75.300781 L 56.898438 75.398438 L 22.601563 75.398438 Z M 22.699219 75.398438 L 56.898438 75.398438 L 56.898438 75.5 L 22.699219 75.5 Z M 22.800781 75.5 L 56.800781 75.5 L 56.800781 75.601563 L 22.800781 75.601563 Z M 22.800781 75.601563 L 56.699219 75.601563 L 56.699219 75.699219 L 22.800781 75.699219 Z M 22.898438 75.699219 L 56.601563 75.699219 L 56.601563 75.800781 L 22.898438 75.800781 Z M 23 75.800781 L 56.5 75.800781 L 56.5 75.898438 L 23 75.898438 Z M 23.101563 75.898438 L 56.398438 75.898438 L 56.398438 76 L 23.101563 76 Z M 23.199219 76 L 56.300781 76 L 56.300781 76.101563 L 23.199219 76.101563 Z M 23.300781 76.101563 L 56.199219 76.101563 L 56.199219 76.199219 L 23.300781 76.199219 Z M 23.398438 76.199219 L 56.101563 76.199219 L 56.101563 76.300781 L 23.398438 76.300781 Z M 23.5 76.300781 L 56 76.300781 L 56 76.398438 L 23.5 76.398438 Z M 23.601563 76.398438 L 55.898438 76.398438 L 55.898438 76.5 L 23.601563 76.5 Z M 23.699219 76.5 L 55.800781 76.5 L 55.800781 76.601563 L 23.699219 76.601563 Z M 23.800781 76.601563 L 55.699219 76.601563 L 55.699219 76.699219 L 23.800781 76.699219 Z M 23.898438 76.699219 L 55.601563 76.699219 L 55.601563 76.800781 L 23.898438 76.800781 Z M 24 76.800781 L 55.5 76.800781 L 55.5 76.898438 L 24 76.898438 Z M 24.101563 76.898438 L 55.398438 76.898438 L 55.398438 77 L 24.101563 77 Z M 24.199219 77 L 55.300781 77 L 55.300781 77.101563 L 24.199219 77.101563 Z M 24.300781 77.101563 L 55.199219 77.101563 L 55.199219 77.199219 L 24.300781 77.199219 Z M 24.398438 77.199219 L 55.101563 77.199219 L 55.101563 77.300781 L 24.398438 77.300781 Z M 24.5 77.300781 L 55 77.300781 L 55 77.398438 L 24.5 77.398438 Z M 24.601563 77.398438 L 54.898438 77.398438 L 54.898438 77.5 L 24.601563 77.5 Z M 24.699219 77.5 L 54.800781 77.5 L 54.800781 77.601563 L 24.699219 77.601563 Z M 24.800781 77.601563 L 54.699219 77.601563 L 54.699219 77.699219 L 24.800781 77.699219 Z M 24.898438 77.699219 L 54.601563 77.699219 L 54.601563 77.800781 L 24.898438 77.800781 Z M 25 77.800781 L 54.5 77.800781 L 54.5 77.898438 L 25 77.898438 Z M 25.199219 77.898438 L 54.398438 77.898438 L 54.398438 78 L 25.199219 78 Z M 25.300781 78 L 54.199219 78 L 54.199219 78.101563 L 25.300781 78.101563 Z M 25.398438 78.101563 L 54.101563 78.101563 L 54.101563 78.199219 L 25.398438 78.199219 Z M 25.601563 78.199219 L 54 78.199219 L 54 78.300781 L 25.601563 78.300781 Z M 25.699219 78.300781 L 53.898438 78.300781 L 53.898438 78.398438 L 25.699219 78.398438 Z M 25.800781 78.398438 L 53.699219 78.398438 L 53.699219 78.5 L 25.800781 78.5 Z M 25.898438 78.5 L 53.601563 78.5 L 53.601563 78.601563 L 25.898438 78.601563 Z M 26.101563 78.601563 L 53.5 78.601563 L 53.5 78.699219 L 26.101563 78.699219 Z M 26.199219 78.699219 L 53.300781 78.699219 L 53.300781 78.800781 L 26.199219 78.800781 Z M 26.300781 78.800781 L 53.199219 78.800781 L 53.199219 78.898438 L 26.300781 78.898438 Z M 26.5 78.898438 L 53.101563 78.898438 L 53.101563 79 L 26.5 79 Z M 26.601563 79 L 53 79 L 53 79.101563 L 26.601563 79.101563 Z M 26.699219 79.101563 L 52.800781 79.101563 L 52.800781 79.199219 L 26.699219 79.199219 Z M 26.800781 79.199219 L 52.699219 79.199219 L 52.699219 79.300781 L 26.800781 79.300781 Z M 27 79.300781 L 52.601563 79.300781 L 52.601563 79.398438 L 27 79.398438 Z M 27.101563 79.398438 L 52.5 79.398438 L 52.5 79.5 L 27.101563 79.5 Z M 27.300781 79.5 L 52.300781 79.5 L 52.300781 79.601563 L 27.300781 79.601563 Z M 27.398438 79.601563 L 52.101563 79.601563 L 52.101563 79.699219 L 27.398438 79.699219 Z M 27.601563 79.699219 L 52 79.699219 L 52 79.800781 L 27.601563 79.800781 Z M 27.800781 79.800781 L 51.800781 79.800781 L 51.800781 79.898438 L 27.800781 79.898438 Z M 27.898438 79.898438 L 51.601563 79.898438 L 51.601563 80 L 27.898438 80 Z M 28.101563 80 L 51.5 80 L 51.5 80.101563 L 28.101563 80.101563 Z M 28.300781 80.101563 L 51.300781 80.101563 L 51.300781 80.199219 L 28.300781 80.199219 Z M 28.398438 80.199219 L 51.101563 80.199219 L 51.101563 80.300781 L 28.398438 80.300781 Z M 28.601563 80.300781 L 51 80.300781 L 51 80.398438 L 28.601563 80.398438 Z M 28.800781 80.398438 L 50.800781 80.398438 L 50.800781 80.5 L 28.800781 80.5 Z M 28.898438 80.5 L 50.601563 80.5 L 50.601563 80.601563 L 28.898438 80.601563 Z M 29.101563 80.601563 L 50.5 80.601563 L 50.5 80.699219 L 29.101563 80.699219 Z M 29.300781 80.699219 L 50.300781 80.699219 L 50.300781 80.800781 L 29.300781 80.800781 Z M 29.398438 80.800781 L 50.101563 80.800781 L 50.101563 80.898438 L 29.398438 80.898438 Z M 29.699219 80.898438 L 49.898438 80.898438 L 49.898438 81 L 29.699219 81 Z M 29.898438 81 L 49.699219 81 L 49.699219 81.101563 L 29.898438 81.101563 Z M 30.101563 81.101563 L 49.398438 81.101563 L 49.398438 81.199219 L 30.101563 81.199219 Z M 30.300781 81.199219 L 49.199219 81.199219 L 49.199219 81.300781 L 30.300781 81.300781 Z M 30.601563 81.300781 L 49 81.300781 L 49 81.398438 L 30.601563 81.398438 Z M 30.800781 81.398438 L 48.800781 81.398438 L 48.800781 81.5 L 30.800781 81.5 Z M 31 81.5 L 48.5 81.5 L 48.5 81.601563 L 31 81.601563 Z M 31.199219 81.601563 L 48.300781 81.601563 L 48.300781 81.699219 L 31.199219 81.699219 Z M 31.5 81.699219 L 48.101563 81.699219 L 48.101563 81.800781 L 31.5 81.800781 Z M 31.699219 81.800781 L 47.898438 81.800781 L 47.898438 81.898438 L 31.699219 81.898438 Z M 31.898438 81.898438 L 47.601563 81.898438 L 47.601563 82 L 31.898438 82 Z M 32.199219 82 L 47.300781 82 L 47.300781 82.101563 L 32.199219 82.101563 Z M 32.601563 82.101563 L 47 82.101563 L 47 82.199219 L 32.601563 82.199219 Z M 32.898438 82.199219 L 46.699219 82.199219 L 46.699219 82.300781 L 32.898438 82.300781 Z M 33.199219 82.300781 L 46.300781 82.300781 L 46.300781 82.398438 L 33.199219 82.398438 Z M 33.601563 82.398438 L 46 82.398438 L 46 82.5 L 33.601563 82.5 Z M 33.898438 82.5 L 45.699219 82.5 L 45.699219 82.601563 L 33.898438 82.601563 Z M 34.199219 82.601563 L 45.398438 82.601563 L 45.398438 82.699219 L 34.199219 82.699219 Z M 34.601563 82.699219 L 45 82.699219 L 45 82.800781 L 34.601563 82.800781 Z M 35.199219 82.800781 L 44.398438 82.800781 L 44.398438 82.898438 L 35.199219 82.898438 Z M 35.699219 82.898438 L 43.800781 82.898438 L 43.800781 83 L 35.699219 83 Z M 35.699219 82.898438 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 21.125 73.324219 C 13.355469 72.679688 7.09375 69.34375 3.054688 62.535156 C -0.972656 55.746094 -0.863281 48.714844 2.476563 41.734375 C -4.851563 27.527344 4.976563 10.921875 21.15625 9.945313 C 25.621094 3.542969 31.828125 0 39.746094 0.00390625 C 47.613281 0.00390625 53.789063 3.519531 58.273438 9.898438 C 73.777344 10.5 84.339844 26.648438 76.964844 41.648438 C 80.308594 48.652344 80.453125 55.726563 76.398438 62.558594 C 72.359375 69.371094 66.074219 72.671875 58.382813 73.328125 C 49.472656 86.59375 30.175781 86.65625 21.125 73.324219 Z M 21.125 73.324219 "/>
-</clipPath>
-<image id="image5" width="398" height="208" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg=="/>
-</defs>
-<g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<use xlink:href="#image5" transform="matrix(0.2,0,0,-0.4,0,83.3)"/>
-</g>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.714844 68.582031 C 42.746094 68.59375 45.347656 66.761719 46.320313 63.929688 C 47.265625 61.171875 46.332031 58.199219 43.9375 56.332031 C 43.449219 55.953125 42.933594 55.589844 42.523438 55.132813 C 40.144531 52.5 41.367188 48.5625 44.8125 47.707031 C 47.679688 46.992188 50.15625 48.957031 50.546875 52.246094 C 51.050781 56.460938 54.773438 59.203125 58.898438 58.390625 C 62.804688 57.625 65.25 53.617188 64.132813 49.804688 C 62.996094 45.929688 58.773438 43.933594 54.839844 45.410156 C 54.300781 45.609375 53.769531 45.847656 53.214844 45.988281 C 51.296875 46.476563 49.273438 45.710938 48.175781 44.125 C 47.121094 42.601563 47.128906 40.640625 48.191406 39.136719 C 49.335938 37.515625 51.273438 36.792969 53.230469 37.296875 C 53.871094 37.464844 54.480469 37.746094 55.109375 37.960938 C 58.304688 39.066406 61.757813 37.84375 63.429688 35.023438 C 65.066406 32.265625 64.558594 28.78125 62.214844 26.636719 C 59.746094 24.375 55.996094 24.183594 53.273438 26.199219 C 51.519531 27.496094 50.75 29.300781 50.519531 31.4375 C 50.261719 33.792969 48.585938 35.410156 46.277344 35.714844 C 44.429688 35.953125 42.40625 34.769531 41.65625 33.011719 C 40.792969 30.984375 41.425781 28.824219 43.3125 27.34375 C 43.695313 27.042969 44.09375 26.757813 44.449219 26.425781 C 47.296875 23.722656 47.355469 19.386719 44.589844 16.703125 C 41.75 13.9375 37.09375 14.132813 34.492188 17.125 C 31.921875 20.074219 32.390625 24.445313 35.519531 26.902344 C 36.078125 27.335938 36.652344 27.773438 37.105469 28.304688 C 38.402344 29.816406 38.527344 31.972656 37.480469 33.628906 C 36.429688 35.289063 34.460938 36.074219 32.511719 35.558594 C 29.980469 34.890625 29.15625 32.988281 28.796875 30.613281 C 28.179688 26.550781 24.324219 24.035156 20.347656 24.992188 C 16.480469 25.917969 14.210938 29.890625 15.414063 33.628906 C 16.640625 37.445313 20.875 39.371094 24.675781 37.855469 C 25.292969 37.613281 25.914063 37.34375 26.558594 37.226563 C 29.195313 36.734375 31.585938 38.425781 32.019531 41.039063 C 32.410156 43.378906 30.664063 45.824219 28.160156 46.03125 C 26.949219 46.132813 25.636719 45.722656 24.449219 45.316406 C 20.636719 44 16.515625 45.964844 15.363281 49.742188 C 14.21875 53.511719 16.5 57.425781 20.382813 58.34375 C 24.289063 59.265625 28.097656 56.78125 28.820313 52.828125 C 28.914063 52.304688 28.964844 51.769531 29.078125 51.253906 C 29.589844 48.996094 31.714844 47.398438 33.957031 47.566406 C 36.1875 47.730469 37.933594 49.425781 38.125 51.683594 C 38.292969 53.710938 37.25 55.097656 35.683594 56.25 C 33.113281 58.136719 32.191406 61.015625 33.140625 63.882813 C 34.074219 66.699219 36.695313 68.570313 39.714844 68.582031 Z M 25.773438 65.414063 C 18.71875 66.613281 13.148438 64.601563 9.441406 58.484375 C 6.882813 54.265625 6.554688 47.328125 11.746094 41.675781 C 7.125 36.164063 6.03125 30.171875 9.984375 23.855469 C 13.101563 18.871094 17.695313 17.203125 25.726563 17.765625 C 28.097656 11.304688 32.671875 7.417969 39.710938 7.40625 C 46.703125 7.394531 51.273438 11.207031 53.726563 17.753906 C 61.207031 16.59375 67.246094 18.796875 70.578125 25.90625 C 73.25 31.597656 71.835938 36.882813 67.703125 41.597656 C 72.414063 47.171875 73.421875 53.183594 69.367188 59.527344 C 66.261719 64.390625 61.414063 66.136719 53.691406 65.445313 C 51.363281 71.957031 46.730469 75.816406 39.722656 75.8125 C 32.765625 75.804688 28.144531 72 25.773438 65.414063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 120.390625 19.523438 C 114.488281 19.523438 109.761719 21.257813 106.210938 24.730469 C 102.65625 28.203125 100.882813 32.691406 100.882813 38.199219 C 100.882813 43.675781 102.507813 47.976563 105.757813 51.097656 C 109.007813 54.21875 113.453125 55.777344 119.09375 55.777344 C 124.179688 55.777344 129.050781 54.792969 132.472656 52.820313 L 132.472656 35.8125 L 116.941406 35.8125 L 116.941406 42.117188 L 124.578125 42.117188 L 124.578125 48.34375 C 123.46875 48.882813 121.351563 49.152344 119.460938 49.152344 C 116.316406 49.152344 113.816406 48.167969 111.96875 46.195313 C 110.117188 44.222656 109.191406 41.4375 109.191406 37.835938 C 109.191406 34.28125 110.222656 31.441406 112.285156 29.316406 C 114.347656 27.1875 117.015625 26.125 120.292969 26.125 C 124.203125 26.125 128.128906 26.90625 130.835938 28.472656 L 130.835938 21.0625 C 128 20.035156 124.105469 19.523438 120.390625 19.523438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 150.328125 29.078125 C 145.996094 29.078125 142.558594 30.265625 140.015625 32.644531 C 137.476563 35.023438 136.203125 38.316406 136.203125 42.527344 C 136.203125 46.605469 137.429688 49.832031 139.878906 52.210938 C 142.328125 54.589844 145.695313 55.777344 149.976563 55.777344 C 154.324219 55.777344 157.75 54.550781 160.25 52.097656 C 162.75 49.644531 164 46.304688 164 42.078125 C 164 38.167969 162.785156 35.023438 160.363281 32.644531 C 157.9375 30.265625 154.59375 29.078125 150.328125 29.078125 M 150.226563 49.761719 C 146.246094 49.761719 144.257813 47.316406 144.257813 42.425781 C 144.257813 40.089844 144.773438 38.285156 145.8125 37.007813 C 146.847656 35.730469 148.304688 35.09375 150.175781 35.09375 C 154.007813 35.09375 155.921875 37.472656 155.921875 42.226563 C 155.921875 47.25 154.023438 49.761719 150.226563 49.761719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 195.0625 29.078125 C 190.730469 29.078125 187.296875 30.265625 184.753906 32.644531 C 182.210938 35.023438 180.941406 38.316406 180.941406 42.527344 C 180.941406 46.605469 182.164063 49.832031 184.613281 52.210938 C 187.0625 54.589844 190.429688 55.777344 194.710938 55.777344 C 199.058594 55.777344 202.484375 54.550781 204.984375 52.097656 C 207.484375 49.644531 208.734375 46.304688 208.734375 42.078125 C 208.734375 38.167969 207.523438 35.023438 205.097656 32.644531 C 202.671875 30.265625 199.328125 29.078125 195.0625 29.078125 M 194.964844 49.761719 C 190.980469 49.761719 188.992188 47.316406 188.992188 42.425781 C 188.992188 40.089844 189.511719 38.285156 190.546875 37.007813 C 191.585938 35.730469 193.039063 35.09375 194.910156 35.09375 C 198.742188 35.09375 200.65625 37.472656 200.65625 42.226563 C 200.65625 47.25 198.757813 49.761719 194.964844 49.761719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 186.8125 20.109375 L 158.324219 20.109375 L 158.324219 27.15625 L 168.273438 27.15625 L 168.273438 55.167969 L 176.8125 55.167969 L 176.8125 27.15625 L 186.8125 27.15625 L 186.8125 20.109375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 252.660156 21.027344 L 249.078125 21.027344 L 241.414063 48.199219 L 240.472656 48.199219 L 232.703125 21.027344 L 230.476563 21.027344 L 222.074219 48.015625 L 221.140625 48.015625 L 213.175781 21.027344 L 209.46875 21.027344 L 219.789063 54.71875 L 223.183594 54.71875 L 230.773438 28.675781 L 231.726563 28.675781 L 239.3125 54.71875 L 242.339844 54.71875 L 252.660156 21.027344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 262.359375 29.722656 C 255.773438 29.722656 251.175781 35.128906 251.175781 42.875 C 251.175781 50.4375 255.675781 55.136719 262.925781 55.136719 C 266.257813 55.136719 268.585938 54.003906 270.128906 53.257813 C 270.269531 53.191406 270.402344 53.125 270.53125 53.0625 L 270.59375 50.234375 C 268.957031 51.429688 266.410156 52.570313 263.542969 52.570313 C 257.984375 52.570313 254.605469 49.105469 254.507813 43.300781 L 254.5 42.796875 L 272.054688 42.796875 C 272.105469 42.363281 272.15625 41.808594 272.15625 41.148438 C 272.15625 39.976563 271.882813 29.722656 262.359375 29.722656 M 254.503906 40.492188 L 254.5625 39.941406 C 255.007813 36.003906 257.480469 32.027344 262 32.027344 C 263.910156 32.027344 265.472656 32.628906 266.636719 33.816406 C 268.683594 35.898438 268.789063 39.082031 268.773438 40.007813 L 268.761719 40.492188 L 254.503906 40.492188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 280.101563 21.027344 L 276.613281 21.027344 L 276.613281 48.78125 C 276.613281 50.8125 276.527344 53.085938 276.4375 54.71875 L 279.355469 54.71875 L 279.472656 52.359375 C 279.472656 52.359375 282.339844 55.617188 288.148438 55.863281 C 288.261719 55.867188 288.371094 55.871094 288.484375 55.871094 C 293.539063 55.871094 299.191406 51.078125 299.191406 42.449219 C 299.21875 38.535156 298.425781 34.558594 296.222656 32.339844 C 294.464844 30.570313 291.765625 29.085938 289.1875 29.085938 C 282.464844 29.085938 280.101563 33.082031 280.101563 33.082031 L 280.101563 21.027344 M 287.613281 53.144531 C 284.15625 53.144531 281.285156 50.449219 280.316406 46.972656 C 280.214844 46.457031 280.101563 45.851563 280.101563 45.230469 L 280.101563 40.753906 C 280.101563 40.09375 280.222656 39.511719 280.320313 39.042969 L 280.378906 38.773438 C 281.328125 35.230469 283.164063 32.382813 287.816406 32.382813 C 293.273438 32.382813 295.652344 36.089844 295.652344 42.605469 C 295.652344 48.71875 292.507813 53.144531 287.613281 53.144531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 304.757813 19.878906 C 303.402344 19.878906 302.421875 20.859375 302.421875 22.214844 C 302.421875 23.515625 303.378906 24.5 304.652344 24.5 C 305.402344 24.5 306.027344 24.261719 306.464844 23.808594 C 306.855469 23.402344 307.0625 22.84375 307.039063 22.214844 C 307.039063 20.816406 306.121094 19.878906 304.757813 19.878906 M 306.527344 30.234375 L 302.988281 30.234375 L 302.988281 54.71875 L 306.527344 54.71875 L 306.527344 30.234375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 322.257813 29.394531 L 321.144531 29.433594 C 317.097656 29.433594 313.972656 32.90625 313.972656 32.90625 L 313.800781 29.414063 L 310.78125 29.414063 C 310.898438 31.203125 310.953125 33.859375 310.953125 36.410156 L 310.953125 54.71875 L 314.492188 54.71875 L 314.492188 39.601563 C 314.492188 38.730469 314.613281 37.917969 314.820313 37.34375 C 315.578125 34.867188 317.898438 32.363281 321.367188 32.363281 C 325.402344 32.363281 327.621094 35.152344 327.621094 40.21875 L 327.621094 54.71875 L 331.164063 54.71875 L 331.164063 39.703125 C 331.164063 30.085938 323.644531 29.394531 322.257813 29.394531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 344.070313 29.414063 C 341.179688 29.414063 337.847656 30.222656 335.921875 32.257813 L 335.890625 36.183594 C 337.757813 34.253906 341.183594 32.257813 343.457031 32.257813 C 347.425781 32.257813 349.558594 34.109375 349.558594 38.226563 L 349.558594 39.59375 L 348.839844 39.589844 C 339.644531 39.589844 333.996094 42.746094 333.996094 48.53125 C 333.996094 51.695313 336.355469 55.960938 340.902344 55.960938 C 341.070313 55.960938 341.238281 55.957031 341.410156 55.945313 C 345.65625 55.65625 347.578125 54.8125 348.703125 53.226563 C 349.039063 52.75 349.96875 51.695313 349.96875 51.695313 L 350.28125 54.71875 L 353.371094 54.71875 C 353.105469 52.851563 353.046875 50.535156 353.046875 48.847656 L 353.046875 39.332031 C 353.046875 32.75 350.027344 29.414063 344.070313 29.414063 M 342.890625 52.597656 C 339.992188 52.597656 337.25 51.59375 337.25 48.613281 C 337.25 45.769531 339.972656 42.683594 348.496094 42.683594 C 348.742188 42.683594 349.660156 42.683594 349.660156 42.683594 L 349.660156 46.375 C 349.660156 46.867188 349.558594 47.445313 349.378906 48.003906 C 348.667969 50.121094 346.546875 52.597656 342.890625 52.597656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.799561%,0.799561%,0.799561%);fill-opacity:1;" d="M 366.945313 29.351563 C 362.777344 29.351563 361.476563 32.382813 361.476563 32.382813 L 360.4375 32.382813 L 360.28125 29.980469 L 357.324219 29.980469 C 357.445313 32.003906 357.5 34.277344 357.5 37.257813 L 357.5 54.71875 L 360.988281 54.71875 L 360.988281 41.117188 C 360.988281 40.3125 361.066406 38.621094 361.183594 37.984375 C 361.636719 35.511719 363.617188 32.078125 366.929688 32.078125 C 367.132813 32.078125 367.339844 32.09375 367.554688 32.125 C 368.5625 32.269531 369.417969 32.769531 370 33.125 L 370 30.03125 C 369.886719 29.992188 369.757813 29.945313 369.621094 29.898438 C 369.152344 29.730469 368.273438 29.414063 368.015625 29.414063 C 367.640625 29.371094 367.28125 29.351563 366.945313 29.351563 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85"><defs><clipPath id="a"><path d="M36.602.102h6.296v.097h-6.296zm-.5.097h7.296v.102h-7.296zM35.5.301H44v.097h-8.5zm-.602.097H44.5V.5h-9.602zm-.5.102h10.704v.102H34.398zm-.5.102H45.5v.097H33.898zm-.296.097h12.296v.102H33.602zM33.3.801h12.898v.097H33.301zM33 .898h13.5V1H33zM32.7 1h14.1v.102H32.7zm-.4.102h14.802v.097H32.3zm-.3.097h15.398v.102H32zm-.3.102h16.1v.097H31.7zm-.302.097H48V1.5H31.398zM31.2 1.5h17.102v.102H31.199zM31 1.602h17.5v.097H31zm-.2.097h17.9v.102H30.8zm-.198.102h18.296v.097H30.602zm-.301.097h18.8V2h-18.8zM30.1 2h19.2v.102H30.1zm-.203.102h19.704v.097H29.898zm-.199.097h20.102v.102H29.699zm-.199.102H50v.097H29.5zm-.2.097h20.9V2.5H29.3zm-.198.102h21.296v.102H29.102zm-.204.102h21.704v.097H28.898zm-.199.097h22v.102h-22zm-.097.102h22.296v.097H28.602zm-.204.097H51V3H28.398zM28.301 3h22.898v.102H28.301zm-.2.102h23.2v.097H28.1zm-.203.097H51.5v.102H27.898zm-.097.102h23.898v.097H27.801zm-.2.097h24.2V3.5H27.6zM27.5 3.5H52v.102H27.5zm-.2.102h24.802v.097H27.3zm-.1.097h25.1v.102H27.2zm-.2.102h25.5v.097H27zm-.2.097h25.802V4H26.8zM26.7 4h26v.102h-26zm-.098.102h26.296v.097H26.602zm-.102.097H53v.102H26.5zm-.102.102h26.704v.097H26.398zm-.199.097h27V4.5h-27zm-.097.102H53.3v.102H26.1zM26 4.602h27.5v.097H26zm-.102.097h27.704v.102H25.898zm-.199.102h28v.097h-28zm-.097.097H53.8V5H25.6zM25.5 5H54v.102H25.5zm-.102.102h28.704v.097H25.398zm-.097.097h28.898v.102H25.301zm-.2.102h29.2v.097H25.1zM25 5.398h29.398V5.5H25zm-.102.102h29.704v.102H24.898zm-.097.102h29.898v.097H24.801zm-.102.097h30.102v.102H24.699zm-.097.102h30.296v.097H24.602zm-.102.097H55V6H24.5zM24.398 6h30.704v.102H24.398zm-.097.102h30.898v.097H24.301zm-.102.097h31.102v.102H24.199zm-.097.102h31.296v.097H24.102zM24 6.398h31.5V6.5H24zm-.102.102h31.704v.102H23.898zm-.097.102h31.898v.097H23.801zm-.102.097h32v.102h-32zm-.097.102H55.8v.097H23.6zm-.102.097h32.398V7H23.5zM23.398 7H56v.102H23.398zm-.097.102h32.8v.097h-32.8zm-.102.097h33v.102h-33zm-.097.102H56.3v.097H23.1zM23 7.398h33.398V7.5H23zm-.102.102H56.5v.102H22.898zm-.097.102h33.8v.097h-33.8zm0 .097h33.898v.102H22.801zm-.102.102h34.102v.097H22.699zm-.097.097h34.296V8H22.602zM22.5 8h34.398v.102H22.5zm-.102.102H57v.097H22.398zm0 .097h34.704v.102H22.398zm-.097.102h34.898v.097H22.301zm-.102.097h35.102V8.5H22.199zm-.097.102H57.3v.102H22.1zM22 8.602h35.398v.097H22zm0 .097h35.5v.102H22zm-.102.102h35.704v.097H21.898zm-.097.097h35.898V9H21.801zM21.699 9h36v.102h-36zm-.097.102H57.8v.097H21.6zm0 .097h36.296v.102H21.602zm-.102.102H58v.097H21.5zm-.102.097H58V9.5H21.398zm-.097.102h36.8v.102h-36.8zm0 .102h36.898v.097H21.301zm-.102.097h37.102v.102H21.199zm-.097.102h37.296v.097H21.102zm-.801.097h39.3V10h-39.3zm-.7.102h40.797v.102H19.602zm-.703.102H61.2v.097H18.9zm-.699.097h43.403v.102H18.199zm-.398.102h44.3v.097h-44.3zm-.403.097H62.5v.102H17.398zM17 10.5h45.898v.102H17zm-.398.102h46.796v.097H16.602zm-.403.097h47.602v.102H16.199zm-.398.102h48.3v.097h-48.3zm-.403.097h49V11h-49zm-.296.102h49.5v.102h-49.5zm-.204.102h50v.097h-50zm-.296.097h50.597v.102H14.602zm-.204.102h51v.097h-51zm-.296.097h51.597v.102H14.102zm-.301.102H66v.102H13.8zm-.2.102h52.7v.097H13.6zm-.3.097H66.5v.102H13.3zm-.2.102H66.7v.097H13.102zm-.3.097h54.097V12H12.801zm-.2.102h54.5v.102h-54.5zm-.203.102h54.903v.097H12.398zm-.199.097H67.5v.102H12.2zm-.199.102h55.7v.097H12zm-.102.097h56v.102h-56zm-.199.102H68v.102H11.7zm-.199.102h56.7v.097H11.5zm-.2.097h57.098v.102H11.301zm-.198.102h57.5v.097h-57.5zm-.204.097h57.903V13H10.898zm-.097.102H69v.102H10.8zm-.2.102h58.5v.097h-58.5zm-.203.097h58.903v.102H10.398zm-.199.102h59.2v.097h-59.2zm-.097.097H69.5v.102H10.102zm-.204.102H69.7v.102H9.9zm-.097.102h60v.097h-60zm-.102.097H70v.102H9.7zm-.199.102h60.602v.097H9.5zm-.102.097h60.903V14H9.398zM9.2 14h61.2v.102h-61.2zm-.097.102h61.5v.097h-61.5zM9 14.199h61.7v.102H9zm-.2.102h62.098v.097H8.801zm-.1.097H71v.102H8.7zm-.2.102h62.602v.102H8.5zm-.102.102H71.2v.097H8.4zm-.097.097h63v.102h-63zm-.2.102H71.5v.097H8.102zM8 14.898h63.602V15H8zM7.898 15H71.7v.102H7.9zm-.097.102h64v.097h-64zm-.102.097h64.2v.102h-64.2zm-.097.102H72v.097H7.602zm-.102.097h64.602v.102H7.5zm-.2.102h65v.102h-65zm-.1.102h65.198v.097H7.2zm-.098.097H72.5v.102H7.102zM7 15.801h65.602v.097H7zm-.102.097H72.7V16H6.9zM6.801 16h66v.102h-66zm-.102.102h66.2v.097h-66.2zm-.097.097H73v.102H6.602zm-.102.102h66.602v.097H6.5zm-.102.097H73.2v.102H6.4zM6.2 16.5h67.102v.102H6.199zm-.097.102h67.296v.097H6.102zm0 .097H73.5v.102H6.102zM6 16.801h67.602v.097H6zm-.102.097H73.7V17H5.9zM5.801 17h67.898v.102H5.801zm-.102.102h68.102v.097H5.699zm-.097.097h68.296v.102H5.602zm-.102.102H74v.097H5.5zm0 .097h68.602v.102H5.5zm-.102.102H74.2v.102H5.4zm-.097.102h69v.097h-69zm-.102.097h69.2v.102h-69.2zm-.097.102H74.5v.097H5.102zM5 17.898h69.602V18H5zM4.898 18h69.704v.102H4.898zm-.097.102h69.898v.097H4.801zm0 .097h70v.102h-70zm-.102.102h70.2v.097h-70.2zm-.097.097h70.296v.102H4.602zM4.5 18.5H75v.102H4.5zm-.102.102h70.704v.097H4.398zm0 .097H75.2v.102H4.4zm-.097.102h70.898v.097H4.301zm-.102.097h71.102V19H4.199zM4.102 19h71.296v.2H4.102zM4 19.2h71.5v.1H4zm-.102.1h71.704v.2H3.898zm-.097.2h71.898v.102H3.801zm-.102.102h72.102v.199H3.699zm-.097.199h72.296v.097H3.602zm-.102.097H76V20H3.5zm0 .102h72.602v.102H3.5zm-.102.102h72.704v.097H3.398zm-.097.097h72.898v.102H3.301zm0 .102h73v.097h-73zm-.102.097h73.102v.102H3.199zm-.097.102h73.296v.2H3.102zM3 20.7h73.5v.1H3zm-.102.1H76.5v.098H2.898zm0 .098h73.704V21H2.898zM2.801 21h73.8v.102h-73.8zm0 .102h73.898v.097H2.801zm-.102.097h74v.102h-74zm0 .102h74.102v.097H2.699zm-.097.097H76.8v.102H2.6zm0 .102h74.296v.102H2.602zm-.102.102H77v.199H2.5zm-.102.199h74.704V22H2.398zM2.301 22h74.898v.2H2.301zm-.102.2h75.102v.198H2.199zm-.097.198h75.296v.204H2.102zM2 22.602h75.5v.199H2zm-.102.199h75.704V23H1.898zM1.801 23h75.8v.102h-75.8zm0 .102h75.898v.097H1.801zm-.102.097h76v.102h-76zm0 .102h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.2H1.5zm0 .2H78V24H1.5zM1.398 24H78v.102H1.398zm0 .102h76.704v.199H1.398zm-.097.199h76.8v.097h-76.8zm0 .097h76.898v.102H1.301zm-.102.102h77v.2h-77zm0 .2h77.102v.1H1.199zm-.097.1H78.3v.098H1.1zm0 .098h77.296v.204H1.102zM1 25.102h77.398v.097H1zm0 .097h77.5v.2H1zm-.102.2H78.5v.203H.898zm-.097.203h77.8V26H.802zM.8 26h77.898v.102H.801zm-.102.102h78v.296H.7zm0 .296h78.102v.102H.699zm-.097.102H78.8v.3H.6zm0 .3h78.296v.098H.602zm-.102.098h78.398v.301H.5zm0 .301H79v.2H.5zm-.102.2H79v.203H.398zm0 .203h78.704v.199H.398zm-.097.199h78.8v.398H.302zm-.102.398h78.903v.2H.199zm0 .2h79v.8H.2zm-.097.8H79.3v.903H.1zm0 .903h79.296v.097H.102zM0 30.199h79.398v3.102H0zm0 3.102h79.3v.398H0zm.102.398H79.3V34H.1zm0 .301h79.097v.398H.102zm.097.398h79v.301H.2zm0 .301h78.903V35H.199zM.301 35h78.8v.398H.302zm0 .398H79v.301H.3zm.097.301H79v.403H.398zm0 .403h78.5v.199H.398zM.5 36.3h78.398v.199H.5zm0 .199h78.3v.2H.5zm.102.2H78.8v.1H.6zm0 .1h78.097v.2H.602zm.097.2h78v.2H.7zm0 .2h77.903v.198H.699zm.102.198h77.8v.204H.802zm0 .204H78.5v.097H.8zm.097.097H78.5v.2H.898zm0 .2h77.5v.203H.898zm.102.203h77.398v.199H1zm0 .199h77.3v.097H1zm.102.097H78.3v.301H1.1zm.097.301h77V39h-77zm0 .301h76.903v.102H1.199zm.102.102h76.8v.097h-76.8zm0 .097H78v.102H1.3zm.097.102H78v.199H1.398zm0 .199h76.5v.102h-76.5zm.102.102h76.398v.097H1.5zm0 .097h76.3v.102H1.5zm.102.102H77.8V40H1.6zm0 .199h76.097v.102H1.602zm.097.102h76v.097h-76zm0 .097h75.903v.102H1.699zm.102.102h75.8v.199h-75.8zm.097.199H77.5v.3H1.898zm.102.3h75.398v.2H2zm.102.2H77.3v.2H2.1zm.097.2h75v.198h-75zm.102.198h74.8v.204h-74.8zm.097.204H77v.097H2.398zm0 .097h74.704v.102H2.398zm-.097.102h74.8v.097h-74.8zm0 .097h74.898v.204H2.301zm-.102.204h75.102v.199H2.199zm-.097.199h75.296v.199H2.102zM2 42.5h75.398v.102H2zm0 .102h75.5v.199H2zm-.102.199h75.704V43H1.898zM1.801 43h75.8v.102h-75.8zm0 .102h75.898v.199H1.801zm-.102.199h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.102H1.5zm0 .102H78V44H1.5zM1.398 44H78v.102H1.398zm0 .102h76.704v.097H1.398zm-.097.097h76.8v.102h-76.8zm0 .102h76.898v.3H1.301zm-.102.3h77v.098h-77zm0 .098h77.102v.2H1.199zm-.097.2H78.3V45H1.1zm0 .101h77.296v.2H1.102zM1 45.2h77.398v.1H1zm0 .1h77.5v.302H1zm-.102.302H78.5v.097H.898zm0 .097h77.704v.2H.898zm-.097.2h77.8V46H.802zM.8 46h77.898v.2H.801zm-.102.2h78v.1H.7zm0 .1h78.102v.302H.699zm-.097.302H78.8v.097H.6zm0 .097h78.296v.2H.602zm-.102.2h78.398v.203H.5zm0 .203H79v.296H.5zm-.102.296H79v.301H.398zm0 .301h78.704V48H.398zM.301 48h78.8v.2H.302zm0 .2h78.898v.402H.301zm-.102.402h79v.199H.2zm0 .199h79.102v.3H.199zm-.097.3H79.3v.297H.1zm0 .297h79.296v.801H.102zM0 50.2h79.398V51H0zM0 51h79.5v1.898H0zm0 1.898h79.398v.5H0zm.102.5h79.296v.704H.102zm0 .704H79.3v.5H.1zm.097.5h79.102V55H.199zM.2 55h79v.2H.2zm.102.2h78.898v.3H.301zm0 .3h78.8v.2H.302zm.097.2h78.704v.198H.398zm0 .198H79v.204H.398zm.102.204H79v.296H.5zm0 .296h78.398v.204H.5zm.102.204h78.296v.199H.602zm0 .199H78.8V57H.6zM.699 57h78.102v.3H.699zm0 .3h78v.2H.7zm.102.2h77.898v.102H.801zm0 .102h77.8v.097H.802zm.097.097h77.704v.2H.898zm0 .2H78.5V58H.898zM1 58h77.5v.2H1zm0 .2h77.398v.1H1zm.102.1h77.296v.2H1.102zm0 .2H78.3v.102H1.1zm.097.102h77.102v.097H1.199zm0 .097h77v.102h-77zm.102.102h76.898V59H1.301zm0 .199h76.8v.102h-76.8zm.097.102h76.704v.199H1.398zm0 .199H78v.097H1.398zm.102.097H78v.204H1.5zm0 .204h76.398v.097H1.5zm.102.097h76.296v.102H1.602zm0 .102H77.8v.097H1.6zm.097.097h76.102v.204H1.699zm0 .204h76v.097h-76zm.102.097h75.898v.102H1.801zm0 .102h75.8v.097h-75.8zm.097.097h75.704v.102H1.898zm0 .102H77.5v.102H1.898zm.102.102h75.5v.097H2zm0 .097h75.398v.102H2zm.102.102h75.296v.097H2.102zm0 .097H77.3V61H2.1zm.097.102h75.102v.102H2.199zm0 .102h75v.097h-75zm.102.097h74.898v.102H2.301zm0 .102h74.8v.097h-74.8zm.097.097h74.704v.102H2.398zm0 .102H77v.102H2.398zm.102.102H77v.097H2.5zm0 .097h74.398v.102H2.5zm.102.102h74.296v.097H2.602zm0 .097H76.8V62H2.6zm.097.102h74.102v.102H2.699zm0 .102h74v.097h-74zm.102.097h73.898v.102H2.801zm.097.102h73.704v.097H2.898zm0 .097H76.5v.102H2.898zM3 62.5h73.5v.102H3zm0 .102h73.398v.097H3zm.102.097h73.296v.102H3.102zm.097.102h73.102v.097H3.199zm0 .097h73V63h-73zm.102.102h72.898v.102H3.301zm0 .102h72.8v.097h-72.8zm.097.097h72.704v.102H3.398zm.102.102H76v.097H3.5zm0 .097h72.398v.102H3.5zm.102.102h72.296v.102H3.602zm.097.102h72.102v.097H3.699zm.102.097h71.898v.102H3.801zm0 .102h71.8v.097h-71.8zm.097.097h71.704V64H3.898zM4 64h71.5v.102H4zm0 .102h71.398v.097H4zm.102.097h71.296v.102H4.102zm.097.102h71.102v.097H4.199zm.102.097h70.898v.102H4.301zm0 .102h70.8v.102h-70.8zm.097.102h70.704v.097H4.398zm.102.097H75v.102H4.5zm0 .102h70.398v.097H4.5zm.102.097h70.296V65H4.602zm.097.102h70.102v.102H4.699zm.102.102h69.898v.097H4.801zm.097.097h69.704v.102H4.898zm0 .102H74.5v.097H4.898zm.102.097h69.398v.102H5zm.102.102H74.3v.102H5.1zm.097.102h69.102v.097H5.199zm.102.097h68.898v.102H5.301zm.097.102h68.704v.097H5.398zm.102.097H74V66H5.5zm.102.102h68.296v.102H5.602zm.097.102h68.102v.097H5.699zm0 .097h68v.102h-68zm.102.102h67.8v.097h-67.8zm.097.097h67.704v.102H5.898zM6 66.5h67.5v.102H6zm.102.102h67.296v.097H6.102zm.097.097h67.102v.102H6.199zm.102.102h66.898v.097H6.301zm.097.097h66.704V67H6.398zm0 .102H73v.102H6.398zm.204.102h66.296v.097H6.602zm.097.097h66.102v.102H6.699zm.102.102h65.898v.097H6.801zm.097.097h65.704v.102H6.898zM7 67.5h65.5v.102H7zm.102.102h65.296v.097H7.102zm.097.097h65v.102h-65zm.102.102h64.8v.097h-64.8zm.199.097H72V68H7.5zm.102.102h64.296v.102H7.602zm.097.102h64.102v.097H7.699zm.102.097h63.898v.102H7.801zm.097.102h63.704v.097H7.898zm.102.097h63.398v.102H8zm.102.102H71.3v.102H8.1zm.199.102h62.898v.097H8.301zm.097.097h62.704v.102H8.398zm.102.102H71v.097H8.5zm.102.097H70.8V69H8.6zM8.8 69h61.898v.102H8.801zm.097.102H70.5v.097H8.898zm.204.097h61.296v.102H9.102zm.097.102h61v.097h-61zm.2.097h60.703v.102H9.398zm.101.102h60.398v.102H9.5zm.2.102h60.1v.097H9.7zm.1.097h59.802v.102H9.8zm.2.102h59.5v.097H10zm.102.097H69.3V70H10.1zM10.3 70h58.898v.102H10.301zm.097.102H69v.097H10.398zm.204.097h58.296v.102H10.602zm.199.102h57.898v.097H10.801zm.199.097h57.5v.102H11zm.2.102h57.1v.102H11.2zm.198.102h56.704v.097H11.398zm.204.097h56.296v.102H11.602zm.199.102h55.898v.097H11.801zm.199.097h55.5V71H12zm.2.102h55.1v.102H12.2zm.198.102h54.704v.097H12.398zm.204.097h54.296v.102H12.602zm.199.102h53.898v.097H12.801zm.199.097h53.5v.102H13zm.2.102h53v.102h-53zm.3.102H66v.097H13.5zm.3.097h51.9v.102H13.8zm.302.102h51.296v.097H14.102zm.296.097h50.704V72H14.398zm.204.102H64.8v.102H14.6zm.296.102h49.704v.097H14.898zm.301.097h49.102v.102H15.199zm.301.102H64v.097H15.5zm.398.097h47.704v.102H15.898zm.403.102h46.898v.102H16.301zm.398.102h46.102v.097H16.699zm.5.097h45.102v.102H17.199zm.403.102h44.296v.097H17.602zm.398.097h43.5V73H18zm.5.102H61v.102H18.5zm.7.102h41.1v.097H19.2zm.698.097h39.704v.102H19.898zm.903.102h38v.097h-38zm.3.097h37.297v.102H21.102zm.098.102h37.102v.102H21.199zm.102.102h37v.097h-37zm0 .097h36.898v.102H21.301zm.097.102h36.704v.097H21.398zm.102.097H58v.204H21.5zm.102.204h36.296v.097H21.602zm.097.097h36.102v.102H21.699zm.102.102h35.898v.097H21.801zm.097.097H57.7v.102H21.9zm0 .102h35.704v.102H21.898zm.102.102h35.5v.097H22zm.102.097h35.296v.102H22.102zm.097.102h35.102v.097H22.199zm.102.097h35V75h-35zm.097.102H57.2v.102H22.4zm0 .102h34.704v.097H22.398zm.102.097H57v.102H22.5zm.102.102h34.296v.097H22.602zm.097.097h34.2v.102h-34.2zm.102.102h34v.102h-34zm0 .102h33.898v.097H22.801zm.097.097h33.704v.102H22.898zm.102.102h33.5v.097H23zm.102.097h33.296V76H23.102zm.097.102h33.102v.102H23.199zm.102.102h32.898v.097H23.301zm.097.097h32.704v.102H23.398zm.102.102H56v.097H23.5zm.102.097h32.296v.102H23.602zm.097.102h32.102v.102H23.699zm.102.102h31.898v.097H23.801zm.097.097h31.704v.102H23.898zm.102.102h31.5v.097H24zm.102.097h31.296V77H24.102zm.097.102h31.102v.102H24.199zm.102.102h30.898v.097H24.301zm.097.097h30.704v.102H24.398zm.102.102H55v.097H24.5zm.102.097h30.296v.102H24.602zm.097.102h30.102v.102H24.699zm.102.102h29.898v.097H24.801zm.097.097h29.704v.102H24.898zm.102.102h29.5v.097H25zm.2.097h29.198V78H25.2zm.1.102h28.9v.102H25.3zm.098.102h28.704v.097H25.398zm.204.097H54v.102H25.602zm.097.102h28.2v.097h-28.2zm.102.097h27.898v.102H25.801zm.097.102h27.704v.102H25.898zm.204.102H53.5v.097H26.102zm.097.097h27.102v.102H26.199zm.102.102h26.898v.097H26.301zm.199.097h26.602V79H26.5zm.102.102H53v.102H26.602zm.097.102h26.102v.097H26.699zm.102.097h25.898v.102H26.801zm.199.102h25.602v.097H27zm.102.097H52.5v.102H27.102zm.199.102h25v.102h-25zm.097.102h24.704v.097H27.398zm.204.097H52v.102H27.602zm.199.102h24v.097h-24zm.097.097h23.704V80H27.898zm.204.102H51.5v.102H28.102zm.199.102h23v.097h-23zm.097.097h22.704v.102H28.398zm.204.102H51v.097H28.602zm.199.097h22v.102h-22zm.097.102h21.704v.102H28.898zm.204.102H50.5v.097H29.102zm.199.097h21v.102h-21zm.097.102h20.704v.097H29.398zm.301.097h20.2V81h-20.2zm.2.102h19.8v.102H29.9zm.203.102h19.296v.097H30.102zm.199.097h18.898v.102H30.301zm.3.102H49v.097H30.602zm.2.097h18v.102h-18zM31 81.5h17.5v.102H31zm.2.102h17.1v.097H31.2zm.3.097h16.602v.102H31.5zm.2.102h16.198v.097H31.7zm.198.097h15.704V82H31.898zM32.2 82h15.102v.102H32.199zm.403.102H47v.097H32.602zm.296.097H46.7v.102H32.9zm.301.102h13.102v.097H33.199zm.403.097H46v.102H33.602zm.296.102H45.7v.102H33.9zm.301.102h11.2v.097h-11.2zm.403.097H45v.102H34.602zm.597.102h9.2v.097h-9.2zm.5.097h8.102V83h-8.102zm0 0"/></clipPath><clipPath id="b"><path d="M21.125 73.324c-7.77-.644-14.031-3.98-18.07-10.789-4.028-6.789-3.918-13.82-.578-20.8-7.329-14.208 2.5-30.813 18.68-31.79C25.62 3.543 31.827 0 39.746.004c7.866 0 14.042 3.516 18.526 9.894 15.504.602 26.067 16.75 18.692 31.75 3.344 7.004 3.488 14.079-.567 20.91-4.039 6.813-10.324 10.114-18.015 10.77-8.91 13.266-28.207 13.328-37.258-.004zm0 0"/></clipPath><image id="c" width="398" height="208" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg=="/></defs><g clip-path="url(#a)"><g clip-path="url(#b)"><use xlink:href="#c" transform="matrix(.2 0 0 -.4 0 83.3)"/></g></g><path style="stroke:none;fill-rule:nonzero;fill:#fff;fill-opacity:1" d="M39.715 68.582c3.031.012 5.633-1.82 6.605-4.652.946-2.758.012-5.73-2.383-7.598-.488-.379-1.003-.742-1.414-1.2-2.378-2.632-1.156-6.57 2.29-7.425 2.867-.715 5.343 1.25 5.734 4.54.504 4.214 4.226 6.956 8.351 6.144 3.907-.766 6.352-4.774 5.235-8.586-1.137-3.875-5.36-5.871-9.293-4.395-.54.2-1.07.438-1.625.578-1.918.489-3.942-.277-5.04-1.863a4.315 4.315 0 0 1 .016-4.988c1.145-1.621 3.082-2.344 5.04-1.84.64.168 1.25.45 1.878.664 3.196 1.105 6.649-.117 8.32-2.938 1.637-2.757 1.13-6.242-1.214-8.386-2.469-2.262-6.219-2.453-8.942-.438-1.753 1.297-2.523 3.102-2.753 5.238-.258 2.356-1.934 3.973-4.243 4.278-1.847.238-3.87-.945-4.62-2.703-.864-2.028-.231-4.188 1.656-5.668.382-.301.78-.586 1.136-.918 2.848-2.703 2.906-7.04.14-9.723-2.839-2.765-7.495-2.57-10.097.422-2.57 2.95-2.101 7.32 1.028 9.777.558.434 1.132.871 1.585 1.403a4.484 4.484 0 0 1 .375 5.324c-1.05 1.66-3.02 2.445-4.968 1.93-2.532-.668-3.356-2.57-3.715-4.946-.617-4.062-4.473-6.578-8.45-5.62-3.867.925-6.136 4.898-4.933 8.636 1.227 3.816 5.461 5.742 9.262 4.226.617-.242 1.238-.511 1.883-.628 2.636-.493 5.027 1.199 5.46 3.812.391 2.34-1.355 4.785-3.859 4.992-1.21.102-2.523-.308-3.71-.715-3.813-1.316-7.934.649-9.087 4.426-1.144 3.77 1.137 7.684 5.02 8.602a6.91 6.91 0 0 0 8.437-5.516c.094-.523.145-1.058.258-1.574.512-2.258 2.637-3.856 4.879-3.688 2.23.164 3.977 1.86 4.168 4.118.168 2.027-.875 3.414-2.441 4.566-2.57 1.887-3.493 4.766-2.543 7.633.933 2.816 3.554 4.687 6.574 4.699zm-13.942-3.168c-7.054 1.2-12.625-.812-16.332-6.93-2.558-4.218-2.886-11.156 2.305-16.808-4.621-5.512-5.715-11.504-1.762-17.82 3.118-4.985 7.711-6.653 15.743-6.09 2.37-6.461 6.945-10.348 13.984-10.36 6.992-.011 11.562 3.801 14.016 10.348 7.48-1.16 13.52 1.043 16.851 8.152 2.672 5.692 1.258 10.977-2.875 15.692 4.711 5.574 5.719 11.586 1.664 17.93-3.105 4.863-7.953 6.609-15.676 5.917-2.328 6.512-6.96 10.371-13.968 10.368-6.957-.008-11.578-3.813-13.95-10.399"/><path style="stroke:none;fill-rule:nonzero;fill:#020202;fill-opacity:1" d="M120.39 19.523c-5.902 0-10.628 1.735-14.18 5.207-3.554 3.473-5.327 7.961-5.327 13.47 0 5.476 1.625 9.777 4.875 12.898 3.25 3.12 7.695 4.68 13.336 4.68 5.086 0 9.957-.985 13.379-2.958V35.812H116.94v6.305h7.637v6.227c-1.11.539-3.226.808-5.117.808-3.145 0-5.645-.984-7.492-2.957-1.852-1.972-2.778-4.758-2.778-8.36 0-3.554 1.032-6.394 3.094-8.519 2.063-2.128 4.73-3.191 8.008-3.191 3.91 0 7.836.781 10.543 2.348v-7.41c-2.836-1.028-6.73-1.54-10.445-1.54M150.328 29.078c-4.332 0-7.77 1.188-10.312 3.567-2.54 2.378-3.813 5.671-3.813 9.882 0 4.078 1.227 7.305 3.676 9.684 2.45 2.379 5.816 3.566 10.098 3.566 4.347 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.215-7.055-3.637-9.433-2.425-2.38-5.77-3.567-10.035-3.567m-.101 20.684c-3.98 0-5.97-2.446-5.97-7.336 0-2.336.516-4.14 1.555-5.418 1.036-1.278 2.493-1.914 4.364-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.899 7.535-5.695 7.535M195.063 29.078c-4.333 0-7.766 1.188-10.31 3.567-2.542 2.378-3.812 5.671-3.812 9.882 0 4.078 1.223 7.305 3.672 9.684 2.45 2.379 5.817 3.566 10.098 3.566 4.348 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.21-7.055-3.636-9.433-2.426-2.38-5.77-3.567-10.036-3.567m-.097 20.684c-3.985 0-5.973-2.446-5.973-7.336 0-2.336.52-4.14 1.555-5.418 1.039-1.278 2.492-1.914 4.363-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.898 7.535-5.691 7.535"/><path style="stroke:none;fill-rule:nonzero;fill:#020202;fill-opacity:1" d="M186.813 20.11h-28.489v7.046h9.95v28.012h8.538V27.156h10V20.11M252.66 21.027h-3.582L241.414 48.2h-.941l-7.77-27.172h-2.226l-8.403 26.989h-.933l-7.965-26.989h-3.707l10.32 33.692h3.395l7.59-26.043h.953l7.585 26.043h3.028l10.32-33.692M262.36 29.723c-6.587 0-11.184 5.406-11.184 13.152 0 7.563 4.5 12.262 11.75 12.262 3.332 0 5.66-1.133 7.203-1.88.14-.066.273-.132.402-.194l.063-2.829c-1.637 1.196-4.184 2.336-7.051 2.336-5.559 0-8.938-3.465-9.035-9.27l-.008-.503h17.555c.05-.434.101-.988.101-1.649 0-1.171-.273-11.425-9.797-11.425m-7.855 10.77.059-.552c.445-3.937 2.917-7.914 7.437-7.914 1.91 0 3.473.602 4.637 1.79 2.047 2.081 2.152 5.265 2.136 6.19l-.011.485h-14.258M280.102 21.027h-3.489v27.754a115.5 115.5 0 0 1-.175 5.938h2.917l.118-2.36s2.867 3.258 8.675 3.504c.114.004.223.008.336.008 5.055 0 10.707-4.793 10.707-13.422.028-3.914-.765-7.89-2.968-10.11-1.758-1.769-4.457-3.253-7.036-3.253-6.722 0-9.085 3.996-9.085 3.996V21.027m7.511 32.118c-3.457 0-6.328-2.696-7.297-6.172-.101-.516-.214-1.121-.214-1.743v-4.476c0-.66.12-1.242.218-1.711l.059-.27c.95-3.543 2.785-6.39 7.437-6.39 5.457 0 7.836 3.707 7.836 10.222 0 6.114-3.144 10.54-8.039 10.54M304.758 19.879c-1.356 0-2.336.98-2.336 2.336 0 1.3.957 2.285 2.23 2.285.75 0 1.375-.238 1.813-.691.39-.407.598-.965.574-1.594 0-1.399-.918-2.336-2.281-2.336m1.77 10.355h-3.54V54.72h3.54V30.234M322.258 29.395l-1.113.039c-4.047 0-7.172 3.472-7.172 3.472l-.172-3.492h-3.02c.117 1.79.172 4.445.172 6.996V54.72h3.54V39.602c0-.872.12-1.684.327-2.258.758-2.477 3.078-4.98 6.547-4.98 4.035 0 6.254 2.788 6.254 7.855v14.5h3.543V39.703c0-9.617-7.52-10.308-8.906-10.308M344.07 29.414c-2.89 0-6.222.809-8.148 2.844l-.031 3.926c1.867-1.93 5.293-3.926 7.566-3.926 3.969 0 6.102 1.851 6.102 5.969v1.367l-.72-.004c-9.194 0-14.843 3.156-14.843 8.941 0 3.164 2.36 7.43 6.906 7.43.168 0 .336-.004.508-.016 4.246-.289 6.168-1.133 7.293-2.718.336-.477 1.266-1.532 1.266-1.532l.312 3.024h3.09c-.266-1.867-.324-4.184-.324-5.871v-9.516c0-6.582-3.02-9.918-8.977-9.918m-1.18 23.184c-2.898 0-5.64-1.004-5.64-3.985 0-2.843 2.723-5.93 11.246-5.93h1.164v3.692c0 .492-.101 1.07-.281 1.629-.711 2.117-2.832 4.594-6.488 4.594M366.945 29.352c-4.168 0-5.468 3.03-5.468 3.03h-1.04l-.156-2.402h-2.957c.121 2.024.176 4.297.176 7.278v17.46h3.488v-13.6c0-.806.078-2.497.196-3.134.453-2.472 2.433-5.906 5.746-5.906.203 0 .41.016.625.047 1.007.145 1.863.645 2.445 1v-3.094c-.113-.039-.242-.086-.379-.133-.469-.168-1.348-.484-1.605-.484a9.433 9.433 0 0 0-1.07-.062"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Analytics/analytics.svg b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
index bc9386a1af..2a22a4e7c5 100644
--- a/packages/nodes-base/nodes/Google/Analytics/analytics.svg
+++ b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="192px" height="192px" viewBox="0 0 192 192" enable-background="new 0 0 192 192" xml:space="preserve">
-<rect x="0" y="0" fill="none" width="192" height="192"/>
-<g>
-	<g>
-		<path fill="#F9AB00" d="M130,29v132c0,14.77,10.19,23,21,23c10,0,21-7,21-23V30c0-13.54-10-22-21-22S130,17.33,130,29z"/>
-	</g>
-	<g>
-		<path fill="#E37400" d="M75,96v65c0,14.77,10.19,23,21,23c10,0,21-7,21-23V97c0-13.54-10-22-21-22S75,84.33,75,96z"/>
-	</g>
-	<g>
-		<circle fill="#E37400" cx="41" cy="163" r="21"/>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" xml:space="preserve"><path fill="none" d="M0 0h192v192H0z"/><path fill="#F9AB00" d="M130 29v132c0 14.77 10.19 23 21 23 10 0 21-7 21-23V30c0-13.54-10-22-21-22s-21 9.33-21 21z"/><path fill="#E37400" d="M75 96v65c0 14.77 10.19 23 21 23 10 0 21-7 21-23V97c0-13.54-10-22-21-22s-21 9.33-21 21z"/><circle fill="#E37400" cx="41" cy="163" r="21"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Books/googlebooks.svg b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
index 752d18d549..85d3bf7fa0 100644
--- a/packages/nodes-base/nodes/Google/Books/googlebooks.svg
+++ b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
@@ -1,37 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="svg61" xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 448.7 500" enable-background="new 0 0 448.7 500" xml:space="preserve">
-<metadata id="metadata58">
-	<rdf:RDF>
-		<cc:Work rdf:about="">
-			<dc:format>image/svg+xml</dc:format>
-			<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-		</cc:Work>
-	</rdf:RDF>
-	<sfw xmlns="http://ns.adobe.com/SaveForWeb/1.0/">
-		<slices/>
-		<sliceSourceBounds bottomLeftOrigin="true" height="500" width="448.7" x="3451.9" y="3846"/>
-	</sfw>
-</metadata>
-<g>
-	<path fill="#0B5E9F" d="M428.2,221.9L49.2,6.5C33-2.6,18.5-1.7,9.7,6.8l0,0C3.4,12.8,0,22.4,0,34.9v429.9C0,477.4,3.7,487,9.7,493   l0,0c9.1,8.8,23.3,9.7,39.5,0.3l379.1-215.4C455.5,262.5,455.5,237.5,428.2,221.9z"/>
-	
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="223.1684" y1="7682.2407" x2="223.1684" y2="8182.2686" gradientTransform="matrix(0.9998 0 0 -0.9998 1.2134 8180.7046)">
-		<stop offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
-		<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0.1"/>
-	</linearGradient>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M428.3,221.9l-95-54l-1.7-1.1l-0.1,0.1L49.2,6.6   c-15.7-9-29.9-8.3-38.9-0.2L8.8,7.7C3.2,13.7,0,23,0,35.1v429.7c0,12.1,3.2,21.4,9.1,27.2l0,0l-0.2,0.2c8.9,9.5,23.7,10.6,40.4,1.3   l282.2-160.5l0.1,0.1c0,0,1.7-1.1,1.8-1.1l95-54C455.5,262.5,455.5,237.2,428.3,221.9z"/>
-	<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" enable-background="new    " d="M49.2,9.4l379,215.3   c12.3,6.9,19.2,16,20.3,25.3c0-10.1-6.7-20.3-20.3-28.1L49.2,6.6C22-9,0,4,0,35.1v2.8C0,6.8,22-5.9,49.2,9.4z"/>
-	<path fill="#40DCFF" d="M358.2,70.2H135.9V444l242.9-138V90.9C378.8,79.5,369.6,70.2,358.2,70.2z"/>
-	
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7121.7529" y1="-324.192" x2="7123.5923" y2="-327.4978" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2002)">
-		<stop offset="0" style="stop-color:#5B7C8C;stop-opacity:0"/>
-		<stop offset="1" style="stop-color:#5B7C8C;stop-opacity:0.4"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M358.2,70.2H135.9v373.6l242.9-137.9V90.9C378.8,79.5,369.6,70.2,358.2,70.2z"/>
-	<polygon fill="#009BF0" points="135.9,70.2 70.3,70.2 70.3,481.2 135.9,444  "/>
-	<path opacity="0.15" fill="#FFFFFF" enable-background="new    " d="M358.2,70.2H70.3v2.3h287.9c11.4,0,20.7,6.9,20.7,18.3l0,0   C378.8,79.5,369.6,70.2,358.2,70.2z"/>
-	<polygon fill="#FAFAFA" points="261.1,173.3 294.9,152.4 329.9,173.3 329.9,70.2 261.1,70.2  "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448.7 500" xml:space="preserve"><path fill="#0B5E9F" d="M428.2 221.9 49.2 6.5C33-2.6 18.5-1.7 9.7 6.8 3.4 12.8 0 22.4 0 34.9v429.9C0 477.4 3.7 487 9.7 493c9.1 8.8 23.3 9.7 39.5.3l379.1-215.4c27.2-15.4 27.2-40.4-.1-56z"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="223.168" y1="7682.241" x2="223.168" y2="8182.269" gradientTransform="matrix(.9998 0 0 -.9998 1.213 8180.705)"><stop offset="0" style="stop-color:#fff;stop-opacity:0"/><stop offset="1" style="stop-color:#fff;stop-opacity:.1"/></linearGradient><path fill-rule="evenodd" clip-rule="evenodd" fill="url(#a)" d="m428.3 221.9-95-54-1.7-1.1-.1.1L49.2 6.6c-15.7-9-29.9-8.3-38.9-.2L8.8 7.7C3.2 13.7 0 23 0 35.1v429.7c0 12.1 3.2 21.4 9.1 27.2l-.2.2c8.9 9.5 23.7 10.6 40.4 1.3L331.5 333l.1.1s1.7-1.1 1.8-1.1l95-54c27.1-15.5 27.1-40.8-.1-56.1z"/><path opacity=".25" fill-rule="evenodd" clip-rule="evenodd" fill="#FFF" d="m49.2 9.4 379 215.3c12.3 6.9 19.2 16 20.3 25.3 0-10.1-6.7-20.3-20.3-28.1L49.2 6.6C22-9 0 4 0 35.1v2.8C0 6.8 22-5.9 49.2 9.4z"/><path fill="#40DCFF" d="M358.2 70.2H135.9V444l242.9-138V90.9c0-11.4-9.2-20.7-20.6-20.7z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7121.753" y1="-324.192" x2="7123.592" y2="-327.498" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2)"><stop offset="0" style="stop-color:#5b7c8c;stop-opacity:0"/><stop offset="1" style="stop-color:#5b7c8c;stop-opacity:.4"/></linearGradient><path fill="url(#b)" d="M358.2 70.2H135.9v373.6l242.9-137.9v-215c0-11.4-9.2-20.7-20.6-20.7z"/><path fill="#009BF0" d="M135.9 70.2H70.3v411l65.6-37.2z"/><path opacity=".15" fill="#FFF" d="M358.2 70.2H70.3v2.3h287.9c11.4 0 20.7 6.9 20.7 18.3-.1-11.3-9.3-20.6-20.7-20.6z"/><path fill="#FAFAFA" d="m261.1 173.3 33.8-20.9 35 20.9V70.2h-68.8z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
index 634c13601d..869ae43b54 100644
--- a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
+++ b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 82" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.052 18.947H18.947v42.105h42.105V18.947z"/><path d="M61.053 80L80 61.053H61.053V80z" fill="#ea4335"/><path d="M80 18.947H61.053v42.105H80V18.947z" fill="#fbbc04"/><path d="M61.052 61.053H18.947V80h42.105V61.053z" fill="#34a853"/><path d="M0 61.053v12.632C0 77.174 2.826 80 6.316 80h12.632V61.053H0z" fill="#188038"/><path d="M80 18.947V6.316C80 2.826 77.174 0 73.685 0H61.053v18.947H80z" fill="#1967d2"/><path d="M61.053 0H6.316C2.826 0 0 2.826 0 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505c.332 1.263.911 2.242 1.737 2.937s1.821 1.037 2.989 1.037c1.195 0 2.221-.363 3.079-1.089s1.29-1.653 1.29-2.774a3.44 3.44 0 0 0-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1c1.168 0 2.153-.316 2.953-.947s1.2-1.495 1.2-2.595c0-.979-.358-1.758-1.074-2.342s-1.621-.879-2.721-.879c-1.074 0-1.926.284-2.558.858s-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558c1.479 0 2.811.284 3.989.858s2.105 1.368 2.774 2.379 1 2.153 1 3.416c0 1.289-.311 2.379-.932 3.274s-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 0 1 2.937 2.289c.763 1.026 1.147 2.253 1.147 3.684s-.363 2.711-1.089 3.832-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126l-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z" fill="#4285f4"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 82" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.052 18.947H18.947v42.105h42.105V18.947z"/><path d="M61.053 80 80 61.053H61.053V80z" fill="#ea4335"/><path d="M80 18.947H61.053v42.105H80V18.947z" fill="#fbbc04"/><path d="M61.052 61.053H18.947V80h42.105V61.053z" fill="#34a853"/><path d="M0 61.053v12.632A6.314 6.314 0 0 0 6.316 80h12.632V61.053H0z" fill="#188038"/><path d="M80 18.947V6.316A6.314 6.314 0 0 0 73.685 0H61.053v18.947H80z" fill="#1967d2"/><path d="M61.053 0H6.316A6.314 6.314 0 0 0 0 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505c.332 1.263.911 2.242 1.737 2.937s1.821 1.037 2.989 1.037c1.195 0 2.221-.363 3.079-1.089s1.29-1.653 1.29-2.774a3.44 3.44 0 0 0-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1c1.168 0 2.153-.316 2.953-.947s1.2-1.495 1.2-2.595c0-.979-.358-1.758-1.074-2.342s-1.621-.879-2.721-.879c-1.074 0-1.926.284-2.558.858s-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558c1.479 0 2.811.284 3.989.858s2.105 1.368 2.774 2.379 1 2.153 1 3.416c0 1.289-.311 2.379-.932 3.274s-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 0 1 2.937 2.289c.763 1.026 1.147 2.253 1.147 3.684s-.363 2.711-1.089 3.832-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z" fill="#4285f4"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
index 8ca43d996d..9762077d2b 100644
--- a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
+++ b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 73" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M6.048 61.26l3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 0 0 1.1 4.124z" fill="#0066da"/><path d="M40 22.91L27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445C.38 45.7.001 47.122 0 48.568h25.2z" fill="#00ac47"/><path d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 0 0 1.1-4.124H54.798l5.363 10.538z" fill="#ea4335"/><path d="M40 22.91L52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z" fill="#00832d"/><path d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z" fill="#2684fc"/><path d="M67.262 24.284L55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 0 0-1.1-4.124z" fill="#ffba00"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 73" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="m6.048 61.26 3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 0 0 1.1 4.124z" fill="#0066da"/><path d="M40 22.91 27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445A8.298 8.298 0 0 0 0 48.568h25.2z" fill="#00ac47"/><path d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 0 0 1.1-4.124H54.798l5.363 10.538z" fill="#ea4335"/><path d="M40 22.91 52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z" fill="#00832d"/><path d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z" fill="#2684fc"/><path d="M67.262 24.284 55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 0 0-1.1-4.124z" fill="#ffba00"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.svg b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
index 7f6de6b2e9..71e6ba1dc4 100644
--- a/packages/nodes-base/nodes/Google/Gmail/gmail.svg
+++ b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="193px" viewBox="0 0 256 193" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M58.1818182,192.049515 L58.1818182,93.1404244 L27.5066233,65.0770089 L0,49.5040608 L0,174.59497 C0,184.253152 7.82545455,192.049515 17.4545455,192.049515 L58.1818182,192.049515 Z" fill="#4285F4"></path>
-        <path d="M197.818182,192.049515 L238.545455,192.049515 C248.203636,192.049515 256,184.224061 256,174.59497 L256,49.5040608 L224.844415,67.3422767 L197.818182,93.1404244 L197.818182,192.049515 Z" fill="#34A853"></path>
-        <polygon fill="#EA4335" points="58.1818182 93.1404244 54.0077618 54.4932827 58.1818182 17.5040608 128 69.8676972 197.818182 17.5040608 202.487488 52.4960089 197.818182 93.1404244 128 145.504061"></polygon>
-        <path d="M197.818182,17.5040608 L197.818182,93.1404244 L256,49.5040608 L256,26.2313335 C256,4.64587897 231.36,-7.65957557 214.109091,5.28587897 L197.818182,17.5040608 Z" fill="#FBBC04"></path>
-        <path d="M0,49.5040608 L26.7588051,69.5731646 L58.1818182,93.1404244 L58.1818182,17.5040608 L41.8909091,5.28587897 C24.6109091,-7.65957557 0,4.64587897 0,26.2313335 L0,49.5040608 Z" fill="#C5221F"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="256" height="193" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M58.182 192.05V93.14L27.507 65.077 0 49.504v125.091c0 9.658 7.825 17.455 17.455 17.455h40.727z" fill="#4285F4"/><path d="M197.818 192.05h40.727c9.659 0 17.455-7.826 17.455-17.455V49.505l-31.156 17.837-27.026 25.798v98.91z" fill="#34A853"/><path fill="#EA4335" d="m58.182 93.14-4.174-38.647 4.174-36.989L128 69.868l69.818-52.364 4.67 34.992-4.67 40.644L128 145.504z"/><path d="M197.818 17.504V93.14L256 49.504V26.231c0-21.585-24.64-33.89-41.89-20.945l-16.292 12.218z" fill="#FBBC04"/><path d="m0 49.504 26.759 20.07L58.182 93.14V17.504L41.89 5.286C24.61-7.66 0 4.646 0 26.23v23.273z" fill="#C5221F"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
index b09ceb2ac8..8afa04ca8a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
+++ b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>google_sheets_node_icon</title>
-    <g id="google_sheets_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="google-sheets" transform="translate(8.000000, 0.000000)">
-            <g id="Group" transform="translate(1.000000, 1.000000)">
-                <path d="M26.6896552,-7.41532298e-06 L43.0000075,16.225 L43.0000075,55.3125 C43.0019734,56.2910863 42.6120602,57.2301574 41.916454,57.9221237 C41.2208478,58.6140901 40.2768372,59.0019631 39.2931034,59.0000074 L3.70689655,59.0000074 C2.72316282,59.0019631 1.77915216,58.6140901 1.08354597,57.9221237 C0.387939777,57.2301574 -0.00197339359,56.2910863 -7.45432819e-06,55.3125 L-7.45432819e-06,3.6875 C-0.00197339359,2.70891371 0.387939777,1.76984265 1.08354597,1.07787625 C1.77915216,0.385909859 2.72316282,-0.00196306769 3.70689655,-7.41532298e-06 L26.6896552,-7.41532298e-06 Z" id="Path" fill="#28B446"></path>
-                <path d="M26.6896552,0 L43,16.225 L30.3965517,16.225 C28.342931,16.225 26.6896552,14.396 26.6896552,12.353125 L26.6896552,0 Z" id="Path" fill="#6ACE7C"></path>
-                <polygon id="Path" fill="#219B38" points="30.2112069 16.225 43 21.4796875 43 16.225"></polygon>
-                <path d="M11.1206897,30.975 C11.1206897,30.15785 11.782,29.5 12.6034483,29.5 L30.3965517,29.5 C31.218,29.5 31.8793103,30.15785 31.8793103,30.975 L31.8793103,46.4625 C31.8793103,47.27965 31.218,47.9375 30.3965517,47.9375 L12.6034483,47.9375 C11.782,47.9375 11.1206897,47.27965 11.1206897,46.4625 L11.1206897,30.975 Z M13.3448276,32.45 L20.0172414,32.45 L20.0172414,34.6625 L13.3448276,34.6625 L13.3448276,32.45 Z M13.3448276,37.6125 L20.0172414,37.6125 L20.0172414,39.825 L13.3448276,39.825 L13.3448276,37.6125 Z M13.3448276,42.775 L20.0172414,42.775 L20.0172414,44.9875 L13.3448276,44.9875 L13.3448276,42.775 Z M22.9827586,32.45 L29.6551724,32.45 L29.6551724,34.6625 L22.9827586,34.6625 L22.9827586,32.45 Z M22.9827586,37.6125 L29.6551724,37.6125 L29.6551724,39.825 L22.9827586,39.825 L22.9827586,37.6125 Z M22.9827586,42.775 L29.6551724,42.775 L29.6551724,44.9875 L22.9827586,44.9875 L22.9827586,42.775 Z" id="Shape" fill="#FFFFFF"></path>
-            </g>
-            <g id="Group">
-                <path d="M26.6896552,-7.41532298e-06 L43.0000075,16.225 L43.0000075,55.3125 C43.0019734,56.2910863 42.6120602,57.2301574 41.916454,57.9221237 C41.2208478,58.6140901 40.2768372,59.0019631 39.2931034,59.0000074 L3.70689655,59.0000074 C2.72316282,59.0019631 1.77915216,58.6140901 1.08354597,57.9221237 C0.387939777,57.2301574 -0.00197339359,56.2910863 -7.45432819e-06,55.3125 L-7.45432819e-06,3.6875 C-0.00197339359,2.70891371 0.387939777,1.76984265 1.08354597,1.07787625 C1.77915216,0.385909859 2.72316282,-0.00196306769 3.70689655,-7.41532298e-06 L26.6896552,-7.41532298e-06 Z" id="Path" fill="#28B446"></path>
-                <path d="M26.6896552,0 L43,16.225 L30.3965517,16.225 C28.342931,16.225 26.6896552,14.396 26.6896552,12.353125 L26.6896552,0 Z" id="Path" fill="#6ACE7C"></path>
-                <polygon id="Path" fill="#219B38" points="30.2112069 16.225 43 21.4796875 43 16.225"></polygon>
-                <path d="M11.1206897,30.975 C11.1206897,30.15785 11.782,29.5 12.6034483,29.5 L30.3965517,29.5 C31.218,29.5 31.8793103,30.15785 31.8793103,30.975 L31.8793103,46.4625 C31.8793103,47.27965 31.218,47.9375 30.3965517,47.9375 L12.6034483,47.9375 C11.782,47.9375 11.1206897,47.27965 11.1206897,46.4625 L11.1206897,30.975 Z M13.3448276,32.45 L20.0172414,32.45 L20.0172414,34.6625 L13.3448276,34.6625 L13.3448276,32.45 Z M13.3448276,37.6125 L20.0172414,37.6125 L20.0172414,39.825 L13.3448276,39.825 L13.3448276,37.6125 Z M13.3448276,42.775 L20.0172414,42.775 L20.0172414,44.9875 L13.3448276,44.9875 L13.3448276,42.775 Z M22.9827586,32.45 L29.6551724,32.45 L29.6551724,34.6625 L22.9827586,34.6625 L22.9827586,32.45 Z M22.9827586,37.6125 L29.6551724,37.6125 L29.6551724,39.825 L22.9827586,39.825 L22.9827586,37.6125 Z M22.9827586,42.775 L29.6551724,42.775 L29.6551724,44.9875 L22.9827586,44.9875 L22.9827586,42.775 Z" id="Shape" fill="#FFFFFF"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M35.69 1 52 17.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.71 3.71 0 0 1 48.293 60H12.707a3.71 3.71 0 0 1-2.623-1.078A3.67 3.67 0 0 1 9 56.312V4.688a3.67 3.67 0 0 1 1.084-2.61A3.71 3.71 0 0 1 12.707 1H35.69z" fill="#28B446"/><path d="M35.69 1 52 17.225H39.397c-2.054 0-3.707-1.829-3.707-3.872V1z" fill="#6ACE7C"/><path fill="#219B38" d="M39.211 17.225 52 22.48v-5.255z"/><path d="M20.12 31.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H21.603a1.476 1.476 0 0 1-1.482-1.474V31.974zm2.225 1.475h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/><g><path d="M34.69 0 51 16.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.71 3.71 0 0 1 47.293 59H11.707a3.71 3.71 0 0 1-2.623-1.078A3.67 3.67 0 0 1 8 55.312V3.688a3.67 3.67 0 0 1 1.084-2.61A3.71 3.71 0 0 1 11.707 0H34.69z" fill="#28B446"/><path d="M34.69 0 51 16.225H38.397c-2.054 0-3.707-1.829-3.707-3.872V0z" fill="#6ACE7C"/><path fill="#219B38" d="M38.211 16.225 51 21.48v-5.255z"/><path d="M19.12 30.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H20.603a1.476 1.476 0 0 1-1.482-1.474V30.974zm2.225 1.475h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Slides/googleslides.svg b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
index d1fcb9c20b..b17df78263 100644
--- a/packages/nodes-base/nodes/Google/Slides/googleslides.svg
+++ b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
@@ -1 +1 @@
-<svg viewBox="-60 -60 630 630" xmlns="http://www.w3.org/2000/svg"><path d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z" fill="#f5b912"/><path d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5zm-.7 139.5h-133v-90.5h133z" fill="#fff"/><path d="M319.6 134.4l121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z" fill="#fadc87"/></svg>
+<svg viewBox="-60 -60 630 630" xmlns="http://www.w3.org/2000/svg"><path d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z" fill="#f5b912"/><path d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5zm-.7 139.5h-133v-90.5h133z" fill="#fff"/><path d="m319.6 134.4 121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z" fill="#fadc87"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HelpScout/helpScout.svg b/packages/nodes-base/nodes/HelpScout/helpScout.svg
index 2645eaa983..c7be1bcb92 100644
--- a/packages/nodes-base/nodes/HelpScout/helpScout.svg
+++ b/packages/nodes-base/nodes/HelpScout/helpScout.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="310px" viewBox="0 0 256 310" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M18.432,180.968727 L108.916364,90.4843636 C120.645818,78.9410909 127.906909,62.7432727 127.906909,45.056 C127.906909,27.5549091 120.832,11.5432727 109.474909,0 L18.9905455,90.4843636 C7.26109091,102.027636 0,118.225455 0,135.912727 C0,153.6 7.07490909,169.425455 18.432,180.968727 Z M237.568,128.093091 L147.083636,218.577455 C135.354182,230.120727 128.093091,246.318545 128.093091,264.005818 C128.093091,281.506909 135.168,297.518545 146.525091,309.061818 L237.009455,218.577455 C248.738909,207.034182 256,190.836364 256,173.149091 C256,155.461818 248.925091,139.636364 237.568,128.093091 Z M237.009455,90.6705455 C248.738909,79.1272727 256,62.9294545 256,45.2421818 C256,27.7410909 248.925091,11.7294545 237.568,0.186181818 L18.9905455,218.577455 C7.26109091,230.306909 0,246.318545 0,264.192 C0,281.693091 7.07490909,297.704727 18.432,309.248 L237.009455,90.6705455 Z" fill="#1292EE"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="256" height="310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="m18.432 180.969 90.484-90.485a63.717 63.717 0 0 0 18.99-45.428A64.245 64.245 0 0 0 109.476 0L18.99 90.484A63.717 63.717 0 0 0 0 135.913c0 17.687 7.075 33.512 18.432 45.056zm219.136-52.876-90.484 90.484a63.717 63.717 0 0 0-18.99 45.429 64.245 64.245 0 0 0 18.431 45.056l90.484-90.485A63.717 63.717 0 0 0 256 173.15c0-17.687-7.075-33.513-18.432-45.056zm-.559-37.422A63.717 63.717 0 0 0 256 45.242 64.245 64.245 0 0 0 237.568.186L18.991 218.577C7.26 230.307 0 246.32 0 264.192a64.245 64.245 0 0 0 18.432 45.056L237.009 90.671z" fill="#1292EE"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Hubspot/hubspot.svg b/packages/nodes-base/nodes/Hubspot/hubspot.svg
index 7e1637cb5d..6c0bbb621e 100644
--- a/packages/nodes-base/nodes/Hubspot/hubspot.svg
+++ b/packages/nodes-base/nodes/Hubspot/hubspot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 62.883 69.883" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="2.442" y="2.442"/><symbol id="A" overflow="visible"><path d="M55.504 30.401a16.26 16.26 0 0 0-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798c2.161-.895 3.558-3.018 3.525-5.357a5.86 5.86 0 0 0-5.859-5.889 5.91 5.91 0 0 0-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754c-1.808.262-3.562.812-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724C13.042 2.92 10.122 0 6.519 0A6.52 6.52 0 0 0 0 6.524c0 3.604 2.92 6.524 6.524 6.524a6.47 6.47 0 0 0 3.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586c.007 1.927.354 3.838 1.025 5.645.566 1.543 1.396 2.949 2.427 4.219l-6.221 6.235c-1.841-.684-3.906-.23-5.298 1.162-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5.01 5.01 0 0 0 3.565-1.48c.942-.952 1.479-2.227 1.475-3.564a5.03 5.03 0 0 0-.234-1.514l6.426-6.426a16.09 16.09 0 0 0 2.856 1.563 16.7 16.7 0 0 0 6.685 1.406h.439a15.76 15.76 0 0 0 7.627-1.929 15.77 15.77 0 0 0 5.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.79 8.79 0 0 1-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 0 1 4.297-1.294h.147c1.416 0 2.769.278 4.038.928 1.286.677 2.378 1.67 3.174 2.886a9.18 9.18 0 0 1 1.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z" stroke="none" fill="#f8761f" fill-rule="nonzero"/></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 62.883 69.883" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.442" y="2.442"/><symbol id="a" overflow="visible"><path d="M55.504 30.401a16.26 16.26 0 0 0-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798a5.711 5.711 0 0 0 3.525-5.357 5.86 5.86 0 0 0-5.859-5.889 5.91 5.91 0 0 0-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754a17.036 17.036 0 0 0-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724A6.522 6.522 0 0 0 6.519 0 6.52 6.52 0 0 0 0 6.524a6.523 6.523 0 0 0 6.524 6.524 6.47 6.47 0 0 0 3.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586a16.388 16.388 0 0 0 1.025 5.645C26.5 45.324 27.33 46.73 28.361 48l-6.221 6.235a5.015 5.015 0 0 0-5.298 1.162c-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5.01 5.01 0 0 0 3.565-1.48 5.047 5.047 0 0 0 1.475-3.564 5.03 5.03 0 0 0-.234-1.514l6.426-6.426a16.09 16.09 0 0 0 2.856 1.563 16.7 16.7 0 0 0 6.685 1.406h.439a15.76 15.76 0 0 0 7.627-1.929 15.77 15.77 0 0 0 5.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.79 8.79 0 0 1-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 0 1 4.297-1.294h.147c1.416 0 2.769.278 4.038.928a8.558 8.558 0 0 1 3.174 2.886 9.18 9.18 0 0 1 1.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z" stroke="none" fill="#f8761f" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
index 7ce814392f..d39ba31b56 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
+++ b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
@@ -1 +1 @@
-<svg width="24px" height="24px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>Invoice Ninja icon</title><path d="M16.247 10.326a1.164 1.164 0 11-2.328 0 1.164 1.164 0 012.328 0zm-6.288 0a1.164 1.164 0 11-2.329 0 1.164 1.164 0 012.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65V15.564a790.1 790.1 0 003.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 011.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
\ No newline at end of file
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M16.247 10.326a1.164 1.164 0 1 1-2.328 0 1.164 1.164 0 0 1 2.328 0zm-6.288 0a1.164 1.164 0 1 1-2.329 0 1.164 1.164 0 0 1 2.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65v7.19a790.1 790.1 0 0 0 3.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 0 1 1.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Jira/jira.svg b/packages/nodes-base/nodes/Jira/jira.svg
index edf23f5aea..0a289a27f5 100644
--- a/packages/nodes-base/nodes/Jira/jira.svg
+++ b/packages/nodes-base/nodes/Jira/jira.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 68.25 71.25" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#C" x="3.125" y="3.125"/><defs><linearGradient id="A" x1="91.90%" y1="40.22%" x2="28.49%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="B" x1="8.70%" y1="59.17%" x2="72.26%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="C" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.161 30.211L30.95 0 .74 30.211a2.54 2.54 0 0 0 0 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 0 0 0-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z" fill="#2684ff"/><path d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z" fill="url(#A)"/><path d="M40.437 31.973L30.95 41.46a15.93 15.93 0 0 1 0 22.536l20.749-20.749z" fill="url(#B)"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 68.25 71.25" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="3.125" y="3.125"/><defs><linearGradient id="b" x1="91.9%" y1="40.22%" x2="28.49%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="c" x1="8.7%" y1="59.17%" x2="72.26%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.161 30.211 30.95 0 .74 30.211a2.54 2.54 0 0 0 0 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 0 0 0-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z" fill="#2684ff"/><path d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z" fill="url(#b)"/><path d="M40.437 31.973 30.95 41.46a15.93 15.93 0 0 1 0 22.536l20.749-20.749z" fill="url(#c)"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Kafka/kafka.svg b/packages/nodes-base/nodes/Kafka/kafka.svg
index 91f4712005..87f5d75b7a 100644
--- a/packages/nodes-base/nodes/Kafka/kafka.svg
+++ b/packages/nodes-base/nodes/Kafka/kafka.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid"><path d="M21.538 17.724a4.16 4.16 0 0 0-3.128 1.42l-1.96-1.388c.208-.573.328-1.188.328-1.832a5.35 5.35 0 0 0-.317-1.802l1.956-1.373a4.16 4.16 0 0 0 3.122 1.414 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172 4.18 4.18 0 0 0-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374c-.818-1.014-1.995-1.723-3.336-1.94V8.25a4.18 4.18 0 0 0 3.313-4.082A4.18 4.18 0 0 0 11.388 0a4.18 4.18 0 0 0-4.172 4.172c0 1.98 1.387 3.637 3.24 4.063v2.4C7.928 11.067 6 13.273 6 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523c-1.87.4-3.276 2.08-3.276 4.072A4.18 4.18 0 0 0 11.388 32a4.18 4.18 0 0 0 4.172-4.172c0-1.993-1.405-3.66-3.276-4.072v-2.523c1.315-.22 2.47-.916 3.28-1.907l1.973 1.397a4.15 4.15 0 0 0-.171 1.173 4.18 4.18 0 0 0 4.172 4.172 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172zm0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023zM9.366 4.172c0-1.115.907-2.022 2.023-2.022s2.022.907 2.022 2.022-.907 2.022-2.022 2.022-2.023-.907-2.023-2.022zM13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022zm-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82zm10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid"><path d="M21.538 17.724a4.16 4.16 0 0 0-3.128 1.42l-1.96-1.388a5.354 5.354 0 0 0 .328-1.832 5.35 5.35 0 0 0-.317-1.802l1.956-1.373a4.16 4.16 0 0 0 3.122 1.414 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172 4.18 4.18 0 0 0-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374a5.393 5.393 0 0 0-3.336-1.94V8.25a4.18 4.18 0 0 0 3.313-4.082A4.18 4.18 0 0 0 11.388 0a4.18 4.18 0 0 0-4.172 4.172 4.177 4.177 0 0 0 3.24 4.063v2.4A5.371 5.371 0 0 0 6 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523a4.169 4.169 0 0 0-3.276 4.072A4.18 4.18 0 0 0 11.388 32a4.18 4.18 0 0 0 4.172-4.172 4.177 4.177 0 0 0-3.276-4.072v-2.523a5.386 5.386 0 0 0 3.28-1.907l1.973 1.397a4.15 4.15 0 0 0-.171 1.173 4.18 4.18 0 0 0 4.172 4.172 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172zm0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023zM9.366 4.172a2.024 2.024 0 0 1 4.045 0c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022zM13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022zm-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82zm10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Lemlist/lemlist.svg b/packages/nodes-base/nodes/Lemlist/lemlist.svg
index 667de83eae..7f153b0b02 100644
--- a/packages/nodes-base/nodes/Lemlist/lemlist.svg
+++ b/packages/nodes-base/nodes/Lemlist/lemlist.svg
@@ -1,23 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="200.000000pt" height="200.000000pt" viewBox="0 0 200.000000 200.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
-fill="#4d19ff" stroke="none">
-<path d="M315 1986 c-127 -40 -218 -119 -274 -236 l-36 -75 0 -415 c0 -403 1
--418 23 -500 27 -100 93 -242 152 -331 24 -35 82 -102 130 -149 135 -133 296
--215 520 -264 64 -15 131 -16 465 -14 l390 3 70 34 c88 43 163 119 207 208
-l33 68 3 655 c3 697 3 696 -46 795 -52 105 -122 167 -236 210 l-66 25 -648 -1
-c-494 0 -656 -3 -687 -13z m402 -590 l28 -24 5 -249 c8 -377 -3 -366 371 -371
-229 -3 248 -4 268 -23 27 -25 35 -60 24 -96 -17 -51 -34 -54 -323 -51 l-265 3
--53 30 c-73 40 -147 123 -169 188 -13 41 -17 101 -21 285 -4 252 0 276 46 312
-33 26 55 25 89 -4z m654 9 c57 -30 62 -112 9 -140 -23 -12 -71 -15 -218 -15
--176 0 -191 1 -216 21 -48 38 -29 119 34 142 8 3 93 6 188 6 138 1 179 -2 203
--14z m-61 -345 c13 -13 20 -33 20 -60 0 -27 -7 -47 -20 -60 -18 -18 -33 -20
--182 -20 -152 0 -163 1 -185 22 -30 28 -31 83 -1 115 21 22 27 23 185 23 150
-0 165 -2 183 -20z"/>
-</g>
-</svg>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="266.667" height="266.667" viewBox="0 0 200 200"><path d="M31.5 1.4C18.8 5.4 9.7 13.3 4.1 25L.5 32.5V74c0 40.3.1 41.8 2.3 50 2.7 10 9.3 24.2 15.2 33.1 2.4 3.5 8.2 10.2 13 14.9 13.5 13.3 29.6 21.5 52 26.4 6.4 1.5 13.1 1.6 46.5 1.4l39-.3 7-3.4c8.8-4.3 16.3-11.9 20.7-20.8l3.3-6.8.3-65.5c.3-69.7.3-69.6-4.6-79.5C190 13 183 6.8 171.6 2.5L165 0l-64.8.1C50.8.1 34.6.4 31.5 1.4zm40.2 59 2.8 2.4.5 24.9c.8 37.7-.3 36.6 37.1 37.1 22.9.3 24.8.4 26.8 2.3 2.7 2.5 3.5 6 2.4 9.6-1.7 5.1-3.4 5.4-32.3 5.1l-26.5-.3-5.3-3c-7.3-4-14.7-12.3-16.9-18.8-1.3-4.1-1.7-10.1-2.1-28.5-.4-25.2 0-27.6 4.6-31.2 3.3-2.6 5.5-2.5 8.9.4zm65.4-.9c5.7 3 6.2 11.2.9 14-2.3 1.2-7.1 1.5-21.8 1.5-17.6 0-19.1-.1-21.6-2.1-4.8-3.8-2.9-11.9 3.4-14.2.8-.3 9.3-.6 18.8-.6 13.8-.1 17.9.2 20.3 1.4zM131 94c1.3 1.3 2 3.3 2 6s-.7 4.7-2 6c-1.8 1.8-3.3 2-18.2 2-15.2 0-16.3-.1-18.5-2.2-3-2.8-3.1-8.3-.1-11.5 2.1-2.2 2.7-2.3 18.5-2.3 15 0 16.5.2 18.3 2z" fill="#4d19ff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
index 9b26e7d3d8..1733e23516 100644
--- a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
+++ b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>mailchimp_node_icon</title>
-    <g id="mailchimp_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="iconfinder_78-mailchimp_1929181" transform="translate(2.000000, 0.000000)" fill="#000000" fill-rule="nonzero">
-            <path d="M56.7978989,39.1146881 C56.4387361,38.2696177 55.6006897,37.665996 54.6429223,37.4245473 C54.2837595,35.8551308 53.8048758,35.1307847 53.8048758,35.0100604 C53.9245967,34.7686117 54.1640386,34.6478873 54.1640386,34.527163 C55.6006897,32.8370221 54.6429223,30.3018109 52.2485038,29.6981891 C50.9315737,28.3702213 49.7343644,27.7665996 48.6568761,27.2837022 C47.6991087,26.8008048 48.0582715,27.0422535 47.2202251,26.5593561 C46.9807832,25.3521127 46.8610623,22.6961771 46.5018995,20.7645875 C46.1427368,19.0744467 45.4244112,17.7464789 44.4666438,17.0221328 C43.9877601,16.056338 43.5088764,15.2112676 42.7905509,14.4869215 C46.1427368,9.41649899 46.9807832,4.34607646 44.5863648,1.69014085 C43.5088764,0.482897384 41.9525045,0 40.0369697,0 C37.2833885,0 34.0509235,1.08651911 30.6987377,3.138833 C30.6987377,3.138833 28.5437611,1.32796781 28.4240402,1.32796781 C19.0858082,-6.0362173 -7.37251578,26.6800805 1.9657162,33.8028169 L4.36013466,35.6136821 C2.80376266,39.8390342 4.95873928,44.9094567 9.38841342,46.4788732 C10.3461808,46.8410463 11.4236691,46.9617706 12.5011574,46.9617706 C12.5011574,46.9617706 19.5646919,60 34.5298072,60 C51.7696201,60 56.1992943,42.9778672 56.1992943,42.8571429 C56.0795734,42.9778672 57.5162244,40.804829 56.7978989,39.1146881 Z M2.56432082,31.6297787 C0.768506975,28.3702213 4.00097189,21.8511066 6.39539035,17.9879276 C12.1419947,8.69215292 21.8393894,1.32796781 26.2690636,2.41448692 L27.4662728,1.93158954 C27.4662728,1.93158954 30.6987377,4.7082495 30.8184586,4.7082495 C33.0931562,3.38028169 35.9664583,1.93158954 38.6003186,1.69014085 C36.9242257,2.05231388 35.0086909,2.89738431 32.6142725,4.34607646 C32.6142725,4.34607646 26.9873891,8.20925553 23.6352032,11.5895372 C21.8393894,13.4004024 14.4166922,22.4547284 14.4166922,22.334004 C15.7336223,19.7987928 16.6913897,18.4708249 18.8463663,15.8148893 C20.0435756,14.2454728 21.3605057,12.7967807 22.6774359,11.3480885 C23.2760405,10.7444668 23.8746451,10.1408451 24.5929706,9.53722334 C25.0718543,9.1750503 25.4310171,8.69215292 25.9099008,8.32997988 C26.1493426,8.20925553 26.2690636,7.96780684 26.5085054,7.84708249 C26.5085054,7.84708249 26.5085054,7.84708249 26.5085054,7.84708249 L22.1985522,4.22535211 L22.437994,5.79476861 L25.550738,8.57142857 C25.550738,8.57142857 22.7971568,10.5030181 21.3605057,11.7102616 C15.7336223,16.5392354 10.3461808,23.9034205 8.31092512,31.0261569 L8.43064604,31.0261569 C7.47287866,31.6297787 6.39539035,32.4748491 5.55734389,33.6820926 C5.19818112,33.8028169 2.92348359,32.2334004 2.56432082,31.6297787 Z M11.7828319,45.0301811 C8.43064604,45.0301811 5.79678574,42.1327968 5.79678574,38.6317907 C5.79678574,35.1307847 8.55036696,32.2334004 11.7828319,32.2334004 C12.6208783,32.2334004 13.4589248,32.4748491 14.1772503,32.7162978 C14.1772503,32.7162978 15.4941805,33.3199195 15.8533433,36.4587525 C15.8533433,36.4587525 15.8533433,36.4587525 15.8533433,36.4587525 C15.8533433,36.4587525 15.8533433,36.4587525 15.8533433,36.4587525 C16.212506,35.4929577 16.4519479,34.6478873 16.4519479,34.6478873 C16.9308316,35.9758551 17.0505525,37.4245473 17.0505525,38.7525151 L17.0505525,38.7525151 L17.0505525,38.7525151 C17.4097153,38.2696177 17.768878,37.4245473 17.768878,37.4245473 C18.4872036,41.5291751 15.6139014,45.0301811 11.7828319,45.0301811 Z M19.2055291,22.4547284 L19.2055291,22.4547284 C19.2055291,22.4547284 21.8393894,17.5050302 27.4662728,14.1247485 C26.9873891,14.0040241 26.0296217,14.2454728 25.7901799,14.2454728 C26.8676682,13.4004024 28.7832029,12.7967807 30.1001331,12.4346076 C29.7409703,12.193159 28.7832029,12.0724346 28.3043192,12.0724346 C28.1845983,12.0724346 28.1845983,12.0724346 28.0648774,12.0724346 C29.2620866,11.3480885 31.6565051,10.9859155 33.6917608,11.3480885 C33.4523189,10.9859155 32.8537143,10.7444668 32.3748306,10.6237425 C32.3748306,10.6237425 32.1353888,10.6237425 32.1353888,10.6237425 C32.1353888,10.6237425 32.2551097,10.6237425 32.2551097,10.6237425 C33.5720398,10.3822938 35.0086909,10.6237425 36.2059002,11.1066398 C36.0861792,10.7444668 35.7270165,10.3822938 35.4875746,10.1408451 C35.4875746,10.1408451 35.3678537,10.0201207 35.3678537,10.0201207 C36.5650629,10.2615694 37.7622721,10.8651911 38.7200395,11.4688129 C38.6003186,11.2273642 38.3608768,10.8651911 38.1214349,10.6237425 C39.3186441,10.9859155 40.6355743,11.8309859 41.2341789,13.0382294 L41.2341789,13.0382294 C41.2341789,13.0382294 41.2341789,13.1589537 41.2341789,13.1589537 C41.2341789,13.1589537 41.2341789,13.1589537 41.2341789,13.1589537 C38.9594814,11.4688129 32.4945515,11.9517103 26.0296217,16.1770624 C23.1563196,18.1086519 20.881622,20.1609658 19.2055291,22.4547284 Z M54.4034804,42.1327968 C54.2837595,42.2535211 53.565434,46.7203219 48.7765971,50.4627767 C42.9102718,55.1710262 35.1284118,54.6881288 32.1353888,52.0321932 C30.5790168,50.583501 29.8606912,48.4104628 29.8606912,48.4104628 C29.8606912,48.4104628 29.7409703,49.6177062 29.6212494,50.1006036 C28.4240402,48.0482897 28.5437611,45.6338028 28.5437611,45.6338028 C28.5437611,45.6338028 27.9451565,46.8410463 27.5859937,47.444668 C26.7479472,45.1509054 27.10711,42.8571429 27.10711,42.8571429 L26.3887845,43.943662 C26.3887845,43.943662 26.0296217,41.4084507 26.8676682,39.3561368 C27.7057146,37.0623742 29.3818075,35.4929577 29.7409703,35.2515091 C28.5437611,34.889336 27.10711,33.6820926 27.10711,33.6820926 C27.10711,33.6820926 27.7057146,33.6820926 28.0648774,33.6820926 C28.0648774,33.6820926 25.550738,31.8712274 25.0718543,29.0945674 C25.4310171,29.5774648 26.1493426,30.0603622 26.1493426,30.0603622 C25.9099008,29.3360161 25.7901799,27.7665996 26.0296217,26.0764588 L26.0296217,26.0764588 C26.5085054,23.0583501 29.0226448,21.0060362 31.776226,21.0060362 C34.7692491,21.0060362 36.8045048,21.6096579 39.3186441,19.3158954 C39.7975278,18.832998 40.2764115,18.3501006 40.9947371,18.2293763 C41.114458,18.2293763 41.2341789,18.1086519 41.7130626,18.1086519 C42.0722254,18.1086519 42.5511091,18.2293763 42.9102718,18.4708249 C44.227202,19.3158954 44.5863648,21.4889336 44.7060857,23.0583501 C45.3046903,28.8531187 45.0652484,27.8873239 47.339946,29.0945674 C48.4174343,29.6981891 49.7343644,30.1810865 51.1710155,31.750503 C51.1710155,31.750503 51.1710155,31.750503 51.1710155,31.750503 C51.1710155,31.750503 51.1710155,31.750503 51.1710155,31.750503 C52.3682247,31.750503 52.9668294,32.7162978 52.4879457,33.4406439 C48.4174343,38.2696177 42.7905509,40.5633803 36.5650629,40.804829 C36.3256211,40.804829 35.7270165,40.804829 35.7270165,40.804829 C33.2128771,40.9255533 32.3748306,44.1851107 33.9312026,46.1167002 C34.88897,47.3239437 36.9242257,47.806841 38.4805977,47.806841 L38.4805977,47.806841 C45.3046903,47.9275654 52.2485038,43.0985915 53.445713,40.3219316 C53.445713,40.3219316 53.565434,40.0804829 53.565434,40.0804829 C53.3259921,40.4426559 46.6216204,46.7203219 38.4805977,46.4788732 C38.4805977,46.4788732 37.6425512,46.4788732 36.8045048,46.2374245 C35.7270165,45.9959759 34.88897,45.5130785 34.5298072,44.4265594 C35.2481328,44.5472837 36.0861792,44.668008 37.0439466,44.668008 C42.9102718,44.668008 47.1005041,42.0120724 46.7413414,41.8913481 C46.7413414,41.8913481 46.7413414,41.8913481 46.6216204,41.8913481 C45.9032949,42.0120724 38.8397605,44.7887324 34.4100863,43.3400402 C34.4100863,43.2193159 34.4100863,43.0985915 34.5298072,42.9778672 C34.88897,41.6498994 35.6072955,41.7706237 36.8045048,41.7706237 L36.8045048,41.7706237 C40.8750161,41.6498994 44.1074811,40.5633803 46.6216204,39.4768612 C49.2554807,38.2696177 51.2907364,36.5794769 52.009062,35.7344064 C52.9668294,37.3038229 52.9668294,39.3561368 52.9668294,39.3561368 C52.9668294,39.3561368 53.3259921,39.2354125 53.8048758,39.2354125 C55.2415269,39.3561368 55.4809687,40.6841046 54.4034804,42.1327968 Z" id="Shape"></path>
-            <polygon id="Path" points="25.25 4.8 25.95 5 25.35 3 25.05 4"></polygon>
-            <path d="M30,5.28571429 L29,4 L29.3636364,6 C29.5454545,5.71428571 29.7272727,5.57142857 30,5.28571429 Z" id="Path"></path>
-            <path d="M42.2222222,26.668878 C42.8888889,26.668878 43.4444444,26.779252 44,27 C44,25.4547642 43.1111111,23.7991543 42.4444444,24.0199023 L42.4444444,24.0199023 C42.4444444,24.0199023 42.4444444,24.0199023 42.4444444,24.0199023 L42.4444444,24.0199023 C42,24.1302763 42,24.7925202 42,25.2340162 C42,25.7858861 42,26.2273821 42.2222222,26.668878 Z" id="Path"></path>
-            <path d="M28,7.53846154 L25,7 L26.9565217,8 C27.3478261,7.84615385 27.6086957,7.69230769 28,7.53846154 Z" id="Path"></path>
-            <path d="M34.9387187,29.5 C35.6020195,29.75 36,29.875 36,29.75 C36,29.75 36,29.5 35.8673398,29.375 C35.4693594,28.875 34.8060586,28.375 34.1427578,28.25 C32.683496,27.75 30.9589139,28 29.7649725,29 C29.1016717,29.5 28.8363513,30 29.1016717,30 C29.2343318,30 29.6323123,29.875 30.1629529,29.75 C32.2855155,28.875 33.3467968,28.875 34.9387187,29.5 Z" id="Path"></path>
-            <path d="M35.5145862,31.581392 C35.800418,31.581392 35.9909725,31.581392 35.9909725,31.581392 C36.0862497,31.3917283 35.419309,30.9175692 34.3712592,31.012401 C34.275982,31.012401 34.1807047,31.1072328 33.9901502,31.1072328 C33.9901502,31.1072328 33.894873,31.1072328 33.894873,31.1072328 C33.7043185,31.2020647 33.4184867,31.2968965 33.2279322,31.4865602 C33.0373777,31.6762239 32.9421005,31.8658875 33.0373777,31.9607194 C33.132655,32.0555512 33.2279322,31.9607194 33.513764,31.8658875 C34.3712592,31.581392 34.9429227,31.581392 35.5145862,31.581392 Z" id="Path"></path>
-            <path d="M13.1504621,36.5616053 C13.5145498,37.0893846 13.3931872,37.3532743 13.5145498,37.4852192 C13.5145498,37.4852192 13.6359123,37.617164 13.7572749,37.4852192 C14,37.3532743 14,37.0893846 14,36.825495 L14,36.825495 C14,36.825495 14,36.825495 14,36.825495 L14,36.825495 C14,36.2977156 13.7572749,35.6379914 13.3931872,35.2421569 C13.3931872,35.2421569 13.3931872,35.2421569 13.3931872,35.2421569 L13.3931872,35.2421569 C12.9077369,34.7143775 12.3009241,34.1865982 11.4513862,34.0546533 C10.7232108,33.9227085 9.99503548,34.0546533 9.87367292,34.1865982 L9.87367292,34.1865982 C9.75231035,34.1865982 9.63094779,34.1865982 9.50958523,34.318543 C7.56778425,35.1102121 6.71824632,37.2213295 7.08233401,39.2005021 C7.20369657,39.7282814 7.44642169,40.2560608 7.68914681,40.6518953 L7.68914681,40.6518953 C7.68914681,40.6518953 7.68914681,40.6518953 7.68914681,40.6518953 L7.68914681,40.6518953 C8.0532345,41.1796747 8.53868474,41.0477298 8.29595962,40.6518953 C8.29595962,40.5199505 8.0532345,39.9921711 7.93187193,39.2005021 C7.93187193,38.2768882 8.0532345,37.3532743 8.6600473,36.5616053 C9.02413499,36.0338259 9.50958523,35.7699363 9.63094779,35.7699363 L9.63094779,35.7699363 C9.75231035,35.7699363 9.75231035,35.6379914 9.87367292,35.6379914 C9.87367292,35.6379914 9.99503548,35.6379914 9.99503548,35.6379914 C10.2377606,35.5060466 10.116398,35.6379914 10.3591232,35.5060466 L10.3591232,35.5060466 C11.8154739,35.2421569 12.7863744,35.9018811 13.1504621,36.5616053 Z" id="Path"></path>
-            <path d="M13.2809235,38.0388209 C13.1755065,37.9349388 13.0700895,37.8310568 13.0700895,37.7271747 C13.0700895,37.5194105 13.0700895,37.4155284 13.2809235,37.3116463 C13.3863404,37.2077642 13.4917574,37.2077642 13.4917574,37.1038821 C13.4917574,37 13.0700895,36.8961179 12.6484215,37.2077642 C12.3321705,37.5194105 12.3321705,38.142703 12.7538385,38.5582314 C13.2809235,39.0776419 14.0188424,39.181524 14.1242594,39.8048165 C14.1242594,39.9086986 14.1242594,40.0125807 14.1242594,40.1164628 C14.1242594,40.2203449 14.1242594,40.4281091 14.1242594,40.4281091 C14.0188424,41.0514017 13.3863404,41.6746942 12.3321705,41.4669301 C12.1213366,41.4669301 12.0159196,41.4669301 12.0159196,41.4669301 C11.9105026,41.5708122 12.3321705,42.0902226 13.1755065,41.9863405 C14.3350934,41.9863405 15.1784293,40.8436375 14.9675953,39.5970524 C14.8621783,38.5582314 13.7025914,38.3504672 13.2809235,38.0388209 Z" id="Path"></path>
-            <ellipse id="Oval" transform="translate(43.659875, 29.980543) rotate(-81.135792) translate(-43.659875, -29.980543) " cx="43.6598748" cy="29.9805433" rx="1" ry="1"></ellipse>
-            <ellipse id="Oval" transform="translate(40.817460, 30.926949) rotate(-61.277058) translate(-40.817460, -30.926949) " cx="40.8174602" cy="30.9269493" rx="1" ry="1"></ellipse>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(2)" fill="#000" fill-rule="nonzero"><path d="M56.798 39.115c-.36-.845-1.197-1.449-2.155-1.69-.36-1.57-.838-2.294-.838-2.415.12-.241.359-.362.359-.483 1.437-1.69.479-4.225-1.915-4.829-1.317-1.328-2.515-1.931-3.592-2.414-.958-.483-.599-.242-1.437-.725-.24-1.207-.359-3.863-.718-5.794-.36-1.69-1.078-3.019-2.035-3.743-.48-.966-.958-1.81-1.676-2.535 3.352-5.07 4.19-10.14 1.795-12.797C43.51.483 41.953 0 40.037 0c-2.754 0-5.986 1.087-9.338 3.139 0 0-2.155-1.811-2.275-1.811C19.086-6.036-7.373 26.68 1.966 33.803l2.394 1.81C2.804 39.84 4.96 44.91 9.388 46.48c.958.362 2.036.483 3.113.483 0 0 7.064 13.038 22.029 13.038C51.77 60 56.2 42.978 56.2 42.857c-.12.12 1.316-2.052.598-3.742zM2.564 31.63C.77 28.37 4.001 21.85 6.395 17.988 12.142 8.692 21.84 1.328 26.27 2.414l1.197-.482s3.233 2.776 3.352 2.776C33.093 3.38 35.966 1.932 38.6 1.69c-1.676.362-3.591 1.207-5.986 2.656 0 0-5.627 3.863-8.979 7.244-1.796 1.81-9.218 10.865-9.218 10.744 1.317-2.535 2.274-3.863 4.43-6.52 1.197-1.569 2.514-3.017 3.83-4.466.599-.604 1.198-1.207 1.916-1.81.479-.363.838-.846 1.317-1.208.24-.12.36-.362.599-.483l-4.31-3.622.239 1.57 3.113 2.776s-2.754 1.932-4.19 3.14c-5.627 4.828-11.015 12.192-13.05 19.315h.12c-.958.604-2.036 1.449-2.874 2.656-.359.12-2.634-1.449-2.993-2.052zm9.219 13.4c-3.352 0-5.986-2.897-5.986-6.398s2.753-6.399 5.986-6.399c.838 0 1.676.242 2.394.483 0 0 1.317.604 1.676 3.743.36-.966.599-1.811.599-1.811.479 1.328.599 2.777.599 4.105.359-.483.718-1.328.718-1.328.718 4.104-2.155 7.605-5.986 7.605zm7.423-22.575s2.633-4.95 8.26-8.33c-.479-.121-1.436.12-1.676.12 1.078-.845 2.993-1.448 4.31-1.81-.359-.242-1.317-.363-1.796-.363h-.24c1.198-.724 3.593-1.086 5.628-.724-.24-.362-.838-.604-1.317-.724h-.24.12c1.317-.242 2.754 0 3.95.483-.119-.363-.478-.725-.717-.966l-.12-.12c1.197.24 2.394.844 3.352 1.448a3.668 3.668 0 0 0-.599-.845c1.198.362 2.515 1.207 3.113 2.414v.121c-2.275-1.69-8.74-1.207-15.204 3.018-2.874 1.932-5.148 3.984-6.824 6.278zm35.197 19.678c-.12.12-.838 4.587-5.626 8.33-5.867 4.708-13.649 4.225-16.642 1.57-1.556-1.45-2.274-3.623-2.274-3.623s-.12 1.208-.24 1.69c-1.197-2.052-1.077-4.466-1.077-4.466s-.599 1.207-.958 1.81c-.838-2.293-.479-4.587-.479-4.587l-.718 1.087s-.36-2.536.479-4.588c.838-2.294 2.514-3.863 2.873-4.104-1.197-.363-2.634-1.57-2.634-1.57h.958s-2.514-1.81-2.993-4.587c.359.482 1.077.965 1.077.965-.24-.724-.359-2.293-.12-3.984.48-3.018 2.994-5.07 5.747-5.07 2.993 0 5.029.604 7.543-1.69.479-.483.957-.966 1.676-1.087.12 0 .24-.12.718-.12.36 0 .838.12 1.197.362 1.317.845 1.676 3.018 1.796 4.587.599 5.795.36 4.83 2.634 6.037 1.077.603 2.394 1.086 3.831 2.656 1.197 0 1.796.965 1.317 1.69-4.07 4.829-9.697 7.122-15.923 7.364h-.838c-2.514.12-3.352 3.38-1.796 5.312.958 1.207 2.993 1.69 4.55 1.69 6.824.12 13.768-4.708 14.965-7.485l.12-.242c-.24.363-6.944 6.64-15.085 6.399 0 0-.838 0-1.676-.242-1.078-.241-1.916-.724-2.275-1.81.718.12 1.556.241 2.514.241 5.866 0 10.057-2.656 9.697-2.777h-.12c-.718.121-7.781 2.898-12.21 1.449 0-.12 0-.241.119-.362.359-1.328 1.077-1.207 2.275-1.207 4.07-.121 7.302-1.208 9.817-2.294 2.633-1.207 4.669-2.898 5.387-3.743.958 1.57.958 3.622.958 3.622s.359-.12.838-.12c1.437.12 1.676 1.448.598 2.897z"/><path d="m25.25 4.8.7.2-.6-2-.3 1zM30 5.286 29 4l.364 2c.181-.286.363-.429.636-.714zM42.222 26.669c.667 0 1.222.11 1.778.331 0-1.545-.889-3.2-1.556-2.98-.444.11-.444.773-.444 1.214 0 .552 0 .993.222 1.435zM28 7.538 25 7l1.957 1c.39-.154.652-.308 1.043-.462zM34.939 29.5c.663.25 1.061.375 1.061.25 0 0 0-.25-.133-.375-.398-.5-1.06-1-1.724-1.125-1.46-.5-3.184-.25-4.378.75-.663.5-.929 1-.663 1 .132 0 .53-.125 1.061-.25 2.123-.875 3.184-.875 4.776-.25zM35.515 31.581h.476c.095-.19-.572-.663-1.62-.569-.095 0-.19.095-.38.095h-.096c-.19.095-.477.19-.667.38-.19.19-.286.379-.19.474.095.095.19 0 .476-.095.857-.285 1.429-.285 2-.285zM13.15 36.562c.365.527.243.791.365.923 0 0 .12.132.242 0 .243-.132.243-.396.243-.66 0-.527-.243-1.187-.607-1.583-.485-.528-1.092-1.055-1.942-1.187-.728-.132-1.456 0-1.577.132-.122 0-.243 0-.364.132-1.942.791-2.792 2.902-2.428 4.882a5.09 5.09 0 0 0 .607 1.45c.364.529.85.397.607 0 0-.131-.243-.659-.364-1.45 0-.924.121-1.848.728-2.64.364-.527.85-.791.97-.791.122 0 .122-.132.244-.132h.121c.243-.132.121 0 .364-.132 1.456-.264 2.427.396 2.791 1.056z"/><path d="M13.28 38.039c-.104-.104-.21-.208-.21-.312 0-.208 0-.311.21-.415.106-.104.212-.104.212-.208s-.422-.208-.844.104c-.316.311-.316.935.106 1.35.527.52 1.265.624 1.37 1.247v.623c-.105.623-.738 1.247-1.792 1.039h-.316c-.105.104.316.623 1.16.52 1.16 0 2.002-1.143 1.792-2.39-.106-1.039-1.265-1.247-1.687-1.558z"/><circle transform="rotate(-81.136 43.66 29.98)" cx="43.66" cy="29.981" r="1"/><circle transform="rotate(-61.277 40.817 30.927)" cx="40.817" cy="30.927" r="1"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mattermost/mattermost.svg b/packages/nodes-base/nodes/Mattermost/mattermost.svg
index 76d5d58a41..fe21ec8b8d 100644
--- a/packages/nodes-base/nodes/Mattermost/mattermost.svg
+++ b/packages/nodes-base/nodes/Mattermost/mattermost.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="85" height="85" viewBox="0 0 85 85" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);"><path d="M42.642.004l.538.011l-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874c-5.378 15.885 3.635 33.29 20.131 38.874c16.496 5.584 34.228-2.767 39.605-18.651c3.55-10.487.828-21.636-6.179-29.61l-.312-.349l-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51c-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574c6-17.722 22.66-28.821 40.411-28.57zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006c3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683c-2.669.534-5.686.8-9.05.8c-2.724 0-5.22-.239-7.49-.72c-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 0 1-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489c0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 0 1 4.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 0 1 6.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 0 0-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 0 0-3.646-.24c-2.883 0-5.954.56-9.21 1.682c-.75-1.389-1.31-2.698-1.683-3.926c-.373-1.228-.561-2.696-.561-4.406c2.35-.8 4.7-1.387 7.048-1.76c2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 0 1-5.813-.483l-1.563-39.455l-12.67 27.27c-.81.107-1.648.202-2.517.281c-.867.081-1.734.12-2.603.12c-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 0 1-2.344-.322l-11.8-27.835l-1.215 40.02c-1.851.323-3.645.484-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 0 1 6.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718l14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522c2.243 1.014 4.152 2.404 5.727 4.166c1.576 1.761 2.765 3.858 3.566 6.287c.8 2.43 1.2 5.034 1.2 7.81c0 1.015-.039 2.017-.12 3.005c-.079.986-.174 1.775-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968c2.029 1.442 4.699 2.163 8.01 2.163c1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 0 0 5.407-1.48c.588 1.068 1.095 2.348 1.522 3.844c.427 1.494.667 3.097.72 4.806c-4.165 1.602-8.864 2.403-14.098 2.403c-3.844 0-7.141-.534-9.892-1.602c-2.75-1.068-4.992-2.55-6.728-4.446c-1.736-1.895-3.018-4.151-3.845-6.769c-.828-2.616-1.24-5.472-1.24-8.57c0-3.043.425-5.9 1.28-8.57c.853-2.672 2.122-4.994 3.805-6.97c1.682-1.976 3.765-3.538 6.248-4.686c2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682c2.51 1.123 4.592 2.657 6.25 4.606c1.654 1.95 2.882 4.26 3.684 6.929c.8 2.67 1.201 5.527 1.201 8.57c0 3.045-.4 5.874-1.201 8.491c-.802 2.617-2.03 4.9-3.685 6.848c-1.657 1.95-3.739 3.473-6.249 4.567c-2.51 1.094-5.446 1.642-8.81 1.642c-3.365 0-6.289-.548-8.77-1.642c-2.485-1.094-4.54-2.617-6.17-4.567c-1.628-1.948-2.856-4.231-3.684-6.848c-.828-2.617-1.241-5.446-1.241-8.49c0-3.044.413-5.902 1.241-8.571c.828-2.67 2.056-4.98 3.685-6.929c1.628-1.95 3.684-3.483 6.168-4.606c2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561c2.03.374 4.085.934 6.168 1.682a21.827 21.827 0 0 1-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 0 0-4.247-1.402c-1.548-.4-3.177-.601-4.885-.601c-1.816 0-3.23.28-4.246.841c-1.015.56-1.521 1.455-1.521 2.683c0 1.175.36 2.003 1.08 2.484c.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561c1.201.615 2.23 1.376 3.084 2.283c.855.908 1.522 2.03 2.002 3.364c.481 1.335.722 2.964.722 4.886c0 1.976-.414 3.819-1.242 5.527c-.827 1.71-2.03 3.191-3.604 4.445c-1.576 1.256-3.485 2.244-5.728 2.964c-2.242.722-4.78 1.082-7.61 1.082c-1.282 0-2.455-.04-3.523-.12a28.05 28.05 0 0 1-3.084-.4a36.158 36.158 0 0 1-2.924-.681a35.455 35.455 0 0 1-3.124-1.042c.107-1.442.36-2.898.76-4.365a27.54 27.54 0 0 1 1.563-4.286c1.763.695 3.431 1.215 5.007 1.562c1.575.348 3.217.521 4.926.521c.748 0 1.561-.067 2.442-.2a8.974 8.974 0 0 0 2.444-.72a5.791 5.791 0 0 0 1.882-1.363c.508-.56.76-1.295.76-2.203c0-1.281-.387-2.203-1.16-2.764c-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805c-1.683-1.681-2.524-4.206-2.524-7.57c0-4.058 1.455-7.234 4.365-9.531c2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163c.054.641.08 1.308.08 2.003c0 .747-.026 1.468-.08 2.162a21.984 21.984 0 0 1-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005c.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321c.802 0 1.59-.067 2.364-.2c.774-.134 1.455-.253 2.042-.36c.374 1.013.64 2.069.8 3.163c.162 1.095.242 2.07.242 2.924c0 .588-.014 1.081-.04 1.483c-.027.399-.067.788-.12 1.16c-2.457.589-4.993.88-7.61.88c-4.86 0-8.571-1.134-11.134-3.402c-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602l14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163c.052.641.079 1.308.079 2.003c0 .747-.027 1.468-.079 2.162a22.255 22.255 0 0 1-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005c.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 0 0 1.883 1.2c.748.214 1.63.321 2.643.321c.802 0 1.589-.067 2.364-.2c.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 0 1 .802 3.163c.16 1.095.24 2.07.24 2.924c0 .588-.014 1.081-.04 1.483c-.027.399-.067.788-.121 1.16a32.55 32.55 0 0 1-7.609.88c-4.86 0-8.572-1.134-11.134-3.402c-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602l14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081c.694.053 1.201.133 1.522.24c.106.534.187 1.148.24 1.842c.055.694.08 1.416.08 2.164c0 .907-.04 1.895-.12 2.963a21.374 21.374 0 0 1-.44 3.043c-.588-.107-1.242-.16-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28c-1.12.188-2.189.682-3.204 1.484c-1.015.8-1.855 2.001-2.522 3.604c-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 0 1-5.567 0a29.813 29.813 0 0 1-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36c.722-.08 1.509-.12 2.364-.12c.801 0 1.59.054 2.362.16c.775.107 1.536.24 2.283.4c.161.268.308.654.441 1.162c.134.508.254 1.042.361 1.602c.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445c1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886c2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48c-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647c-.72-1.55-2.175-2.324-4.365-2.324c-.908 0-1.802.134-2.682.4c-.883.267-1.683.76-2.404 1.482c-.72.72-1.308 1.736-1.763 3.045c-.454 1.306-.68 3.004-.68 5.085v22.349c-1.923.32-3.819.48-5.688.48c-1.869 0-3.765-.16-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647c-.722-1.55-2.176-2.324-4.366-2.324c-.907 0-1.815.134-2.724.4c-.907.267-1.721.788-2.443 1.562c-.72.774-1.295 1.856-1.721 3.245c-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48c-1.869 0-3.764-.16-5.686-.48V29.275c.747-.16 1.494-.28 2.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 0 1 2.402.12c.695.08 1.415.2 2.163.36c.16.267.307.655.44 1.162c.134.507.254 1.042.361 1.602c.107.56.2 1.108.28 1.642c.081.534.147.988.201 1.361c.427-.8.988-1.601 1.682-2.403c.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 0 1 3.244-1.562c1.201-.4 2.55-.601 4.045-.601c6.461 0 10.6 2.457 12.416 7.37c1.067-1.977 2.576-3.698 4.526-5.167c1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692c.161.801.267 1.522.321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 0 1-.08 2.162a21.72 21.72 0 0 1-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005c.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321c.801 0 1.588-.067 2.364-.2c.773-.134 1.454-.253 2.041-.36c.375 1.013.642 2.069.801 3.163c.162 1.095.24 2.07.24 2.924c0 .588-.012 1.081-.04 1.483c-.026.399-.065.788-.119 1.16c-2.456.589-4.992.88-7.61.88c-4.86 0-8.57-1.134-11.134-3.402c-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602l14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325c-1.31 2.216-1.964 5.407-1.964 9.572c0 4.165.655 7.356 1.964 9.572c1.309 2.216 3.43 3.324 6.368 3.324c2.99 0 5.14-1.108 6.447-3.324c1.309-2.216 1.963-5.407 1.963-9.572c0-4.165-.654-7.356-1.963-9.572c-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401c-1.522.935-2.283 2.443-2.283 4.526c0 1.389.295 2.456.882 3.204c.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 0 0 2.643.642c.936.08 1.75.12 2.443.12c.802 0 1.603-.067 2.403-.2c.802-.134 1.496-.253 2.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28c-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096l.024.038l.02.044c.056.106.103.226.125.375c.04.271.06.882.07 1.53l.003.392l.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222l.244 7.18l.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553c-3.98 3.9-8.868 3.542-12.048 2.466c-3.18-1.077-7.28-3.763-8.074-9.278c-.778-5.41 2.663-9.825 2.793-9.99l.003-.004l7.823-9.728l4.556-5.555l3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055l.075-.038l.013-.005a.973.973 0 0 1 .702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243c-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208c-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><rect x="0" y="0" width="512" height="85" fill="rgba(0, 0, 0, 0)" /></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg);transform:rotate(360deg)"><path d="m42.642.004.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874 16.496 5.584 34.228-2.767 39.605-18.651 3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006 3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683-2.669.534-5.686.8-9.05.8-2.724 0-5.22-.239-7.49-.72-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 0 1-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489 0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 0 1 4.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 0 1 6.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 0 0-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 0 0-3.646-.24c-2.883 0-5.954.56-9.21 1.682-.75-1.389-1.31-2.698-1.683-3.926-.373-1.228-.561-2.696-.561-4.406 2.35-.8 4.7-1.387 7.048-1.76 2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 0 1-5.813-.483l-1.563-39.455-12.67 27.27c-.81.107-1.648.202-2.517.281-.867.081-1.734.12-2.603.12-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 0 1-2.344-.322l-11.8-27.835-1.215 40.02a31.291 31.291 0 0 1-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 0 1 6.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718 14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522 2.243 1.014 4.152 2.404 5.727 4.166 1.576 1.761 2.765 3.858 3.566 6.287.8 2.43 1.2 5.034 1.2 7.81 0 1.015-.039 2.017-.12 3.005a25.251 25.251 0 0 1-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968 2.029 1.442 4.699 2.163 8.01 2.163 1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 0 0 5.407-1.48c.588 1.068 1.095 2.348 1.522 3.844.427 1.494.667 3.097.72 4.806-4.165 1.602-8.864 2.403-14.098 2.403-3.844 0-7.141-.534-9.892-1.602-2.75-1.068-4.992-2.55-6.728-4.446-1.736-1.895-3.018-4.151-3.845-6.769-.828-2.616-1.24-5.472-1.24-8.57 0-3.043.425-5.9 1.28-8.57.853-2.672 2.122-4.994 3.805-6.97 1.682-1.976 3.765-3.538 6.248-4.686 2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682 2.51 1.123 4.592 2.657 6.25 4.606 1.654 1.95 2.882 4.26 3.684 6.929.8 2.67 1.201 5.527 1.201 8.57 0 3.045-.4 5.874-1.201 8.491-.802 2.617-2.03 4.9-3.685 6.848-1.657 1.95-3.739 3.473-6.249 4.567-2.51 1.094-5.446 1.642-8.81 1.642-3.365 0-6.289-.548-8.77-1.642-2.485-1.094-4.54-2.617-6.17-4.567-1.628-1.948-2.856-4.231-3.684-6.848-.828-2.617-1.241-5.446-1.241-8.49 0-3.044.413-5.902 1.241-8.571.828-2.67 2.056-4.98 3.685-6.929 1.628-1.95 3.684-3.483 6.168-4.606 2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561a39.33 39.33 0 0 1 6.168 1.682 21.827 21.827 0 0 1-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 0 0-4.247-1.402 19.458 19.458 0 0 0-4.885-.601c-1.816 0-3.23.28-4.246.841-1.015.56-1.521 1.455-1.521 2.683 0 1.175.36 2.003 1.08 2.484.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561 1.201.615 2.23 1.376 3.084 2.283.855.908 1.522 2.03 2.002 3.364.481 1.335.722 2.964.722 4.886 0 1.976-.414 3.819-1.242 5.527-.827 1.71-2.03 3.191-3.604 4.445-1.576 1.256-3.485 2.244-5.728 2.964-2.242.722-4.78 1.082-7.61 1.082a47.4 47.4 0 0 1-3.523-.12 28.05 28.05 0 0 1-3.084-.4 36.158 36.158 0 0 1-2.924-.681 35.455 35.455 0 0 1-3.124-1.042 23.06 23.06 0 0 1 .76-4.365 27.54 27.54 0 0 1 1.563-4.286c1.763.695 3.431 1.215 5.007 1.562 1.575.348 3.217.521 4.926.521.748 0 1.561-.067 2.442-.2a8.974 8.974 0 0 0 2.444-.72 5.791 5.791 0 0 0 1.882-1.363c.508-.56.76-1.295.76-2.203 0-1.281-.387-2.203-1.16-2.764-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805-1.683-1.681-2.524-4.206-2.524-7.57 0-4.058 1.455-7.234 4.365-9.531 2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163.054.641.08 1.308.08 2.003 0 .747-.026 1.468-.08 2.162a21.984 21.984 0 0 1-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321.802 0 1.59-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.65 15.65 0 0 1 .8 3.163c.162 1.095.242 2.07.242 2.924 0 .588-.014 1.081-.04 1.483a15.83 15.83 0 0 1-.12 1.16c-2.457.589-4.993.88-7.61.88-4.86 0-8.571-1.134-11.134-3.402-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163.052.641.079 1.308.079 2.003 0 .747-.027 1.468-.079 2.162a22.255 22.255 0 0 1-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 0 0 1.883 1.2c.748.214 1.63.321 2.643.321.802 0 1.589-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 0 1 .802 3.163c.16 1.095.24 2.07.24 2.924 0 .588-.014 1.081-.04 1.483-.027.399-.067.788-.121 1.16a32.55 32.55 0 0 1-7.609.88c-4.86 0-8.572-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081.694.053 1.201.133 1.522.24.106.534.187 1.148.24 1.842.055.694.08 1.416.08 2.164 0 .907-.04 1.895-.12 2.963a21.374 21.374 0 0 1-.44 3.043 11.003 11.003 0 0 0-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28-1.12.188-2.189.682-3.204 1.484-1.015.8-1.855 2.001-2.522 3.604-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 0 1-5.567 0 29.813 29.813 0 0 1-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36.722-.08 1.509-.12 2.364-.12.801 0 1.59.054 2.362.16.775.107 1.536.24 2.283.4.161.268.308.654.441 1.162.134.508.254 1.042.361 1.602.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445 1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886 2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647-.72-1.55-2.175-2.324-4.365-2.324-.908 0-1.802.134-2.682.4-.883.267-1.683.76-2.404 1.482-.72.72-1.308 1.736-1.763 3.045-.454 1.306-.68 3.004-.68 5.085v22.349a34.61 34.61 0 0 1-5.688.48 34.61 34.61 0 0 1-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647-.722-1.55-2.176-2.324-4.366-2.324a9.66 9.66 0 0 0-2.724.4c-.907.267-1.721.788-2.443 1.562-.72.774-1.295 1.856-1.721 3.245-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48-1.869 0-3.764-.16-5.686-.48V29.275a21.73 21.73 0 0 1 2.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 0 1 2.402.12c.695.08 1.415.2 2.163.36.16.267.307.655.44 1.162.134.507.254 1.042.361 1.602.107.56.2 1.108.28 1.642.081.534.147.988.201 1.361.427-.8.988-1.601 1.682-2.403.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 0 1 3.244-1.562c1.201-.4 2.55-.601 4.045-.601 6.461 0 10.6 2.457 12.416 7.37 1.067-1.977 2.576-3.698 4.526-5.167 1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19.3 19.3 0 0 1 .321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 0 1-.08 2.162 21.72 21.72 0 0 1-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321.801 0 1.588-.067 2.364-.2.773-.134 1.454-.253 2.041-.36a15.52 15.52 0 0 1 .801 3.163 20.184 20.184 0 0 1 .2 4.407 14.81 14.81 0 0 1-.119 1.16c-2.456.589-4.992.88-7.61.88-4.86 0-8.57-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325-1.31 2.216-1.964 5.407-1.964 9.572 0 4.165.655 7.356 1.964 9.572 1.309 2.216 3.43 3.324 6.368 3.324 2.99 0 5.14-1.108 6.447-3.324 1.309-2.216 1.963-5.407 1.963-9.572 0-4.165-.654-7.356-1.963-9.572-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401-1.522.935-2.283 2.443-2.283 4.526 0 1.389.295 2.456.882 3.204.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 0 0 2.643.642c.936.08 1.75.12 2.443.12.802 0 1.603-.067 2.403-.2a135.91 135.91 0 0 0 2.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055.075-.038.013-.005a.973.973 0 0 1 .702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MessageBird/messagebird.svg b/packages/nodes-base/nodes/MessageBird/messagebird.svg
index 76a221909c..6b75eda427 100644
--- a/packages/nodes-base/nodes/MessageBird/messagebird.svg
+++ b/packages/nodes-base/nodes/MessageBird/messagebird.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>messagebird_node_icon</title>
-    <g id="messagebird_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="messagebird-icon" transform="translate(0.000000, 5.000000)" fill="#2481D7" fill-rule="nonzero">
-            <g id="A" transform="translate(0.461538, 0.461538)">
-                <path d="M53.0076923,8.83384615 C50.6372308,8.83384615 48.5187692,10.0190769 47.2255385,11.8153846 L38.4987692,24.0258462 C38.1720194,24.4968546 37.6357085,24.7784523 37.0624615,24.78 C36.0916228,24.7779689 35.305108,23.9914541 35.3030769,23.0206154 C35.3030769,22.6513846 35.4110769,22.3024615 35.58,22.0513846 L42.9415385,11.0252308 C43.6956923,9.912 44.1267692,8.54769231 44.1267692,7.07446154 C44.136,3.16061538 40.9846154,0 37.0615385,0 L0,0 L0,7.07446154 L31.7473846,7.07446154 C31.7473846,9.01292308 30.1670769,10.6301538 28.1916923,10.6301538 L0,10.6301538 C0,13.1436923 0.539076923,15.5501538 1.47230769,17.7046154 L24.6461538,17.7046154 C24.6461538,19.6430769 23.0658462,21.2603077 21.0904615,21.2603077 L3.55569231,21.2603077 C6.89973532,25.7288152 12.160331,28.3522669 17.7415385,28.3347692 L26.4683077,28.3347692 C27.4391465,28.3368003 28.2256613,29.1233151 28.2276923,30.0941538 C28.2256613,31.0649926 27.4391465,31.8515074 26.4683077,31.8535385 L17.7046154,31.8535385 L5.85230769,49.5581538 L27.2926154,49.5581538 C37.0956923,49.5581538 45.4283077,43.1658462 48.3387692,34.3310769 L52.3264615,22.2387692 C53.6187692,18.3249231 55.9892308,14.8763077 59.0778462,12.2547692 C57.8566154,10.2073846 55.5941538,8.84307692 53.0086154,8.84307692 L53.0076923,8.83384615 Z M53.0076923,13.6818462 C52.2895385,13.6818462 51.6784615,13.0726154 51.6784615,12.3526154 C51.6883943,11.6226554 52.2777323,11.0333174 53.0076923,11.0233846 C53.7376523,11.0333174 54.3269903,11.6226554 54.3369231,12.3526154 C54.3369231,13.1067692 53.7276923,13.6818462 53.0076923,13.6818462 L53.0076923,13.6818462 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.47 14.295c-2.371 0-4.49 1.186-5.783 2.982l-8.727 12.21a1.754 1.754 0 0 1-1.436.755 1.763 1.763 0 0 1-1.76-1.76c0-.37.109-.718.278-.97l7.361-11.025c.754-1.113 1.185-2.478 1.185-3.951a7.046 7.046 0 0 0-7.065-7.074H.462v7.074h31.747a3.564 3.564 0 0 1-3.556 3.556H.462c0 2.513.539 4.92 1.472 7.074h23.174a3.564 3.564 0 0 1-3.556 3.556H4.017a17.65 17.65 0 0 0 14.186 7.074h8.727c.97.002 1.757.789 1.76 1.76a1.763 1.763 0 0 1-1.76 1.76h-8.764L6.314 55.02h21.44c9.803 0 18.136-6.393 21.046-15.227L52.788 27.7a22.305 22.305 0 0 1 6.751-9.984 7.044 7.044 0 0 0-6.069-3.411v-.01zm0 4.848c-.719 0-1.33-.609-1.33-1.329.01-.73.6-1.32 1.33-1.33.73.01 1.319.6 1.328 1.33 0 .754-.609 1.33-1.329 1.33z" fill="#2481D7" fill-rule="nonzero" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
index cb90800486..4831d52a9f 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
+++ b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
@@ -1,34 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>microsoft_excel_node_icon</title>
-    <g id="microsoft_excel_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="microsoft-excel" fill="#02723B">
-            <g id="Group" transform="translate(0.370370, 0.370370)">
-                <polygon id="C" points="42.7288889 19.857037 52.2414815 19.857037 52.2414815 24.5481481 42.7288889 24.5481481"></polygon>
-                <g id="C-link" transform="translate(42.222222, 12.224444)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <g id="C-link" transform="translate(42.222222, 26.451852)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <g id="C-link" transform="translate(42.222222, 33.488148)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <path d="M42.7288889,41.2785185 L52.2414815,41.2785185 L52.2414815,45.9688889 L42.7288889,45.9688889 L42.7288889,41.2785185 Z M57.6992593,6.41037037 L34.7755556,6.41037037 L34.7755556,0 L0,6.09777778 L0,53.3185185 L34.7755556,59.2592593 L34.7755556,52.0740741 L57.6992593,52.0740741 C58.6348148,52.0740741 59.2585185,51.2925926 59.2585185,50.5185185 L59.2585185,7.97407407 C59.2585185,7.19259259 58.6348148,6.41851852 57.6992593,6.41851852 L57.6992593,6.41037037 Z M19.6474074,40.1837037 L16.3733333,31.5911111 L16.2251852,31.5911111 C16.2251852,31.7392593 12.9511111,39.7214815 12.9511111,39.7214815 L8.58444444,39.4088889 L13.7303704,29.2459259 L9.05185185,19.082963 L13.4185185,18.7703704 L16.3814815,26.7444444 L16.5296296,26.7444444 C16.5296296,26.5962963 19.8037037,18.4577778 19.8037037,18.4577778 L24.3259259,18.1451852 L18.8681481,29.2466667 L24.482963,40.3481481 L19.6488889,40.2 L19.6474074,40.1837037 Z M57.2303704,50.3466667 L34.7755556,50.3466667 L34.7755556,45.9762963 L40.2333333,45.9762963 L40.2333333,41.2851852 L34.7755556,41.2851852 L34.7755556,38.9333333 L40.2333333,38.9333333 L40.2333333,34.242963 L34.7755556,34.242963 L34.7755556,31.8962963 L40.2333333,31.8962963 L40.2333333,27.2059259 L34.7755556,27.2059259 L34.7755556,24.8607407 L40.2333333,24.8607407 L40.2333333,20.1703704 L34.7755556,20.1703704 L34.7755556,17.8251852 L40.2333333,17.8251852 L40.2333333,13.1333333 L34.7755556,13.1333333 L34.7755556,8.44296296 L57.2318519,8.44296296 L57.2318519,50.3466667 L57.2303704,50.3466667 Z" id="Shape"></path>
-            </g>
-            <g id="Group">
-                <polygon id="C" points="42.7288889 19.857037 52.2414815 19.857037 52.2414815 24.5481481 42.7288889 24.5481481"></polygon>
-                <g id="C-link" transform="translate(42.222222, 12.224444)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <g id="C-link" transform="translate(42.222222, 26.451852)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <g id="C-link" transform="translate(42.222222, 33.488148)">
-                    <polygon id="C" points="0.506666667 0.597777778 10.0192593 0.597777778 10.0192593 5.28888889 0.506666667 5.28888889"></polygon>
-                </g>
-                <path d="M42.7288889,41.2785185 L52.2414815,41.2785185 L52.2414815,45.9688889 L42.7288889,45.9688889 L42.7288889,41.2785185 Z M57.6992593,6.41037037 L34.7755556,6.41037037 L34.7755556,0 L0,6.09777778 L0,53.3185185 L34.7755556,59.2592593 L34.7755556,52.0740741 L57.6992593,52.0740741 C58.6348148,52.0740741 59.2585185,51.2925926 59.2585185,50.5185185 L59.2585185,7.97407407 C59.2585185,7.19259259 58.6348148,6.41851852 57.6992593,6.41851852 L57.6992593,6.41037037 Z M19.6474074,40.1837037 L16.3733333,31.5911111 L16.2251852,31.5911111 C16.2251852,31.7392593 12.9511111,39.7214815 12.9511111,39.7214815 L8.58444444,39.4088889 L13.7303704,29.2459259 L9.05185185,19.082963 L13.4185185,18.7703704 L16.3814815,26.7444444 L16.5296296,26.7444444 C16.5296296,26.5962963 19.8037037,18.4577778 19.8037037,18.4577778 L24.3259259,18.1451852 L18.8681481,29.2466667 L24.482963,40.3481481 L19.6488889,40.2 L19.6474074,40.1837037 Z M57.2303704,50.3466667 L34.7755556,50.3466667 L34.7755556,45.9762963 L40.2333333,45.9762963 L40.2333333,41.2851852 L34.7755556,41.2851852 L34.7755556,38.9333333 L40.2333333,38.9333333 L40.2333333,34.242963 L34.7755556,34.242963 L34.7755556,31.8962963 L40.2333333,31.8962963 L40.2333333,27.2059259 L34.7755556,27.2059259 L34.7755556,24.8607407 L40.2333333,24.8607407 L40.2333333,20.1703704 L34.7755556,20.1703704 L34.7755556,17.8251852 L40.2333333,17.8251852 L40.2333333,13.1333333 L34.7755556,13.1333333 L34.7755556,8.44296296 L57.2318519,8.44296296 L57.2318519,50.3466667 L57.2303704,50.3466667 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#02723B" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.1 20.227h9.512v4.692h-9.513zM43.1 13.193h9.512v4.69h-9.513zM43.1 27.42h9.512v4.691h-9.513zM43.1 34.456h9.512v4.691h-9.513z"/><path d="M43.1 41.649h9.512v4.69h-9.513v-4.69zM58.07 6.78H35.146V.37L.37 6.467v47.22l34.776 5.942v-7.186H58.07c.935 0 1.559-.781 1.559-1.555V8.344c0-.781-.624-1.555-1.56-1.555V6.78zM20.018 40.554l-3.274-8.593h-.148c0 .149-3.275 8.13-3.275 8.13l-4.366-.312L14.1 29.616 9.422 19.453l4.367-.312 2.963 7.974h.148c0-.148 3.274-8.287 3.274-8.287l4.522-.312-5.457 11.101 5.614 11.102-4.834-.149-.001-.016zM57.6 50.717H35.146v-4.37h5.458v-4.691h-5.458v-2.352h5.458v-4.69h-5.458v-2.347h5.458v-4.69h-5.458V25.23h5.458v-4.69h-5.458v-2.345h5.458v-4.692h-5.458v-4.69h22.456v41.903h-.001z"/><g><path d="M42.729 19.857h9.512v4.691H42.73zM42.729 12.822h9.512v4.691H42.73zM42.729 27.05h9.512v4.69H42.73zM42.729 34.086h9.512v4.691H42.73z"/><path d="M42.729 41.279h9.512v4.69H42.73v-4.69zM57.699 6.41H34.776V0L0 6.098v47.22l34.776 5.941v-7.185h22.923c.936 0 1.56-.781 1.56-1.555V7.974c0-.781-.624-1.555-1.56-1.555V6.41zM19.647 40.184l-3.274-8.593h-.148c0 .148-3.274 8.13-3.274 8.13l-4.367-.312 5.146-10.163-4.678-10.163 4.367-.313 2.962 7.974h.149c0-.148 3.274-8.286 3.274-8.286l4.522-.313-5.458 11.102 5.615 11.101-4.834-.148-.002-.016zM57.23 50.347H34.776v-4.37h5.457v-4.692h-5.457v-2.352h5.457v-4.69h-5.457v-2.347h5.457v-4.69h-5.457V24.86h5.457v-4.69h-5.457v-2.346h5.457v-4.692h-5.457v-4.69h22.456v41.904h-.002z"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
index a4eae7d657..056f59b0f6 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974zm55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23v31.873zm0-35.462l-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575z" fill="#2372ba" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974zm55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23v31.873zm0-35.462-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575z" fill="#2372ba" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
index 7fb7859c8a..43b3bbd01c 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
+++ b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="385"
-   height="385"
-   id="svg3614">
-  <defs
-     id="defs3616">
-    <linearGradient
-       x1="-411.5267"
-       y1="-29.889751"
-       x2="-23.846952"
-       y2="-258.96371"
-       id="linearGradient2851"
-       xlink:href="#linearGradient3649-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66977913,0,0,0.66977913,488.25553,811.45513)" />
-    <linearGradient
-       id="linearGradient3649-2">
-      <stop
-         id="stop3651-1"
-         style="stop-color:#909ca9;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3653-6"
-         style="stop-color:#ededee;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-447.79681"
-       y1="-889.05798"
-       x2="-135.85931"
-       y2="-889.05798"
-       id="linearGradient2848"
-       xlink:href="#linearGradient3672-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66977913,0,0,0.66977913,488.25553,811.45513)" />
-    <linearGradient
-       id="linearGradient3672-8">
-      <stop
-         id="stop3674-5"
-         style="stop-color:#939fab;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3676-7"
-         style="stop-color:#dcdee1;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="-1259.0977"
-       cy="-245.42754"
-       r="414.15625"
-       fx="-1259.0977"
-       fy="-245.42754"
-       id="radialGradient2845"
-       xlink:href="#linearGradient3629-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6435342,-0.09731428,0.19435637,-1.2852688,-377.15369,-44.777181)" />
-    <linearGradient
-       id="linearGradient3629-6">
-      <stop
-         id="stop3631-1"
-         style="stop-color:#ee352c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3633-8"
-         style="stop-color:#a91d22;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata3619">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-220.96887,-214.23042)"
-     id="layer1">
-    <g
-       transform="matrix(0.87205879,0,0,0.87205879,-814.02071,35.444919)"
-       id="g3545">
-      <g
-         transform="matrix(0.65282401,0,0,0.65282401,1153.1248,109.92721)"
-         id="layer1-2">
-        <path
-           d="m 469.03913,461.90328 -132.3442,43.15889 -115.05546,50.81949 -32.23313,8.51875 c -8.17177,7.76757 -16.8442,15.65704 -26.07959,23.69344 -10.15197,8.83403 -19.69921,16.83977 -26.95861,22.62598 -8.0837,6.44323 -20.10328,18.36933 -26.2469,26.01673 -9.14014,11.37738 -16.287689,23.50961 -19.360836,32.84011 -5.528893,16.78653 -2.835108,33.78858 7.828043,49.47993 13.621163,20.04417 40.737103,40.40934 72.273323,54.27304 16.08642,7.07173 43.2321,16.18811 63.58722,21.32828 33.92184,8.56609 99.48216,17.87306 135.58835,19.25615 7.32269,0.28037 17.07093,0.25405 17.51894,-0.0419 0.79242,-0.52337 6.41334,-11.16652 12.93511,-24.4888 22.19045,-45.32961 38.24499,-87.82466 46.88454,-124.11845 5.23117,-21.97568 9.30946,-51.27956 11.9514,-86.02475 0.73997,-9.73283 1.00822,-42.19356 0.43951,-53.22651 -0.92537,-17.95348 -2.50678,-32.58669 -5.04424,-46.94733 -0.37226,-2.10481 -0.50923,-3.95573 -0.31399,-4.12333 0.36798,-0.31586 1.61798,-0.71689 17.87473,-5.44196 l -3.24421,-7.5978 z m -30.24475,17.74914 c 1.20273,0 4.40105,30.67062 5.23265,50.12878 0.17669,4.13457 0.14099,6.78152 -0.10462,6.78152 -0.78993,0 -16.94869,-9.48862 -28.40285,-16.68169 -10.00288,-6.28166 -28.98503,-18.89586 -32.00292,-21.26549 -0.95222,-0.74772 -0.85162,-0.78423 7.32578,-3.60006 13.91339,-4.79103 46.90054,-15.36306 47.95196,-15.36306 z m -67.41748,22.12364 c 0.8551,-0.002 3.18352,1.28312 8.68623,4.73032 20.64212,12.93129 48.59495,28.48887 60.57315,33.71919 3.71405,1.62171 4.13809,0.99331 -4.41633,6.80245 -18.2344,12.38245 -40.90361,24.5574 -68.73608,36.92157 -4.85087,2.15488 -8.9601,3.91402 -9.12574,3.91402 -0.1657,0 0.37575,-2.46057 1.19301,-5.48381 6.7424,-24.94123 10.54708,-50.11594 10.65364,-70.30588 0.0528,-9.98517 0.0555,-10.03807 1.00467,-10.27692 0.0445,-0.0112 0.11045,-0.0208 0.16745,-0.0209 z m -13.87696,5.29545 c 0.59745,0.60014 0.16483,22.97565 -0.56509,29.0726 -1.7512,14.62678 -4.61304,28.15457 -9.18857,43.53564 -1.09334,3.67531 -2.11824,6.8435 -2.2814,7.03268 -0.39745,0.46078 -14.07996,-12.87072 -18.6283,-18.14683 -7.77131,-9.01483 -13.91915,-17.9699 -18.39796,-26.79116 -2.27631,-4.48349 -5.90618,-13.33805 -5.56754,-13.58396 1.53714,-1.11625 54.25332,-21.49615 54.62886,-21.11897 z m -65.36622,25.76556 c 0.12304,0.0123 0.21861,0.0457 0.27206,0.10465 0.19732,0.2174 0.89409,1.84262 1.54887,3.621 3.18701,8.65635 10.35364,21.51606 16.57703,29.74238 6.79451,8.98129 15.65307,18.55091 23.06552,24.90741 2.38006,2.04101 4.60058,3.94598 4.91872,4.22798 0.63469,0.56261 0.84808,0.46722 -15.46774,6.65593 -18.90941,7.17244 -39.50324,14.35475 -63.14758,21.99806 -9.01047,2.91269 -16.63651,5.37392 -16.93289,5.48382 -0.90065,0.33395 -0.62443,-0.22068 2.00934,-4.33264 11.74846,-18.3418 29.5459,-54.22153 39.496,-79.59906 1.72589,-4.40154 3.36832,-8.80985 3.66289,-9.79552 0.43275,-1.448 0.85919,-1.94051 2.21864,-2.55353 0.75197,-0.33911 1.40989,-0.49735 1.77914,-0.46048 z m -20.03062,8.26759 c 0.26617,0.23414 -4.80586,10.9457 -9.79552,20.67943 -9.67797,18.87958 -20.34802,37.45869 -34.51459,60.13361 -2.44429,3.91242 -4.69682,7.48919 -5.00238,7.93269 -0.50313,0.73036 -0.70936,0.48967 -2.2605,-2.59539 -3.39136,-6.74515 -6.2327,-15.25552 -7.70246,-23.17017 -1.45456,-7.8331 -1.20714,-21.39417 0.5442,-29.80517 1.30111,-6.24889 1.24371,-6.11077 4.18612,-7.61874 12.72165,-6.51994 54.13081,-25.92074 54.54513,-25.55626 z m 172.53089,7.01175 0,4.24891 c -0.0214,22.31631 -2.40351,52.86892 -5.86057,75.16178 -0.60662,3.91204 -1.13193,7.13954 -1.17211,7.17919 -0.0399,0.0395 -2.85983,-0.78685 -6.25822,-1.84189 -15.01651,-4.6618 -31.29677,-11.6262 -45.98456,-19.67476 -9.7266,-5.33 -23.7947,-13.96405 -23.40034,-14.35839 0.10717,-0.10722 4.25062,-2.30294 9.20947,-4.87683 19.6404,-10.19451 38.40192,-21.18544 54.71251,-32.08661 6.11971,-4.09005 15.27646,-10.71038 17.30964,-12.49557 l 1.44418,-1.25583 z m -248.06945,29.57493 c 0.40776,-0.0196 0.30422,0.75423 -0.33489,4.43729 -0.44433,2.56146 -0.9466,7.40004 -1.13018,10.7374 -0.80454,14.62803 1.56768,25.42028 8.83264,40.18674 2.01986,4.10553 3.59993,7.52788 3.51634,7.59781 -0.72738,0.60887 -66.88032,19.96701 -87.67824,25.66091 -6.16505,1.68785 -11.55335,3.17468 -11.9932,3.30704 -0.72168,0.21724 -0.78598,0.0601 -0.5233,-1.63259 2.27799,-14.67589 13.47301,-33.93791 29.11443,-50.10785 10.39893,-10.75028 18.72529,-17.11825 32.88201,-25.20044 10.16014,-5.80048 25.93974,-14.50561 27.10515,-14.94445 0.0783,-0.0295 0.15104,-0.039 0.20924,-0.0419 z m 156.03764,27.94235 c 0.0628,-0.0752 2.51368,1.2368 5.44196,2.93028 21.36749,12.35737 51.18459,23.94792 76.60598,29.76331 l 2.30237,0.52327 -3.16049,1.75817 c -13.27957,7.36881 -57.0128,25.56519 -101.68091,42.32167 -6.52063,2.44614 -12.88327,4.84452 -14.12812,5.3373 -1.24485,0.49277 -2.2605,0.83065 -2.2605,0.73257 0,-0.0981 1.84243,-3.64405 4.1024,-7.8699 12.53953,-23.44641 25.05657,-51.93851 31.47962,-71.70823 0.65484,-2.01549 1.23473,-3.71321 1.29769,-3.78844 z m -15.90725,5.21172 c 0.0686,0.0686 -0.71258,2.16894 -1.73728,4.64659 -8.71744,21.07977 -20.13898,44.07627 -34.70286,69.9082 -3.70629,6.57395 -6.83047,11.94122 -6.94896,11.93044 -0.11862,-0.0108 -3.13302,-1.79443 -6.69779,-3.97681 -21.21318,-12.9868 -39.98213,-28.97251 -52.3056,-44.51938 l -1.75817,-2.19772 9.14664,-2.51167 c 32.62555,-8.93767 60.29345,-18.49568 87.80389,-30.34937 3.8955,-1.67848 7.13161,-2.99883 7.20013,-2.93028 z m 98.81332,34.49363 c 0.0469,0.01 0.0628,0.0426 0.0628,0.0837 0,2.22372 -5.04658,22.80235 -9.25132,37.696 -3.52706,12.49334 -6.48795,22.26528 -11.9723,39.57976 -2.42219,7.64702 -4.50166,13.88841 -4.6257,13.85606 -0.12398,-0.0323 -0.70488,-0.1439 -1.29763,-0.25117 -29.71937,-5.37841 -56.33827,-12.87864 -81.27354,-22.89807 -6.97609,-2.80315 -17.04984,-7.26544 -17.58171,-7.78618 -0.18017,-0.17646 5.84389,-3.01436 13.37469,-6.30011 45.54156,-19.87009 92.7275,-42.49814 108.86,-52.20091 1.94035,-1.16701 3.37683,-1.84667 3.70469,-1.7791 z m -228.10159,7.80711 c 0.2442,0.23133 -12.49486,18.4671 -30.28661,43.3682 -6.18387,8.65476 -13.44816,18.85582 -16.13752,22.66783 -2.68937,3.81203 -6.75754,9.84571 -9.06292,13.41652 l -4.20702,6.48848 -4.47921,-3.7675 c -5.25569,-4.41283 -14.45517,-13.78206 -18.62817,-18.98406 -8.5875,-10.7047 -14.40634,-21.97023 -16.70268,-32.31684 -1.06013,-4.77661 -1.09134,-7.21066 -0.0837,-7.51408 1.4563,-0.43858 28.17205,-6.72799 53.22654,-12.53743 13.91701,-3.22699 30.00678,-7.00436 35.77036,-8.39317 5.76372,-1.38878 10.53462,-2.48127 10.59095,-2.42795 z m 12.80952,4.89776 3.22325,3.60006 c 14.41063,16.05315 29.06627,28.03245 46.94736,38.36579 3.15707,1.82441 5.56326,3.41056 5.35824,3.53727 -0.74426,0.46 -61.83334,22.18032 -90.0853,32.02381 -15.9331,5.55138 -29.02126,10.07794 -29.09353,10.06762 -0.0723,-0.0106 -0.97479,-0.60081 -1.98837,-1.31863 l -1.84189,-1.31863 2.88835,-4.16518 c 9.37383,-13.57822 21.15136,-28.51041 46.92647,-59.52662 l 17.66542,-21.26549 z m 79.82924,57.05681 c 0.0707,-0.0882 4.53708,1.49528 9.94207,3.51634 13.0284,4.87154 23.25352,8.04885 37.08901,11.51183 16.99337,4.25336 41.55116,8.5067 56.09401,9.73272 2.23257,0.18819 3.3722,0.44297 3.014,0.66978 -0.67513,0.42754 -15.40023,5.34585 -26.226,8.74899 -17.18459,5.402 -69.70184,20.91648 -112.5229,33.23779 -7.94351,2.28564 -14.73534,4.2168 -15.09099,4.29078 -0.95912,0.19948 -4.3117,-0.68047 -4.3117,-1.13026 0,-0.21379 2.40109,-3.25252 5.31637,-6.73965 14.39308,-17.21623 28.69146,-36.44489 40.62632,-54.62886 3.2643,-4.97354 5.99921,-9.12129 6.06981,-9.20946 z m -17.68632,0.50233 c 0.12879,0.12882 -6.96618,11.48947 -19.4445,31.14473 -5.26881,8.29909 -11.24331,17.74618 -13.29096,20.99339 -2.04758,3.24725 -5.04799,8.18192 -6.65593,10.98857 l -2.93028,5.10706 -1.48604,-0.39768 c -3.5858,-0.9708 -28.87947,-9.90623 -35.56112,-12.55836 -8.28115,-3.28696 -16.91132,-7.25644 -23.27483,-10.69553 -7.95208,-4.29764 -18.03755,-10.6749 -17.24681,-10.92578 0.22766,-0.0722 13.91165,-3.81738 30.39123,-8.30944 43.83966,-11.94992 68.08908,-18.815 83.99446,-23.77716 2.97194,-0.92717 5.44784,-1.62666 5.50478,-1.5698 z m 124.51609,29.19819 c 0.0944,-0.0205 0.13817,-0.0209 0.14655,0 0.41466,1.03688 -15.8149,45.98847 -21.74693,60.23826 -1.32857,3.19176 -1.82019,3.96509 -2.51167,3.93495 -1.67907,-0.0733 -25.21156,-3.3635 -39.45414,-5.52568 -24.9328,-3.78505 -66.6954,-11.07791 -77.23391,-13.4793 l -2.44891,-0.5442 14.94451,-3.36982 c 32.03205,-7.21707 47.41561,-11.0878 63.022,-15.8654 19.68246,-6.02544 39.17203,-13.53787 58.85684,-22.68877 3.11213,-1.44671 5.76479,-2.5564 6.42566,-2.70004 z"
-           id="path3639"
-           style="fill:url(#linearGradient2851);fill-opacity:1" />
-        <path
-           d="m 332.64704,153.47532 c -2.21329,-0.2584 -37.73187,12.5384 -60.55222,21.80969 -30.92132,12.56253 -54.92967,24.5993 -69.74075,34.99596 -5.51288,3.86977 -12.44517,10.82962 -13.45838,13.50023 -0.37916,0.99939 -0.55705,2.16745 -0.56512,3.36983 l 13.43744,12.68394 31.8773,10.17227 75.93621,13.56303 86.79919,14.92352 0.87908,-7.4513 c -0.2626,-0.0414 -0.51109,-0.0842 -0.77443,-0.12558 l -11.42811,-1.80003 -2.32329,-4.08147 c -11.79701,-20.81606 -24.83366,-46.57511 -32.40057,-64.00577 -5.86027,-13.49938 -11.48771,-29.05026 -14.60955,-40.31233 -1.8541,-6.68868 -2.04712,-7.12176 -3.0768,-7.24199 z m -1.67445,5.14893 c 0.0883,-0.0159 0.13275,-0.0165 0.14651,0 0.0701,0.0839 0.47344,2.87583 0.87909,6.19546 1.70838,13.98057 4.83676,27.53945 9.73273,42.13329 3.68933,10.99713 3.74223,10.35122 -0.64885,9.12574 -10.20664,-2.84851 -55.93699,-10.69829 -89.01783,-15.27933 -5.3303,-0.73814 -9.76678,-1.39454 -9.83739,-1.46515 -0.42002,-0.42002 23.85716,-13.1396 34.61921,-18.14682 13.80301,-6.42205 51.38994,-22.07103 54.12653,-22.56319 z m -96.3854,44.77055 3.87216,1.31863 c 21.23855,7.22952 74.474,17.39861 103.89948,19.8422 3.31964,0.27568 6.11084,0.57143 6.19546,0.64885 0.0846,0.0774 -2.73544,1.58422 -6.25825,3.3489 -14.19511,7.11074 -29.8186,15.77776 -40.62629,22.54225 -3.17389,1.98653 -6.08469,3.58875 -6.46755,3.5582 -0.38286,-0.0305 -2.47593,-0.36679 -4.66753,-0.73257 l -3.99774,-0.64884 -10.04669,-9.75366 c -17.63706,-17.07029 -31.40719,-30.2763 -36.7332,-35.26806 l -5.16985,-4.8559 z m -3.93496,3.13959 14.06537,17.56077 c 7.74292,9.65889 15.50294,19.24456 17.22588,21.30735 1.72293,2.0628 3.05584,3.81094 2.97214,3.87216 -0.39911,0.29195 -20.38542,-3.5993 -30.97728,-6.02801 -10.87353,-2.49331 -15.37086,-3.68678 -22.10271,-5.83964 l -5.48382,-1.75817 0.0209,-1.36049 c 0.0697,-6.74572 8.57225,-16.69555 23.00272,-26.87488 l 1.27677,-0.87909 z m 119.78582,23.92367 c 0.42188,0.0326 0.8674,0.89008 2.11399,3.621 3.41149,7.47361 14.0307,27.72893 16.59796,31.64706 0.84547,1.29036 2.18584,1.37673 -11.90951,-0.90001 -33.87492,-5.47162 -44.83374,-7.3032 -44.83334,-7.51409 2.4e-4,-0.12853 1.01589,-0.79393 2.2605,-1.48607 10.49029,-5.8337 21.07471,-13.17639 30.49588,-21.11898 2.25261,-1.89907 4.4172,-3.70835 4.81404,-4.0396 0.16319,-0.13622 0.31985,-0.22016 0.46048,-0.20931 z"
-           id="path3667"
-           style="fill:url(#linearGradient2848);fill-opacity:1" />
-        <path
-           d="m 189.49624,222.43029 c 0,0 -2.19802,3.48486 -0.12559,8.66526 1.28236,3.20557 5.13312,7.05619 9.37691,11.13508 0,0 44.4523,43.36164 49.89855,49.64738 24.62938,28.42583 35.32656,56.41067 36.31462,95.04581 0.63401,24.79275 -4.14775,46.58763 -15.76078,71.91753 -20.81466,45.40038 -64.672,95.4667 -132.40696,151.13988 l 9.94207,-3.28613 c 6.39049,-4.78745 15.06889,-9.90061 35.54015,-21.09805 47.14502,-25.7875 100.08704,-49.50759 165.12146,-73.94776 93.56794,-35.16314 247.48095,-76.42006 335.05701,-89.83413 l 9.12574,-1.40238 -1.40235,-2.19768 c -8.00773,-12.44678 -13.47363,-20.12184 -20.05151,-28.25631 -19.20861,-23.75425 -42.46295,-43.13612 -70.95473,-59.08711 -39.15285,-21.91946 -89.93571,-38.95523 -154.13289,-51.71947 -12.13647,-2.41309 -38.71491,-6.96926 -60.34295,-10.33972 -45.8141,-7.13958 -75.36328,-11.96085 -108.00188,-17.64453 -11.70198,-2.03037 -29.17404,-4.96447 -40.77281,-7.47219 -6.04368,-1.30667 -17.52946,-4.02262 -26.45627,-7.0955 -7.36978,-2.90169 -17.74774,-5.70666 -19.96779,-14.16998 z m 25.7656,25.01203 c 0.0623,-0.0563 1.73198,0.4602 3.7675,1.15121 3.75137,1.27345 8.70164,2.76425 14.46301,4.37446 4.03609,1.12805 8.47385,2.31161 13.18628,3.51634 6.01455,1.53768 10.98779,2.85882 11.05135,2.93029 0.66583,0.74868 10.76717,32.98709 14.21191,45.35664 1.31478,4.7212 2.31282,8.65475 2.21865,8.74899 -0.0942,0.0942 -1.21478,-1.64411 -2.46981,-3.85123 -11.68618,-20.55124 -30.19298,-41.45042 -51.59396,-58.27079 -2.66753,-2.09661 -4.83493,-3.87661 -4.83493,-3.95591 z m 49.24966,13.60488 c 0.51479,-0.0355 2.73384,0.33597 5.3792,0.92095 17.04192,3.76871 47.4716,9.64348 67.04067,12.93511 3.26035,0.54842 5.94429,1.13903 5.94429,1.31866 0,0.17957 -1.21806,0.94995 -2.70002,1.69535 -3.28339,1.6516 -16.56913,9.60416 -21.01432,12.57932 -11.0969,7.42711 -21.07399,15.37699 -28.34003,22.60504 -2.91997,2.9047 -5.36345,5.27452 -5.44195,5.27452 -0.0785,0 -0.58901,-1.69274 -1.13025,-3.76751 -3.63262,-13.92431 -11.14339,-34.48572 -17.87474,-48.9567 -1.08323,-2.32862 -1.96747,-4.3823 -1.96747,-4.56287 0,-0.0228 0.0308,-0.0368 0.10462,-0.0415 z m 86.63178,16.47242 c 0.57031,0.19008 1.64819,3.55391 3.5582,11.11411 3.65733,14.47668 5.36011,30.73456 4.79307,45.77525 -0.1578,4.18565 -0.4225,8.07258 -0.58606,8.64431 l -0.31392,1.04653 -5.16989,-1.67445 c -10.65733,-3.40656 -28.06998,-8.53352 -42.99145,-12.66298 -8.47693,-2.34597 -15.42582,-4.44037 -15.42582,-4.64659 0,-0.61968 12.36922,-12.98581 17.68632,-17.68639 10.15647,-8.97872 37.48084,-30.23269 38.44955,-29.90979 z m 6.88613,0.9837 c 0.30843,-0.287 41.39844,6.82807 60.07081,10.40254 13.91808,2.66432 34.05452,6.88145 35.2681,7.38847 0.58585,0.24481 -1.49803,1.38042 -8.1839,4.39543 -26.44563,11.92582 -46.0374,22.56968 -65.51277,35.60298 -5.12991,3.43302 -9.39292,6.23732 -9.48153,6.23732 -0.0887,0 -0.16477,-2.86545 -0.16744,-6.36291 -0.0134,-18.99205 -3.80509,-38.1614 -10.75833,-54.35679 -0.74835,-1.7429 -1.30989,-3.23725 -1.23494,-3.30704 z m 106.24372,21.01432 c 0.31814,0.31822 -1.02959,8.42094 -2.19768,13.20724 -3.6357,14.89676 -13.26987,37.00704 -25.15858,57.78935 -2.09501,3.66215 -3.96878,6.71554 -4.18612,6.78151 -0.21741,0.0663 -2.92459,-1.3575 -6.00712,-3.16048 -11.62542,-6.79973 -24.78873,-13.23236 -39.24484,-19.19339 -4.03099,-1.66219 -7.46415,-3.14227 -7.6397,-3.30704 -0.65926,-0.61854 31.46482,-21.88711 48.49623,-32.10754 13.6223,-8.17465 35.55556,-20.39189 35.93781,-20.00965 z m 7.59784,1.19308 c 0.92509,0 19.14786,4.96815 28.57023,7.78618 23.4703,7.01942 50.54446,16.90985 68.10817,24.88645 l 7.30478,3.30704 -5.14893,1.19307 c -42.97491,9.87268 -79.80901,21.26536 -115.2857,35.66574 -2.9479,1.19656 -5.51316,2.17678 -5.69313,2.17678 -0.18003,0 0.76081,-2.27905 2.0721,-5.0652 10.66409,-22.65816 17.55183,-46.43378 19.33987,-66.62213 0.16276,-1.8376 0.4945,-3.32793 0.73261,-3.32793 z m -181.1334,41.63093 c 0.29102,-0.28747 14.16081,2.96223 21.72596,5.08617 11.37077,3.19236 35.56681,11.28879 35.58202,11.90947 0,0.12076 -2.66659,2.44523 -5.9234,5.16989 -13.08138,10.94419 -25.69962,22.3873 -40.81466,36.98434 -4.48096,4.32737 -8.28865,7.849 -8.47686,7.849 -0.18821,0 -0.27186,-0.63173 -0.16744,-1.40238 2.27631,-16.80322 1.7873,-38.37962 -1.38142,-60.34288 -0.40167,-2.78407 -0.64507,-5.15402 -0.5442,-5.25361 z m 292.06554,0.27213 c 0.20802,0.20803 -6.43495,10.59088 -10.56996,16.51421 -6.03345,8.64276 -14.77874,19.98909 -34.70293,45.04264 -10.46568,13.16002 -22.27043,28.05256 -26.24697,33.09131 -3.97649,5.03875 -7.31355,9.1676 -7.40943,9.1676 -0.0958,0 -1.37838,-1.80445 -2.84656,-3.99777 -11.23161,-16.77898 -24.55927,-31.51787 -40.45882,-44.74962 -2.96712,-2.46921 -6.31454,-5.17713 -7.43039,-6.00705 -1.11579,-0.82992 -2.02555,-1.59776 -2.03024,-1.71631 -0.0107,-0.27354 16.97,-7.55631 29.93073,-12.83049 22.56343,-9.1818 53.40235,-20.17643 76.4804,-27.25164 12.16983,-3.731 25.09935,-7.44774 25.28417,-7.26288 z m 7.66059,2.00934 c 0.36443,-0.0743 2.78649,1.09783 5.69313,2.76283 24.30567,13.9231 48.12312,31.80286 66.85233,50.19158 5.32753,5.23064 18.36133,18.78851 18.16776,18.90029 -0.0496,0.0288 -4.55114,0.38526 -10.00483,0.79537 -42.11909,3.16765 -95.9679,12.12762 -147.81188,24.59348 -3.5211,0.8466 -6.56494,1.54887 -6.76058,1.54887 -0.19569,0 3.65828,-3.86858 8.56061,-8.58155 30.44591,-29.27002 44.33563,-47.75183 60.6778,-80.77121 2.43394,-4.91772 4.49766,-9.1603 4.5838,-9.41877 0.005,-0.0161 0.0176,-0.0161 0.0419,-0.0208 z m -222.61781,22.81435 c 1.39073,0.31211 14.3752,6.35392 24.17481,11.26066 8.96171,4.48718 22.53499,11.71377 23.21207,12.34905 0.085,0.0798 -4.69643,2.57657 -10.63275,5.54658 -18.79353,9.40256 -34.89134,18.28202 -51.69857,28.54933 -4.79281,2.92787 -8.81001,5.33734 -8.9374,5.33734 -0.41928,0 -0.25405,-0.36249 2.42795,-5.27451 8.95032,-16.39245 16.17014,-35.96413 20.32364,-55.08934 0.37072,-1.70706 0.8168,-2.74944 1.13025,-2.67911 z m -13.08165,2.34422 c 0.27106,0.27106 -3.09834,12.64697 -5.23265,19.25615 -4.09356,12.67624 -11.01506,28.61129 -17.66543,40.60536 -1.56186,2.81683 -3.95826,6.94005 -5.31637,9.16761 l -2.46981,4.03957 -5.6094,-5.42099 c -6.51822,-6.3191 -11.8277,-10.2432 -18.60727,-13.73048 -2.66471,-1.37063 -4.83165,-2.63919 -4.835,-2.82566 -0.0127,-0.82436 17.05298,-16.34402 30.22378,-27.48184 9.42775,-7.97252 29.27116,-23.8507 29.51215,-23.60972 z m 79.49441,32.6936 4.87686,3.16048 c 11.18772,7.26376 24.43495,17.0353 34.53549,25.45161 5.66023,4.71652 16.66073,14.56689 18.92123,16.95379 l 1.21398,1.2768 -8.10015,2.2605 c -45.81343,12.711 -81.20818,24.02665 -122.50676,39.20298 -4.5833,1.68429 -8.54082,3.07683 -8.81181,3.07683 -0.56972,0 -1.13595,0.5237 9.1676,-8.9583 26.41535,-24.3091 49.75019,-51.09249 67.18722,-77.15018 l 3.51634,-5.27451 z m -20.88874,5.23265 c 0.23931,0.23931 -13.53845,19.53585 -21.72596,30.43309 -9.79532,13.03718 -27.24126,34.83112 -39.24484,49.01946 -5.01517,5.92788 -9.31167,10.84673 -9.54435,10.92577 -0.25525,0.0867 -0.41392,-1.36548 -0.41861,-3.66289 -0.0234,-12.10619 -3.08614,-25.04478 -8.49783,-36.00063 -2.28575,-4.62744 -2.66873,-5.74744 -2.19774,-6.17449 1.88342,-1.70754 31.02524,-18.32389 49.39621,-28.17259 12.61891,-6.76503 31.99307,-16.60777 32.23312,-16.36772 z m -126.33709,30.95632 c 0.2503,0 2.58796,1.17446 5.19079,2.61636 6.37804,3.53321 12.10807,7.42075 17.16309,11.63741 0.19504,0.16269 -2.42259,2.30096 -5.81871,4.75121 -9.47945,6.83932 -23.91439,17.73368 -32.27498,24.38418 -8.82079,7.01654 -9.11335,7.23167 -8.12107,5.71402 6.60583,-10.10288 9.92713,-15.82286 13.39558,-23.12828 3.08333,-6.49424 6.15621,-14.2034 8.35134,-20.9097 0.91191,-2.78608 1.86367,-5.0652 2.11396,-5.0652 z m 33.6564,26.41441 c 0.45539,-0.0563 1.10346,0.79175 3.80937,4.835 5.70277,8.52113 10.06986,19.88474 11.1979,29.1354 l 0.23021,1.98837 -13.66765,5.29547 c -24.53414,9.52085 -47.11769,18.90539 -62.37318,25.89112 -4.2681,1.95442 -11.80338,5.55455 -16.72358,8.01645 -4.92013,2.46184 -8.93733,4.3967 -8.93733,4.29074 0,-0.10589 3.08982,-2.42902 6.86523,-5.16982 29.9406,-21.73594 55.7553,-45.53279 75.20361,-69.32214 2.08,-2.54429 3.96918,-4.75075 4.20708,-4.89776 0.063,-0.0389 0.12331,-0.0549 0.18834,-0.063 z m -15.5305,3.85123 c 0.39604,0.39604 -11.04714,13.33711 -18.75382,21.20273 -19.2889,19.68682 -38.41143,35.12141 -62.10105,50.14971 -2.96397,1.88027 -5.67236,3.58037 -6.02801,3.78841 -0.65029,0.38037 0.21024,-0.59758 10.61178,-11.93044 6.55473,-7.14159 11.57171,-13.07014 17.26778,-20.47013 3.75116,-4.87324 4.46763,-5.55689 9.96296,-9.52339 14.80266,-10.68458 48.64666,-33.61058 49.04036,-33.21689 z"
-           id="path2851"
-           style="fill:url(#radialGradient2845);fill-opacity:1" />
-      </g>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385" height="385"><defs><linearGradient x1="-411.527" y1="-29.89" x2="-23.847" y2="-258.964" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.66978 0 0 .66978 488.256 811.455)"/><linearGradient id="a"><stop style="stop-color:#909ca9;stop-opacity:1" offset="0"/><stop style="stop-color:#ededee;stop-opacity:1" offset="1"/></linearGradient><linearGradient x1="-447.797" y1="-889.058" x2="-135.859" y2="-889.058" id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.66978 0 0 .66978 488.256 811.455)"/><linearGradient id="b"><stop style="stop-color:#939fab;stop-opacity:1" offset="0"/><stop style="stop-color:#dcdee1;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="c"><stop style="stop-color:#ee352c;stop-opacity:1" offset="0"/><stop style="stop-color:#a91d22;stop-opacity:1" offset="1"/></linearGradient><radialGradient cx="-1259.098" cy="-245.428" r="414.156" fx="-1259.098" fy="-245.428" id="f" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.64353 -.09731 .19436 -1.28527 -377.154 -44.777)"/></defs><path d="m469.04 461.903-132.345 43.16-115.056 50.819-32.233 8.518a801.402 801.402 0 0 1-26.08 23.694c-10.151 8.834-19.698 16.84-26.958 22.626-8.084 6.443-20.103 18.37-26.247 26.017-9.14 11.377-16.287 23.51-19.36 32.84-5.53 16.786-2.836 33.788 7.827 49.48 13.622 20.044 40.738 40.409 72.274 54.273 16.086 7.071 43.232 16.188 63.587 21.328 33.922 8.566 99.482 17.873 135.588 19.256 7.323.28 17.071.254 17.52-.042.792-.523 6.413-11.166 12.934-24.489 22.19-45.33 38.245-87.824 46.885-124.118 5.231-21.976 9.31-51.28 11.951-86.025.74-9.733 1.009-42.193.44-53.226-.926-17.954-2.507-32.587-5.044-46.948-.373-2.104-.51-3.955-.314-4.123.368-.316 1.618-.717 17.874-5.442l-3.244-7.598zm-30.246 17.75c1.203 0 4.401 30.67 5.233 50.128.177 4.135.141 6.782-.105 6.782-.79 0-16.948-9.489-28.402-16.682-10.003-6.282-28.985-18.896-32.003-21.265-.953-.748-.852-.785 7.325-3.6 13.914-4.792 46.901-15.364 47.952-15.364zm-67.417 22.123c.855-.002 3.183 1.283 8.686 4.73 20.642 12.932 48.595 28.49 60.573 33.72 3.714 1.621 4.138.993-4.416 6.802-18.234 12.382-40.904 24.557-68.736 36.922-4.851 2.154-8.96 3.914-9.126 3.914-.166 0 .376-2.461 1.193-5.484 6.743-24.941 10.547-50.116 10.654-70.306.053-9.985.055-10.038 1.004-10.277a.756.756 0 0 1 .168-.02zm-13.877 5.296c.597.6.165 22.975-.565 29.072-1.751 14.627-4.613 28.155-9.189 43.536-1.093 3.675-2.118 6.843-2.281 7.032-.398.461-14.08-12.87-18.628-18.146-7.772-9.015-13.92-17.97-18.398-26.792-2.277-4.483-5.907-13.338-5.568-13.584 1.537-1.116 54.253-21.496 54.629-21.118zm-65.366 25.765c.123.012.218.046.272.105.197.217.894 1.842 1.549 3.62 3.187 8.657 10.353 21.517 16.577 29.743 6.794 8.981 15.653 18.551 23.065 24.908 2.38 2.04 4.6 3.945 4.919 4.227.635.563.848.468-15.468 6.656-18.91 7.173-39.503 14.355-63.147 21.998-9.01 2.913-16.637 5.374-16.933 5.484-.9.334-.625-.22 2.01-4.332 11.748-18.342 29.545-54.222 39.495-79.6 1.726-4.4 3.368-8.81 3.663-9.795.433-1.448.86-1.94 2.219-2.553.752-.34 1.41-.498 1.779-.46zm-20.03 8.268c.265.234-4.807 10.945-9.796 20.68-9.678 18.879-20.348 37.458-34.515 60.133-2.444 3.912-4.697 7.489-5.002 7.932-.504.73-.71.49-2.26-2.595-3.392-6.745-6.234-15.256-7.703-23.17-1.455-7.833-1.207-21.394.544-29.805 1.301-6.25 1.244-6.111 4.186-7.62 12.722-6.519 54.13-25.92 54.545-25.555zm172.53 7.011v4.25c-.021 22.316-2.404 52.868-5.86 75.161-.607 3.912-1.133 7.14-1.173 7.18-.04.039-2.86-.788-6.258-1.843-15.016-4.661-31.297-11.626-45.984-19.674-9.727-5.33-23.795-13.964-23.4-14.359.106-.107 4.25-2.303 9.209-4.877 19.64-10.194 38.402-21.185 54.712-32.086 6.12-4.09 15.277-10.71 17.31-12.496l1.444-1.256zm-248.07 29.575c.408-.02.305.755-.334 4.438-.445 2.561-.947 7.4-1.13 10.737-.805 14.628 1.567 25.42 8.832 40.187 2.02 4.105 3.6 7.528 3.516 7.598-.727.608-66.88 19.967-87.678 25.66-6.165 1.688-11.553 3.175-11.993 3.308-.722.217-.786.06-.523-1.633 2.278-14.676 13.473-33.938 29.114-50.108 10.4-10.75 18.725-17.118 32.882-25.2 10.16-5.8 25.94-14.506 27.105-14.945a.685.685 0 0 1 .21-.042zm156.038 27.943c.063-.076 2.514 1.236 5.442 2.93 21.368 12.357 51.185 23.948 76.606 29.763l2.302.524-3.16 1.758c-13.28 7.369-57.013 25.565-101.68 42.321-6.522 2.447-12.884 4.845-14.129 5.338-1.245.492-2.26.83-2.26.732 0-.098 1.842-3.644 4.102-7.87 12.54-23.446 25.056-51.938 31.48-71.708.654-2.015 1.234-3.713 1.297-3.788zm-15.907 5.211c.069.069-.713 2.17-1.737 4.647-8.718 21.08-20.14 44.076-34.703 69.908-3.706 6.574-6.83 11.941-6.95 11.93-.118-.01-3.132-1.794-6.697-3.976-21.213-12.987-39.982-28.973-52.306-44.52l-1.758-2.197 9.147-2.512c32.625-8.938 60.293-18.496 87.804-30.35 3.895-1.678 7.131-2.998 7.2-2.93zm98.813 34.494c.047.01.063.043.063.084 0 2.223-5.047 22.802-9.251 37.696-3.527 12.493-6.488 22.265-11.973 39.58-2.422 7.647-4.501 13.888-4.625 13.856a34.898 34.898 0 0 0-1.298-.252c-29.72-5.378-56.338-12.878-81.273-22.898-6.977-2.803-17.05-7.265-17.582-7.786-.18-.176 5.844-3.014 13.375-6.3 45.541-19.87 92.727-42.498 108.86-52.2 1.94-1.168 3.376-1.848 3.704-1.78zm-228.101 7.807c.244.231-12.495 18.467-30.287 43.368-6.184 8.655-13.448 18.856-16.137 22.668a476.901 476.901 0 0 0-9.063 13.417l-4.207 6.488-4.48-3.767c-5.255-4.413-14.455-13.782-18.628-18.984-8.587-10.705-14.406-21.97-16.702-32.317-1.06-4.777-1.092-7.21-.084-7.514 1.456-.439 28.172-6.728 53.226-12.538 13.917-3.227 30.007-7.004 35.77-8.393 5.764-1.389 10.535-2.481 10.592-2.428zm12.81 4.898 3.222 3.6c14.411 16.053 29.067 28.032 46.948 38.366 3.157 1.824 5.563 3.41 5.358 3.537-.744.46-61.833 22.18-90.085 32.024-15.933 5.551-29.022 10.078-29.094 10.067-.072-.01-.975-.6-1.988-1.318L152.736 743l2.888-4.165c9.374-13.578 21.152-28.51 46.927-59.527l17.665-21.265zm79.828 57.057c.071-.088 4.537 1.495 9.942 3.516 13.029 4.872 23.254 8.049 37.09 11.512 16.993 4.253 41.55 8.507 56.094 9.733 2.232.188 3.372.443 3.014.67-.676.427-15.4 5.345-26.226 8.748-17.185 5.402-69.702 20.917-112.523 33.238-7.944 2.286-14.736 4.217-15.091 4.291-.96.2-4.312-.68-4.312-1.13 0-.214 2.401-3.253 5.316-6.74 14.393-17.216 28.692-36.445 40.627-54.629 3.264-4.973 5.999-9.121 6.07-9.21zm-17.686.502c.129.129-6.966 11.49-19.444 31.145-5.27 8.299-11.244 17.746-13.291 20.993-2.048 3.247-5.048 8.182-6.656 10.989l-2.93 5.107-1.487-.398c-3.585-.97-28.88-9.906-35.56-12.558-8.282-3.287-16.912-7.257-23.276-10.696-7.952-4.297-18.037-10.675-17.246-10.926.227-.072 13.911-3.817 30.39-8.309 43.84-11.95 68.09-18.815 83.995-23.777 2.972-.927 5.448-1.627 5.505-1.57zm124.516 29.198c.095-.02.138-.02.147 0 .414 1.037-15.815 45.989-21.747 60.239-1.329 3.191-1.82 3.965-2.512 3.934-1.679-.073-25.211-3.363-39.454-5.525-24.933-3.785-66.695-11.078-77.234-13.48l-2.449-.544 14.945-3.37c32.032-7.217 47.415-11.087 63.022-15.865 19.682-6.025 39.172-13.538 58.857-22.689 3.112-1.446 5.764-2.556 6.425-2.7z" style="fill:url(#d);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/><path d="M332.647 153.475c-2.213-.258-37.732 12.539-60.552 21.81-30.922 12.563-54.93 24.6-69.74 34.996-5.514 3.87-12.446 10.83-13.46 13.5-.378 1-.556 2.168-.564 3.37l13.437 12.684 31.877 10.172 75.937 13.563 86.799 14.924.879-7.452c-.263-.04-.511-.084-.775-.125l-11.428-1.8-2.323-4.082c-11.797-20.816-24.834-46.575-32.4-64.005-5.86-13.5-11.488-29.05-14.61-40.313-1.854-6.688-2.047-7.121-3.077-7.242zm-1.674 5.15c.088-.017.132-.017.146 0 .07.083.474 2.875.88 6.195 1.708 13.98 4.836 27.54 9.732 42.133 3.69 10.997 3.742 10.351-.649 9.126-10.207-2.849-55.937-10.699-89.018-15.28-5.33-.738-9.767-1.394-9.837-1.465-.42-.42 23.857-13.14 34.62-18.147 13.802-6.422 51.389-22.07 54.126-22.563zm-96.386 44.77 3.872 1.318c21.239 7.23 74.474 17.399 103.9 19.843 3.32.275 6.11.571 6.195.648.085.078-2.735 1.585-6.258 3.35-14.195 7.11-29.819 15.777-40.626 22.542-3.174 1.986-6.085 3.588-6.468 3.558-.383-.03-2.476-.367-4.667-.733l-3.998-.649-10.047-9.753c-17.637-17.07-31.407-30.277-36.733-35.268l-5.17-4.856zm-3.935 3.14 14.066 17.56c7.743 9.66 15.503 19.245 17.225 21.308 1.723 2.062 3.056 3.81 2.973 3.872-.4.292-20.386-3.6-30.978-6.028-10.873-2.494-15.37-3.687-22.102-5.84l-5.484-1.758.02-1.36c.07-6.746 8.573-16.696 23.003-26.876l1.277-.879zm119.786 23.923c.422.033.867.89 2.114 3.621 3.412 7.474 14.03 27.729 16.598 31.647.845 1.29 2.186 1.377-11.91-.9-33.874-5.472-44.833-7.303-44.833-7.514 0-.129 1.016-.794 2.26-1.486 10.49-5.834 21.075-13.176 30.497-21.119 2.252-1.9 4.417-3.708 4.814-4.04.163-.136.32-.22.46-.209z" style="fill:url(#e);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/><path d="M189.496 222.43s-2.198 3.485-.125 8.666c1.282 3.205 5.133 7.056 9.377 11.135 0 0 44.452 43.361 49.898 49.647 24.63 28.426 35.327 56.41 36.315 95.046.634 24.793-4.148 46.587-15.761 71.917-20.815 45.4-64.672 95.467-132.407 151.14l9.942-3.286c6.39-4.787 15.069-9.9 35.54-21.098 47.145-25.787 100.087-49.508 165.122-73.948 93.568-35.163 247.48-76.42 335.057-89.834l9.125-1.402-1.402-2.198c-8.008-12.447-13.474-20.122-20.051-28.256-19.209-23.754-42.463-43.136-70.955-59.087-39.153-21.92-89.936-38.956-154.133-51.72-12.137-2.413-38.715-6.969-60.343-10.34-45.814-7.14-75.363-11.96-108.002-17.644-11.702-2.03-29.174-4.965-40.773-7.472-6.043-1.307-17.53-4.023-26.456-7.096-7.37-2.901-17.748-5.706-19.968-14.17zm25.766 25.012c.062-.056 1.732.46 3.767 1.152 3.752 1.273 8.702 2.764 14.463 4.374a618.885 618.885 0 0 0 13.187 3.516c6.014 1.538 10.987 2.86 11.051 2.93.666.75 10.767 32.988 14.212 45.357 1.315 4.721 2.313 8.655 2.219 8.75-.095.093-1.215-1.645-2.47-3.852-11.686-20.551-30.193-41.45-51.594-58.27-2.668-2.097-4.835-3.877-4.835-3.957zm49.25 13.605c.514-.035 2.733.336 5.379.921 17.042 3.769 47.471 9.644 67.04 12.935 3.26.549 5.945 1.14 5.945 1.319 0 .18-1.218.95-2.7 1.695-3.284 1.652-16.57 9.604-21.015 12.58-11.097 7.427-21.074 15.377-28.34 22.605-2.92 2.904-5.363 5.274-5.442 5.274-.078 0-.589-1.693-1.13-3.767-3.633-13.925-11.143-34.486-17.875-48.957-1.083-2.329-1.967-4.382-1.967-4.563 0-.023.03-.037.105-.041zm86.631 16.473c.57.19 1.648 3.554 3.558 11.114 3.658 14.476 5.36 30.734 4.794 45.775-.158 4.186-.423 8.073-.587 8.644l-.313 1.047-5.17-1.675c-10.658-3.406-28.07-8.533-42.992-12.663-8.477-2.346-15.426-4.44-15.426-4.646 0-.62 12.37-12.986 17.687-17.687 10.156-8.978 37.48-30.232 38.45-29.91zm6.886.983c.309-.287 41.399 6.828 60.071 10.403 13.918 2.664 34.055 6.881 35.268 7.388.586.245-1.498 1.38-8.184 4.396-26.445 11.926-46.037 22.57-65.512 35.603-5.13 3.433-9.393 6.237-9.482 6.237-.089 0-.165-2.865-.167-6.363-.014-18.992-3.805-38.161-10.759-54.357-.748-1.743-1.31-3.237-1.235-3.307zm106.244 21.015c.318.318-1.03 8.42-2.198 13.207-3.635 14.897-13.27 37.007-25.158 57.79-2.095 3.661-3.969 6.715-4.186 6.78-.218.067-2.925-1.357-6.007-3.16-11.626-6.8-24.79-13.232-39.245-19.193-4.031-1.662-7.464-3.142-7.64-3.307-.66-.619 31.465-21.887 48.496-32.108 13.623-8.174 35.556-20.392 35.938-20.01zm7.598 1.193c.925 0 19.148 4.968 28.57 7.786 23.47 7.02 50.545 16.91 68.108 24.886l7.305 3.307-5.149 1.193c-42.975 9.873-79.809 21.266-115.285 35.666-2.948 1.197-5.514 2.177-5.694 2.177-.18 0 .761-2.28 2.072-5.065 10.665-22.658 17.552-46.434 19.34-66.622.163-1.838.495-3.328.733-3.328zm-181.133 41.63c.29-.287 14.16 2.963 21.726 5.087 11.37 3.192 35.566 11.289 35.582 11.91 0 .12-2.667 2.445-5.924 5.17-13.081 10.943-25.7 22.386-40.815 36.984-4.48 4.327-8.288 7.849-8.476 7.849-.189 0-.272-.632-.168-1.403 2.276-16.803 1.787-38.38-1.381-60.343-.402-2.784-.645-5.154-.544-5.253zm292.065.273c.208.208-6.435 10.59-10.57 16.514-6.033 8.643-14.779 19.99-34.703 45.043a15399.201 15399.201 0 0 0-26.247 33.09c-3.976 5.04-7.313 9.169-7.41 9.169-.095 0-1.378-1.805-2.846-3.998-11.231-16.78-24.559-31.518-40.459-44.75-2.967-2.47-6.314-5.177-7.43-6.007-1.116-.83-2.025-1.598-2.03-1.716-.01-.274 16.97-7.557 29.93-12.83 22.564-9.182 53.403-20.177 76.48-27.252 12.17-3.731 25.1-7.448 25.285-7.263zm7.66 2.01c.365-.075 2.787 1.097 5.694 2.762 24.305 13.923 48.123 31.803 66.852 50.192 5.328 5.23 18.361 18.788 18.168 18.9-.05.029-4.551.385-10.005.795-42.119 3.168-95.968 12.128-147.812 24.594-3.52.846-6.565 1.549-6.76 1.549-.196 0 3.658-3.869 8.56-8.582 30.446-29.27 44.336-47.752 60.678-80.771 2.434-4.918 4.498-9.16 4.584-9.419.005-.016.017-.016.042-.02zm-222.617 22.813c1.39.313 14.375 6.354 24.175 11.261 8.961 4.487 22.535 11.714 23.212 12.35.085.079-4.697 2.576-10.633 5.546-18.794 9.402-34.891 18.282-51.699 28.55-4.792 2.927-8.81 5.336-8.937 5.336-.42 0-.254-.362 2.428-5.274 8.95-16.393 16.17-35.964 20.324-55.09.37-1.706.816-2.749 1.13-2.679zm-13.082 2.345c.271.27-3.098 12.647-5.232 19.256-4.094 12.676-11.015 28.611-17.666 40.605a313.089 313.089 0 0 1-5.316 9.168l-2.47 4.04-5.61-5.422c-6.518-6.319-11.827-10.243-18.607-13.73-2.664-1.37-4.831-2.64-4.835-2.826-.012-.824 17.053-16.344 30.224-27.482 9.428-7.972 29.271-23.85 29.512-23.61zm79.495 32.693 4.877 3.16c11.187 7.265 24.434 17.036 34.535 25.452 5.66 4.717 16.66 14.567 18.921 16.954l1.214 1.277-8.1 2.26c-45.813 12.711-81.208 24.027-122.507 39.203-4.583 1.685-8.54 3.077-8.812 3.077-.57 0-1.135.524 9.168-8.958 26.415-24.31 49.75-51.093 67.187-77.15l3.517-5.275zm-20.89 5.233c.24.24-13.538 19.536-21.725 30.433-9.795 13.037-27.241 34.831-39.245 49.02-5.015 5.927-9.312 10.846-9.544 10.925-.255.087-.414-1.365-.419-3.663-.023-12.106-3.086-25.044-8.498-36-2.285-4.628-2.668-5.748-2.197-6.175 1.883-1.707 31.025-18.324 49.396-28.172 12.619-6.765 31.993-16.608 32.233-16.368zm-126.336 30.956c.25 0 2.588 1.175 5.19 2.617 6.379 3.533 12.109 7.42 17.164 11.637.195.163-2.423 2.301-5.819 4.751-9.48 6.84-23.914 17.734-32.275 24.384-8.82 7.017-9.113 7.232-8.121 5.714 6.606-10.102 9.927-15.822 13.396-23.128 3.083-6.494 6.156-14.203 8.35-20.91.913-2.786 1.865-5.065 2.115-5.065zm33.656 26.415c.456-.057 1.104.791 3.81 4.835 5.702 8.52 10.07 19.884 11.197 29.135l.23 1.988-13.667 5.296c-24.534 9.52-47.118 18.905-62.373 25.891a651.678 651.678 0 0 0-16.724 8.016c-4.92 2.462-8.937 4.397-8.937 4.291 0-.106 3.09-2.429 6.865-5.17 29.94-21.736 55.755-45.532 75.204-69.322 2.08-2.544 3.969-4.75 4.207-4.897a.446.446 0 0 1 .188-.063zm-15.53 3.85c.396.397-11.047 13.338-18.754 21.204-19.289 19.686-38.412 35.121-62.101 50.15-2.964 1.88-5.673 3.58-6.028 3.788-.65.38.21-.598 10.612-11.93 6.554-7.142 11.571-13.07 17.267-20.47 3.752-4.874 4.468-5.558 9.963-9.524 14.803-10.685 48.647-33.61 49.04-33.217z" style="fill:url(#f);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
index b05bd28750..9374bc4d45 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
+++ b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 2381.4 2354.5" style="enable-background:new 0 0 2381.4 2354.5;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#5558AF;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M2015.6,899.2c19.5,19.5,42.5,35,67.9,45.8c53,22.2,112.7,22.2,165.8,0c51.2-21.8,92-62.5,113.7-113.7
-		c22.2-53,22.2-112.7,0-165.8c-21.8-51.2-62.5-92-113.7-113.7c-53-22.2-112.7-22.2-165.8,0c-51.2,21.8-92,62.5-113.7,113.7
-		c-22.2,53-22.2,112.7,0,165.8C1980.6,856.6,1996.2,879.7,2015.6,899.2L2015.6,899.2z M1953.2,1097v642.1h107
-		c36.8-0.2,73.4-3.6,109.5-10.4c36.3-6.4,71.3-18.6,103.7-36.2c30.6-16.6,57-40,77.3-68.2c21.3-31.3,32-68.6,30.5-106.5V1097H1953.2
-		z M1606.4,827.8c28.4,0.2,56.6-5.5,82.8-16.7c51.2-21.8,91.9-62.5,113.6-113.7c22.2-53,22.2-112.7-0.1-165.8
-		c-21.8-51.2-62.5-92-113.7-113.7c-26.2-11.2-54.4-16.9-82.9-16.7c-28.3-0.2-56.3,5.5-82.3,16.7c-19.4,8.3-25.5,19.1-52.2,32.1v329
-		c26.8,13.1,32.8,23.8,52.2,32.1C1549.9,822.4,1578,828,1606.4,827.8L1606.4,827.8z M1471.6,1908.9c26.8,5.8,36.4,10.3,55.4,12.9
-		c20.8,3,41.8,4.5,62.8,4.6c32.4-0.2,64.8-3.6,96.5-10.4c32.3-6.5,63.3-18.6,91.5-35.7c27.7-17,51-40.2,68.2-67.7
-		c19-32.1,28.3-69.1,26.9-106.4v-743h-401.3V1908.9z M0,2113.7l1391.3,240.8V0L0,240.8V2113.7z"/>
-</g>
-<path class="st1" d="M1016.7,722.4l-642.1,39.1v148.1l240.8-9.7v686.7l160.5,9.4V893.6l240.8-10.7V722.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2381.4 2354.5" style="enable-background:new 0 0 2381.4 2354.5" xml:space="preserve"><path d="M2015.6 899.2c19.5 19.5 42.5 35 67.9 45.8 53 22.2 112.7 22.2 165.8 0 51.2-21.8 92-62.5 113.7-113.7 22.2-53 22.2-112.7 0-165.8-21.8-51.2-62.5-92-113.7-113.7-53-22.2-112.7-22.2-165.8 0-51.2 21.8-92 62.5-113.7 113.7-22.2 53-22.2 112.7 0 165.8 10.8 25.3 26.4 48.4 45.8 67.9zm-62.4 197.8v642.1h107c36.8-.2 73.4-3.6 109.5-10.4 36.3-6.4 71.3-18.6 103.7-36.2 30.6-16.6 57-40 77.3-68.2 21.3-31.3 32-68.6 30.5-106.5V1097h-428zm-346.8-269.2c28.4.2 56.6-5.5 82.8-16.7 51.2-21.8 91.9-62.5 113.6-113.7 22.2-53 22.2-112.7-.1-165.8-21.8-51.2-62.5-92-113.7-113.7-26.2-11.2-54.4-16.9-82.9-16.7-28.3-.2-56.3 5.5-82.3 16.7-19.4 8.3-25.5 19.1-52.2 32.1v329c26.8 13.1 32.8 23.8 52.2 32.1 26.1 11.3 54.2 16.9 82.6 16.7zm-134.8 1081.1c26.8 5.8 36.4 10.3 55.4 12.9 20.8 3 41.8 4.5 62.8 4.6 32.4-.2 64.8-3.6 96.5-10.4 32.3-6.5 63.3-18.6 91.5-35.7 27.7-17 51-40.2 68.2-67.7 19-32.1 28.3-69.1 26.9-106.4v-743h-401.3v945.7zM0 2113.7l1391.3 240.8V0L0 240.8v1872.9z" style="fill:#5558af"/><path d="m1016.7 722.4-642.1 39.1v148.1l240.8-9.7v686.7l160.5 9.4V893.6l240.8-10.7V722.4z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mindee/mindee.svg b/packages/nodes-base/nodes/Mindee/mindee.svg
index 6a28b1e1ac..d1c6951422 100644
--- a/packages/nodes-base/nodes/Mindee/mindee.svg
+++ b/packages/nodes-base/nodes/Mindee/mindee.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
-    <g fill="none" fill-rule="evenodd"><path d="M18.329 0h13.746v32H18.33V27.43h9.164V4.572H18.33V0zM4.582 13.714V27.43h9.165V32H0V0h13.747v4.571H4.582v9.143zm4.582 0v-4.57h13.747v4.57H9.164zm0 9.143v-4.571h4.583v4.571H9.164z" fill="#FD3246"></path></g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M18.329 0h13.746v32H18.33v-4.57h9.164V4.572H18.33V0zM4.582 13.714V27.43h9.165V32H0V0h13.747v4.571H4.582v9.143zm4.582 0v-4.57h13.747v4.57H9.164zm0 9.143v-4.571h4.583v4.571H9.164z" fill="#FD3246" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MondayCom/mondayCom.svg b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
index 5abd596adc..da02fc14d3 100644
--- a/packages/nodes-base/nodes/MondayCom/mondayCom.svg
+++ b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>monday_node_icon</title>
-    <g id="monday_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Group" transform="translate(1.000000, 12.000000)">
-            <path d="M7.18417187,35.3926154 C4.56973438,35.388 2.16364063,33.9646154 0.898828125,31.6744615 C-0.365984375,29.3843077 -0.290390625,26.5864615 1.0951875,24.3673846 L14.0401563,3.63692308 C15.3953125,1.45569231 17.8272188,0.168923077 20.3955625,0.261230769 C22.9639062,0.353538462 25.2879531,1.812 26.4928438,4.08461538 C27.6977344,6.35723077 27.5990937,9.10246154 26.2347187,11.2846154 L13.2860625,32.0123077 C11.9705469,34.1169231 9.66309375,35.3944615 7.18325,35.3907692 L7.18417187,35.3926154 Z" id="Path" fill="#FF3D57"></path>
-            <path d="M29.4935469,35.3926154 C26.8772656,35.3926154 24.4674844,33.9710769 23.1989844,31.68 C21.9304844,29.3889231 22.0051562,26.5883077 23.3925781,24.3673846 L36.3467656,3.63692308 C37.6558281,1.32923077 40.1172344,-0.0572307692 42.7584062,0.00276923077 C45.3995781,0.0627692308 47.7964531,1.56738462 48.9995,3.92215385 C50.2025469,6.27692308 50.0200156,9.10338462 48.5228906,11.2836923 L35.5935937,32.0123077 C34.2780781,34.1169231 31.970625,35.3944615 29.4907812,35.3907692 L29.4935469,35.3926154 Z" id="Path" fill="#FFCB00"></path>
-            <path d="M44.5910937,28.3569231 C44.5910937,24.4615385 47.80475,21.3230769 51.7955469,21.3230769 C55.7863437,21.3230769 59,24.4596923 59,28.3569231 C59,32.2541538 55.7863437,35.3907692 51.7955469,35.3907692 C47.80475,35.3907692 44.5910937,32.2541538 44.5910937,28.3569231 L44.5910937,28.3569231 Z" id="Path" fill="#00D647"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M8.184 47.393A7.195 7.195 0 0 1 1.9 43.674a7.215 7.215 0 0 1 .196-7.307l12.945-20.73a7.182 7.182 0 0 1 6.356-3.376 7.196 7.196 0 0 1 6.097 3.824 7.212 7.212 0 0 1-.258 7.2L14.286 44.012a7.186 7.186 0 0 1-6.103 3.379l.001.002z" fill="#FF3D57"/><path d="M30.494 47.393a7.196 7.196 0 0 1-6.295-3.713 7.212 7.212 0 0 1 .194-7.313l12.954-20.73a7.174 7.174 0 0 1 6.411-3.634A7.193 7.193 0 0 1 50 15.923a7.211 7.211 0 0 1-.476 7.36l-12.93 20.73a7.186 7.186 0 0 1-6.102 3.378l.003.002z" fill="#FFCB00"/><path d="M45.591 40.357c0-3.895 3.214-7.034 7.205-7.034 3.99 0 7.204 3.137 7.204 7.034s-3.214 7.034-7.204 7.034c-3.991 0-7.205-3.137-7.205-7.034z" fill="#00D647"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MongoDb/mongodb.svg b/packages/nodes-base/nodes/MongoDb/mongodb.svg
index 80d3a99ac2..afc160f09b 100644
--- a/packages/nodes-base/nodes/MongoDb/mongodb.svg
+++ b/packages/nodes-base/nodes/MongoDb/mongodb.svg
@@ -1 +1 @@
-<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m15.9.087.854 1.604c.192.296.4.558.645.802.715.715 1.394 1.464 2.004 2.266 1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12-.488.488-1.01.94-1.57 1.342-.296 0-.436-.227-.558-.436-.227-.383-.366-.82-.436-1.255-.105-.523-.174-1.046-.14-1.586v-.244c-.024-.052-.285-24.052-.181-24.175z" fill="#599636"/><path d="m15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a4.78 4.78 0 0 0 .157-.68l.35-2.614z" fill="#6cac48"/><path d="m16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453-.105-.174-.192-.383-.26-.575-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17.37 17.37 0 0 1 -.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z" fill="#c2bfbf"/></svg>
\ No newline at end of file
+<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m15.9.087.854 1.604c.192.296.4.558.645.802a22.406 22.406 0 0 1 2.004 2.266c1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12a12.7 12.7 0 0 1-1.57 1.342c-.296 0-.436-.227-.558-.436a3.589 3.589 0 0 1-.436-1.255c-.105-.523-.174-1.046-.14-1.586v-.244C16.057 24.21 15.796.21 15.9.087z" fill="#599636"/><path d="M15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a4.78 4.78 0 0 0 .157-.68l.35-2.614z" fill="#6cac48"/><path d="M16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453a3.235 3.235 0 0 1-.26-.575c-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17.37 17.37 0 0 1-.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z" fill="#c2bfbf"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Orbit/orbit.svg b/packages/nodes-base/nodes/Orbit/orbit.svg
index 8811902286..fe9542abd8 100644
--- a/packages/nodes-base/nodes/Orbit/orbit.svg
+++ b/packages/nodes-base/nodes/Orbit/orbit.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="80px" height="80px" fill="none" viewBox="13.5 9.957 132 91.59" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M119.047 49.0982C118.081 41.7948 115.336 34.8402 111.054 28.8452C106.773 22.8503 101.085 17.9982 94.4895 14.7152C87.8945 11.4322 80.5943 9.81863 73.2299 10.0162C65.8655 10.2137 58.6623 12.2164 52.2527 15.8482C45.8432 19.4801 40.4233 24.6301 36.4692 30.846C32.515 37.0619 30.1474 44.1536 29.5744 51.4983C29.0013 58.843 30.2403 66.216 33.1825 72.97C36.1248 79.724 40.6802 85.6523 46.4489 90.2343C50.8655 88.2677 55.6945 85.9719 60.8235 83.397C55.6358 80.9116 51.2279 77.0528 48.0782 72.2395C44.9284 67.4262 43.157 61.8421 42.9562 56.0933C42.7554 50.3445 44.1328 44.6505 46.9391 39.6291C49.7454 34.6078 53.8733 30.4509 58.8749 27.6095C63.8764 24.7682 69.5607 23.3509 75.3108 23.5114C81.0608 23.6719 86.6571 25.4042 91.4924 28.5202C96.3276 31.6362 100.217 36.017 102.739 41.1871C105.261 46.3572 106.318 52.1192 105.797 57.8479C110.547 54.8355 114.988 51.9022 119.047 49.0982ZM119.426 54.198C114.88 57.5604 109.843 61.0436 104.426 64.556C102.007 72.1442 96.8025 78.534 89.861 82.4388C82.9194 86.3437 74.7562 87.4736 67.0149 85.6011C61.0776 88.4552 55.4445 90.9259 50.2863 92.9717C57.147 97.3349 65.0617 99.7578 73.1892 99.9828C81.3167 100.208 89.3533 98.2265 96.4448 94.2495C103.536 90.2725 109.418 84.4484 113.464 77.3962C117.511 70.3441 119.571 62.3273 119.426 54.198Z" fill="#1D2125"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M121.709 17.5992C122.318 17.5992 122.913 17.4186 123.42 17.0803C123.926 16.7419 124.321 16.2611 124.554 15.6984C124.787 15.1358 124.848 14.5167 124.729 13.9194C124.61 13.3222 124.317 12.7735 123.886 12.3429C123.456 11.9123 122.907 11.619 122.31 11.5002C121.712 11.3814 121.093 11.4424 120.531 11.6754C119.968 11.9085 119.487 12.3031 119.149 12.8095C118.81 13.3158 118.63 13.9112 118.63 14.5201C118.629 14.9246 118.709 15.3253 118.863 15.6991C119.018 16.0729 119.244 16.4126 119.531 16.6986C119.817 16.9846 120.156 17.2114 120.53 17.3659C120.904 17.5205 121.304 17.5997 121.709 17.5992Z" fill="#00ADE8"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M18.1041 69.9141C18.9163 69.9141 19.7102 69.6731 20.3854 69.2216C21.0606 68.7701 21.5866 68.1284 21.8969 67.3778C22.2071 66.6271 22.2877 65.8013 22.1283 65.0048C21.9689 64.2084 21.5768 63.4772 21.0016 62.9037C20.4264 62.3302 19.6939 61.9404 18.897 61.7834C18.1001 61.6265 17.2745 61.7095 16.5248 62.0221C15.7751 62.3346 15.135 62.8626 14.6856 63.5391C14.2361 64.2157 13.9975 65.0104 14 65.8226C14.0033 66.9089 14.4372 67.9496 15.2065 68.7165C15.9758 69.4835 17.0178 69.9141 18.1041 69.9141Z" fill="#00ADE8"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M87.4143 45.7399C91.8475 43.29 96.164 40.9651 100.33 38.8193C100.485 39.0693 100.651 39.3651 100.826 39.6985C96.6973 41.8567 92.3808 44.19 87.9476 46.6441L87.4143 45.7399ZM144.996 23.8782C143.017 20.4491 131.017 24.0906 114.034 32.0279C114.193 32.2904 114.351 32.5612 114.501 32.8362C130.771 25.0906 142.125 21.3616 143.567 24.3615C145.833 28.2863 119.817 47.544 85.4852 67.3726C51.153 87.2011 21.4623 100.092 19.1957 96.1674C17.9041 93.8342 24.2913 87.4761 30.0287 82.4179C21.7664 89.0843 17.4332 94.2217 18.8582 96.6883C22.0914 102.292 53.3862 91.2718 88.2226 71.1724C123.059 51.0731 148.246 29.4821 144.996 23.8782Z" fill="#00ADE8"/>
-  <path d="M83.3353 48.9982C82.6012 47.7384 82.3267 46.263 82.5588 44.8236C82.7909 43.3842 83.5151 42.0698 84.6079 41.1046C85.7007 40.1394 87.0944 39.5831 88.5515 39.5306C90.0086 39.4781 91.4388 39.9327 92.5982 40.8168C93.7576 41.7008 94.5745 42.9597 94.9095 44.3787C95.2445 45.7978 95.077 47.2891 94.4354 48.5983C93.7939 49.9076 92.718 50.9539 91.3913 51.5586C90.0646 52.1634 88.5692 52.2892 87.1601 51.9147C86.3577 51.7143 85.6046 51.3523 84.947 50.8508C84.2893 50.3493 83.7409 49.7189 83.3353 48.9982Z" fill="#DD078C"/>
-  <path style="fill: rgb(216, 216, 216); stroke: rgb(0, 0, 0);" d="M 136.262 12.714"/>
-</svg>
\ No newline at end of file
+<svg width="80" height="80" fill="none" viewBox="13.5 9.957 132 91.59" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M119.047 49.098A44.997 44.997 0 0 0 73.23 10.016a44.999 44.999 0 0 0-26.781 80.218c4.416-1.966 9.245-4.262 14.375-6.837a31.493 31.493 0 0 1-1.95-55.788 31.496 31.496 0 0 1 46.923 30.239 405.85 405.85 0 0 0 13.25-8.75zm.379 5.1c-4.546 3.362-9.583 6.846-15 10.358a31.493 31.493 0 0 1-37.411 21.045c-5.937 2.854-11.57 5.325-16.729 7.37a44.999 44.999 0 0 0 69.14-38.773z" fill="#1D2125"/><path fill-rule="evenodd" clip-rule="evenodd" d="M121.709 17.6a3.082 3.082 0 0 0 2.845-1.902 3.078 3.078 0 0 0-4.023-4.023 3.076 3.076 0 0 0-1.901 2.845 3.077 3.077 0 0 0 3.079 3.08zM18.104 69.914a4.104 4.104 0 1 0 0-8.208 4.104 4.104 0 0 0 0 8.208zM87.414 45.74c4.433-2.45 8.75-4.775 12.916-6.92.155.25.321.545.496.879a615.52 615.52 0 0 0-12.878 6.945l-.534-.904zm57.582-21.862c-1.979-3.429-13.979.213-30.962 8.15.159.262.317.533.467.808 16.27-7.745 27.624-11.474 29.066-8.474 2.266 3.924-23.75 23.182-58.082 43.01-34.332 19.83-64.023 32.72-66.29 28.795-1.29-2.333 5.096-8.69 10.834-13.75-8.263 6.667-12.596 11.805-11.17 14.271 3.232 5.604 34.527-5.416 69.364-25.516 34.836-20.099 60.023-41.69 56.773-47.294z" fill="#00ADE8"/><path d="M83.335 48.998a6.3 6.3 0 1 1 3.825 2.917 6.078 6.078 0 0 1-3.825-2.917z" fill="#DD078C"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Oura/oura.svg b/packages/nodes-base/nodes/Oura/oura.svg
index 4d4a1adc66..ba4972a412 100644
--- a/packages/nodes-base/nodes/Oura/oura.svg
+++ b/packages/nodes-base/nodes/Oura/oura.svg
@@ -1,16 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- viewBox="12 12 35.000000 35.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,60.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M240 435 c0 -12 13 -15 60 -15 47 0 60 3 60 15 0 12 -13 15 -60 15
--47 0 -60 -3 -60 -15z"/>
-<path d="M260 387 c-41 -14 -80 -68 -80 -111 0 -77 79 -138 151 -117 98 29
-121 154 39 212 -35 24 -69 29 -110 16z m100 -44 c49 -43 43 -121 -10 -148 -42
--22 -74 -18 -109 11 -43 36 -44 93 -2 135 38 38 80 39 121 2z"/>
-</g>
-</svg>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="12 12 35 35"><path d="M24 16.5c0 1.2 1.3 1.5 6 1.5s6-.3 6-1.5-1.3-1.5-6-1.5-6 .3-6 1.5zM26 21.3c-4.1 1.4-8 6.8-8 11.1 0 7.7 7.9 13.8 15.1 11.7 9.8-2.9 12.1-15.4 3.9-21.2-3.5-2.4-6.9-2.9-11-1.6zm10 4.4c4.9 4.3 4.3 12.1-1 14.8-4.2 2.2-7.4 1.8-10.9-1.1-4.3-3.6-4.4-9.3-.2-13.5 3.8-3.8 8-3.9 12.1-.2z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PayPal/paypal.svg b/packages/nodes-base/nodes/PayPal/paypal.svg
index 2d457931fc..d52a394513 100644
--- a/packages/nodes-base/nodes/PayPal/paypal.svg
+++ b/packages/nodes-base/nodes/PayPal/paypal.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>paypal_node_icon</title>
-    <g id="paypal_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Group" transform="translate(1.000000, 1.000000)">
-            <path d="M58.4441094,20.7421875 C58.4441094,26.9335 55.8702344,31.93375 50.7335469,35.731875 C45.5968594,39.53 38.4191406,41.4244531 29.1893281,41.4244531 L24.08675,41.4244531 L20.1743125,58.3869531 L6.69004687,58.3869531 L19.1408906,6.3609375 L37.3977031,6.3609375 C40.8086406,6.3609375 43.7586406,6.59878125 46.2993281,7.06432813 C48.8280313,7.52895313 51.0165625,8.33467187 52.8446406,9.47964063 C54.6588906,10.6246094 56.0527656,12.1106719 57.0059844,13.9359844 C57.9582813,15.7502344 58.4348906,18.0291094 58.4348906,20.7514063 L58.4441094,20.7421875 Z" id="Path" fill="#009CDE"></path>
-            <path d="M20.6269531,58.9446875 L5.98757812,58.9446875 L18.7094531,5.79582812 L37.3958594,5.79582812 C40.8086406,5.79582812 43.837,6.03367187 46.3878281,6.49921875 C48.9736875,6.97582812 51.2415,7.81473437 53.1359531,8.98275 C55.0294844,10.1738125 56.5035625,11.748375 57.5019531,13.6548125 C58.5003437,15.56125 59,17.9489063 59,20.7421875 C59,27.0920625 56.3265625,32.2969688 51.071875,36.1863594 C45.8559062,40.0416406 38.4975,41.9923281 29.1865625,41.9923281 L24.5255625,41.9923281 L20.6269531,58.9446875 Z M7.4045,57.8329063 L19.7299687,57.8329063 L23.6424062,40.8704063 L29.1874844,40.8704063 C38.2476719,40.8704063 45.3922031,38.9879375 50.4035156,35.2801563 C52.8870469,33.4428594 54.7805781,31.2884375 56.0269531,28.8841875 C57.2733281,26.4799375 57.886375,23.7364375 57.886375,20.7421875 C57.886375,18.1240625 57.42175,15.9115625 56.514625,14.1655313 C55.6075,12.4305625 54.2809219,11.0127188 52.5570156,9.92490625 C50.7870156,8.82510938 48.6445781,8.0424375 46.1960781,7.588875 C43.7125469,7.1353125 40.7533281,6.89746875 37.3967813,6.89746875 L19.5833906,6.89746875 L7.4045,57.8329063 Z" id="Shape" fill="#FFFFFF"></path>
-            <path d="M52.4574531,14.9574219 C52.4574531,21.1487344 49.8835781,26.1489844 44.7468906,29.9471094 C39.6102031,33.7452344 32.4315625,35.6396875 23.2035937,35.6396875 L18.1010156,35.6396875 L14.196875,52.5929687 L0.703390625,52.5929687 L12.721875,0.555890625 L31.4211875,0.555890625 C34.832125,0.555890625 37.782125,0.793734375 40.3228125,1.25928125 C42.8515156,1.72390625 45.0400469,2.529625 46.868125,3.67459375 C48.682375,4.8195625 50.07625,6.305625 51.0294688,8.1309375 C51.9817656,9.9451875 52.458375,12.2240625 52.458375,14.9574219 L52.4574531,14.9574219 Z" id="Path" fill="#0F3572"></path>
-            <path d="M14.6283125,53.1497813 L0,53.1497813 L12.2581719,0 L31.4110469,0 C34.8238281,0 37.8521875,0.23784375 40.4030156,0.703390625 C42.988875,1.18 45.2566875,2.01890625 47.1511406,3.18692187 C49.0446719,4.37798437 50.51875,5.95254688 51.5171406,7.85898437 C52.5155312,9.76542187 53.0142656,12.1457031 53.0142656,14.9463594 C53.0142656,21.2962344 50.3408281,26.5011406 45.0861406,30.3905312 C39.8701719,34.2458125 32.5117656,36.1965 23.2008281,36.1965 L18.5296875,36.1965 L14.6283125,53.1497813 Z M1.40585937,52.0269375 L13.7433125,52.0269375 L17.65575,35.0644375 L23.2008281,35.0644375 C32.2610156,35.0644375 39.4055469,33.1819688 44.4168594,29.4741875 C46.9003906,27.6368906 48.7939219,25.4824688 50.0402969,23.0782188 C51.2866719,20.6739688 51.8997187,17.9304688 51.8997187,14.9362188 C51.8997187,12.3180938 51.4350938,10.1055938 50.5279687,8.3595625 C49.6208437,6.62459375 48.2942656,5.20675 46.5703594,4.1189375 C44.8003594,3.01914063 42.6579219,2.23646875 40.2094219,1.78290625 C37.7258906,1.32934375 34.7666719,1.0915 31.410125,1.0915 L13.14225,1.0915 L1.40585937,52.0269375 Z M38.5989062,16.8057813 C38.5067187,18.39325 38.1794531,19.5714063 37.2041094,20.9108906 C36.2398281,22.2605156 35.1059219,23.1233906 33.5866719,23.8590469 C32.6793716,24.2873285 31.7118872,24.5742784 30.7177969,24.7099375 C29.7203281,24.846375 28.5292656,24.9256563 27.1344687,24.9256563 L20.4324375,24.9256563 L24.1844687,11.4662813 L30.2734531,11.4662813 C31.8268125,11.4662813 33.0741094,11.4893281 34.0162656,11.704125 C34.9565781,11.9069375 35.7281875,12.1927188 36.307125,12.5338125 C37.1119219,13.0104219 37.7581562,13.5884375 38.1324375,14.3250156 C38.5970625,15.1869688 38.6542187,15.7428594 38.5970625,16.7864219 L38.5989062,16.8057813 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M59.444 21.742c0 6.191-2.574 11.192-7.71 14.99-5.137 3.798-12.315 5.692-21.545 5.692h-5.102l-3.913 16.963H7.69L20.14 7.361h18.258c3.41 0 6.36.238 8.901.703 2.529.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.952 1.814 1.429 4.093 1.429 6.815l.01-.009z" fill="#009CDE"/><path d="M21.627 59.945H6.987L19.71 6.795h18.687c3.413 0 6.441.239 8.992.704 2.586.477 4.854 1.316 6.748 2.484 1.893 1.19 3.368 2.765 4.366 4.672C59.5 16.56 60 18.949 60 21.742c0 6.35-2.673 11.555-7.928 15.444-5.216 3.856-12.575 5.806-21.885 5.806h-4.661l-3.899 16.953zM8.404 58.833H20.73l3.912-16.963h5.545c9.06 0 16.205-1.882 21.217-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.246-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.444-.692-8.8-.692H20.583L8.405 58.833z" fill="#FFF"/><path d="M53.457 15.957c0 6.192-2.573 11.192-7.71 14.99-5.137 3.798-12.315 5.693-21.543 5.693H19.1l-3.904 16.953H1.703L13.722 1.556h18.7c3.41 0 6.36.238 8.9.703 2.53.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.953 1.814 1.43 4.093 1.43 6.826h-.002z" fill="#0F3572"/><path d="M15.628 54.15H1L13.258 1h19.153c3.413 0 6.441.238 8.992.703 2.586.477 4.854 1.316 6.748 2.484 1.894 1.191 3.368 2.766 4.366 4.672.999 1.906 1.497 4.287 1.497 7.087 0 6.35-2.673 11.555-7.928 15.445-5.216 3.855-12.574 5.806-21.885 5.806H19.53L15.628 54.15zM2.406 53.027h12.337l3.913-16.963H24.2c9.06 0 16.205-1.882 21.216-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.247-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.443-.692-8.8-.692H14.142L2.406 53.028zm37.193-35.221c-.092 1.587-.42 2.765-1.395 4.105-.964 1.35-2.098 2.212-3.617 2.948a9.836 9.836 0 0 1-2.87.85c-.997.137-2.188.217-3.583.217h-6.702l3.752-13.46h6.09c1.553 0 2.8.023 3.742.238.94.203 1.712.489 2.291.83.805.476 1.451 1.054 1.825 1.791.465.862.522 1.418.465 2.461l.002.02z" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Plivo/plivo.svg b/packages/nodes-base/nodes/Plivo/plivo.svg
index 445ddb2563..82994465ad 100644
--- a/packages/nodes-base/nodes/Plivo/plivo.svg
+++ b/packages/nodes-base/nodes/Plivo/plivo.svg
@@ -1,15 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170">
-  <defs>
-    <polygon id="plivo-icon-a" points="0 .549 152 .549 152 119 0 119"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <rect width="250" height="218" fill="#FFF" fill-opacity=".01"/>
-    <g transform="translate(49 49.451)">
-      <mask id="plivo-icon-b" fill="#fff">
-        <use xlink:href="#plivo-icon-a"/>
-      </mask>
-      <path fill="#43A046" d="M75.7352,0.548254922 C62.8312,0.5936 50.9272,4.8406 41.3112,11.9896 C31.6952,19.1396 24.3682,29.1916 20.6162,40.8426 C20.4632,41.3176 20.2312,41.7556 19.9322,42.1436 C19.6342,42.5306 19.2692,42.8676 18.8512,43.1396 C12.9112,47.0036 8.0222,52.3416 4.7122,58.6356 C1.4022,64.9306 -0.3278,72.1816 0.0512,79.8716 C0.6002,90.9886 5.6532,100.7906 13.3512,107.8026 C21.0492,114.8156 31.3932,119.0376 42.5252,118.999854 L76.1422,118.999854 L109.7582,118.999854 C120.8902,118.9616 131.2052,114.6106 138.8542,107.4866 C146.5042,100.3646 151.4892,90.4716 151.9622,79.3496 C152.2882,71.6566 150.5082,64.4176 147.1552,58.1466 C143.8022,51.8746 138.8762,46.5706 132.9112,42.7476 C132.4912,42.4786 132.1242,42.1446 131.8222,41.7586 C131.5212,41.3736 131.2862,40.9376 131.1302,40.4626 C127.2982,28.8376 119.9022,18.8366 110.2362,11.7536 C100.5722,4.6706 88.6392,0.5046 75.7352,0.548254922 M75.7862,15.3263438 C85.3122,15.2936 94.3582,18.4496 101.7062,23.8936 C109.0532,29.3376 114.7042,37.0686 117.4402,46.1866 L118.0322,48.1596 L118.6252,50.1336 C118.7782,50.6466 119.0262,51.1206 119.3512,51.5346 C119.6752,51.9486 120.0772,52.3026 120.5382,52.5746 L122.3142,53.6216 L124.0892,54.6676 C128.3502,57.1806 131.7232,60.6916 133.9832,64.8106 C136.2432,68.9296 137.3912,73.6576 137.2022,78.6046 C136.9262,85.7856 133.7002,92.1526 128.7452,96.7326 C123.7902,101.3116 117.1082,104.1006 109.9212,104.1246 L76.0912,104.2406 L42.2612,104.357769 C35.0742,104.3826 28.3732,101.6386 23.3872,97.0946 C18.4012,92.5496 15.1302,86.2036 14.8062,79.0256 C14.5822,74.0796 15.6972,69.3446 17.9292,65.2096 C20.1622,61.0746 23.5112,57.5406 27.7552,54.9986 L29.5232,53.9406 L31.2902,52.8816 C31.7502,52.6066 32.1492,52.2496 32.4712,51.8336 C32.7932,51.4166 33.0372,50.9416 33.1882,50.4266 L33.7662,48.4486 L34.3452,46.4716 C37.0192,37.3356 42.6152,29.5656 49.9262,24.0706 C57.2362,18.5776 66.2592,15.3596 75.7862,15.3263438" mask="url(#plivo-icon-b)"/>
-    </g>
-    <path fill="#43A046" d="M113.2811 100.651C113.2811 101.521 112.9311 102.309 112.3631 102.88 111.7951 103.453 111.0091 103.809 110.1391 103.814L106.9651 103.826 103.7901 103.837C102.9211 103.837 102.1331 103.486 101.5611 102.918 100.9891 102.35 100.6331 101.564 100.6271 100.695L100.6161 97.52 100.606098 94.345C100.6051 93.476 100.9561 92.688 101.5241 92.116 102.0921 91.545 102.8781 91.188 103.7471 91.182L106.9221 91.172 110.0961 91.161C110.9661 91.161 111.7541 91.511 112.3251 92.079 112.8981 92.647 113.2541 93.433 113.2591 94.302L113.2701 97.477 113.2811 100.651zM131.2421 100.651C131.2421 101.521 130.8921 102.309 130.3241 102.88 129.7561 103.453 128.9701 103.809 128.1011 103.814L124.9261 103.826 121.7521 103.837C120.8821 103.837 120.0941 103.486 119.5221 102.918 118.9501 102.35 118.5941 101.564 118.5891 100.695L118.5771 97.52 118.567098 94.345C118.5661 93.476 118.9171 92.688 119.4851 92.116 120.0531 91.545 120.8391 91.188 121.7081 91.182L124.8831 91.172 128.0571 91.161C128.9271 91.161 129.7151 91.511 130.2871 92.079 130.8591 92.647 131.2151 93.433 131.2211 94.302L131.2311 97.477 131.2421 100.651zM149.2035 100.653C149.2035 101.522 148.8535 102.31 148.2855 102.882 147.7175 103.454 146.9315 103.81 146.0615 103.816L142.8875 103.827 139.7125 103.838019C138.8425 103.841 138.0535 103.49 137.4805 102.922 136.9085 102.353 136.5525 101.566 136.5495 100.696L136.5385 97.521 136.528466 94.346C136.5245 93.476 136.8745 92.687 137.4435 92.115 138.0125 91.543 138.7985 91.187 139.6695 91.184L142.8445 91.173 146.0185 91.162C146.8905 91.139 147.6905 91.472 148.2775 92.029 148.8645 92.586 149.2385 93.367 149.2615 94.239 149.2615 94.25 149.2625 94.26 149.2625 94.271 149.2625 94.282 149.2625 94.293 149.2625 94.303L149.2325 97.478 149.2035 100.653zM113.2889 118.608C113.2889 119.477 112.9389 120.265 112.3709 120.837 111.8029 121.409 111.0169 121.765 110.1469 121.771L106.9729 121.782 103.7979 121.793002C102.9289 121.794 102.1409 121.442 101.5689 120.875 100.9969 120.306 100.6409 119.521 100.6349 118.651L100.6239 115.476 100.613898 112.302C100.6129 111.432 100.9639 110.644 101.5319 110.073 102.0999 109.501 102.8859 109.144 103.7549 109.139L106.9299 109.129 110.1039 109.117C110.9739 109.117 111.7619 109.467 112.3329 110.036 112.9059 110.603 113.2619 111.389 113.2669 112.258L113.2779 115.433 113.2889 118.608zM131.2499 118.608C131.2499 119.477 130.8999 120.265 130.3319 120.837 129.7639 121.409 128.9779 121.765 128.1089 121.771L124.9339 121.782 121.7599 121.793002C120.8899 121.794 120.1019 121.442 119.5299 120.875 118.9579 120.306 118.6019 119.521 118.5969 118.651L118.5849 115.476 118.574898 112.302C118.5739 111.432 118.9249 110.644 119.4929 110.073 120.0609 109.501 120.8469 109.144 121.7159 109.139L124.8909 109.129 128.0649 109.117C128.9349 109.117 129.7229 109.467 130.2949 110.036 130.8669 110.603 131.2229 111.389 131.2289 112.258L131.2389 115.433 131.2499 118.608zM149.2113 118.608C149.2113 119.477 148.8613 120.265 148.2933 120.837 147.7253 121.409 146.9393 121.765 146.0693 121.771L142.8953 121.782 139.7203 121.793019C138.8503 121.796 138.0613 121.446 137.4883 120.877 136.9163 120.308 136.5603 119.522 136.5573 118.651L136.5463 115.476 136.536266 112.302C136.5323 111.431 136.8823 110.642 137.4513 110.07 138.0203 109.498 138.8063 109.142 139.6773 109.139L142.8523 109.129 146.0263 109.117C146.8963 109.117 147.6843 109.467 148.2553 110.036 148.8283 110.603 149.1843 111.389 149.1893 112.258L149.2003 115.433 149.2113 118.608zM113.296819 136.5582C113.2998 137.4282 112.9498 138.2182 112.3808 138.7902 111.8128 139.3632 111.0258 139.7182 110.1548 139.7212L106.9808 139.7322 103.8058 139.743219C102.9358 139.7462 102.1468 139.3962 101.5738 138.8282 101.0018 138.2592 100.6458 137.4722 100.6428 136.6022L100.6318 133.4272 100.621798 130.2522C100.6208 129.3832 100.9718 128.5952 101.5398 128.0232 102.1078 127.4512 102.8938 127.0952 103.7628 127.0892L106.9378 127.0792 110.1118 127.068198C110.9818 127.0672 111.7698 127.4172 112.3408 127.9862 112.9138 128.5542 113.2698 129.3392 113.2748 130.2082L113.2858 133.3832 113.296819 136.5582zM131.257719 136.5582C131.2607 137.4282 130.9107 138.2182 130.3417 138.7902 129.7737 139.3632 128.9867 139.7182 128.1167 139.7212L124.9417 139.7322 121.7677 139.743219C120.8967 139.7462 120.1077 139.3962 119.5347 138.8282 118.9627 138.2592 118.6077 137.4722 118.6047 136.6022L118.5927 133.4272 118.582698 130.2522C118.5817 129.3832 118.9327 128.5952 119.5007 128.0232 120.0687 127.4512 120.8547 127.0952 121.7237 127.0892L124.8987 127.0792 128.0727 127.068198C128.9427 127.0672 129.7307 127.4172 130.3027 127.9862 130.8747 128.5542 131.2307 129.3392 131.2367 130.2082L131.2467 133.3832 131.257719 136.5582zM149.219119 136.5582C149.2221 137.4282 148.8721 138.2182 148.3031 138.7902 147.7351 139.3632 146.9481 139.7182 146.0771 139.7212L142.9031 139.7322 139.7281 139.743219C138.8581 139.7462 138.0691 139.3962 137.4961 138.8282 136.9241 138.2592 136.5681 137.4722 136.5651 136.6022L136.5541 133.4272 136.544066 130.2522C136.5401 129.3822 136.8901 128.5922 137.4591 128.0202 138.0281 127.4482 138.8141 127.0922 139.6851 127.0892L142.8601 127.0792 146.0341 127.068198C146.9041 127.0672 147.6921 127.4172 148.2631 127.9862 148.8361 128.5542 149.1921 129.3392 149.1971 130.2082L149.2081 133.3832 149.219119 136.5582z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170"><defs><path id="a" d="M0 .549h152V119H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" fill-opacity=".01" d="M0 0h250v218H0z"/><g transform="translate(49 49.451)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#43A046" d="M75.735.548C62.831.594 50.927 4.841 41.311 11.99c-9.616 7.15-16.943 17.202-20.695 28.853a4.275 4.275 0 0 1-.684 1.3 4.372 4.372 0 0 1-1.08.997 41.635 41.635 0 0 0-14.14 15.496C1.402 64.93-.328 72.182.052 79.872c.548 11.117 5.601 20.919 13.3 27.93 7.697 7.014 18.041 11.236 29.173 11.198h67.233a42.937 42.937 0 0 0 29.096-11.513c7.65-7.122 12.635-17.015 13.108-28.137.326-7.693-1.454-14.932-4.807-21.203a41.637 41.637 0 0 0-14.244-15.4 4.378 4.378 0 0 1-1.089-.988 4.257 4.257 0 0 1-.692-1.296c-3.832-11.625-11.228-21.626-20.894-28.71C100.572 4.672 88.64.506 75.736.549m.05 14.778c9.526-.032 18.572 3.124 25.92 8.568 7.347 5.444 12.998 13.175 15.734 22.293l.592 1.973.593 1.974a4.25 4.25 0 0 0 1.913 2.441l1.776 1.047 1.775 1.046c4.261 2.513 7.634 6.024 9.894 10.143 2.26 4.119 3.408 8.847 3.22 13.794-.277 7.18-3.503 13.548-8.458 18.128a27.908 27.908 0 0 1-18.824 7.392l-33.83.116-33.83.117a27.913 27.913 0 0 1-18.874-7.263c-4.986-4.545-8.257-10.891-8.58-18.07-.225-4.945.89-9.68 3.122-13.815 2.233-4.135 5.582-7.67 9.826-10.211l1.768-1.058 1.767-1.06a4.254 4.254 0 0 0 1.898-2.454l.578-1.978.58-1.977c2.673-9.136 8.27-16.906 15.58-22.401 7.31-5.493 16.333-8.711 25.86-8.745" mask="url(#b)"/></g><path fill="#43A046" d="M113.281 100.651c0 .87-.35 1.658-.918 2.229a3.147 3.147 0 0 1-2.224.934l-3.174.012-3.175.011a3.154 3.154 0 0 1-2.229-.919 3.155 3.155 0 0 1-.934-2.223l-.01-3.175-.01-3.175a3.159 3.159 0 0 1 3.141-3.163l3.174-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.933 2.223l.011 3.175.011 3.174zm17.961 0c0 .87-.35 1.658-.918 2.229a3.146 3.146 0 0 1-2.223.934l-3.175.012-3.174.011c-.87 0-1.658-.351-2.23-.919a3.15 3.15 0 0 1-.933-2.223l-.012-3.175-.01-3.175a3.159 3.159 0 0 1 3.141-3.163l3.175-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.934 2.223l.01 3.175.011 3.174zm17.962.002c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.225.934l-3.174.011-3.174.011a3.146 3.146 0 0 1-2.232-.916 3.146 3.146 0 0 1-.931-2.226l-.012-3.175-.01-3.175a3.133 3.133 0 0 1 .916-2.231 3.145 3.145 0 0 1 2.226-.931l3.175-.011 3.173-.011a3.152 3.152 0 0 1 2.26.867c.587.557.96 1.338.984 2.21v.064l-.03 3.175-.029 3.175zm-35.915 17.955c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.224.934l-3.174.011-3.175.011a3.153 3.153 0 0 1-2.23-.918 3.157 3.157 0 0 1-.933-2.224l-.011-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.229.919.573.567.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0c0 .869-.35 1.657-.917 2.229a3.155 3.155 0 0 1-2.223.934l-3.175.011-3.174.011a3.154 3.154 0 0 1-2.23-.918 3.152 3.152 0 0 1-.933-2.224l-.012-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919a3.15 3.15 0 0 1 .934 2.222l.01 3.175.01 3.175zm17.962 0c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.224.934l-3.174.011-3.175.011a3.142 3.142 0 0 1-2.232-.916 3.145 3.145 0 0 1-.93-2.226l-.012-3.175-.01-3.174a3.134 3.134 0 0 1 .915-2.232 3.145 3.145 0 0 1 2.226-.931l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919.572.567.928 1.353.933 2.222l.011 3.175.011 3.175zm-35.914 17.95a3.14 3.14 0 0 1-.916 2.232 3.139 3.139 0 0 1-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 0 1-2.232-.915 3.146 3.146 0 0 1-.931-2.226l-.011-3.175-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.155 3.155 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.142 3.142 0 0 1 2.229.917c.573.568.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0a3.14 3.14 0 0 1-.915 2.232 3.138 3.138 0 0 1-2.225.931l-3.175.011-3.174.011a3.146 3.146 0 0 1-3.163-3.14l-.012-3.176-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.155 3.155 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.146 3.146 0 0 1 2.23.917c.572.568.928 1.353.934 2.222l.01 3.175.01 3.175zm17.962 0a3.14 3.14 0 0 1-.916 2.232 3.139 3.139 0 0 1-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 0 1-2.232-.915 3.146 3.146 0 0 1-.93-2.226l-.012-3.175-.01-3.175c-.004-.87.346-1.66.915-2.232a3.145 3.145 0 0 1 2.226-.93l3.175-.01 3.174-.012a3.142 3.142 0 0 1 2.23.918c.572.568.928 1.353.933 2.222l.011 3.175.011 3.175z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PostHog/postHog.svg b/packages/nodes-base/nodes/PostHog/postHog.svg
index e62492556c..1f6cc79322 100644
--- a/packages/nodes-base/nodes/PostHog/postHog.svg
+++ b/packages/nodes-base/nodes/PostHog/postHog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none" viewBox="0 0 300 300"><rect width="300" height="300" fill="#fff"/><path fill="#F9BD2B" d="M33 179.379L72.0038 218.33H33V179.379ZM33 169.641L81.7548 218.33H120.759L33 130.689V169.641ZM33 120.951L130.51 218.33H169.513L33 82V120.951ZM81.7548 120.951L179.264 218.33V179.379L81.7548 82V120.951ZM130.51 82V120.951L179.264 169.641V130.689L130.51 82Z"/><path fill="#000" d="M267.023 202.75C257.03 202.75 247.451 198.784 240.391 191.734L186.16 137.576V218.33H267.023V202.75Z"/><path fill="#fff" d="M209.563 202.75C213.871 202.75 217.363 199.262 217.363 194.959C217.363 190.657 213.871 187.169 209.563 187.169C205.254 187.169 201.762 190.657 201.762 194.959C201.762 199.262 205.254 202.75 209.563 202.75Z"/><path fill="#1D4AFF" d="M33 218.33H72.0038L33 179.379V218.33Z"/><path fill="#1D4AFF" d="M81.7548 130.689L33 82V120.951L81.7548 169.641V130.689Z"/><path fill="#1D4AFF" d="M33 130.689V169.641L81.7548 218.33V179.379L33 130.689Z"/><path fill="#F54E00" d="M130.51 130.689L81.7548 82V120.951L130.51 169.641V130.689Z"/><path fill="#F54E00" d="M81.7548 218.33H120.759L81.7548 179.379V218.33Z"/><path fill="#F54E00" d="M81.7548 130.689V169.641L130.51 218.33V179.379L81.7548 130.689Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none"><path fill="#fff" d="M0 0h300v300H0z"/><path fill="#F9BD2B" d="m33 179.379 39.004 38.951H33v-38.951zm0-9.738 48.755 48.689h39.004L33 130.689v38.952zm0-48.69 97.51 97.379h39.003L33 82v38.951zm48.755 0 97.509 97.379v-38.951L81.754 82v38.951zM130.51 82v38.951l48.754 48.69v-38.952L130.51 82z"/><path fill="#000" d="M267.023 202.75a37.692 37.692 0 0 1-26.632-11.016l-54.231-54.158v80.754h80.863v-15.58z"/><path fill="#fff" d="M209.563 202.75c4.308 0 7.8-3.488 7.8-7.791 0-4.302-3.492-7.79-7.8-7.79-4.309 0-7.801 3.488-7.801 7.79 0 4.303 3.492 7.791 7.801 7.791z"/><path fill="#1D4AFF" d="M33 218.33h39.004L33 179.379v38.951zM81.755 130.689 33 82v38.951l48.755 48.69v-38.952zM33 130.689v38.952l48.755 48.689v-38.951L33 130.689z"/><path fill="#F54E00" d="M130.51 130.689 81.755 82v38.951l48.755 48.69v-38.952zM81.755 218.33h39.004l-39.004-38.951v38.951zM81.755 130.689v38.952l48.755 48.689v-38.951l-48.755-48.69z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
index 0cc5e90197..47018c4218 100644
--- a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
+++ b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 256" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);"><defs><linearGradient x1="8.59%" y1="1.954%" x2="77.471%" y2="73.896%" id="IconifyId-17538606b22-a94500-15615"><stop stop-color="#4CB36B" offset="0%"/><stop stop-color="#3EA16F" offset="100%"/></linearGradient><path id="IconifyId-17538606b22-a94500-15616" d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128C0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128"/></defs><mask id="IconifyId-17538606b22-a94500-15617" fill="#fff"><use xlink:href="#IconifyId-17538606b22-a94500-15616"/></mask><use fill="#67BF79" xlink:href="#IconifyId-17538606b22-a94500-15616"/><path d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128C0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128" fill="#67BF79" mask="url(#IconifyId-17538606b22-a94500-15617)"/><path d="M63.111 187.022L96.178 72l64.533 60.978L200 90.133l87.533 86.289l-110.844 124.889L63.111 187.022" fill="url(#IconifyId-17538606b22-a94500-15615)" mask="url(#IconifyId-17538606b22-a94500-15617)"/><path d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733H77z" fill="#FFF" mask="url(#IconifyId-17538606b22-a94500-15617)"/><path d="M121.041 189.6c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025c0 30.752-20.628 62.308-52.628 62.308h-37.537z" fill="#FFF" mask="url(#IconifyId-17538606b22-a94500-15617)"/><rect x="0" y="0" width="256" height="256" fill="rgba(0, 0, 0, 0)" /></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg);transform:rotate(360deg)"><defs><linearGradient x1="8.59%" y1="1.954%" x2="77.471%" y2="73.896%" id="c"><stop stop-color="#4CB36B" offset="0%"/><stop stop-color="#3EA16F" offset="100%"/></linearGradient><path id="a" d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128"/></defs><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#67BF79" xlink:href="#a"/><path d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128" fill="#67BF79" mask="url(#b)"/><path d="M63.111 187.022 96.178 72l64.533 60.978L200 90.133l87.533 86.289-110.844 124.889L63.111 187.022" fill="url(#c)" mask="url(#b)"/><path d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733H77zM121.041 189.6c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025 0 30.752-20.628 62.308-52.628 62.308h-37.537z" fill="#FFF" mask="url(#b)"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h256v256H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
index ac04a2e791..d954aaf8e6 100644
--- a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
+++ b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
@@ -1 +1 @@
-<svg enable-background="new 0 0 2500 2500" viewBox="0 0 2500 2500" xmlns="http://www.w3.org/2000/svg"><circle cx="1250" cy="1250" fill="#2ca01c" r="1250"/><path d="m301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1c45.3-9.9 92.2-9.9 137.5 0h175.6v1002.9c-.9 106.1 84.4 192.9 190.5 193.9v-1395.4h-364.5c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1c-45.3 9.9-92.2 9.9-137.5 0h-175.6v-1002.8c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 2500 2500" xmlns="http://www.w3.org/2000/svg"><circle cx="1250" cy="1250" fill="#2ca01c" r="1250"/><path d="M301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1a322 322 0 0 1 137.5 0H987v1002.9c-.9 106.1 84.4 192.9 190.5 193.9V729.6H813c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1a322 322 0 0 1-137.5 0h-175.6V571c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Raindrop/raindrop.svg b/packages/nodes-base/nodes/Raindrop/raindrop.svg
index c226932017..e841d0959c 100644
--- a/packages/nodes-base/nodes/Raindrop/raindrop.svg
+++ b/packages/nodes-base/nodes/Raindrop/raindrop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 0 1 9.5 9.5v9.5H9.5a9.5 9.5 0 0 1 0-19z"></path><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 1 1 9.496 9.77H0z"></path></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863-.17.165-.343.325-.519.479L19 31l-8.673-7.958c-.176-.154-.35-.314-.52-.479-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0z"></path><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"></use></mask><use fill="#2CD4ED" xlink:href="#a"></use><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L19 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#b)"></path></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"></use></mask><use fill="#3169FF" xlink:href="#c"></use><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L0 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#d)"></path></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 0 1 9.5 9.5v9.5H9.5a9.5 9.5 0 0 1 0-19z"/><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 1 1 9.496 9.77H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863-.17.165-.343.325-.519.479L19 31l-8.673-7.958c-.176-.154-.35-.314-.52-.479-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0z"/><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#2CD4ED" xlink:href="#a"/><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L19 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#b)"/></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use fill="#3169FF" xlink:href="#c"/><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L0 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#d)"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Reddit/reddit.svg b/packages/nodes-base/nodes/Reddit/reddit.svg
index 507bbb9ed7..64a9bd454e 100644
--- a/packages/nodes-base/nodes/Reddit/reddit.svg
+++ b/packages/nodes-base/nodes/Reddit/reddit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 513 514" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z" fill="#ff4500"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305z"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#C"/><use xlink:href="#C" x="-118"/></g></g><g stroke="#fff" fill="none"><use xlink:href="#C" x="75" y="-160" stroke-width="25"/><path d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45l24-83 80 16" stroke-width="22"/></g></symbol><defs ><path id="C" d="M287 285a27.94 27.94 0 1 1 56 0 27.94 27.94 0 1 1-56 0z"/></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 513 514" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z" fill="#ff4500"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305z"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#b"/><use xlink:href="#b" x="-118"/></g></g><g stroke="#fff" fill="none"><use xlink:href="#b" x="75" y="-160" stroke-width="25"/><path d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45 24-83 80 16" stroke-width="22"/></g></symbol><defs><path id="b" d="M287 285a27.94 27.94 0 1 1 56 0 27.94 27.94 0 1 1-56 0z"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Redis/redis.svg b/packages/nodes-base/nodes/Redis/redis.svg
index 252d8c080d..df3df0ac29 100644
--- a/packages/nodes-base/nodes/Redis/redis.svg
+++ b/packages/nodes-base/nodes/Redis/redis.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>redis_node_icon</title>
-    <g id="redis_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Group" transform="translate(0.000000, 4.000000)">
-            <path d="M57.65625,39.9898909 C54.4546875,41.6728 37.869375,48.5509818 34.3378125,50.4069091 C30.80625,52.2628364 28.8440625,52.2448727 26.055,50.9013818 C23.2659375,49.5578909 5.60625,42.3658182 2.42625,40.8341818 C0.834375,40.0664727 0.001875,39.4216727 0.001875,38.8109091 L0.001875,32.6938182 C0.001875,32.6938182 22.981875,27.6488727 26.6925,26.3063273 C30.403125,24.9637818 31.6865625,24.9165091 34.8459375,26.0813091 C38.0053125,27.2461091 56.8809375,30.6837818 60,31.8372364 L60,37.8692364 C60,38.4743273 59.2809375,39.1522182 57.650625,39.9927273 L57.65625,39.9898909 Z" id="Path" fill="#A41E11"></path>
-            <path d="M57.65625,33.8718545 C54.4546875,35.5566545 37.869375,42.4329455 34.3378125,44.2888727 C30.80625,46.1448 28.8440625,46.1268364 26.055,44.7833455 C23.2659375,43.4398545 5.60625,36.2487273 2.4253125,34.7152 C-0.755625,33.1816727 -0.8184375,32.1274909 2.3034375,30.8955636 L26.690625,21.3748364 C30.4003125,20.0341818 31.6846875,19.9850182 34.8440625,21.1498182 C38.0034375,22.3146182 54.4875,28.9309091 57.590625,30.1013818 C60.69375,31.2718545 60.830625,32.1870545 57.628125,33.8869818 L57.65625,33.8718545 Z" id="Path" fill="#D82C20"></path>
-            <path d="M57.65625,30.0153455 C54.4546875,31.6982545 37.869375,38.5764364 34.3378125,40.4323636 C30.80625,42.2882909 28.8440625,42.2703273 26.055,40.9268364 C23.2659375,39.5833455 5.60625,32.3912727 2.42625,30.8596364 C0.834375,30.0919273 0.001875,29.4471273 0.001875,28.8363636 L0.001875,22.7192727 C0.001875,22.7192727 22.981875,17.6743273 26.6925,16.3317818 C30.403125,14.9892364 31.6865625,14.9419636 34.8459375,16.1067636 C38.0053125,17.2715636 56.8809375,20.7092364 60,21.8626909 L60,27.8946909 C60,28.4997818 59.2809375,29.1776727 57.650625,30.0181818 L57.65625,30.0153455 Z" id="Path" fill="#A41E11"></path>
-            <path d="M57.65625,23.8982545 C54.4546875,25.5830545 37.869375,32.4593455 34.3378125,34.3152727 C30.80625,36.1712 28.8440625,36.1532364 26.055,34.8097455 C23.2659375,33.4662545 5.60625,26.2760727 2.4253125,24.7425455 C-0.755625,23.2090182 -0.8184375,22.1548364 2.3034375,20.9229091 L26.690625,11.4021818 C30.4003125,10.0596364 31.6846875,10.0123636 34.8440625,11.1781091 C38.0034375,12.3438545 54.4884375,18.9629818 57.609375,20.1126545 C60.7303125,21.2623273 60.849375,22.1983273 57.646875,23.8982545 L57.65625,23.8982545 Z" id="Path" fill="#D82C20"></path>
-            <path d="M57.65625,19.6711273 C54.4546875,21.3540364 37.869375,28.2322182 34.3378125,30.0900364 C30.80625,31.9478545 28.8440625,31.928 26.055,30.5845091 C23.2659375,29.2410182 5.60625,22.0498909 2.42625,20.5163636 C0.834375,19.7505455 0.001875,19.1048 0.001875,18.4959273 L0.001875,12.3854545 C0.001875,12.3854545 22.981875,7.34050909 26.6925,5.99796364 C30.403125,4.65541818 31.6865625,4.60814545 34.8459375,5.77294545 C38.0053125,6.93774545 56.8809375,10.3640727 60,11.5175273 L60,17.5495273 C60,18.1546182 59.2809375,18.8325091 57.650625,19.6730182 L57.65625,19.6711273 Z" id="Path" fill="#A41E11"></path>
-            <path d="M57.65625,13.5530909 C54.4546875,15.2378909 37.869375,22.1141818 34.3378125,23.9701091 C30.80625,25.8260364 28.8440625,25.8080727 26.055,24.4645818 C23.2659375,23.1210909 5.60625,15.9309091 2.4253125,14.3973818 C-0.755625,12.8638545 -0.8184375,11.8096727 2.3034375,10.5777455 L26.690625,1.05607273 C30.4003125,-0.286472727 31.6846875,-0.333745455 34.8440625,0.831054545 C38.0034375,1.99585455 54.4875,8.61592727 57.609375,9.76654545 C60.73125,10.9171636 60.849375,11.8522182 57.646875,13.5521455 L57.65625,13.5530909 Z" id="Path" fill="#D82C20"></path>
-            <path d="M31.4971875,11.0315636 L29.6175,7.87941818 L23.6146875,7.33389091 L28.0940625,5.70392727 L26.7496875,3.20130909 L30.9421875,4.85396364 L34.8965625,3.54923636 L33.8278125,6.13505455 L37.8590625,7.65912727 L32.660625,8.20465455 L31.4971875,11.0315636 Z M21.4828125,17.3065455 L35.3859375,15.1537455 L31.1859375,21.3653818 L21.4828125,17.3065455 Z M10.3125,12.1396364 C10.3125,10.5304727 13.6265625,9.23425455 17.7440625,9.23425455 C21.8615625,9.23425455 25.175625,10.5295273 25.175625,12.1396364 C25.175625,13.7497455 21.8615625,15.0450182 17.7440625,15.0450182 C13.6265625,15.0450182 10.3125,13.7497455 10.3125,12.1396364 Z" id="Shape" fill="#FFFFFF"></path>
-            <polygon id="Path" fill="#7A0C00" points="52.2328125 11.7141818 44.0090625 14.9901818 44.0025 8.4344"></polygon>
-            <polygon id="Path" fill="#AD2115" points="44.0109375 14.9911273 43.1203125 15.3437818 34.903125 12.0677818 43.996875 8.43723636"></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388c3.711-1.342 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124l.006-.003z" fill="#A41E11"/><path d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225 3.16 1.165 19.643 7.78 22.747 8.951 3.103 1.17 3.24 2.086.037 3.786l.028-.015z" fill="#D82C20"/><path d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123l.006-.003z" fill="#A41E11"/><path d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935 3.121 1.15 3.24 2.085.038 3.785h.01z" fill="#D82C20"/><path d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419-3.532 1.858-5.494 1.838-8.283.495-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123l.006-.002z" fill="#A41E11"/><path d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936 3.122 1.15 3.24 2.085.038 3.785l.01.001z" fill="#D82C20"/><path d="m31.497 15.032-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546-1.164 2.827zm-10.014 6.275 13.903-2.153-4.2 6.211-9.703-4.058zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905z" fill="#FFF"/><path fill="#7A0C00" d="m52.233 15.714-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="m44.01 18.991-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Salesforce/salesforce.svg b/packages/nodes-base/nodes/Salesforce/salesforce.svg
index 26f1bf161b..b93dde12b2 100644
--- a/packages/nodes-base/nodes/Salesforce/salesforce.svg
+++ b/packages/nodes-base/nodes/Salesforce/salesforce.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773 1.964-.882 4.155-1.366 6.46-1.366 8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313-1.992 3.557-5.806 5.977-10.2 5.977a11.75 11.75 0 0 1-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 0 1 6.176-10.815c-.768-1.736-1.195-3.67-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0 1 11.441 5.663" fill="#00a1e0"/><path d="M10.712 26.856l.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0l.313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366c-.114.427-.313.797-.57 1.1a2.75 2.75 0 0 1-.968.74c-.398.17-.854.256-1.366.256s-.968-.085-1.366-.256-.7-.427-.968-.74a2.96 2.96 0 0 1-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 0 1 .968-.74 3.44 3.44 0 0 1 1.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a2.96 2.96 0 0 1 .57 1.1zm-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736zm11.697 2.134l.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313-1.1 0-1.935-.313-2.504-.94s-.854-1.48-.854-2.533c0-.484.057-.94.2-1.366s.342-.797.626-1.1a2.96 2.96 0 0 1 1.025-.74 3.62 3.62 0 0 1 1.423-.285 8.3 8.3 0 0 1 .939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085-.427-.142-.825-.2-1.338-.2-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025zm-7.542-.228l.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a7.69 7.69 0 0 1 1.138-.114c.854 0 1.508.2 1.964.598s.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.59 6.59 0 0 1-1.3.114c-.427 0-.797-.028-1.138-.114a2.78 2.78 0 0 1-.882-.37c-.228-.17-.427-.398-.57-.683-.142-.256-.2-.598-.2-.968a2.26 2.26 0 0 1 .228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427c.342-.085.683-.142 1.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.12 1.12 0 0 0 .142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 0 0-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.93 1.93 0 0 1 .7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.32 4.32 0 0 0-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057-.137-.021-.271-.059-.398-.114-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028.2 0 .37-.028.512-.085.17-.057.285-.17.398-.313s.2-.342.313-.598c.105-.346.191-.697.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655c.201.002.401.021.598.057.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773a15.739 15.739 0 0 1 6.46-1.366c8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313a11.677 11.677 0 0 1-10.2 5.977 11.75 11.75 0 0 1-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 0 1 6.176-10.815 14.097 14.097 0 0 1-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0 1 11.441 5.663" fill="#00a1e0"/><path d="m10.712 26.856.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0 .313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366a2.813 2.813 0 0 1-.57 1.1 2.75 2.75 0 0 1-.968.74c-.398.17-.854.256-1.366.256s-.968-.085-1.366-.256-.7-.427-.968-.74a2.96 2.96 0 0 1-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 0 1 .968-.74 3.44 3.44 0 0 1 1.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a2.96 2.96 0 0 1 .57 1.1zm-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736zm11.697 2.134.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313-1.1 0-1.935-.313-2.504-.94s-.854-1.48-.854-2.533c0-.484.057-.94.2-1.366s.342-.797.626-1.1a2.96 2.96 0 0 1 1.025-.74 3.62 3.62 0 0 1 1.423-.285 8.3 8.3 0 0 1 .939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085a4.007 4.007 0 0 0-1.338-.2c-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025zm-7.542-.228.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a7.69 7.69 0 0 1 1.138-.114c.854 0 1.508.2 1.964.598s.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.59 6.59 0 0 1-1.3.114c-.427 0-.797-.028-1.138-.114a2.78 2.78 0 0 1-.882-.37 1.923 1.923 0 0 1-.57-.683c-.142-.256-.2-.598-.2-.968a2.26 2.26 0 0 1 .228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427a4.293 4.293 0 0 1 1.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.12 1.12 0 0 0 .142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 0 0-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.93 1.93 0 0 1 .7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.32 4.32 0 0 0-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057a1.619 1.619 0 0 1-.398-.114c-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028.2 0 .37-.028.512-.085.17-.057.285-.17.398-.313s.2-.342.313-.598c.105-.346.191-.697.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655c.201.002.401.021.598.057.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
index aec08d785f..9f846a2f77 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
+++ b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
@@ -1,19 +1 @@
-<svg width="195" height="195" xmlns="http://www.w3.org/2000/svg">
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="197" width="197" y="-1" x="-1"/>
- </g>
- <g>
-  <title>Layer 1</title>
-  <g fill="none" id="svg_1" class="mark">
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_2" points="140.60000610351562,126.91817474365234 140.60000610351562,126.91817474365234 140.60000610351562,162.91819763183594 171.89999389648438,144.8181915283203 171.8000030517578,108.71817779541016 140.60000610351562,90.71817779541016 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_3" points="65.80000305175781,170.0181884765625 97,188.0181884765625 128.1999969482422,170.0181884765625 128.1999969482422,134.11819458007812 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_4" points="171.8000030517578,94.31817626953125 171.8000030517578,58.418182373046875 140.60000610351562,40.418182373046875 109.5,58.31818389892578 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_5" points="65.80000305175781,83.61817932128906 65.80000305175781,119.61817932128906 97,137.61819458007812 128.1999969482422,119.71817779541016 128.1999969482422,83.61817932128906 97,65.61817932128906 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_6" points="22.100000381469727,108.81817626953125 22.100000381469727,144.8181915283203 53.29999923706055,162.8181915283203 84.5,144.8181915283203 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_7" points="53.29999923706055,40.418182373046875 22.100000381469727,58.418182373046875 22.100000381469727,94.41817474365234 53.29999923706055,112.41817474365234 " class="st0"/>
-   <polygon stroke="#619E73" fill="#4e878c" id="svg_8" points="97,51.21818542480469 97,51.21818542480469 128.1999969482422,33.21818161010742 97,15.218181610107422 65.80000305175781,33.21818161010742 65.80000305175781,69.21817779541016 " class="st0"/>
-  </g>
- </g>
-</svg>
\ No newline at end of file
+<svg width="195" height="195" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M-1-1h197v197H-1z"/><g><g fill="none" class="mark"><path stroke="#619E73" fill="#4e878c" class="st0" d="M140.6 126.918v36l31.3-18.1-.1-36.1-31.2-18zM65.8 170.018l31.2 18 31.2-18v-35.9zM171.8 94.318v-35.9l-31.2-18-31.1 17.9zM65.8 83.618v36l31.2 18 31.2-17.9v-36.1l-31.2-18zM22.1 108.818v36l31.2 18 31.2-18zM53.3 40.418l-31.2 18v36l31.2 18zM97 51.218l31.2-18-31.2-18-31.2 18v36z"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SendGrid/sendGrid.svg b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
index 68fd38911a..28ac52c52f 100644
--- a/packages/nodes-base/nodes/SendGrid/sendGrid.svg
+++ b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 21.25h21.374v21.374H0z"/><path d="M0 21.25h21.374v21.374H0z" fill="#99e1f4"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path d="M21.374 42.626h21.25v21.25h-21.25z" fill="#99e1f4"/><path d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z" fill="#1a82e2"/><path d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z" fill="#00b3e3"/><path d="M21.374 42.626h21.25V21.25h-21.25z" fill="#009dd9"/><g fill="#1a82e2"><path d="M42.626 0H64v21.25H42.626z"/><path d="M42.626 21.25H64v.123H42.626z"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 21.25h21.374v21.374H0z"/><path d="M0 21.25h21.374v21.374H0z" fill="#99e1f4"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path d="M21.374 42.626h21.25v21.25h-21.25z" fill="#99e1f4"/><path d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z" fill="#1a82e2"/><path d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z" fill="#00b3e3"/><path d="M21.374 42.626h21.25V21.25h-21.25z" fill="#009dd9"/><g fill="#1a82e2"><path d="M42.626 0H64v21.25H42.626zM42.626 21.25H64v.123H42.626z"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SentryIo/sentryio.svg b/packages/nodes-base/nodes/SentryIo/sentryio.svg
index 11d971474b..0aef7aca49 100644
--- a/packages/nodes-base/nodes/SentryIo/sentryio.svg
+++ b/packages/nodes-base/nodes/SentryIo/sentryio.svg
@@ -1 +1 @@
-<svg class="css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 44" width="400" height="352" style=""><path d="M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z" fill="#362d59"></path></svg>
\ No newline at end of file
+<svg class="css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 44" width="400" height="352"><path d="M29 2.26a4.67 4.67 0 0 0-8 0l-6.58 11.27a32.21 32.21 0 0 1 17.75 26.66h-4.62a27.68 27.68 0 0 0-15.46-22.72L6 28a15.92 15.92 0 0 1 9.23 12.17H4.62A.76.76 0 0 1 4 39.06l2.94-5a10.74 10.74 0 0 0-3.36-1.9l-2.91 5a4.54 4.54 0 0 0 1.69 6.24 4.66 4.66 0 0 0 2.26.6h14.53a19.4 19.4 0 0 0-8-17.31l2.31-4A23.87 23.87 0 0 1 23.76 44h12.31a35.88 35.88 0 0 0-16.41-31.8l4.67-8a.77.77 0 0 1 1.05-.27c.53.29 20.29 34.77 20.66 35.17a.76.76 0 0 1-.68 1.13H40.6q.09 1.91 0 3.81h4.78A4.59 4.59 0 0 0 50 39.43a4.49 4.49 0 0 0-.62-2.28z" fill="#362d59"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Slack/slack.svg b/packages/nodes-base/nodes/Slack/slack.svg
index a69053160d..29072dc62a 100644
--- a/packages/nodes-base/nodes/Slack/slack.svg
+++ b/packages/nodes-base/nodes/Slack/slack.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150.852 150.852" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".926" y=".926"/><symbol id="A" overflow="visible"><g stroke-width="1.852"><path d="M40.741 93.55c0-8.735 6.607-15.772 14.815-15.772s14.815 7.037 14.815 15.772v38.824c0 8.737-6.607 15.774-14.815 15.774s-14.815-7.037-14.815-15.772z" fill="#e01e5a" stroke="#e01e5a"/><path d="M93.55 107.408c-8.735 0-15.772-6.607-15.772-14.815s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#ecb22d" stroke="#ecb22d"/><path d="M77.778 15.772C77.778 7.037 84.385 0 92.593 0s14.815 7.037 14.815 15.772v38.826c0 8.735-6.607 15.772-14.815 15.772s-14.815-7.037-14.815-15.772z" fill="#2fb67c" stroke="#2fb67c"/><path d="M15.772 70.371C7.037 70.371 0 63.763 0 55.556s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#36c5f1" stroke="#36c5f1"/><g stroke-linejoin="miter"><path d="M77.778 133.333c0 8.208 6.607 14.815 14.815 14.815s14.815-6.607 14.815-14.815-6.607-14.815-14.815-14.815H77.778z" fill="#ecb22d" stroke="#ecb22d"/><path d="M133.334 70.371h-14.815V55.556c0-8.207 6.607-14.815 14.815-14.815s14.815 6.607 14.815 14.815-6.607 14.815-14.815 14.815z" fill="#2fb67c" stroke="#2fb67c"/><path d="M14.815 77.778H29.63v14.815c0 8.207-6.607 14.815-14.815 14.815S0 100.8 0 92.593s6.607-14.815 14.815-14.815z" fill="#e01e5a" stroke="#e01e5a"/><path d="M70.371 14.815V29.63H55.556c-8.207 0-14.815-6.607-14.815-14.815S47.348 0 55.556 0s14.815 6.607 14.815 14.815z" fill="#36c5f1" stroke="#36c5f1"/></g></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150.852 150.852" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".926" y=".926"/><symbol id="a" overflow="visible"><g stroke-width="1.852"><path d="M40.741 93.55c0-8.735 6.607-15.772 14.815-15.772s14.815 7.037 14.815 15.772v38.824c0 8.737-6.607 15.774-14.815 15.774s-14.815-7.037-14.815-15.772z" fill="#e01e5a" stroke="#e01e5a"/><path d="M93.55 107.408c-8.735 0-15.772-6.607-15.772-14.815s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#ecb22d" stroke="#ecb22d"/><path d="M77.778 15.772C77.778 7.037 84.385 0 92.593 0s14.815 7.037 14.815 15.772v38.826c0 8.735-6.607 15.772-14.815 15.772s-14.815-7.037-14.815-15.772z" fill="#2fb67c" stroke="#2fb67c"/><path d="M15.772 70.371C7.037 70.371 0 63.763 0 55.556s7.037-14.815 15.772-14.815h38.826c8.735 0 15.772 6.607 15.772 14.815s-7.037 14.815-15.772 14.815z" fill="#36c5f1" stroke="#36c5f1"/><g stroke-linejoin="miter"><path d="M77.778 133.333c0 8.208 6.607 14.815 14.815 14.815s14.815-6.607 14.815-14.815-6.607-14.815-14.815-14.815H77.778z" fill="#ecb22d" stroke="#ecb22d"/><path d="M133.334 70.371h-14.815V55.556c0-8.207 6.607-14.815 14.815-14.815s14.815 6.607 14.815 14.815-6.607 14.815-14.815 14.815z" fill="#2fb67c" stroke="#2fb67c"/><path d="M14.815 77.778H29.63v14.815c0 8.207-6.607 14.815-14.815 14.815S0 100.8 0 92.593s6.607-14.815 14.815-14.815z" fill="#e01e5a" stroke="#e01e5a"/><path d="M70.371 14.815V29.63H55.556c-8.207 0-14.815-6.607-14.815-14.815S47.348 0 55.556 0s14.815 6.607 14.815 14.815z" fill="#36c5f1" stroke="#36c5f1"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Spotify/spotify.svg b/packages/nodes-base/nodes/Spotify/spotify.svg
index 76fd7c810f..8a72e2aeb6 100644
--- a/packages/nodes-base/nodes/Spotify/spotify.svg
+++ b/packages/nodes-base/nodes/Spotify/spotify.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0zm14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 0 1 .688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z" stroke="none" fill="#1ed760" fill-rule="nonzero"/></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0zm14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 0 1 .688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z" stroke="none" fill="#1ed760" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Storyblok/storyblok.svg b/packages/nodes-base/nodes/Storyblok/storyblok.svg
index b5c3a9f264..0a99709ec8 100644
--- a/packages/nodes-base/nodes/Storyblok/storyblok.svg
+++ b/packages/nodes-base/nodes/Storyblok/storyblok.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="87px" height="103px" viewBox="0 0 87 103" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 51.3 (57544) - http://www.bohemiancoding.com/sketch -->
-    <title>colored-standalone</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="colored-standalone" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" fill="#09B3AF" fill-rule="nonzero">
-            <path d="M51.8,49 L31,49 L31,59 L51.3,59 C52.5,59 53.6,58.5 54.5,57.7 C55.3,56.9 55.8,55.7 55.8,54.2 C55.8290035,52.9130708 55.4433501,51.6509323 54.7,50.6 C53.9,49.6 53,49 51.8,49 Z M52.5,36.9 C53.4,36.3 53.8,35 53.8,33.3 C53.8,31.8 53.4,30.7 52.7,30 C52,29.4 51.1,29 50.1,29 L31,29 L31,38 L49.7,38 C50.7,38 51.7,37.5 52.5,36.9 Z" id="Shape"></path>
-            <path d="M83,0 L4.5,0 C2,0 0,2 0,4.4 L0,83 C0,85.4 2,86.9 4.4,86.9 L16,86.9 L16,102.6 L30.4,87 L83,87 C85.4,87 86.9,85.5 86.9,83 L86.9,4.5 C86.9,2.1 85.4,0.1 82.9,0.1 L83,0 Z M69.8,63.7 C68.8,65.5 67.3,67 65.5,68.1 C63.6,69.3 61.5,70.4 59.1,70.9 C56.7,71.5 54.1,72 51.4,72 L16,72 L16,16 L56.2,16 C58.2,16 59.9,16.4 61.5,17.3 C63,18.1 64.4,19.2 65.5,20.5 C67.7403434,23.2320077 68.9444137,26.6671496 68.9,30.2 C68.9,32.8 68.2,35.3 66.9,37.7 C65.5522265,40.1140117 63.4421536,42.0130773 60.9,43.1 C64.1,44 66.6,45.6 68.5,47.9 C70.3,50.3 71.2,53.4 71.2,57.3 C71.2,59.8 70.7,61.9 69.7,63.7 L69.8,63.7 Z" id="Shape"></path>
-        </g>
-        <g id="logo" fill="#09B3AF" fill-rule="nonzero">
-            <path d="M51.8,49 L31,49 L31,59 L51.3,59 C52.5,59 53.6,58.5 54.5,57.7 C55.3,56.9 55.8,55.7 55.8,54.2 C55.8290035,52.9130708 55.4433501,51.6509323 54.7,50.6 C53.9,49.6 53,49 51.8,49 Z M52.5,36.9 C53.4,36.3 53.8,35 53.8,33.3 C53.8,31.8 53.4,30.7 52.7,30 C52,29.4 51.1,29 50.1,29 L31,29 L31,38 L49.7,38 C50.7,38 51.7,37.5 52.5,36.9 Z" id="Shape"></path>
-            <path d="M83,0 L4.5,0 C2,0 0,2 0,4.4 L0,83 C0,85.4 2,86.9 4.4,86.9 L16,86.9 L16,102.6 L30.4,87 L83,87 C85.4,87 86.9,85.5 86.9,83 L86.9,4.5 C86.9,2.1 85.4,0.1 82.9,0.1 L83,0 Z M69.8,63.7 C68.8,65.5 67.3,67 65.5,68.1 C63.6,69.3 61.5,70.4 59.1,70.9 C56.7,71.5 54.1,72 51.4,72 L16,72 L16,16 L56.2,16 C58.2,16 59.9,16.4 61.5,17.3 C63,18.1 64.4,19.2 65.5,20.5 C67.7403434,23.2320077 68.9444137,26.6671496 68.9,30.2 C68.9,32.8 68.2,35.3 66.9,37.7 C65.5522265,40.1140117 63.4421536,42.0130773 60.9,43.1 C64.1,44 66.6,45.6 68.5,47.9 C70.3,50.3 71.2,53.4 71.2,57.3 C71.2,59.8 70.7,61.9 69.7,63.7 L69.8,63.7 Z" id="Shape"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="87" height="103" xmlns="http://www.w3.org/2000/svg"><g fill="#09B3AF" fill-rule="nonzero"><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/><g><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Strapi/strapi.svg b/packages/nodes-base/nodes/Strapi/strapi.svg
index bf9f95847a..ceb65ff0e3 100644
--- a/packages/nodes-base/nodes/Strapi/strapi.svg
+++ b/packages/nodes-base/nodes/Strapi/strapi.svg
@@ -1,72 +1 @@
-<svg width="1025" height="1032" viewBox="0 0 1025 1032" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M341.328 0V344.061H682.661V688.121H1023.99V0H341.328Z" fill="url(#paint0_linear)"/>
-<path d="M683 343.725H343V688.457H683V343.725Z" fill="url(#paint1_linear)"/>
-<path d="M341.333 344.061H0L341.333 0V344.061Z" fill="url(#paint2_linear)"/>
-<path d="M682.367 1031.18V687.457H1024.37L682.367 1031.18Z" fill="url(#paint3_linear)"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 365.162 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 374.502 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 383.843 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 393.184 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 402.525 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 411.866 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 421.206 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 430.546 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 439.887 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 449.228 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 458.569 314.663)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 365.162 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 374.502 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 383.843 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 393.184 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 402.525 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 411.866 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 421.206 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 430.546 306.041)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 365.162 297.419)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 374.502 297.419)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 383.843 297.419)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 393.184 297.419)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 402.525 297.419)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 365.162 288.796)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 374.502 288.797)" fill="#956FFF"/>
-<circle r="1.7963" transform="matrix(1 8.74228e-08 8.74228e-08 -1 383.843 288.797)" fill="#956FFF"/>
-<circle cx="716.162" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="725.502" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="734.843" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="744.184" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="753.525" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="762.866" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="772.206" cy="638.796" r="1.7963" fill="#956FFF"/>
-<circle cx="716.162" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="725.502" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="734.843" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="744.184" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="753.525" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="762.866" cy="647.419" r="1.7963" fill="#956FFF"/>
-<circle cx="716.162" cy="656.041" r="1.7963" fill="#956FFF"/>
-<circle cx="725.502" cy="656.04" r="1.7963" fill="#956FFF"/>
-<circle cx="734.843" cy="656.04" r="1.7963" fill="#956FFF"/>
-<circle cx="744.184" cy="656.04" r="1.7963" fill="#956FFF"/>
-<circle cx="753.525" cy="656.04" r="1.7963" fill="#956FFF"/>
-<circle cx="716.162" cy="664.664" r="1.7963" fill="#956FFF"/>
-<circle cx="725.502" cy="664.663" r="1.7963" fill="#956FFF"/>
-<circle cx="734.843" cy="664.663" r="1.7963" fill="#956FFF"/>
-<defs>
-<linearGradient id="paint0_linear" x1="1072.36" y1="-51.4075" x2="553.031" y2="446.945" gradientUnits="userSpaceOnUse">
-<stop offset="0.0208333" stop-color="#956FFF"/>
-<stop offset="1" stop-color="#1C1B7E"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="634.365" y1="396.5" x2="277.177" y2="712.901" gradientUnits="userSpaceOnUse">
-<stop stop-color="#956FFF"/>
-<stop offset="1" stop-color="#1A2670"/>
-</linearGradient>
-<linearGradient id="paint2_linear" x1="170.667" y1="0" x2="170.667" y2="344.061" gradientUnits="userSpaceOnUse">
-<stop offset="0.0208333" stop-color="#956FFF"/>
-<stop offset="1" stop-color="#1C1B7E"/>
-</linearGradient>
-<linearGradient id="paint3_linear" x1="1085.18" y1="556.22" x2="695.654" y2="967.042" gradientUnits="userSpaceOnUse">
-<stop stop-color="#956FFF"/>
-<stop offset="0.838542" stop-color="#1C1B7E"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="1025" height="1032" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M341.328 0v344.061h341.333v344.06h341.329V0H341.328z" fill="url(#a)"/><path d="M683 343.725H343v344.732h340V343.725z" fill="url(#b)"/><path d="M341.333 344.061H0L341.333 0v344.061z" fill="url(#c)"/><path d="M682.367 1031.18V687.457h342.003L682.367 1031.18z" fill="url(#d)"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 411.866 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 421.206 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 430.546 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 439.887 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 449.228 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 458.569 314.663)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 411.866 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 421.206 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 430.546 306.041)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 393.184 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 402.525 297.419)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 365.162 288.796)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 374.502 288.797)" fill="#956FFF"/><circle r="1.796" transform="matrix(1 0 0 -1 383.843 288.797)" fill="#956FFF"/><circle cx="716.162" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="772.206" cy="638.796" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="762.866" cy="647.419" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="656.041" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="744.184" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="753.525" cy="656.04" r="1.796" fill="#956FFF"/><circle cx="716.162" cy="664.664" r="1.796" fill="#956FFF"/><circle cx="725.502" cy="664.663" r="1.796" fill="#956FFF"/><circle cx="734.843" cy="664.663" r="1.796" fill="#956FFF"/><defs><linearGradient id="a" x1="1072.36" y1="-51.407" x2="553.031" y2="446.945" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="b" x1="634.365" y1="396.5" x2="277.177" y2="712.901" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset="1" stop-color="#1A2670"/></linearGradient><linearGradient id="c" x1="170.667" y1="0" x2="170.667" y2="344.061" gradientUnits="userSpaceOnUse"><stop offset=".021" stop-color="#956FFF"/><stop offset="1" stop-color="#1C1B7E"/></linearGradient><linearGradient id="d" x1="1085.18" y1="556.22" x2="695.654" y2="967.042" gradientUnits="userSpaceOnUse"><stop stop-color="#956FFF"/><stop offset=".839" stop-color="#1C1B7E"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Strava/strava.svg b/packages/nodes-base/nodes/Strava/strava.svg
index d94ac6a66f..9293ddce3b 100644
--- a/packages/nodes-base/nodes/Strava/strava.svg
+++ b/packages/nodes-base/nodes/Strava/strava.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="M6.9 8.8l2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="M7.2 2.5l3.1 6.3H4zm0 3.8l1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="m6.9 8.8 2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="m7.2 2.5 3.1 6.3H4zm0 3.8 1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg b/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
index 7662b67f70..6ea919ed39 100644
--- a/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
+++ b/packages/nodes-base/nodes/Tapfiliate/tapfiliate.svg
@@ -1 +1 @@
-<svg width="900" height="900" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="2.037%" y1="113.141%" x2="106.275%" y2="-7.854%" id="a"><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2F74FF" offset="100%"/></linearGradient></defs><path d="M900 289.19c0-113.514-67.164-221.622-178.657-267.568C685.075 6.757 647.463 0 609.851 0 552.09 0 495.67 17.568 448.657 48.649 402.985 17.568 347.91 0 288.806 0c-20.15 0-41.642 2.703-63.134 6.757C118.209 29.73 32.239 113.514 6.716 220.27v2.703C2.686 241.892 0 262.163 0 281.081 0 322.973 9.403 363.514 24.18 400l145.074 363.514c21.492 55.405 64.477 101.35 123.582 122.972 21.492 8.109 42.985 12.163 65.82 13.514h502.389l-90-239.19L878.507 400C891.94 363.514 900 325.676 900 289.19zM95.373 281.08c0-12.162 1.343-25.676 4.03-37.838v-2.702c16.12-68.92 75.224-127.027 145.075-140.541 14.776-2.703 29.552-4.054 42.985-4.054 32.238 0 61.79 8.108 88.656 21.622-13.432 18.918-25.522 37.837-34.925 60.81L188.06 556.757l-76.567-191.892c-9.403-28.379-16.12-56.757-16.12-83.784zm693.134 82.433L666.27 659.459l55.074 145.946H362.687c-12.09 0-24.18-2.702-36.27-8.108-48.357-17.567-76.566-63.513-76.566-110.81 0-13.514 2.686-28.379 8.06-43.244l173.283-428.378c30.896-74.324 103.433-118.92 180-118.92 24.18 0 49.702 4.055 73.88 14.866 75.225 31.08 119.553 102.703 119.553 178.378-1.343 24.325-5.373 50-16.12 74.325z" fill-rule="nonzero" fill="url(#a)"/></svg>
+<svg width="900" height="900" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="2.037%" y1="113.141%" x2="106.275%" y2="-7.854%" id="a"><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2FDFBF" offset="0%"/><stop stop-color="#2F74FF" offset="100%"/></linearGradient></defs><path d="M900 289.19c0-113.514-67.164-221.622-178.657-267.568C685.075 6.757 647.463 0 609.851 0 552.09 0 495.67 17.568 448.657 48.649 402.985 17.568 347.91 0 288.806 0c-20.15 0-41.642 2.703-63.134 6.757C118.209 29.73 32.239 113.514 6.716 220.27v2.703C2.686 241.892 0 262.163 0 281.081 0 322.973 9.403 363.514 24.18 400l145.074 363.514c21.492 55.405 64.477 101.35 123.582 122.972 21.492 8.109 42.985 12.163 65.82 13.514h502.389l-90-239.19L878.507 400C891.94 363.514 900 325.676 900 289.19zm-804.627-8.11c0-12.162 1.343-25.676 4.03-37.838v-2.702c16.12-68.92 75.224-127.027 145.075-140.541 14.776-2.703 29.552-4.054 42.985-4.054 32.238 0 61.79 8.108 88.656 21.622-13.432 18.918-25.522 37.837-34.925 60.81L188.06 556.757l-76.567-191.892c-9.403-28.379-16.12-56.757-16.12-83.784zm693.134 82.433L666.27 659.459l55.074 145.946H362.687c-12.09 0-24.18-2.702-36.27-8.108-48.357-17.567-76.566-63.513-76.566-110.81 0-13.514 2.686-28.379 8.06-43.244l173.283-428.378c30.896-74.324 103.433-118.92 180-118.92 24.18 0 49.702 4.055 73.88 14.866 75.225 31.08 119.553 102.703 119.553 178.378-1.343 24.325-5.373 50-16.12 74.325z" fill="url(#a)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Telegram/telegram.svg b/packages/nodes-base/nodes/Telegram/telegram.svg
index fe13cb81f4..0f5adee4fc 100644
--- a/packages/nodes-base/nodes/Telegram/telegram.svg
+++ b/packages/nodes-base/nodes/Telegram/telegram.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32" fill="#37aee2"/><path d="M21.661 34.338l3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z" fill="#c8daea"/><path d="M26.695 37.034l-.729 7.746s-.305 2.373 2.068 0l4.644-4.203" fill="#a9c6d8"/><path d="M21.73 34.712l-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58-.1-.067-.129-.154-.146-.239-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32" fill="#37aee2"/><path d="m21.661 34.338 3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z" fill="#c8daea"/><path d="m26.695 37.034-.729 7.746s-.305 2.373 2.068 0l4.644-4.203" fill="#a9c6d8"/><path d="m21.73 34.712-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58a.34.34 0 0 1-.146-.239c-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TheHive/thehive.svg b/packages/nodes-base/nodes/TheHive/thehive.svg
index 25ee988a32..1b1f5b457b 100644
--- a/packages/nodes-base/nodes/TheHive/thehive.svg
+++ b/packages/nodes-base/nodes/TheHive/thehive.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-1{fill:#f3d02f;}.cls-2{fill:#fff;}</style></defs><title>th-logo</title><path class="cls-1" d="M290,150A140,140,0,1,1,150,10,140,140,0,0,1,290,150"/><path class="cls-2" d="M204.62,210.6a15.13,15.13,0,0,1-6.68,1.38,17.49,17.49,0,0,1-16.11-10.93L177,189.45l-7.31-18.28a5.05,5.05,0,0,0-.7-2.12l-10.1-25.31c16.15,2.86,45.93,20.16,55.68,43.72,3.48,9.49-.76,19.66-9.9,23.14m-54.87,27.21c-11.58,0-21-8.5-24.85-21.5l49.85.16c-3.9,13.33-13.41,21.38-25,21.34m-48-26.14a14.3,14.3,0,0,1-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85,9.91-23.85,39.81-40.95,56-43.36L131,170l-7.79,19.29-5,11.57a18.34,18.34,0,0,1-16.53,10.83m42.63-45.16L150,152.84l5.57,13.71Zm-7.79,19.29,3.19-8.06,20.37.07,3.13,8.08Zm-5,11.57,36.17.12,3.13,8.09-42.48-.15Zm18.56-90.87c9.48,0,17.53,9.18,17.5,16.56,0,8.77-14.43,9.43-17.23,9.41-3.16,0-17.21-.4-17.18-9.53-.67-7.38,7.43-16.48,16.91-16.44"/><path class="cls-2" d="M136.88,106.1a3.75,3.75,0,0,1-3.39-2.15l-5.81-12.34a3.74,3.74,0,1,1,6.77-3.19l5.81,12.34a3.74,3.74,0,0,1-1.79,5,3.79,3.79,0,0,1-1.59.36"/><path class="cls-2" d="M163.12,106.1a3.79,3.79,0,0,1-1.59-.36,3.74,3.74,0,0,1-1.79-5l5.82-12.35a3.74,3.74,0,1,1,6.77,3.2L166.51,104a3.75,3.75,0,0,1-3.39,2.15"/><path class="cls-2" d="M204.36,157.81a3.74,3.74,0,0,1-3.26-5.56l14.41-25.87-32.87-56.7H117.36L84.54,126.3l15.66,25.83A3.74,3.74,0,0,1,93.8,156L77,128.28a3.72,3.72,0,0,1,0-3.81l35-60.41a3.77,3.77,0,0,1,3.24-1.87h69.6A3.75,3.75,0,0,1,188,64.06l35,60.41a3.73,3.73,0,0,1,0,3.7l-15.44,27.72a3.75,3.75,0,0,1-3.28,1.92"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140" style="fill:#f3d02f"/><path class="cls-2" d="M204.62 210.6a15.13 15.13 0 0 1-6.68 1.38 17.49 17.49 0 0 1-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 0 0-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 0 1-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 0 1-16.53 10.83m42.63-45.16 5.69-13.69 5.57 13.71zm-7.79 19.29 3.19-8.06 20.37.07 3.13 8.08zm-5 11.57 36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44M136.88 106.1a3.75 3.75 0 0 1-3.39-2.15l-5.81-12.34a3.74 3.74 0 1 1 6.77-3.19l5.81 12.34a3.74 3.74 0 0 1-1.79 5 3.79 3.79 0 0 1-1.59.36M163.12 106.1a3.79 3.79 0 0 1-1.59-.36 3.74 3.74 0 0 1-1.79-5l5.82-12.35a3.74 3.74 0 1 1 6.77 3.2L166.51 104a3.75 3.75 0 0 1-3.39 2.15"/><path class="cls-2" d="M204.36 157.81a3.74 3.74 0 0 1-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 0 1-6.4 3.87L77 128.28a3.72 3.72 0 0 1 0-3.81l35-60.41a3.77 3.77 0 0 1 3.24-1.87h69.6a3.75 3.75 0 0 1 3.16 1.87l35 60.41a3.73 3.73 0 0 1 0 3.7l-15.44 27.72a3.75 3.75 0 0 1-3.28 1.92"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TimescaleDb/timescale.svg b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
index ed6ddce7d8..2afad3022c 100644
--- a/packages/nodes-base/nodes/TimescaleDb/timescale.svg
+++ b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
@@ -1,3 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80px" height="80px"  viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20C0 31.05 9.14 40 20.42 40C31.7 40 40.84 31.05 40.84 20C40.84 8.95 31.7 0 20.42 0Z" id="d1hxvVyaGo"></path><path d="M20.42 0C9.14 0 0 8.95 0 20C0 31.05 9.14 40 20.42 40C31.7 40 40.84 31.05 40.84 20C40.84 8.95 31.7 0 20.42 0Z" id="cNHUcEeGQ"></path><path d="M20.42 6.56C12.86 6.56 6.73 12.57 6.73 19.97C6.73 27.38 12.86 33.38 20.42 33.38C27.98 33.38 34.11 27.38 34.11 19.97C34.11 12.57 27.98 6.56 20.42 6.56Z" id="bi9X5uZiU"></path><path d="M20.42 6.56C12.86 6.56 6.73 12.57 6.73 19.97C6.73 27.38 12.86 33.38 20.42 33.38C27.98 33.38 34.11 27.38 34.11 19.97C34.11 12.57 27.98 6.56 20.42 6.56Z" id="hmMB4d1Dy"></path><path d="M23.82 16.38C23 18.34 23.6 20.44 25.16 21.07C26.72 21.7 28.66 20.62 29.48 18.65C30.3 16.69 29.7 14.59 28.14 13.97C26.58 13.34 24.65 14.42 23.82 16.38Z" id="a2HHkFBWIG"></path><path d="M23.82 16.38C23 18.34 23.6 20.44 25.16 21.07C26.72 21.7 28.66 20.62 29.48 18.65C30.3 16.69 29.7 14.59 28.14 13.97C26.58 13.34 24.65 14.42 23.82 16.38Z" id="a1ybJKyO6M"></path><path d="M20.45 28.27C18.29 28.27 16.53 30.14 16.53 32.43C16.53 34.73 18.29 36.6 20.45 36.6C22.62 36.6 24.38 34.73 24.38 32.43C24.38 30.14 22.62 28.27 20.45 28.27Z" id="b2PkJqlTMD"></path><path d="M20.45 28.27C18.29 28.27 16.53 30.14 16.53 32.43C16.53 34.73 18.29 36.6 20.45 36.6C22.62 36.6 24.38 34.73 24.38 32.43C24.38 30.14 22.62 28.27 20.45 28.27Z" id="k4lEU0z7RN"></path><path d="M12.83 13.96C11.27 14.59 10.67 16.69 11.5 18.65C12.32 20.61 14.25 21.69 15.81 21.07C17.37 20.44 17.97 18.34 17.15 16.38C16.33 14.42 14.4 13.33 12.83 13.96Z" id="b5IwHNYTvB"></path><path d="M12.83 13.96C11.27 14.59 10.67 16.69 11.5 18.65C12.32 20.61 14.25 21.69 15.81 21.07C17.37 20.44 17.97 18.34 17.15 16.38C16.33 14.42 14.4 13.33 12.83 13.96Z" id="f49EjiTdSk"></path><path d="M37.49 24.22C36.17 29.49 32.37 33.8 27.38 35.92C27.43 35.5 27.46 35.03 27.46 34.49C27.45 33.95 27.43 33.41 27.38 32.87C31.61 30.65 34.62 26.46 35.12 21.56C35.36 21.82 37.25 23.96 37.49 24.22ZM25.34 33.76C25.02 35.03 24.51 36.13 23.87 37C22.75 37.22 21.59 37.34 20.4 37.34C19.29 37.34 18.2 37.24 17.14 37.04C16.49 36.18 15.98 35.08 15.65 33.83C17.14 34.32 18.73 34.59 20.4 34.59C22.13 34.59 23.79 34.3 25.34 33.76ZM3.35 24.42C4.73 29.63 8.53 33.88 13.5 35.96C13.45 35.53 13.42 35.04 13.42 34.49C13.42 33.96 13.45 33.43 13.5 32.91C9.19 30.69 6.15 26.45 5.67 21.48C5.43 21.77 3.58 24.13 3.35 24.42ZM29.76 5.49C29.48 5.65 27.21 6.93 26.93 7.09C29.04 8.1 30.88 9.61 32.28 11.45C32.61 10.98 33.79 9.33 33.96 9.1C32.76 7.69 31.35 6.47 29.76 5.49ZM8.74 11.16C10.12 9.44 11.88 8.04 13.9 7.07C13.72 6.95 12.83 6.39 11.23 5.37C9.13 6.87 7.67 8.11 6.85 9.08C7.04 9.29 8.55 10.96 8.74 11.16Z" id="e7ROnX0zq"></path><path d="M37.49 24.22C36.17 29.49 32.37 33.8 27.38 35.92C27.43 35.5 27.46 35.03 27.46 34.49C27.45 33.95 27.43 33.41 27.38 32.87C31.61 30.65 34.62 26.46 35.12 21.56C35.36 21.82 37.25 23.96 37.49 24.22ZM25.34 33.76C25.02 35.03 24.51 36.13 23.87 37C22.75 37.22 21.59 37.34 20.4 37.34C19.29 37.34 18.2 37.24 17.14 37.04C16.49 36.18 15.98 35.08 15.65 33.83C17.14 34.32 18.73 34.59 20.4 34.59C22.13 34.59 23.79 34.3 25.34 33.76ZM3.35 24.42C4.73 29.63 8.53 33.88 13.5 35.96C13.45 35.53 13.42 35.04 13.42 34.49C13.42 33.96 13.45 33.43 13.5 32.91C9.19 30.69 6.15 26.45 5.67 21.48C5.43 21.77 3.58 24.13 3.35 24.42ZM29.76 5.49C29.48 5.65 27.21 6.93 26.93 7.09C29.04 8.1 30.88 9.61 32.28 11.45C32.61 10.98 33.79 9.33 33.96 9.1C32.76 7.69 31.35 6.47 29.76 5.49ZM8.74 11.16C10.12 9.44 11.88 8.04 13.9 7.07C13.72 6.95 12.83 6.39 11.23 5.37C9.13 6.87 7.67 8.11 6.85 9.08C7.04 9.29 8.55 10.96 8.74 11.16Z" id="k3jpaUWErU"></path><path d="M18.34 9.52C13.32 10.47 9.54 14.8 9.54 19.99C9.54 23.66 11.44 26.9 14.33 28.82C14.46 28.45 14.59 28.1 14.75 27.76C12.27 26.03 10.66 23.19 10.66 19.99C10.66 15.64 13.62 11.98 17.67 10.81C17.86 10.31 18.08 9.88 18.34 9.52Z" id="bU7b1w2q2"></path><path d="M18.34 9.52C13.32 10.47 9.54 14.8 9.54 19.99C9.54 23.66 11.44 26.9 14.33 28.82C14.46 28.45 14.59 28.1 14.75 27.76C12.27 26.03 10.66 23.19 10.66 19.99C10.66 15.64 13.62 11.98 17.67 10.81C17.86 10.31 18.08 9.88 18.34 9.52Z" id="e56nbOOAO"></path><path d="M17.19 13.19C17.22 12.86 17.25 12.55 17.3 12.24C15.17 13.07 13.46 14.72 12.58 16.79C12.75 16.83 13.32 16.98 13.41 17C14.15 15.32 15.5 13.96 17.19 13.19Z" id="aj2IZ7tMY"></path><path d="M17.19 13.19C17.22 12.86 17.25 12.55 17.3 12.24C15.17 13.07 13.46 14.72 12.58 16.79C12.75 16.83 13.32 16.98 13.41 17C14.15 15.32 15.5 13.96 17.19 13.19Z" id="bCBhnufJb"></path><path d="M15.33 26.62C15.47 26.38 15.62 26.14 15.78 25.92C14.26 24.78 13.2 23.1 12.88 21.17C12.71 21.17 12.11 21.17 12.03 21.17C12.36 23.39 13.58 25.33 15.33 26.62Z" id="a6l2FDA3D0"></path><path d="M15.33 26.62C15.47 26.38 15.62 26.14 15.78 25.92C14.26 24.78 13.2 23.1 12.88 21.17C12.71 21.17 12.11 21.17 12.03 21.17C12.36 23.39 13.58 25.33 15.33 26.62Z" id="c1kNeFBolC"></path><path d="M22.73 11.98C22.79 12.27 22.84 12.57 22.88 12.89C24.94 13.57 26.6 15.09 27.45 17.03C27.61 16.99 28.19 16.84 28.27 16.82C27.29 14.48 25.25 12.67 22.73 11.98Z" id="i8FG5E3FNm"></path><path d="M22.73 11.98C22.79 12.27 22.84 12.57 22.88 12.89C24.94 13.57 26.6 15.09 27.45 17.03C27.61 16.99 28.19 16.84 28.27 16.82C27.29 14.48 25.25 12.67 22.73 11.98Z" id="i2bfS8saHM"></path><path d="M25.11 18.5L24.67 19.81L26.01 20.69L28.47 19.81L28.92 18.94L28.03 18.04L25.11 18.5Z" id="bpUNUsUiP"></path><path d="M25.11 18.5L24.67 19.81L26.01 20.69L28.47 19.81L28.92 18.94L28.03 18.04L25.11 18.5Z" id="areX7KXg"></path><path d="M15.85 18.5L16.29 19.81L14.95 20.69L12.5 19.81L12.05 18.94L12.93 18.04L15.85 18.5Z" id="i7luqG593A"></path><path d="M15.85 18.5L16.29 19.81L14.95 20.69L12.5 19.81L12.05 18.94L12.93 18.04L15.85 18.5Z" id="fCgif7M4Q"></path><path d="M27.97 21.17C27.92 21.42 27.87 21.67 27.8 21.92C28.05 22.12 28.28 22.31 28.5 22.5C28.64 22.07 28.75 21.63 28.82 21.17C28.73 21.17 28.05 21.17 27.97 21.17Z" id="d79oJJGnU"></path><path d="M27.97 21.17C27.92 21.42 27.87 21.67 27.8 21.92C28.05 22.12 28.28 22.31 28.5 22.5C28.64 22.07 28.75 21.63 28.82 21.17C28.73 21.17 28.05 21.17 27.97 21.17Z" id="c1ic8o6SYM"></path><path d="M25.57 26.58C25.95 26.29 26.3 25.98 26.63 25.64C26.36 25.53 26.09 25.41 25.81 25.28C25.59 25.49 25.36 25.69 25.12 25.88C25.28 26.1 25.43 26.33 25.57 26.58Z" id="f22G6Vs6S9"></path><path d="M25.57 26.58C25.95 26.29 26.3 25.98 26.63 25.64C26.36 25.53 26.09 25.41 25.81 25.28C25.59 25.49 25.36 25.69 25.12 25.88C25.28 26.1 25.43 26.33 25.57 26.58Z" id="e6zxG8JAkv"></path><path d="M30.07 25.28C30.76 23.88 31.15 22.32 31.15 20.67C31.15 15.17 26.89 10.64 21.43 10.07C21.7 10.4 21.94 10.81 22.14 11.28C26.63 12.14 30.02 16.02 30.02 20.67C30.02 21.92 29.77 23.1 29.33 24.19C29.66 24.58 29.91 24.95 30.07 25.28Z" id="aSbcn9cNX"></path><path d="M30.07 25.28C30.76 23.88 31.15 22.32 31.15 20.67C31.15 15.17 26.89 10.64 21.43 10.07C21.7 10.4 21.94 10.81 22.14 11.28C26.63 12.14 30.02 16.02 30.02 20.67C30.02 21.92 29.77 23.1 29.33 24.19C29.66 24.58 29.91 24.95 30.07 25.28Z" id="i3Fm8SLIBe"></path><path d="M26.59 28.77C27.61 28.08 28.5 27.23 29.23 26.25C28.86 26.25 28.43 26.19 27.95 26.07C27.43 26.69 26.83 27.24 26.17 27.72C26.32 28.05 26.46 28.41 26.59 28.77Z" id="m5RK09VD0u"></path><path d="M26.59 28.77C27.61 28.08 28.5 27.23 29.23 26.25C28.86 26.25 28.43 26.19 27.95 26.07C27.43 26.69 26.83 27.24 26.17 27.72C26.32 28.05 26.46 28.41 26.59 28.77Z" id="bpPvm3O2u"></path><path d="M20.42 9.31C20.36 9.31 20.08 9.31 19.57 9.31C19.1 14.97 18.84 18.11 18.79 18.74C18.79 18.74 18.79 18.74 18.79 18.74C18.79 18.76 18.79 18.78 18.79 18.8C18.79 18.95 18.8 19.1 18.83 19.25C18.85 19.41 18.89 19.57 18.97 19.73C19.13 20.14 19.4 20.45 19.71 20.6C19.78 20.65 19.85 20.71 19.93 20.76C19.94 20.77 19.96 20.78 19.98 20.78C19.98 20.79 19.98 20.79 19.98 20.79C20.61 21.13 23.78 22.83 29.48 25.9L29.97 25.23C24.8 21.3 21.93 19.12 21.36 18.68C21.35 18.68 21.34 18.68 21.34 18.67C21.28 18.05 20.97 14.93 20.42 9.31Z" id="jjEhJFcj2"></path><path d="M20.42 9.31C20.36 9.31 20.08 9.31 19.57 9.31C19.1 14.97 18.84 18.11 18.79 18.74C18.79 18.74 18.79 18.74 18.79 18.74C18.79 18.76 18.79 18.78 18.79 18.8C18.79 18.95 18.8 19.1 18.83 19.25C18.85 19.41 18.89 19.57 18.97 19.73C19.13 20.14 19.4 20.45 19.71 20.6C19.78 20.65 19.85 20.71 19.93 20.76C19.94 20.77 19.96 20.78 19.98 20.78C19.98 20.79 19.98 20.79 19.98 20.79C20.61 21.13 23.78 22.83 29.48 25.9L29.97 25.23C24.8 21.3 21.93 19.12 21.36 18.68C21.35 18.68 21.34 18.68 21.34 18.67C21.28 18.05 20.97 14.93 20.42 9.31Z" id="a1IL6Qv42n"></path><path d="M24.54 29.01C24.48 28.87 24.2 28.19 23.7 26.97L20.42 28.27L17.14 26.97C16.64 28.19 16.37 28.87 16.31 29.01C18.39 29.82 19.56 30.27 19.79 30.36C19.6 31.01 18.98 31.49 18.25 31.49C18.2 31.49 18.15 31.49 18.1 31.49C18.03 31.58 17.46 32.36 17.39 32.46C17.66 32.55 17.95 32.6 18.25 32.6C19.13 32.6 19.91 32.19 20.41 31.55C20.9 32.18 21.69 32.6 22.57 32.6C22.9 32.6 23.22 32.54 23.51 32.43C23.44 32.33 22.89 31.57 22.82 31.48C22.73 31.49 22.65 31.49 22.57 31.49C21.83 31.49 21.2 31 21.02 30.33C21.26 30.24 22.43 29.8 24.54 29.01Z" id="g5FlYgs8L"></path><path d="M24.54 29.01C24.48 28.87 24.2 28.19 23.7 26.97L20.42 28.27L17.14 26.97C16.64 28.19 16.37 28.87 16.31 29.01C18.39 29.82 19.56 30.27 19.79 30.36C19.6 31.01 18.98 31.49 18.25 31.49C18.2 31.49 18.15 31.49 18.1 31.49C18.03 31.58 17.46 32.36 17.39 32.46C17.66 32.55 17.95 32.6 18.25 32.6C19.13 32.6 19.91 32.19 20.41 31.55C20.9 32.18 21.69 32.6 22.57 32.6C22.9 32.6 23.22 32.54 23.51 32.43C23.44 32.33 22.89 31.57 22.82 31.48C22.73 31.49 22.65 31.49 22.57 31.49C21.83 31.49 21.2 31 21.02 30.33C21.26 30.24 22.43 29.8 24.54 29.01Z" id="d636GCWan"></path><path d="M32.43 19.97C32.43 24.12 30.23 27.77 26.92 29.86C27.06 30.41 27.18 30.99 27.27 31.58C31.36 29.26 34.1 24.93 34.1 19.97C34.11 16.95 33.08 14.15 31.36 11.91C31.13 12.16 30.33 13.05 30.22 13.18C31.61 15.1 32.43 17.44 32.43 19.97Z" id="f8cHJe8q4"></path><path d="M32.43 19.97C32.43 24.12 30.23 27.77 26.92 29.86C27.06 30.41 27.18 30.99 27.27 31.58C31.36 29.26 34.1 24.93 34.1 19.97C34.11 16.95 33.08 14.15 31.36 11.91C31.13 12.16 30.33 13.05 30.22 13.18C31.61 15.1 32.43 17.44 32.43 19.97Z" id="e1giJbiX4s"></path><path d="M9.48 11.92C7.75 14.16 6.73 16.95 6.73 19.97C6.73 24.96 9.51 29.31 13.64 31.62C13.74 31.03 13.85 30.45 14 29.91C10.64 27.82 8.42 24.15 8.42 19.97C8.42 17.45 9.23 15.11 10.62 13.19C10.51 13.06 9.6 12.04 9.48 11.92Z" id="asNpThMhX"></path><path d="M9.48 11.92C7.75 14.16 6.73 16.95 6.73 19.97C6.73 24.96 9.51 29.31 13.64 31.62C13.74 31.03 13.85 30.45 14 29.91C10.64 27.82 8.42 24.15 8.42 19.97C8.42 17.45 9.23 15.11 10.62 13.19C10.51 13.06 9.6 12.04 9.48 11.92Z" id="g15wrBh49b"></path><path d="M15.39 9.29C16.92 8.6 18.62 8.21 20.42 8.21C22.21 8.21 23.92 8.6 25.45 9.29C25.53 9.15 26.2 8 26.29 7.85C24.51 7.03 22.52 6.56 20.42 6.56C18.32 6.56 16.32 7.03 14.55 7.86C14.63 8 15.3 9.15 15.39 9.29Z" id="c3IDFV7bts"></path><path d="M15.39 9.29C16.92 8.6 18.62 8.21 20.42 8.21C22.21 8.21 23.92 8.6 25.45 9.29C25.53 9.15 26.2 8 26.29 7.85C24.51 7.03 22.52 6.56 20.42 6.56C18.32 6.56 16.32 7.03 14.55 7.86C14.63 8 15.3 9.15 15.39 9.29Z" id="d1dEnGwGnj"></path></defs><g><g><g><use xlink:href="#d1hxvVyaGo" opacity="1" fill="#ffffff" fill-opacity="1"></use><g><use xlink:href="#d1hxvVyaGo" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#cNHUcEeGQ" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#cNHUcEeGQ" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#bi9X5uZiU" opacity="1" fill="#fdb515" fill-opacity="1"></use><g><use xlink:href="#bi9X5uZiU" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#hmMB4d1Dy" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#hmMB4d1Dy" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#a2HHkFBWIG" opacity="1" fill="#ffffff" fill-opacity="1"></use><g><use xlink:href="#a2HHkFBWIG" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#a1ybJKyO6M" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#a1ybJKyO6M" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#b2PkJqlTMD" opacity="1" fill="#ffffff" fill-opacity="1"></use><g><use xlink:href="#b2PkJqlTMD" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#k4lEU0z7RN" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#k4lEU0z7RN" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#b5IwHNYTvB" opacity="1" fill="#ffffff" fill-opacity="1"></use><g><use xlink:href="#b5IwHNYTvB" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#f49EjiTdSk" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#f49EjiTdSk" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#e7ROnX0zq" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#e7ROnX0zq" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#k3jpaUWErU" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#k3jpaUWErU" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#bU7b1w2q2" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#bU7b1w2q2" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#e56nbOOAO" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#e56nbOOAO" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#aj2IZ7tMY" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#aj2IZ7tMY" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#bCBhnufJb" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#bCBhnufJb" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#a6l2FDA3D0" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#a6l2FDA3D0" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#c1kNeFBolC" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#c1kNeFBolC" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#i8FG5E3FNm" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#i8FG5E3FNm" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#i2bfS8saHM" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#i2bfS8saHM" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#bpUNUsUiP" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#bpUNUsUiP" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#areX7KXg" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#areX7KXg" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#i7luqG593A" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#i7luqG593A" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#fCgif7M4Q" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#fCgif7M4Q" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#d79oJJGnU" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#d79oJJGnU" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#c1ic8o6SYM" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#c1ic8o6SYM" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#f22G6Vs6S9" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#f22G6Vs6S9" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#e6zxG8JAkv" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#e6zxG8JAkv" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#aSbcn9cNX" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#aSbcn9cNX" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#i3Fm8SLIBe" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#i3Fm8SLIBe" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#m5RK09VD0u" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#m5RK09VD0u" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#bpPvm3O2u" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#bpPvm3O2u" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#jjEhJFcj2" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#jjEhJFcj2" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#a1IL6Qv42n" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#a1IL6Qv42n" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#g5FlYgs8L" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#g5FlYgs8L" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#d636GCWan" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#d636GCWan" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#f8cHJe8q4" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#f8cHJe8q4" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#e1giJbiX4s" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#e1giJbiX4s" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#asNpThMhX" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#asNpThMhX" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#g15wrBh49b" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#g15wrBh49b" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#c3IDFV7bts" opacity="1" fill="#333333" fill-opacity="1"></use><g><use xlink:href="#c3IDFV7bts" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g><g><use xlink:href="#d1dEnGwGnj" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#d1dEnGwGnj" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="0"></use></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 0 0-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 0 1 3.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 0 0-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 0 1 3.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 0 1-2.9-4.75h-.85a8.294 8.294 0 0 0 3.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 0 1-2.9-4.75h-.85a8.294 8.294 0 0 0 3.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 0 0-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 0 0-5.54-4.84z" id="t"/><path d="m25.11 18.5-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="m25.11 18.5-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="m15.85 18.5.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="m15.85 18.5.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 0 1-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 0 0 3.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 0 1-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 0 0 3.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 0 0-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 0 0-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 0 0-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 0 0-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 0 0-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 0 0-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g><use xlink:href="#v" fill-opacity="0"/><use xlink:href="#v" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#x" fill-opacity="0"/><use xlink:href="#x" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#z" fill-opacity="0"/><use xlink:href="#z" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#B" fill-opacity="0"/><use xlink:href="#B" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#D" fill-opacity="0"/><use xlink:href="#D" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#F" fill-opacity="0"/><use xlink:href="#F" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#H" fill-opacity="0"/><use xlink:href="#H" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#J" fill-opacity="0"/><use xlink:href="#J" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#L" fill-opacity="0"/><use xlink:href="#L" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#N" fill-opacity="0"/><use xlink:href="#N" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#P" fill-opacity="0"/><use xlink:href="#P" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Trello/trello.svg b/packages/nodes-base/nodes/Trello/trello.svg
index eecadb36bc..3fa2aaf532 100644
--- a/packages/nodes-base/nodes/Trello/trello.svg
+++ b/packages/nodes-base/nodes/Trello/trello.svg
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
-    <title>trello-mark-blue-flat</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Logos" transform="translate(-1579.000000, -521.000000)">
-            <g id="Group" transform="translate(-9.000000, 1.000000)">
-                <g id="Trello-Logo" transform="translate(468.000000, 0.000000)">
-                    <g id="Trello-Mark---Blue---Flat" transform="translate(1020.000000, 420.000000)">
-                        <g id="Mark" transform="translate(100.000000, 100.000000)">
-                            <rect id="Board" fill="#0079BF" x="0" y="0" width="200" height="200" rx="25"></rect>
-                            <rect id="Right-List" fill="#FFFFFF" x="113" y="26" width="61" height="87.5" rx="12"></rect>
-                            <rect id="Left-List" fill="#FFFFFF" x="26" y="26" width="61" height="137.5" rx="12"></rect>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><rect fill="#0079BF" width="200" height="200" rx="25"/><rect fill="#FFF" x="113" y="26" width="61" height="87.5" rx="12"/><rect fill="#FFF" x="26" y="26" width="61" height="137.5" rx="12"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Typeform/typeform.svg b/packages/nodes-base/nodes/Typeform/typeform.svg
index 092c063329..dd5e81c753 100644
--- a/packages/nodes-base/nodes/Typeform/typeform.svg
+++ b/packages/nodes-base/nodes/Typeform/typeform.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="257px" viewBox="0 0 256 257" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M121.239531,0.47435412 C154.258847,-2.24419986 177.973534,6.51949224 203.490026,32.0209539 C231.03887,59.5533708 249.354214,95.2328648 254.290235,133.239251 C259.781839,175.505244 252.228399,207.045826 228.963591,230.137302 C206.717472,252.217693 174.224091,259.500956 130.817584,255.872056 L130.817584,255.872056 L129.020628,255.714401 C92.0580678,252.31591 65.9142731,240.197353 40.5830264,214.542641 C13.525519,187.139558 -0.732370213,156.026391 0.0289819699,123.37039 C0.401368488,107.383336 4.93009017,93.7578927 13.6639513,80.3889177 C19.3897229,71.6244438 25.2046788,64.7874057 37.3681164,52.2487147 L37.3681164,52.2487147 L41.4275324,48.0907013 L45.9022443,43.5551431 C74.7290193,14.5793771 93.7072016,2.74118195 121.239531,0.47435412 Z M201.527922,33.9842216 C176.58625,9.05724142 153.671595,0.589198793 121.467288,3.24065127 C94.3271196,5.47519117 75.6884654,17.3319772 46.5188613,46.8760997 L46.5188613,46.8760997 L44.4086816,49.0171264 C30.1966379,63.4648858 23.5365117,70.8518409 17.66965,79.3947543 L17.66965,79.3947543 L16.8159631,80.6541424 L15.9876804,81.9069942 C7.52700788,94.8577977 3.16375473,107.9854 2.80388584,123.435056 C2.06141566,155.281167 15.9979199,185.693018 42.5581255,212.592447 C67.82505,238.182016 93.7827344,249.991613 131.048788,253.106044 L131.048788,253.106044 L132.897415,253.254431 C174.642425,256.464747 205.76515,249.252143 227.008257,228.167291 C249.578581,205.765126 256.927442,175.078792 251.537704,133.596809 C246.682834,96.2152658 228.654224,61.0943485 201.527922,33.9842216 Z M166.984321,93.3903087 L166.984321,106.949394 L138.186877,106.949394 L138.186877,184.662246 L123.842281,184.662246 L123.842281,106.949394 L95.044837,106.949394 L95.044837,93.3903087 L166.984321,93.3903087 Z" fill="#262627" fill-rule="nonzero"></path>
-    </g>
-</svg>
+<svg width="256" height="257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M121.24.474c33.019-2.718 56.734 6.045 82.25 31.547 27.549 27.532 45.864 63.212 50.8 101.218 5.492 42.266-2.062 73.807-25.326 96.898-22.247 22.08-54.74 29.364-98.146 25.735l-1.797-.158c-36.963-3.398-63.107-15.517-88.438-41.171C13.526 187.14-.732 156.026.029 123.37.401 107.383 4.93 93.758 13.664 80.39c5.726-8.765 11.54-15.602 23.704-28.14l4.06-4.158 4.474-4.536C74.73 14.58 93.707 2.741 121.24.475zm80.288 33.51C176.586 9.057 153.672.59 121.468 3.241c-27.14 2.234-45.78 14.091-74.95 43.635l-2.11 2.141C30.198 63.465 23.538 70.852 17.67 79.395l-.854 1.26-.828 1.252c-8.461 12.95-12.824 26.078-13.184 41.528-.743 31.846 13.194 62.258 39.754 89.157 25.267 25.59 51.225 37.4 88.49 40.514l1.85.148c41.744 3.21 72.867-4.002 94.11-25.087 22.57-22.402 29.92-53.088 24.53-94.57-4.855-37.382-22.884-72.503-50.01-99.613zM166.984 93.39v13.56h-28.797v77.712h-14.345V106.95H95.045V93.39h71.94z" fill="#262627"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wise/wise.svg b/packages/nodes-base/nodes/Wise/wise.svg
index d0dfa43fad..ee51582125 100644
--- a/packages/nodes-base/nodes/Wise/wise.svg
+++ b/packages/nodes-base/nodes/Wise/wise.svg
@@ -1,4 +1 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-2 -3 25 26" id="svg4349">
-  <defs id="defs4351"/>
-  <path d="M 2.47119,0 5.75339,5.49614 0,10.98341 l 9.94703,0 0.93496,-2.19922 -5.48835,0 3.32098,-3.30263 -1.93983,-3.28298 9.05021,0 -7.94492,18.76756 2.72225,0 L 19.48602,0 2.47119,0" id="Fill-1" style="fill:#00cdff;fill-opacity:1;stroke:none"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -3 25 26"><path d="m2.471 0 3.282 5.496L0 10.983h9.947l.935-2.199H5.394l3.32-3.302-1.94-3.283h9.051L7.88 20.966h2.722L19.486 0H2.471" style="fill:#00cdff;fill-opacity:1;stroke:none"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Xero/xero.svg b/packages/nodes-base/nodes/Xero/xero.svg
index ca25aa1e74..14ed475e5f 100644
--- a/packages/nodes-base/nodes/Xero/xero.svg
+++ b/packages/nodes-base/nodes/Xero/xero.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>xero_node_icon</title>
-    <g id="xero_node_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="xero-icon">
-            <g id="Group" transform="translate(0.461538, 0.461538)">
-                <path d="M29.5384615,59.0769231 C45.8741538,59.0769231 59.0769231,45.8741538 59.0769231,29.5384615 C59.0769231,13.2027692 45.8741538,0 29.5384615,0 C13.2027692,0 0,13.2027692 0,29.5384615 C0,45.8741538 13.2027692,59.0769231 29.5384615,59.0769231 Z" id="Path" fill="#00B2D5"></path>
-                <path d="M14.1267692,29.4461538 L19.1612308,24.4116923 C19.3185218,24.2439493 19.4096894,24.0248848 19.4178462,23.7950769 C19.4178462,23.2809231 19.0070769,22.8701538 18.4929231,22.8701538 C18.2363077,22.8701538 18.0313846,22.9624615 17.8255385,23.1267692 L12.7910769,28.1612308 L7.75661538,23.1267692 C7.5888724,22.9694782 7.36980786,22.8783106 7.14,22.8701538 C6.62584615,22.8701538 6.21507692,23.2809231 6.21507692,23.7950769 C6.21507692,24.0516923 6.30738462,24.2566154 6.47169231,24.4624615 L11.5061538,29.4969231 L6.46153846,34.5230769 C6.25569231,34.6772308 6.20492308,34.9338462 6.20492308,35.1904615 C6.20492308,35.7046154 6.61569231,36.1153846 7.12984615,36.1153846 C7.36180596,36.1176517 7.58459728,36.0249332 7.74646154,35.8587692 L12.7809231,30.8243077 L17.8153846,35.8587692 C17.9892409,36.0383551 18.2333833,36.1322301 18.4827692,36.1153846 C18.9969231,36.1153846 19.4076923,35.7046154 19.4076923,35.1904615 C19.4099594,34.9585017 19.3172409,34.7357104 19.1510769,34.5738462 L14.1267692,29.4461538 Z M44.0769231,29.4461538 C44.0769231,30.3710769 44.7969231,31.0892308 45.72,31.0892308 C46.6430769,31.0892308 47.3630769,30.3692308 47.3630769,29.4461538 C47.3630769,28.5230769 46.6430769,27.8030769 45.72,27.8030769 C44.8467692,27.8030769 44.0769231,28.5738462 44.0769231,29.4461538 Z M39.0923077,29.4461538 C39.1029539,33.1015985 42.0636322,36.0622768 45.7190769,36.0729231 C49.3745216,36.0622768 52.3351999,33.1015985 52.3458462,29.4461538 C52.3351999,25.7907092 49.3745216,22.8300309 45.7190769,22.8193846 C42.0636322,22.8300309 39.1029539,25.7907092 39.0923077,29.4461538 Z M40.9938462,29.4461538 C40.9938462,26.8264615 43.1003077,24.6683077 45.7716923,24.6683077 C48.3913846,24.6683077 50.5495385,26.7747692 50.5495385,29.4461538 C50.5609841,30.7167917 50.0612816,31.938717 49.1627685,32.8372301 C48.2642555,33.7357431 47.0423301,34.2354456 45.7716923,34.224 C43.1003077,34.224 40.9938462,32.0667692 40.9938462,29.4461538 L40.9938462,29.4461538 Z M38.6307692,22.9726154 L38.3741538,22.9726154 C37.5433846,22.9726154 36.7310769,23.2292308 36.0627692,23.7433846 C35.9704615,23.3326154 35.6012308,23.0233846 35.1895385,23.0233846 C34.6753846,23.0233846 34.3163077,23.4341538 34.3163077,23.8966154 L34.3163077,35.0446154 C34.3163077,35.5587692 34.7270769,35.9695385 35.2412308,35.9695385 C35.7553846,35.9695385 36.1661538,35.5587692 36.1661538,35.0446154 L36.1661538,28.212 C36.1661538,25.9504615 36.372,25.0273846 38.3233846,24.7689231 L38.6926154,24.7689231 C39.2067692,24.7689231 39.6175385,24.3996923 39.6175385,23.8956923 C39.5658462,23.3307692 39.156,22.9707692 38.6418462,22.9707692 L38.6307692,22.9726154 Z M32.4156923,28.2027692 C32.0049231,26.3538462 31.0283077,24.864 29.4876923,23.8873846 C27.2261538,22.4492308 24.2473846,22.5516923 22.0901538,24.0932308 C20.3436923,25.3264615 19.3163077,27.432 19.3163077,29.5393846 C19.3163077,30.0535385 19.368,30.6193846 19.5221538,31.1316923 C20.1895385,33.7513846 22.4501538,35.7470769 25.1215385,36.0636923 C25.9117156,36.1678472 26.7146664,36.1154672 27.4846154,35.9095385 C28.152,35.7553846 28.872,35.448 29.4876923,35.0787692 C30.1550769,34.668 30.6692308,34.1030769 31.1833846,33.4864615 L31.2350769,33.4347692 C31.6043077,32.9732308 31.5433846,32.3547692 31.1427692,32.0473846 C30.8344615,31.7907692 30.2695385,31.6781538 29.8070769,32.2532308 C29.7147692,32.4073846 29.6012308,32.5098462 29.4987692,32.664 C29.1295385,33.0747692 28.728,33.4347692 28.2064615,33.744 C27.5390769,34.1132308 26.7683077,34.3089231 25.9975385,34.3089231 C23.3778462,34.2572308 21.9913846,32.46 21.4772308,31.1243077 C21.3849231,30.8676923 21.3230769,30.6101538 21.2713846,30.3535385 L21.2713846,30.1993846 L30.7236923,30.1993846 C31.9569231,30.1476923 32.6252308,29.2236923 32.4193846,28.1963077 L32.4156923,28.2027692 Z M21.3203077,28.3569231 L21.3203077,28.2646154 C21.8344615,26.2098462 23.7350769,24.6683077 25.9356923,24.6683077 C28.1972308,24.6683077 30.0969231,26.2606154 30.6101538,28.3670769 L21.3203077,28.3569231 Z" id="Shape" fill="#FFFFFF"></path>
-            </g>
-            <g id="Group">
-                <path d="M29.5384615,59.0769231 C45.8741538,59.0769231 59.0769231,45.8741538 59.0769231,29.5384615 C59.0769231,13.2027692 45.8741538,0 29.5384615,0 C13.2027692,0 0,13.2027692 0,29.5384615 C0,45.8741538 13.2027692,59.0769231 29.5384615,59.0769231 Z" id="Path" fill="#00B2D5"></path>
-                <path d="M14.1267692,29.4461538 L19.1612308,24.4116923 C19.3185218,24.2439493 19.4096894,24.0248848 19.4178462,23.7950769 C19.4178462,23.2809231 19.0070769,22.8701538 18.4929231,22.8701538 C18.2363077,22.8701538 18.0313846,22.9624615 17.8255385,23.1267692 L12.7910769,28.1612308 L7.75661538,23.1267692 C7.5888724,22.9694782 7.36980786,22.8783106 7.14,22.8701538 C6.62584615,22.8701538 6.21507692,23.2809231 6.21507692,23.7950769 C6.21507692,24.0516923 6.30738462,24.2566154 6.47169231,24.4624615 L11.5061538,29.4969231 L6.46153846,34.5230769 C6.25569231,34.6772308 6.20492308,34.9338462 6.20492308,35.1904615 C6.20492308,35.7046154 6.61569231,36.1153846 7.12984615,36.1153846 C7.36180596,36.1176517 7.58459728,36.0249332 7.74646154,35.8587692 L12.7809231,30.8243077 L17.8153846,35.8587692 C17.9892409,36.0383551 18.2333833,36.1322301 18.4827692,36.1153846 C18.9969231,36.1153846 19.4076923,35.7046154 19.4076923,35.1904615 C19.4099594,34.9585017 19.3172409,34.7357104 19.1510769,34.5738462 L14.1267692,29.4461538 Z M44.0769231,29.4461538 C44.0769231,30.3710769 44.7969231,31.0892308 45.72,31.0892308 C46.6430769,31.0892308 47.3630769,30.3692308 47.3630769,29.4461538 C47.3630769,28.5230769 46.6430769,27.8030769 45.72,27.8030769 C44.8467692,27.8030769 44.0769231,28.5738462 44.0769231,29.4461538 Z M39.0923077,29.4461538 C39.1029539,33.1015985 42.0636322,36.0622768 45.7190769,36.0729231 C49.3745216,36.0622768 52.3351999,33.1015985 52.3458462,29.4461538 C52.3351999,25.7907092 49.3745216,22.8300309 45.7190769,22.8193846 C42.0636322,22.8300309 39.1029539,25.7907092 39.0923077,29.4461538 Z M40.9938462,29.4461538 C40.9938462,26.8264615 43.1003077,24.6683077 45.7716923,24.6683077 C48.3913846,24.6683077 50.5495385,26.7747692 50.5495385,29.4461538 C50.5609841,30.7167917 50.0612816,31.938717 49.1627685,32.8372301 C48.2642555,33.7357431 47.0423301,34.2354456 45.7716923,34.224 C43.1003077,34.224 40.9938462,32.0667692 40.9938462,29.4461538 L40.9938462,29.4461538 Z M38.6307692,22.9726154 L38.3741538,22.9726154 C37.5433846,22.9726154 36.7310769,23.2292308 36.0627692,23.7433846 C35.9704615,23.3326154 35.6012308,23.0233846 35.1895385,23.0233846 C34.6753846,23.0233846 34.3163077,23.4341538 34.3163077,23.8966154 L34.3163077,35.0446154 C34.3163077,35.5587692 34.7270769,35.9695385 35.2412308,35.9695385 C35.7553846,35.9695385 36.1661538,35.5587692 36.1661538,35.0446154 L36.1661538,28.212 C36.1661538,25.9504615 36.372,25.0273846 38.3233846,24.7689231 L38.6926154,24.7689231 C39.2067692,24.7689231 39.6175385,24.3996923 39.6175385,23.8956923 C39.5658462,23.3307692 39.156,22.9707692 38.6418462,22.9707692 L38.6307692,22.9726154 Z M32.4156923,28.2027692 C32.0049231,26.3538462 31.0283077,24.864 29.4876923,23.8873846 C27.2261538,22.4492308 24.2473846,22.5516923 22.0901538,24.0932308 C20.3436923,25.3264615 19.3163077,27.432 19.3163077,29.5393846 C19.3163077,30.0535385 19.368,30.6193846 19.5221538,31.1316923 C20.1895385,33.7513846 22.4501538,35.7470769 25.1215385,36.0636923 C25.9117156,36.1678472 26.7146664,36.1154672 27.4846154,35.9095385 C28.152,35.7553846 28.872,35.448 29.4876923,35.0787692 C30.1550769,34.668 30.6692308,34.1030769 31.1833846,33.4864615 L31.2350769,33.4347692 C31.6043077,32.9732308 31.5433846,32.3547692 31.1427692,32.0473846 C30.8344615,31.7907692 30.2695385,31.6781538 29.8070769,32.2532308 C29.7147692,32.4073846 29.6012308,32.5098462 29.4987692,32.664 C29.1295385,33.0747692 28.728,33.4347692 28.2064615,33.744 C27.5390769,34.1132308 26.7683077,34.3089231 25.9975385,34.3089231 C23.3778462,34.2572308 21.9913846,32.46 21.4772308,31.1243077 C21.3849231,30.8676923 21.3230769,30.6101538 21.2713846,30.3535385 L21.2713846,30.1993846 L30.7236923,30.1993846 C31.9569231,30.1476923 32.6252308,29.2236923 32.4193846,28.1963077 L32.4156923,28.2027692 Z M21.3203077,28.3569231 L21.3203077,28.2646154 C21.8344615,26.2098462 23.7350769,24.6683077 25.9356923,24.6683077 C28.1972308,24.6683077 30.0969231,26.2606154 30.6101538,28.3670769 L21.3203077,28.3569231 Z" id="Shape" fill="#FFFFFF"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M30 59.538c16.336 0 29.538-13.202 29.538-29.538S46.336.462 30 .462.462 13.664.462 30 13.664 59.538 30 59.538z" fill="#00B2D5"/><path d="m14.588 29.908 5.035-5.035a.95.95 0 0 0 .256-.616.92.92 0 0 0-.925-.925c-.256 0-.461.092-.667.256l-5.034 5.035-5.035-5.035a.95.95 0 0 0-.616-.256.92.92 0 0 0-.925.925c0 .256.092.461.256.667l5.035 5.034-5.045 5.027c-.206.154-.257.41-.257.667 0 .514.411.925.925.925a.85.85 0 0 0 .617-.257l5.034-5.034 5.035 5.034a.85.85 0 0 0 .667.257.92.92 0 0 0 .925-.925.85.85 0 0 0-.256-.617l-5.025-5.127zm29.95 0c0 .925.72 1.643 1.644 1.643.923 0 1.643-.72 1.643-1.643s-.72-1.643-1.643-1.643c-.874 0-1.644.77-1.644 1.643zm-4.984 0a6.646 6.646 0 0 0 6.627 6.626 6.646 6.646 0 0 0 6.626-6.626 6.646 6.646 0 0 0-6.626-6.627 6.646 6.646 0 0 0-6.627 6.627zm1.901 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.769 4.769 0 0 1-4.778-4.778zm-2.363-6.474h-.256c-.831 0-1.643.257-2.312.77-.092-.41-.461-.72-.873-.72a.865.865 0 0 0-.873.874v11.148c0 .514.41.925.925.925a.92.92 0 0 0 .925-.925v-6.832c0-2.262.206-3.185 2.157-3.444h.37c.513 0 .924-.369.924-.873-.052-.565-.461-.925-.976-.925l-.01.002zm-6.215 5.23c-.41-1.849-1.387-3.338-2.928-4.315-2.261-1.438-5.24-1.336-7.397.206-1.747 1.233-2.774 3.339-2.774 5.446 0 .514.052 1.08.206 1.592.667 2.62 2.928 4.616 5.6 4.932.79.104 1.592.052 2.362-.154a7.215 7.215 0 0 0 2.003-.83c.668-.411 1.182-.976 1.696-1.593l.052-.052c.369-.461.308-1.08-.093-1.387-.308-.257-.873-.37-1.335.206-.093.154-.206.256-.309.41-.369.411-.77.771-1.292 1.08a4.592 4.592 0 0 1-2.209.565c-2.62-.051-4.006-1.848-4.52-3.184a5.413 5.413 0 0 1-.206-.77v-.155h9.452c1.233-.052 1.902-.976 1.696-2.003l-.004.006zm-11.095.154v-.092c.514-2.055 2.415-3.596 4.615-3.596 2.262 0 4.161 1.592 4.675 3.699l-9.29-.01z" fill="#FFF"/><g><path d="M29.538 59.077c16.336 0 29.539-13.203 29.539-29.539C59.077 13.203 45.874 0 29.538 0 13.203 0 0 13.203 0 29.538c0 16.336 13.203 29.539 29.538 29.539z" fill="#00B2D5"/><path d="m14.127 29.446 5.034-5.034a.95.95 0 0 0 .257-.617.92.92 0 0 0-.925-.925c-.257 0-.462.092-.667.257L12.79 28.16l-5.034-5.034a.95.95 0 0 0-.617-.257.92.92 0 0 0-.925.925c0 .257.092.462.257.667l5.034 5.035-5.044 5.026c-.206.154-.257.41-.257.667 0 .515.41.925.925.925a.85.85 0 0 0 .616-.256l5.035-5.035 5.034 5.035a.85.85 0 0 0 .668.256.92.92 0 0 0 .925-.925.85.85 0 0 0-.257-.616l-5.024-5.128zm29.95 0c0 .925.72 1.643 1.643 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.873 0-1.643.77-1.643 1.643zm-4.985 0a6.646 6.646 0 0 0 6.627 6.627 6.646 6.646 0 0 0 6.627-6.627 6.646 6.646 0 0 0-6.627-6.627 6.646 6.646 0 0 0-6.627 6.627zm1.902 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.769 4.769 0 0 1-4.778-4.778zm-2.363-6.473h-.257c-.83 0-1.643.256-2.311.77-.093-.41-.462-.72-.873-.72a.865.865 0 0 0-.874.874v11.148c0 .514.411.925.925.925a.92.92 0 0 0 .925-.925v-6.833c0-2.262.206-3.185 2.157-3.443h.37c.514 0 .925-.37.925-.873-.052-.565-.462-.925-.976-.925l-.011.002zm-6.215 5.23c-.411-1.85-1.388-3.339-2.928-4.316-2.262-1.438-5.24-1.335-7.398.206-1.746 1.233-2.774 3.339-2.774 5.446 0 .515.052 1.08.206 1.593.668 2.62 2.928 4.615 5.6 4.932.79.104 1.593.051 2.363-.154a7.215 7.215 0 0 0 2.003-.831c.667-.411 1.181-.976 1.695-1.593l.052-.051c.37-.462.308-1.08-.092-1.388-.309-.256-.873-.369-1.336.206-.092.154-.206.257-.308.411-.37.41-.771.77-1.293 1.08a4.592 4.592 0 0 1-2.208.565c-2.62-.052-4.007-1.849-4.52-3.185a5.413 5.413 0 0 1-.207-.77v-.155h9.453c1.233-.051 1.901-.975 1.695-2.003l-.003.007zm-11.096.154v-.092c.514-2.055 2.415-3.597 4.616-3.597 2.261 0 4.16 1.593 4.674 3.7l-9.29-.011z" fill="#FFF"/></g></g></svg>
\ No newline at end of file

From 48224d51ead5ac098c226740f69b16daed3a3d0e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 17:19:48 +0200
Subject: [PATCH 047/231] :zap: Bring commands in order

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 716e4d64d8..866d256baf 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
     "build": "lerna exec npm run build",
     "dev": "lerna exec npm run dev --parallel",
     "clean:dist": "lerna exec -- rimraf ./dist",
+    "optimize-svg": "find ./packages -name '*.svg' -print0 | xargs -0 -P16 -L20 npx svgo",
     "start": "run-script-os",
     "start:default": "cd packages/cli/bin && ./n8n",
     "start:windows": "cd packages/cli/bin && n8n",
     "test": "lerna run test",
     "tslint": "lerna exec npm run tslint",
-    "watch": "lerna run --parallel watch",
-    "optimize-svg": "find ./packages -name '*.svg' -print0 | xargs -0 -P16 -L20 npx svgo"
+    "watch": "lerna run --parallel watch"
   },
   "devDependencies": {
     "lerna": "^3.13.1",

From b83c2e2a3cb8222ffca46a6d29192de43ecee5a3 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 17:23:48 +0200
Subject: [PATCH 048/231] :shirt: Fix lint issue

---
 packages/cli/src/Interfaces.ts     | 2 +-
 packages/cli/src/WorkflowRunner.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 464d140757..249d77f336 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -413,7 +413,7 @@ export interface IWorkflowExecutionDataProcessWithExecution extends IWorkflowExe
 }
 
 export interface IWorkflowExecuteProcess {
-	startedAt: Date,
+	startedAt: Date;
 	workflow: Workflow;
 	workflowExecute: WorkflowExecute;
 }
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index b86df1c122..bb92501d96 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -434,7 +434,7 @@ export class WorkflowRunner {
 		const processTimeoutFunction = (timeout: number) => {
 			this.activeExecutions.stopExecution(executionId, 'timeout');
 			executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)); // minimum 5 seconds
-		}
+		};
 
 		if (workflowTimeout > 0) {
 			workflowTimeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds

From d33dad7ebc7535c42f83ebce8b790f8eeda2d269 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 17:23:59 +0200
Subject: [PATCH 049/231] :zap: Optimize svgs

---
 packages/nodes-base/nodes/Airtable/airtable.svg                 | 2 +-
 packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg       | 2 +-
 packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg         | 2 +-
 packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg       | 2 +-
 packages/nodes-base/nodes/Aws/SES/ses.svg                       | 2 +-
 packages/nodes-base/nodes/Aws/SQS/sqs.svg                       | 2 +-
 packages/nodes-base/nodes/Bitwarden/bitwarden.svg               | 2 +-
 packages/nodes-base/nodes/Bubble/bubble.svg                     | 2 +-
 packages/nodes-base/nodes/Clearbit/clearbit.svg                 | 2 +-
 packages/nodes-base/nodes/ClickUp/clickup.svg                   | 2 +-
 packages/nodes-base/nodes/Cortex/cortex.svg                     | 2 +-
 packages/nodes-base/nodes/DeepL/deepl.svg                       | 2 +-
 packages/nodes-base/nodes/Demio/demio.svg                       | 2 +-
 packages/nodes-base/nodes/Discourse/discourse.svg               | 2 +-
 packages/nodes-base/nodes/Dropbox/dropbox.svg                   | 2 +-
 packages/nodes-base/nodes/ERPNext/erpnext.svg                   | 2 +-
 packages/nodes-base/nodes/Emelia/emelia.svg                     | 2 +-
 packages/nodes-base/nodes/Gitlab/gitlab.svg                     | 2 +-
 packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg           | 2 +-
 packages/nodes-base/nodes/Google/Analytics/analytics.svg        | 2 +-
 packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg    | 2 +-
 packages/nodes-base/nodes/Google/Books/googlebooks.svg          | 2 +-
 packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg    | 2 +-
 packages/nodes-base/nodes/Google/Drive/googleDrive.svg          | 2 +-
 packages/nodes-base/nodes/Google/Gmail/gmail.svg                | 2 +-
 packages/nodes-base/nodes/Google/Sheet/googleSheets.svg         | 2 +-
 packages/nodes-base/nodes/Google/Slides/googleslides.svg        | 2 +-
 packages/nodes-base/nodes/HelpScout/helpScout.svg               | 2 +-
 packages/nodes-base/nodes/Hubspot/hubspot.svg                   | 2 +-
 packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg         | 2 +-
 packages/nodes-base/nodes/Jira/jira.svg                         | 2 +-
 packages/nodes-base/nodes/Kafka/kafka.svg                       | 2 +-
 packages/nodes-base/nodes/Lemlist/lemlist.svg                   | 2 +-
 packages/nodes-base/nodes/Mailchimp/mailchimp.svg               | 2 +-
 packages/nodes-base/nodes/Mattermost/mattermost.svg             | 2 +-
 packages/nodes-base/nodes/MessageBird/messagebird.svg           | 2 +-
 packages/nodes-base/nodes/Microsoft/Excel/excel.svg             | 2 +-
 packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg         | 2 +-
 packages/nodes-base/nodes/Microsoft/Sql/mssql.svg               | 2 +-
 packages/nodes-base/nodes/Microsoft/Teams/teams.svg             | 2 +-
 packages/nodes-base/nodes/MondayCom/mondayCom.svg               | 2 +-
 packages/nodes-base/nodes/MongoDb/mongodb.svg                   | 2 +-
 packages/nodes-base/nodes/Orbit/orbit.svg                       | 2 +-
 packages/nodes-base/nodes/Oura/oura.svg                         | 2 +-
 packages/nodes-base/nodes/PayPal/paypal.svg                     | 2 +-
 packages/nodes-base/nodes/Plivo/plivo.svg                       | 2 +-
 packages/nodes-base/nodes/PostHog/postHog.svg                   | 2 +-
 packages/nodes-base/nodes/Pushbullet/pushbullet.svg             | 2 +-
 packages/nodes-base/nodes/QuickBooks/quickbooks.svg             | 2 +-
 packages/nodes-base/nodes/Raindrop/raindrop.svg                 | 2 +-
 packages/nodes-base/nodes/Reddit/reddit.svg                     | 2 +-
 packages/nodes-base/nodes/Redis/redis.svg                       | 2 +-
 packages/nodes-base/nodes/Salesforce/salesforce.svg             | 2 +-
 .../nodes-base/nodes/SecurityScorecard/securityScorecard.svg    | 2 +-
 packages/nodes-base/nodes/SendGrid/sendGrid.svg                 | 2 +-
 packages/nodes-base/nodes/SentryIo/sentryio.svg                 | 2 +-
 packages/nodes-base/nodes/Spotify/spotify.svg                   | 2 +-
 packages/nodes-base/nodes/Storyblok/storyblok.svg               | 2 +-
 packages/nodes-base/nodes/Strava/strava.svg                     | 2 +-
 packages/nodes-base/nodes/Telegram/telegram.svg                 | 2 +-
 packages/nodes-base/nodes/TheHive/thehive.svg                   | 2 +-
 packages/nodes-base/nodes/TimescaleDb/timescale.svg             | 2 +-
 packages/nodes-base/nodes/Typeform/typeform.svg                 | 2 +-
 packages/nodes-base/nodes/Webflow/webflow.svg                   | 2 +-
 packages/nodes-base/nodes/Wise/wise.svg                         | 2 +-
 packages/nodes-base/nodes/Xero/xero.svg                         | 2 +-
 66 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/packages/nodes-base/nodes/Airtable/airtable.svg b/packages/nodes-base/nodes/Airtable/airtable.svg
index 0fc86fa2a4..0235854a9b 100644
--- a/packages/nodes-base/nodes/Airtable/airtable.svg
+++ b/packages/nodes-base/nodes/Airtable/airtable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170" style="enable-background:new 0 0 200 170" xml:space="preserve"><path d="M89 4.8 16.2 34.9c-4.1 1.7-4 7.4.1 9.1l73.2 29c6.4 2.6 13.6 2.6 20 0l73.2-29c4.1-1.6 4.1-7.4.1-9.1l-73-30.1C103.2 2 95.7 2 89 4.8" style="fill:#fcb400"/><path d="M105.9 88.9v72.5c0 3.4 3.5 5.8 6.7 4.5l81.6-31.7c1.9-.7 3.1-2.5 3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5L109 84.3c-1.9.8-3.1 2.6-3.1 4.6" style="fill:#18bfff"/><path d="m86.9 92.6-24.2 11.7-2.5 1.2L9.1 130c-3.2 1.6-7.4-.8-7.4-4.4V57.5c0-1.3.7-2.4 1.6-3.3.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.5 4.3 7.1.5 8.9" style="fill:#f82b60"/><path d="m86.9 92.6-24.2 11.7-59.4-50c.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.4 4.3 7 .5 8.8" style="fill:#ba1e45"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170"><path d="M89 4.8L16.2 34.9c-4.1 1.7-4 7.4.1 9.1l73.2 29c6.4 2.6 13.6 2.6 20 0l73.2-29c4.1-1.6 4.1-7.4.1-9.1l-73-30.1C103.2 2 95.7 2 89 4.8" fill="#fcb400"/><path d="M105.9 88.9v72.5c0 3.4 3.5 5.8 6.7 4.5l81.6-31.7c1.9-.7 3.1-2.5 3.1-4.5V57.2c0-3.4-3.5-5.8-6.7-4.5L109 84.3c-1.9.8-3.1 2.6-3.1 4.6" fill="#18bfff"/><path d="M86.9 92.6l-24.2 11.7-2.5 1.2L9.1 130c-3.2 1.6-7.4-.8-7.4-4.4V57.5c0-1.3.7-2.4 1.6-3.3.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.5 4.3 7.1.5 8.9" fill="#f82b60"/><path d="M86.9 92.6l-24.2 11.7-59.4-50c.4-.4.8-.7 1.2-.9 1.2-.7 3-.9 4.4-.3l77.5 30.7c4 1.4 4.3 7 .5 8.8" fill="#ba1e45"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
index f3fbeb03f6..4fe3ce87d5 100755
--- a/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
+++ b/packages/nodes-base/nodes/ApiTemplateIo/apiTemplateIo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 23.167 21.167"><g style="fill:#000"><path fill="#91bce5" d="M18.611.504 3.473 11.24l4.597 2.213 1.066 3.883 3.171-2.226 2.802.951z"/><path fill="#1f212b" d="M9.172 17.597a.264.264 0 0 1-.29-.192l-1.035-3.767-4.488-2.16a.265.265 0 0 1-.039-.454L18.458.288a.264.264 0 0 1 .41.274l-3.5 15.556a.265.265 0 0 1-.344.193l-2.674-.908-3.061 2.15a.273.273 0 0 1-.117.044zm-5.18-6.401 4.193 2.017c.069.034.12.095.14.169l.967 3.52 2.863-2.01a.265.265 0 0 1 .237-.033l2.524.856L18.2 1.119z"/><path fill="#3a84c1" d="m9.339 17.079.946-2.913L18.642.728 8.226 13.235z"/><path fill="#1f212b" d="M9.356 17.21a.132.132 0 0 1-.143-.172l.946-2.913a.16.16 0 0 1 .014-.03l7.393-11.888-9.419 11.156a.133.133 0 0 1-.202-.171L18.54.642a.132.132 0 0 1 .214.156l-8.348 13.424-.941 2.898a.132.132 0 0 1-.109.09zM6.141 18.255c-1.168.029-2.303-.373-3.067-1.287-.485-.58-.683-1.574.275-1.705.859-.119 1.229.485 1.48 1.196.804 2.026.16 2.938-1.68 4.272-.144.09.015.296.159.206 1.218-1 1.829-1.466 2.1-2.448.134-1.36-.402-3.091-1.384-3.436-1.12-.382-2.063.516-1.499 1.585.699 1.324 2.23 1.914 3.652 1.878.17-.004.133-.266-.036-.261z"/><path fill="#1f212b" d="M7.235 18.14c-.252.038-.506.065-.759.09-.17.017-.133.279.036.262.253-.025.507-.052.758-.09.169-.026.133-.288-.035-.262zm1.194-.504c-.283.13-.57.246-.865.344-.162.054-.057.297.104.243.295-.098.583-.214.865-.344.154-.071.05-.315-.104-.243z"/><path fill="#1f212b" d="M54.07 64.636a.497.497 0 0 1-.254-.08l-7.482-4.834a.501.501 0 0 1 .543-.84l7.482 4.834a.501.501 0 0 1-.29.92z" style="fill:#000" transform="scale(.26458) rotate(-9.8 9.355 98.706)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 23.167 21.167"><path fill="#91bce5" d="M18.611.504L3.473 11.24l4.597 2.213 1.066 3.883 3.171-2.226 2.802.951z"/><path fill="#1f212b" d="M9.172 17.597a.264.264 0 01-.29-.192l-1.035-3.767-4.488-2.16a.265.265 0 01-.039-.454L18.458.288a.264.264 0 01.41.274l-3.5 15.556a.265.265 0 01-.344.193l-2.674-.908-3.061 2.15a.273.273 0 01-.117.044zm-5.18-6.401l4.193 2.017c.069.034.12.095.14.169l.967 3.52 2.863-2.01a.265.265 0 01.237-.033l2.524.856L18.2 1.119z"/><path fill="#3a84c1" d="M9.339 17.079l.946-2.913L18.642.728 8.226 13.235z"/><path fill="#1f212b" d="M9.356 17.21a.132.132 0 01-.143-.172l.946-2.913a.16.16 0 01.014-.03l7.393-11.888-9.419 11.156a.133.133 0 01-.202-.171L18.54.642a.132.132 0 01.214.156l-8.348 13.424-.941 2.898a.132.132 0 01-.109.09zm-3.215 1.045c-1.168.029-2.303-.373-3.067-1.287-.485-.58-.683-1.574.275-1.705.859-.119 1.229.485 1.48 1.196.804 2.026.16 2.938-1.68 4.272-.144.09.015.296.159.206 1.218-1 1.829-1.466 2.1-2.448.134-1.36-.402-3.091-1.384-3.436-1.12-.382-2.063.516-1.499 1.585.699 1.324 2.23 1.914 3.652 1.878.17-.004.133-.266-.036-.261z"/><path fill="#1f212b" d="M7.235 18.14a14.95 14.95 0 01-.759.09c-.17.017-.133.279.036.262.253-.025.507-.052.758-.09.169-.026.133-.288-.035-.262zm1.194-.504a8.46 8.46 0 01-.865.344c-.162.054-.057.297.104.243a8.37 8.37 0 00.865-.344c.154-.071.05-.315-.104-.243z"/><path d="M12.599 15.22a.131.131 0 01-.07-.01l-2.168-.924a.133.133 0 01.103-.243l2.169.923a.133.133 0 01-.034.253z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
index add34ba328..1e421aa9a8 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
+++ b/packages/nodes-base/nodes/Aws/Comprehend/comprehend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 75"><defs><linearGradient id="a" x1="617.46" y1="-674.53" x2="723.53" y2="-568.46" gradientTransform="rotate(-90 683.5 24.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><path data-name="Turquoise Gradient" style="fill:url(#a)" d="M0 0h75v75H0z"/><path d="M44.5 34.2v-9.7a1 1 0 0 0-.29-.71l-11-11a1 1 0 0 0-.71-.29h-19a1 1 0 0 0-1 1v43a1 1 0 0 0 1 1h30a1 1 0 0 0 1-1v-4.44a11.8 11.8 0 0 1-2-2.3v5.74h-28v-41h17v10a1 1 0 0 0 1 1h10v11a11.56 11.56 0 0 1 2-2.3zm-11-10.7v-7.59l7.59 7.59zm-10 8h-6v-2h6zm16 0h-14v-2h14zm0 6h-22v-2h22zm15.44 25h-4.88a1 1 0 0 1-.93-.62l-1.21-3a1 1 0 0 1 .09-.94 1 1 0 0 1 .83-.44h7.32a1 1 0 0 1 .83.44 1 1 0 0 1 .09.94l-1.21 3a1 1 0 0 1-.93.62zm-4.21-2h3.54l.4-1h-4.34zm11.64-19a10 10 0 0 0-19.87 1.62 10 10 0 0 0 4.28 8.2 3.88 3.88 0 0 1 .72.59v3.59a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3.6a4.33 4.33 0 0 1 .71-.57 9.92 9.92 0 0 0 4.29-8.2 10.19 10.19 0 0 0-.13-1.65zm-5.32 8.2c-.58.4-1.55 1.07-1.55 2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2v-2.68c0-1-1-1.73-1.58-2.14A8 8 0 1 1 58 37.32a7.89 7.89 0 0 1 2.39 4.47 8 8 0 0 1-3.34 7.91zM28.5 25.5h-11v-2h11zm1 18h-12v-2h12zm10 0h-8v-2h8zm-9 6h-13v-2h13z" style="fill:#fff" data-name="Icon Test"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75 75"><defs><linearGradient id="a" x1="617.46" y1="-674.53" x2="723.53" y2="-568.46" gradientTransform="rotate(-90 683.5 24.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055f4e"/><stop offset="1" stop-color="#56c0a7"/></linearGradient></defs><path data-name="Turquoise Gradient" d="M0 0h75v75H0z" fill="url(#a)"/><path d="M44.5 34.2v-9.7a1 1 0 00-.29-.71l-11-11a1 1 0 00-.71-.29h-19a1 1 0 00-1 1v43a1 1 0 001 1h30a1 1 0 001-1v-4.44a11.8 11.8 0 01-2-2.3v5.74h-28v-41h17v10a1 1 0 001 1h10v11a11.56 11.56 0 012-2.3zm-11-10.7v-7.59l7.59 7.59zm-10 8h-6v-2h6zm16 0h-14v-2h14zm0 6h-22v-2h22zm15.44 25h-4.88a1 1 0 01-.93-.62l-1.21-3a1 1 0 01.09-.94 1 1 0 01.83-.44h7.32a1 1 0 01.83.44 1 1 0 01.09.94l-1.21 3a1 1 0 01-.93.62zm-4.21-2h3.54l.4-1h-4.34zm11.64-19a10 10 0 00-19.87 1.62 10 10 0 004.28 8.2 3.88 3.88 0 01.72.59v3.59a1 1 0 001 1h8a1 1 0 001-1v-3.6a4.33 4.33 0 01.71-.57 9.92 9.92 0 004.29-8.2 10.19 10.19 0 00-.13-1.65zm-5.32 8.2c-.58.4-1.55 1.07-1.55 2.1v2.7h-2v-7h2v-2h-6v2h2v7h-2v-2.68c0-1-1-1.73-1.58-2.14A8 8 0 1158 37.32a7.89 7.89 0 012.39 4.47 8 8 0 01-3.34 7.91zM28.5 25.5h-11v-2h11zm1 18h-12v-2h12zm10 0h-8v-2h8zm-9 6h-13v-2h13z" data-name="Icon Test" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
index 1e08488699..5eeab98fa0 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
+++ b/packages/nodes-base/nodes/Aws/Rekognition/rekognition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M2.886 52.8 16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="m67.207 28.898-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966 35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24 0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478 0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566 35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26 34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="m67.64 51.142-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="m67.207 51.103-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40 35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376 35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435 35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75 70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M2.886 52.8L16.8 51.268V28.732L2.886 27.2v25.6z" fill="#5294cf"/><g fill="#19486f"><path d="M67.207 28.898l-6.462 2.43-36.237-5.346L34.99 0l32.217 28.898z"/><path d="M3.504 28.966L35 12.234 45.543 26 16.81 30.224l-13.305-1.26z"/></g><g fill="#205b99"><path d="M35 24L0 30.624V16.556L35 0l17.016 18.478L35 24z"/><path d="M7.008 16.478L0 19.395v44.05l7.008 3.307V16.478z"/></g><path d="M70 16.566L35 0v24l35 6.624v-14.06z" fill="#5294cf"/><g fill="#99bce3"><path d="M1.154 51.26L34.99 80l10.554-26-28.734-4.224L1.154 51.26z"/><path d="M67.64 51.142l-6.493-2.527-36.64 5.405 10.48 25.22 32.65-28.097z"/></g><path d="M67.207 51.103l-13.965-1.327v-19.55L67.207 28.9v22.205zM35 56l15.13-16L35 24 16.356 40 35 56z" fill="#205b99"/><path d="M53.624 40L35 56V24l18.634 16z" fill="#5294cf"/><path d="M0 49.376L35 56l19.21 7.873L35 80 0 63.444V49.376z" fill="#205b99"/><g fill="#5294cf"><path d="M70 63.435L35 80V56l35-6.624v14.06z"/><path d="M62.97 66.75L70 63.434V16.566l-7.03-3.327V66.75z"/></g></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/SES/ses.svg b/packages/nodes-base/nodes/Aws/SES/ses.svg
index c17810926f..d7224cb0ec 100644
--- a/packages/nodes-base/nodes/Aws/SES/ses.svg
+++ b/packages/nodes-base/nodes/Aws/SES/ses.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M16.558 12.75 0 38.591l16.558 25.841 13.227-3.324.654-44.869-13.881-3.489z" fill="#876929"/><path d="m35.049 59.786-18.491 4.645V12.75l18.491 4.645v42.391z" fill="#d9a741"/><g fill="#876929"><path d="M32.849 21.614 35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="m46.184 33.149 10.906-.632 10.778-19.164L40.612 0 30.439 4.364l15.745 28.785z"/></g><path d="m40.612 0 27.256 13.353L57.09 32.517 40.612 0z" fill="#d9a741"/><path d="M35.049 5.539 57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64l10.46-4.101z" fill="#876929"/><path d="M69.991 19.251 70 62.867 35.05 80V5.539l22.041 39.203L69.99 19.251z" fill="#d9a741"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 74.375 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g stroke="none"><path d="M16.558 12.75L0 38.591l16.558 25.841 13.227-3.324.654-44.869-13.881-3.489z" fill="#876929"/><path d="M35.049 59.786l-18.491 4.645V12.75l18.491 4.645v42.391z" fill="#d9a741"/><g fill="#876929"><path d="M32.849 21.614L35.05 80 70 62.867l-.01-43.615-8.914 1.448-28.228.913z"/><path d="M46.184 33.149l10.906-.632 10.778-19.164L40.612 0 30.439 4.364l15.745 28.785z"/></g><path d="M40.612 0l27.256 13.353L57.09 32.517 40.612 0z" fill="#d9a741"/><path d="M35.049 5.539L57.09 44.742l3.788 22.595L35.049 80l-10.46-5.131V9.64l10.46-4.101z" fill="#876929"/><path d="M69.991 19.251L70 62.867 35.05 80V5.539l22.041 39.203L69.99 19.251z" fill="#d9a741"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/SQS/sqs.svg b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
index 2de0d76300..e8073a53a0 100644
--- a/packages/nodes-base/nodes/Aws/SQS/sqs.svg
+++ b/packages/nodes-base/nodes/Aws/SQS/sqs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-5 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56v9.378z"/><path d="m.021 54.062 34.98 9.942V80L.021 63.44v-9.378z"/><path d="M4.465 65.549 0 63.431V16.56l4.475-2.109-.01 51.098z"/></g><path d="m40.255 50.564-35.79 4.762.01-30.661 35.78 4.772v21.127zM70 25.948l-35-9.951V0l35 16.57v9.378zm-.02 28.124L35 64.004V80l34.98-16.56v-9.368z" stroke="none" fill="#d9a741"/><path d="m22.109 48.581 12.892 1.526V29.815L22.109 31.36v17.221zM9.125 47.065l8.365.982V31.924l-8.365 1.001v14.14z" stroke="none" fill="#876929"/><path d="M4.475 24.665 35 15.996l35 9.951-29.745 3.489-35.78-4.772z" fill="#624a1e" stroke="none"/><path d="M4.465 55.326 35 64.004l34.98-9.932-29.724-3.508-35.79 4.762z" fill="#fad791" stroke="none"/><path d="M69.98 45.918 35 50.107V29.815l34.98 4.218v11.885z" fill="#d9a741" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-5 0 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.188" y="2.5"/><symbol id="a" overflow="visible"><g fill="#876929" stroke="none"><path d="M0 25.938L.021 63.44 35 80l34.98-16.56v-9.368l-29.745-3.508.02-21.127L70 25.948V16.57L35 0 0 16.56v9.378z"/><path d="M.021 54.062l34.98 9.942V80L.021 63.44v-9.378z"/><path d="M4.465 65.549L0 63.431V16.56l4.475-2.109-.01 51.098z"/></g><path d="M40.255 50.564l-35.79 4.762.01-30.661 35.78 4.772v21.127zM70 25.948l-35-9.951V0l35 16.57v9.378zm-.02 28.124L35 64.004V80l34.98-16.56v-9.368z" stroke="none" fill="#d9a741"/><path d="M22.109 48.581l12.892 1.526V29.815L22.109 31.36v17.221zM9.125 47.065l8.365.982V31.924l-8.365 1.001v14.14z" stroke="none" fill="#876929"/><path d="M4.475 24.665L35 15.996l35 9.951-29.745 3.489-35.78-4.772z" fill="#624a1e" stroke="none"/><path d="M4.465 55.326L35 64.004l34.98-9.932-29.724-3.508-35.79 4.762z" fill="#fad791" stroke="none"/><path d="M69.98 45.918L35 50.107V29.815l34.98 4.218v11.885z" fill="#d9a741" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
index 55453b1917..c53078dd43 100644
--- a/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
+++ b/packages/nodes-base/nodes/Bitwarden/bitwarden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M53.333 2.667v32c0 2.388-.465 4.756-1.396 7.103s-2.084 4.43-3.458 6.25-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834c-.333.166-.695.25-1.083.25a2.4 2.4 0 0 1-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23c-1.61-1.14-3.368-2.57-5.27-4.292s-3.54-3.492-4.916-5.312-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 0 1 .791.792 2.56 2.56 0 0 1 2.666 0h48c.72 0 1.346.264 1.874.792a2.56 2.56 0 0 1 .792 1.875m-8 32V8H26.666v47.375c3.305-1.75 6.264-3.653 8.875-5.708 6.527-5.11 9.79-10.11 9.79-15" stroke="none" fill="#3c8dbc" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M53.333 2.667v32c0 2.388-.465 4.756-1.396 7.103s-2.084 4.43-3.458 6.25-3.015 3.59-4.917 5.312-3.66 3.153-5.272 4.292l-5.04 3.23-3.73 2.062-1.77.834c-.333.166-.695.25-1.083.25a2.4 2.4 0 01-1.083-.25l-1.77-.834-3.73-2.062-5.042-3.23c-1.61-1.14-3.368-2.57-5.27-4.292s-3.54-3.492-4.916-5.312-2.528-3.903-3.46-6.25S0 37.055 0 34.667v-32A2.56 2.56 0 01.791.792 2.56 2.56 0 012.666 0h48c.72 0 1.346.264 1.874.792a2.56 2.56 0 01.792 1.875m-8 32V8H26.666v47.375c3.305-1.75 6.264-3.653 8.875-5.708 6.527-5.11 9.79-10.11 9.79-15" stroke="none" fill="#3c8dbc" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bubble/bubble.svg b/packages/nodes-base/nodes/Bubble/bubble.svg
index 2c50a4f59c..8f68a8b2aa 100644
--- a/packages/nodes-base/nodes/Bubble/bubble.svg
+++ b/packages/nodes-base/nodes/Bubble/bubble.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -10 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337c0 8.461-6.86 15.337-15.337 15.337zm56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337zM69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579zM243.101 66.27h-9.674V0h9.674v66.27zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511a39.392 39.392 0 0 1-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 0 1-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0 1 15.337 15.337 15.34 15.34 0 0 1-15.337 15.337z" fill="#000" fill-rule="nonzero" stroke="none"/><path d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169S9.586 67.4 6.169 67.4 0 64.648 0 61.231z" fill="#00f" fill-rule="nonzero" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -10 85 85" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M145.432 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337c0 8.461-6.86 15.337-15.337 15.337zm56.562-40.298c-6.051 0-12.034 2.596-16.584 7.719V0h-9.017v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.551-24.961-24.32-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337 15.34 15.34 0 01-15.337 15.337zM69.067 46.821V18.843h9.674v27.893c0 7.129 4.129 11.697 11.09 11.697 7.045 0 11.09-4.399 11.09-11.697V18.843h9.758v27.978c0 12.927-7.837 20.579-20.848 20.579-12.674.017-20.764-7.905-20.764-20.579zM243.101 66.27h-9.674V0h9.674v66.27zm54.775-19.972h-37.028c1.416 7.382 6.59 12.404 15.741 12.404 5.36 0 11.882-2.022 16.096-5.107l4.045 7.129c-4.837 3.607-12.489 6.59-20.494 6.59-17.764 0-25.416-12.404-25.416-24.893 0-7.129 2.191-13.011 6.691-17.68 4.483-4.669 10.382-7.045 17.511-7.045 6.775 0 12.405 2.107 16.719 6.421s6.506 10.112 6.506 17.511a39.392 39.392 0 01-.371 4.669zm-37.045-7.921h27.624c-.792-7.483-6.337-12.32-13.466-12.32-7.298 0-12.742 4.938-14.157 12.32zM38.343 17.494c-6.051 0-12.034 2.596-16.584 7.719V0h-9.034v42.455c0 13.786 11.174 24.961 24.961 24.961s24.961-11.174 24.961-24.961-10.534-24.961-24.303-24.961zm-.657 40.298a15.34 15.34 0 01-15.337-15.337c0-8.461 6.876-15.337 15.337-15.337a15.34 15.34 0 0115.337 15.337 15.34 15.34 0 01-15.337 15.337z" fill="#000" fill-rule="nonzero" stroke="none"/><path d="M0 61.231c0-3.417 2.751-6.169 6.169-6.169s6.168 2.751 6.168 6.169S9.586 67.4 6.169 67.4 0 64.648 0 61.231z" fill="#00f" fill-rule="nonzero" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Clearbit/clearbit.svg b/packages/nodes-base/nodes/Clearbit/clearbit.svg
index 72b8343f42..22f7fd495a 100644
--- a/packages/nodes-base/nodes/Clearbit/clearbit.svg
+++ b/packages/nodes-base/nodes/Clearbit/clearbit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72"><defs><linearGradient id="a" x1="50%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DEF2FE"/><stop offset="100%" stop-color="#DBF1FE"/></linearGradient><linearGradient id="b" x1="0%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#57BCFD"/><stop offset="100%" stop-color="#51B5FD"/></linearGradient><linearGradient id="c" x1="37.5%" x2="62.5%" y1="0%" y2="100%"><stop offset="0%" stop-color="#1CA7FD"/><stop offset="100%" stop-color="#148CFC"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M72 36v16.77l-.004.868c-.06 6.035-.75 8.353-2 10.688a13.63 13.63 0 0 1-5.67 5.67l-.326.171C61.658 71.364 59.16 72 52.77 72H36V36h36z"/><path fill="url(#b)" d="M64.326 2.003a13.63 13.63 0 0 1 5.67 5.67l.171.327C71.364 10.342 72 12.84 72 19.23V36H36V0h16.77c6.687 0 9.112.696 11.556 2.003z"/><path fill="url(#c)" d="M36 0v72H19.23l-.868-.004c-6.035-.06-8.353-.75-10.688-2a13.63 13.63 0 0 1-5.67-5.67L1.832 64C.636 61.658 0 59.16 0 52.77V19.23c0-6.687.696-9.112 2.003-11.556a13.63 13.63 0 0 1 5.67-5.67L8 1.832C10.342.636 12.84 0 19.23 0H36z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72"><defs><linearGradient id="a" x1="50%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DEF2FE"/><stop offset="100%" stop-color="#DBF1FE"/></linearGradient><linearGradient id="b" x1="0%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#57BCFD"/><stop offset="100%" stop-color="#51B5FD"/></linearGradient><linearGradient id="c" x1="37.5%" x2="62.5%" y1="0%" y2="100%"><stop offset="0%" stop-color="#1CA7FD"/><stop offset="100%" stop-color="#148CFC"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" d="M72 36v16.77l-.004.868c-.06 6.035-.75 8.353-2 10.688a13.63 13.63 0 01-5.67 5.67l-.326.171C61.658 71.364 59.16 72 52.77 72H36V36h36z"/><path fill="url(#b)" d="M64.326 2.003a13.63 13.63 0 015.67 5.67l.171.327C71.364 10.342 72 12.84 72 19.23V36H36V0h16.77c6.687 0 9.112.696 11.556 2.003z"/><path fill="url(#c)" d="M36 0v72H19.23l-.868-.004c-6.035-.06-8.353-.75-10.688-2a13.63 13.63 0 01-5.67-5.67L1.832 64C.636 61.658 0 59.16 0 52.77V19.23c0-6.687.696-9.112 2.003-11.556a13.63 13.63 0 015.67-5.67L8 1.832C10.342.636 12.84 0 19.23 0H36z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ClickUp/clickup.svg b/packages/nodes-base/nodes/ClickUp/clickup.svg
index a95779b2c1..29d96fe86c 100644
--- a/packages/nodes-base/nodes/ClickUp/clickup.svg
+++ b/packages/nodes-base/nodes/ClickUp/clickup.svg
@@ -1 +1 @@
-<svg width="130" height="155" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="a"><stop stop-color="#8930FD" offset="0%"/><stop stop-color="#49CCF9" offset="100%"/></linearGradient><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="b"><stop stop-color="#FF02F0" offset="0%"/><stop stop-color="#FFC800" offset="100%"/></linearGradient></defs><g fill="none"><path d="m.4 119.12 23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88z" fill="url(#a)"/><path fill="url(#b)" d="M65.18 39.84 22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
+<svg width="130" height="155" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="a"><stop stop-color="#8930FD" offset="0%"/><stop stop-color="#49CCF9" offset="100%"/></linearGradient><linearGradient x1="0%" y1="68.01%" y2="68.01%" id="b"><stop stop-color="#FF02F0" offset="0%"/><stop stop-color="#FFC800" offset="100%"/></linearGradient></defs><g fill="none"><path d="M.4 119.12l23.81-18.24C36.86 117.39 50.3 125 65.26 125c14.88 0 27.94-7.52 40.02-23.9l24.15 17.8C112 142.52 90.34 155 65.26 155c-25 0-46.87-12.4-64.86-35.88z" fill="url(#a)"/><path fill="url(#b)" d="M65.18 39.84L22.8 76.36 3.21 53.64 65.27.16l61.57 53.52-19.68 22.64z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Cortex/cortex.svg b/packages/nodes-base/nodes/Cortex/cortex.svg
index eebfd08aeb..35d1d48c2d 100644
--- a/packages/nodes-base/nodes/Cortex/cortex.svg
+++ b/packages/nodes-base/nodes/Cortex/cortex.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140" style="fill:#54c4c4"/><path class="cls-2" d="M231.17 159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9 1.9 0 0 1 .08-1.46 1.93 1.93 0 0 1 3.55.2c4.22 12.09 14 13.1 23.5 14.09 4.68.48 10 1 14.12 3.4a1.4 1.4 0 0 0 1.45 0 1.39 1.39 0 0 0 .64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.47 35.47 0 0 0-12.07-5.8 1.39 1.39 0 0 0-1.56 2 49.56 49.56 0 0 1 4 11c2.18 7.91 4.06 14.74 12.62 16.44a1.93 1.93 0 0 1 1.51 2.26 1.93 1.93 0 0 1-1.88 1.55 1.58 1.58 0 0 1-.38 0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29.19 29.19 0 0 0-4.05.27 18.5 18.5 0 0 0-9.68 4.07 1.41 1.41 0 0 0-.47 1 1.38 1.38 0 0 0 .37 1 73.85 73.85 0 0 1 11.13 16.84 1.92 1.92 0 0 1-.85 2.58 2 2 0 0 1-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12-6.31-6-11.94-7.25-15.56-7.25a14.73 14.73 0 0 0-2.85.27c-5.1 1-8.5 4.35-9.51 7a1.44 1.44 0 0 0 .12 1.23 32.6 32.6 0 0 1 2.62 5.94c2.32 6.38 4.51 12.4 15.48 12.91a1.88 1.88 0 0 1 1.33.62 1.91 1.91 0 0 1 .5 1.39 1.89 1.89 0 0 1-2 1.83c-13.53-.62-16.52-8.84-18.91-15.44a25.62 25.62 0 0 0-2.62-5.75 1 1 0 0 0-.14-.16 2 2 0 0 1-.24-.32 1.84 1.84 0 0 0-.17-.22 5.88 5.88 0 0 0-4.76-1.9c-4.69 0-8.26 1.47-10.62 4.4a13.45 13.45 0 0 0-2.12 3.84 2 2 0 0 0-.07.26 2.16 2.16 0 0 1-.15.5.87.87 0 0 0-.07.17 25.75 25.75 0 0 0-.3 12.29c1.6 7.48 6.24 16.89 19.27 19.25a22.45 22.45 0 0 0 3.92.32 70.9 70.9 0 0 0 9.77-1 83.59 83.59 0 0 1 12-1.12 33.73 33.73 0 0 1 17 4.21 1.43 1.43 0 0 0 1.16.1 1.41 1.41 0 0 0 .83-.81c2.3-5.79 5.74-9.55 8.51-12.57 5.55-6.06 9.56-10.44 3.79-25.68a1.92 1.92 0 0 1 .05-1.47 1.9 1.9 0 0 1 1.07-1 2 2 0 0 1 2.34 1.05c6.6 17.45 1.43 23.1-4.56 29.65-3 3.23-6.32 6.89-8.31 12.79a1.4 1.4 0 0 0 .51 1.58c13.47 9.74 20.52 13 27.92 13a25.17 25.17 0 0 0 2.83-.16 1.93 1.93 0 0 1 1.7 3.12 1.88 1.88 0 0 1-1.29.7 30.3 30.3 0 0 1-3.33.19c-8.5 0-16.58-3.82-32-15.17a29.36 29.36 0 0 0-18.21-5.8 79.71 79.71 0 0 0-11.55 1.1 73.31 73.31 0 0 1-10.3 1 25.76 25.76 0 0 1-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7 33.7 0 0 1-.69-6.26 1.41 1.41 0 0 0-2.36-1c-11 10.25-11.68 20.34-11.09 25.44.93 8.21 5.87 14.26 10.27 16a13 13 0 0 0 4.89.84 47.14 47.14 0 0 0 6.16-.58 61.45 61.45 0 0 1 8.46-.72c8.41 0 16.19 2.86 24.51 9a1.92 1.92 0 0 1 .42 2.68 2 2 0 0 1-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a57.85 57.85 0 0 0-8 .69 50.8 50.8 0 0 1-6.68.6 16.82 16.82 0 0 1-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48a1.4 1.4 0 0 0-1.2-1.02 1.38 1.38 0 0 0-1.41.81c-5.25 11.33-2.3 22.75 3 29a19 19 0 0 0 14.9 7.15 26.43 26.43 0 0 0 13-3.8 1.38 1.38 0 0 0 .67-.88 25.77 25.77 0 0 1 2.83-7 2 2 0 0 1 2.64-.65 1.93 1.93 0 0 1 .65 2.64c-3.74 6.18-4.8 16.88.58 24.55 4.11 5.85 11 8.82 20.56 8.82.83 0 1.68 0 2.55-.07a1.42 1.42 0 0 0 1.2-.82A1.37 1.37 0 0 0 134 192c-4.91-6.44.5-13.39 5.74-20.11s10.6-13.6 8.48-21.23a1.92 1.92 0 0 1 1.33-2.36 1.94 1.94 0 0 1 2.37 1.33c2.64 9.49-3.9 17.88-9.15 24.62-5.94 7.63-9.1 12.15-4.85 16.4a6.77 6.77 0 0 0 5 2.35c2.73 0 5.92-1.69 12-5.46 5.24-3.23 12.41-7.66 21.64-10.41a1.41 1.41 0 0 0 .2-2.61 16.22 16.22 0 0 1-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2 2 0 0 1 2.33-1.39 1.93 1.93 0 0 1 1.4 2.34c-.81 3.19-.4 5.86 1.21 7.93 2 2.64 7.28 6 20.7 6.82 2.23 0 4.41 0 6.69.2a54.18 54.18 0 0 0 19.34-3.53 1.4 1.4 0 0 0 .52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93 1.93 0 0 1 1.73-2.11 1.91 1.91 0 0 1 2.1 1.73c.41 4.29 3.25 5.5 6.86 7 2.53 1.08 5.68 2.41 7.72 5.3a1.41 1.41 0 0 0 2 .28c2.95-2.4 4.45-5.21 4.45-8.34"/><path class="cls-2" d="M200 177.4c-1.1 0-2.15-.09-3.29-.15-17.52.28-29 7.36-37.35 12.52a65.71 65.71 0 0 1-8.53 4.69 1.4 1.4 0 0 0-.22 2.47 37.57 37.57 0 0 0 4.61 2.42 19.8 19.8 0 0 0 5.63 1.44c5 .74 9 1.33 10.77 15.26a1.4 1.4 0 0 0 1.39 1.22h9.87a1.4 1.4 0 0 0 1.39-1.6c-1.93-13.8-.17-14.81 3.71-17a28 28 0 0 0 4.37-2.93c3.83-3.23 7.8-6.56 9-16.75a1.38 1.38 0 0 0-.33-1.08 1.39 1.39 0 0 0-1-.48"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 11150 10a140 140 0 01140 140" fill="#54c4c4"/><path class="cls-2" d="M231.17 159.29c0-12.87-6.51-14.17-18-15.36-10.18-1.06-21.71-2.25-26.73-16.65a1.9 1.9 0 01.08-1.46 1.93 1.93 0 013.55.2c4.22 12.09 14 13.1 23.5 14.09 4.68.48 10 1 14.12 3.4a1.4 1.4 0 001.45 0 1.39 1.39 0 00.64-1.3c-2.23-25.82-13.16-38.79-21.94-45.12a35.47 35.47 0 00-12.07-5.8 1.39 1.39 0 00-1.56 2 49.56 49.56 0 014 11c2.18 7.91 4.06 14.74 12.62 16.44a1.93 1.93 0 011.51 2.26 1.93 1.93 0 01-1.88 1.55 1.58 1.58 0 01-.38 0c-10.9-2.16-13.28-10.82-15.59-19.23-1.55-5.61-3-10.91-7-14.2-5.61-4.65-15-7.78-23.37-7.78a29.19 29.19 0 00-4.05.27 18.5 18.5 0 00-9.68 4.07 1.41 1.41 0 00-.47 1 1.38 1.38 0 00.37 1 73.85 73.85 0 0111.13 16.84 1.92 1.92 0 01-.85 2.58 2 2 0 01-2.59-.86c-3.87-7.76-8.11-13.86-12.58-18.12-6.31-6-11.94-7.25-15.56-7.25a14.73 14.73 0 00-2.85.27c-5.1 1-8.5 4.35-9.51 7a1.44 1.44 0 00.12 1.23 32.6 32.6 0 012.62 5.94c2.32 6.38 4.51 12.4 15.48 12.91a1.88 1.88 0 011.33.62 1.91 1.91 0 01.5 1.39 1.89 1.89 0 01-2 1.83c-13.53-.62-16.52-8.84-18.91-15.44a25.62 25.62 0 00-2.62-5.75 1 1 0 00-.14-.16 2 2 0 01-.24-.32 1.84 1.84 0 00-.17-.22 5.88 5.88 0 00-4.76-1.9c-4.69 0-8.26 1.47-10.62 4.4a13.45 13.45 0 00-2.12 3.84 2 2 0 00-.07.26 2.16 2.16 0 01-.15.5.87.87 0 00-.07.17 25.75 25.75 0 00-.3 12.29c1.6 7.48 6.24 16.89 19.27 19.25a22.45 22.45 0 003.92.32 70.9 70.9 0 009.77-1 83.59 83.59 0 0112-1.12 33.73 33.73 0 0117 4.21 1.43 1.43 0 001.16.1 1.41 1.41 0 00.83-.81c2.3-5.79 5.74-9.55 8.51-12.57 5.55-6.06 9.56-10.44 3.79-25.68a1.92 1.92 0 01.05-1.47 1.9 1.9 0 011.07-1 2 2 0 012.34 1.05c6.6 17.45 1.43 23.1-4.56 29.65-3 3.23-6.32 6.89-8.31 12.79a1.4 1.4 0 00.51 1.58c13.47 9.74 20.52 13 27.92 13a25.17 25.17 0 002.83-.16 1.93 1.93 0 011.7 3.12 1.88 1.88 0 01-1.29.7 30.3 30.3 0 01-3.33.19c-8.5 0-16.58-3.82-32-15.17a29.36 29.36 0 00-18.21-5.8 79.71 79.71 0 00-11.55 1.1 73.31 73.31 0 01-10.3 1 25.76 25.76 0 01-4.62-.39c-11.8-2.14-19.74-10-22.36-22.22a33.7 33.7 0 01-.69-6.26 1.41 1.41 0 00-2.36-1c-11 10.25-11.68 20.34-11.09 25.44.93 8.21 5.87 14.26 10.27 16a13 13 0 004.89.84 47.14 47.14 0 006.16-.58 61.45 61.45 0 018.46-.72c8.41 0 16.19 2.86 24.51 9a1.92 1.92 0 01.42 2.68 2 2 0 01-2.69.42c-7.63-5.62-14.69-8.23-22.21-8.23a57.85 57.85 0 00-8 .69 50.8 50.8 0 01-6.68.6 16.82 16.82 0 01-6.29-1.1c-5.42-2.14-10.13-8.22-12-15.48a1.4 1.4 0 00-1.2-1.02 1.38 1.38 0 00-1.41.81c-5.25 11.33-2.3 22.75 3 29a19 19 0 0014.9 7.15 26.43 26.43 0 0013-3.8 1.38 1.38 0 00.67-.88 25.77 25.77 0 012.83-7 2 2 0 012.64-.65 1.93 1.93 0 01.65 2.64c-3.74 6.18-4.8 16.88.58 24.55 4.11 5.85 11 8.82 20.56 8.82.83 0 1.68 0 2.55-.07a1.42 1.42 0 001.2-.82A1.37 1.37 0 00134 192c-4.91-6.44.5-13.39 5.74-20.11s10.6-13.6 8.48-21.23a1.92 1.92 0 011.33-2.36 1.94 1.94 0 012.37 1.33c2.64 9.49-3.9 17.88-9.15 24.62-5.94 7.63-9.1 12.15-4.85 16.4a6.77 6.77 0 005 2.35c2.73 0 5.92-1.69 12-5.46 5.24-3.23 12.41-7.66 21.64-10.41a1.41 1.41 0 00.2-2.61 16.22 16.22 0 01-6-4.52c-2.39-3.06-3-6.84-1.91-11.24a2 2 0 012.33-1.39 1.93 1.93 0 011.4 2.34c-.81 3.19-.4 5.86 1.21 7.93 2 2.64 7.28 6 20.7 6.82 2.23 0 4.41 0 6.69.2a54.18 54.18 0 0019.34-3.53 1.4 1.4 0 00.52-2.23c-1.3-1.45-3.14-2.3-5.59-3.35-3.81-1.61-8.54-3.62-9.18-10.19a1.93 1.93 0 011.73-2.11 1.91 1.91 0 012.1 1.73c.41 4.29 3.25 5.5 6.86 7 2.53 1.08 5.68 2.41 7.72 5.3a1.41 1.41 0 002 .28c2.95-2.4 4.45-5.21 4.45-8.34"/><path class="cls-2" d="M200 177.4c-1.1 0-2.15-.09-3.29-.15-17.52.28-29 7.36-37.35 12.52a65.71 65.71 0 01-8.53 4.69 1.4 1.4 0 00-.22 2.47 37.57 37.57 0 004.61 2.42 19.8 19.8 0 005.63 1.44c5 .74 9 1.33 10.77 15.26a1.4 1.4 0 001.39 1.22h9.87a1.4 1.4 0 001.39-1.6c-1.93-13.8-.17-14.81 3.71-17a28 28 0 004.37-2.93c3.83-3.23 7.8-6.56 9-16.75a1.38 1.38 0 00-.33-1.08 1.39 1.39 0 00-1-.48"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/DeepL/deepl.svg b/packages/nodes-base/nodes/DeepL/deepl.svg
index fd01fb99fd..0738c3c766 100644
--- a/packages/nodes-base/nodes/DeepL/deepl.svg
+++ b/packages/nodes-base/nodes/DeepL/deepl.svg
@@ -1 +1 @@
-<svg height="64" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M54.579 12.268 34.204.643a4.781 4.781 0 0 0-4.5 0L9.329 12.268c-1.375.75-2.25 2.25-2.25 3.875v23.75c0 1.625.875 3.125 2.25 3.875l35.125 20.25V49.643l10.125-5.875c1.375-.75 2.25-2.25 2.25-3.875v-23.75c.125-1.625-.875-3.125-2.25-3.875zm-25.75 26.125c0 2.375-1.875 4.25-4.25 4.25s-4.25-1.875-4.25-4.25 1.875-4.25 4.25-4.25c1.125 0 2 .375 2.75 1l7.5-4.25c.375.875.875 1.75 1.375 2.5l-7.5 4.25c.125.25.125.5.125.75zm13-5.625a4.215 4.215 0 0 1-4.25-4.25c0-.25 0-.5.125-.75l-10.25-5.875c-.75.625-1.75 1-2.75 1-2.375 0-4.25-1.875-4.25-4.25s1.875-4.25 4.25-4.25 4.25 1.875 4.25 4.25c0 .25 0 .5-.125.75l10.25 5.875c.75-.625 1.75-1.125 2.875-1.125a4.215 4.215 0 0 1 4.25 4.25c-.125 2.375-2 4.375-4.375 4.375z" fill="#042b48"/></svg>
\ No newline at end of file
+<svg height="64" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M54.579 12.268L34.204.643a4.781 4.781 0 00-4.5 0L9.329 12.268c-1.375.75-2.25 2.25-2.25 3.875v23.75c0 1.625.875 3.125 2.25 3.875l35.125 20.25V49.643l10.125-5.875c1.375-.75 2.25-2.25 2.25-3.875v-23.75c.125-1.625-.875-3.125-2.25-3.875zm-25.75 26.125c0 2.375-1.875 4.25-4.25 4.25s-4.25-1.875-4.25-4.25 1.875-4.25 4.25-4.25c1.125 0 2 .375 2.75 1l7.5-4.25c.375.875.875 1.75 1.375 2.5l-7.5 4.25c.125.25.125.5.125.75zm13-5.625a4.215 4.215 0 01-4.25-4.25c0-.25 0-.5.125-.75l-10.25-5.875c-.75.625-1.75 1-2.75 1-2.375 0-4.25-1.875-4.25-4.25s1.875-4.25 4.25-4.25 4.25 1.875 4.25 4.25c0 .25 0 .5-.125.75l10.25 5.875c.75-.625 1.75-1.125 2.875-1.125a4.215 4.215 0 014.25 4.25c-.125 2.375-2 4.375-4.375 4.375z" fill="#042b48"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Demio/demio.svg b/packages/nodes-base/nodes/Demio/demio.svg
index 7e64136ba8..3698f1e463 100644
--- a/packages/nodes-base/nodes/Demio/demio.svg
+++ b/packages/nodes-base/nodes/Demio/demio.svg
@@ -1 +1 @@
-<svg viewBox="45 55 310 310" xmlns="http://www.w3.org/2000/svg"><path d="M186.014 72.737c-5.011.543-9.553 1.267-9.99 1.592-.22.163-2.055.596-4.078.962-3.435.622-16.058 4.437-16.501 4.987-.11.136-1.189.591-2.398 1.011-2.083.723-10.409 4.656-12.987 6.134-3.401 1.951-8.416 5.034-8.591 5.282-.11.155-.65.516-1.199.801-1.337.694-5.62 3.794-8.147 5.895-1.124.935-2.64 2.193-3.37 2.797-2.798 2.315-14.9 14.608-15.474 15.717-.331.641-.763 1.166-.959 1.166-.196 0-.719.584-1.162 1.299-.443.714-1.169 1.687-1.613 2.161-.444.475-1.443 1.856-2.219 3.071-.777 1.214-1.597 2.321-1.823 2.461-.225.139-.761.941-1.19 1.783-.429.841-1.011 1.773-1.293 2.07-.282.298-1.042 1.529-1.689 2.735-.647 1.207-1.571 2.778-2.055 3.49-.484.713-1.213 2.108-1.621 3.1-.408.991-.85 1.804-.982 1.804-.132.001-.737 1.216-1.344 2.699a127.76 127.76 0 0 1-2.458 5.525c-.744 1.554-1.353 3.086-1.353 3.402 0 .317-.352 1.233-.782 2.036-.431.804-1.251 3.139-1.823 5.189-.572 2.051-1.207 4.088-1.41 4.528-.573 1.236-1.409 4.801-2.157 9.19-.374 2.198-.848 4.356-1.052 4.796-1.77 3.802-3.04 113.303-1.423 122.672 1.257 7.287 4.856 12.927 12.079 18.934 3.185 2.648 8.829 4.7 14.425 5.244 5.107.497 92.915.503 103.422.008 8.183-.386 16.956-1.328 18.382-1.974.439-.199 1.968-.57 3.396-.824 3.535-.628 9.301-2.031 9.791-2.382.219-.157 1.838-.697 3.596-1.198 1.758-.502 3.736-1.155 4.396-1.451.659-.296 2.723-1.095 4.586-1.775 1.863-.681 3.481-1.363 3.596-1.517.115-.154 1.288-.707 2.607-1.228 1.319-.522 2.847-1.232 3.396-1.578.55-.347 2.168-1.222 3.597-1.945 1.428-.724 3.856-2.113 5.394-3.087a287.642 287.642 0 0 1 4.896-3.027c1.153-.69 2.097-1.421 2.097-1.625 0-.204.188-.37.417-.37.229 0 1.421-.765 2.649-1.699a141.244 141.244 0 0 1 3.079-2.291c.467-.325 2.287-1.832 4.045-3.348 7.841-6.76 14.897-14.283 20.853-22.233.906-1.209 1.979-2.75 2.385-3.425.406-.676 1.625-2.564 2.709-4.196 1.083-1.633 2.49-3.999 3.125-5.26.635-1.26 1.295-2.378 1.466-2.484.171-.106.915-1.592 1.653-3.303.738-1.71 1.455-3.2 1.594-3.31.138-.11.756-1.548 1.373-3.197.616-1.648 1.283-3.205 1.482-3.459.373-.479 2.321-6.36 2.321-7.008 0-.201.35-1.133.777-2.07.427-.938 1.256-4.12 1.841-7.071.585-2.952 1.217-5.726 1.404-6.166 1.588-3.739 2.474-23.654 1.55-34.843-.644-7.801-3.395-22.204-4.792-25.097-.213-.439-.82-2.238-1.349-3.996-.992-3.295-4.181-11.434-4.619-11.788-.136-.11-.561-1.009-.944-1.998-.383-.989-1.003-2.358-1.378-3.041a363.68 363.68 0 0 1-2.231-4.196c-.852-1.624-1.681-3.043-1.842-3.153-.161-.11-.614-.829-1.005-1.598-.392-.769-1.496-2.5-2.454-3.847-.957-1.347-1.741-2.641-1.741-2.877 0-.236-.241-.573-.536-.749-.295-.175-.875-.859-1.289-1.518-2.571-4.098-14.001-16.5-19.369-21.017-4.082-3.435-6.643-5.456-7.479-5.904a7.471 7.471 0 0 1-1.463-1.074c-.878-.878-7.699-5.372-8.153-5.372-.206 0-.561-.225-.79-.5-.228-.276-1.644-1.124-3.146-1.885-1.501-.761-2.825-1.515-2.941-1.677-.116-.161-1.555-.862-3.197-1.557-1.642-.694-3.18-1.419-3.417-1.61-.237-.191-1.675-.816-3.196-1.388-1.522-.573-3.716-1.475-4.876-2.006-1.16-.531-2.26-.965-2.443-.965-.184 0-2.123-.602-4.31-1.337-2.188-.735-6.033-1.742-8.546-2.238-2.513-.496-4.929-1.066-5.368-1.266-3.1-1.41-29.712-2.48-38.362-1.543m21.408 46.586c3.502.597 11.586 3.514 13.157 4.747.33.258 1.463.963 2.517 1.565 2.322 1.326 9.521 8.152 10.729 10.173.478.8 1.189 1.814 1.58 2.254 1.463 1.646 4.354 8.1 5.193 11.588.475 1.978 1.065 4.029 1.312 4.556.68 1.459.631 51.261-.052 51.488-.275.092-.499.558-.499 1.035 0 7.229-9.675 22.237-17.172 26.638-.936.549-2.029 1.302-2.429 1.672-.4.371-2.043 1.246-3.65 1.947-1.608.7-3.103 1.41-3.323 1.579-4.574 3.514-23.807 2.909-32.061-1.008-1.614-.766-3.079-1.393-3.257-1.393-.177 0-.648-.36-1.045-.799-.398-.44-.879-.8-1.07-.8-.653 0-3.705-2.197-4.856-3.496-.632-.714-1.401-1.299-1.708-1.299-.307 0-.558-.143-.558-.319 0-.175-.675-1.031-1.499-1.9-2.217-2.34-4.656-5.726-5.899-8.191-.604-1.197-1.228-2.267-1.386-2.377-.415-.288-1.812-4.227-2.409-6.793-.282-1.209-.653-2.291-.825-2.404-1.191-.783-1.617-50.057-.466-53.94 2.851-9.621 2.728-9.294 5.092-13.572.785-1.42 1.556-2.679 1.713-2.797.158-.118.791-.959 1.408-1.869 1.195-1.761 5.312-5.927 8.239-8.335 1.619-1.332 2.477-1.87 6.174-3.872 7.636-4.135 17.759-5.661 27.05-4.078m-14.415 14.587c-3.653.969-5.667 1.685-6.178 2.195-.307.307-.665.558-.795.558-.35 0-3.383 2.047-4.736 3.197-2.173 1.846-5.719 6.641-6.675 9.025-.521 1.3-1.095 2.466-1.277 2.59-1.441.991-2.355 44.928-1.096 52.686 1.478 9.111 9.321 18.2 17.96 20.813 1.648.499 3.429 1.107 3.957 1.353 1.296.602 10.537.585 11.271-.021.306-.253 1.244-.589 2.085-.746 1.998-.373 4.933-1.496 5.786-2.214.373-.313 1.127-.773 1.676-1.023 4.096-1.861 11.189-11.174 11.189-14.689 0-.316.176-.634.392-.708 1.777-.604 1.779-54.279.002-54.279-.162 0-.403-.542-.535-1.205-.328-1.636-2.226-5.588-2.685-5.588-.204 0-.371-.286-.371-.635 0-.966-6.47-7.156-8.342-7.983-.907-.399-1.648-.847-1.648-.995 0-.368-3.153-1.542-5.914-2.202-2.593-.619-11.895-.705-14.066-.129m10.973 27.778c3.089 2.359 3.013 1.807 3.013 21.98v17.86l-1.016 1.734c-2.654 4.528-9.599 4.385-12.05-.249l-.92-1.74v-17.732c0-19.722-.031-19.472 2.646-21.57 2.97-2.329 5.533-2.416 8.327-.283m65.79 55.723c3.829 2.727 4.95 6.8 2.935 10.663-.315.603-.573 1.327-.575 1.609-.006 1.408-3.042 9.02-4.975 12.475-2.169 3.877-3.594 6.142-4.438 7.052-.538.581-.979 1.207-.979 1.391 0 .938-10.79 11.864-14.186 14.365-3.174 2.337-9.438 6.363-9.899 6.363-.202 0-.9.379-1.551.843-.651.464-2.562 1.374-4.246 2.022-1.683.648-3.246 1.328-3.472 1.51-.737.594-10.299 3.283-14.398 4.049-8.227 1.539-22.502 1.399-30.37-.295a413.861 413.861 0 0 0-3.196-.681 2.975 2.975 0 0 1-.8-.32c-.219-.134-1.902-.629-3.739-1.102-1.837-.473-3.995-1.191-4.795-1.597-.801-.405-2.714-1.232-4.253-1.836-1.538-.605-3.067-1.319-3.396-1.587-.33-.268-1.67-1.009-2.978-1.646-1.308-.637-2.694-1.466-3.08-1.841-.386-.376-1.429-1.054-2.317-1.507-.889-.453-1.615-.972-1.615-1.154 0-.182-.35-.493-.778-.691-2.639-1.225-11.242-9.9-15.416-15.545-1.305-1.766-5.385-8.435-5.385-8.804 0-.128-.54-1.322-1.201-2.654-5.25-10.582-5.176-17.183.215-19.284 4.739-1.846 8.566.514 10.16 6.265 1.038 3.748 3.212 8.729 5.545 12.707 3.117 5.315 12.606 15.565 14.41 15.565.243 0 .442.172.442.383 0 .211.854.87 1.898 1.465 1.044.595 2.257 1.389 2.697 1.765 1.046.893 8.848 4.654 10.39 5.009.659.151 1.93.601 2.825.999 5.355 2.382 25.756 3.641 33.139 2.045 4.764-1.03 7.6-1.762 7.992-2.062.219-.169 1.388-.622 2.597-1.006 2.622-.833 9.685-4.33 11.426-5.657.68-.519 1.415-.943 1.632-.943.217 0 .92-.534 1.561-1.187.641-.654 1.353-1.193 1.582-1.199.824-.022 9.881-9.227 11.216-11.4.405-.659.861-1.29 1.012-1.402.28-.205 2.506-3.99 3.641-6.19 1.034-2.004 1.896-4.19 1.896-4.809 0-.322.153-.586.34-.586.188 0 .65-1.214 1.029-2.697 1.708-6.693 1.729-6.732 4.647-8.662 2.425-1.605 4.744-1.673 6.811-.201" fill="#00bf6f" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg viewBox="45 55 310 310" xmlns="http://www.w3.org/2000/svg"><path d="M186.014 72.737c-5.011.543-9.553 1.267-9.99 1.592-.22.163-2.055.596-4.078.962-3.435.622-16.058 4.437-16.501 4.987-.11.136-1.189.591-2.398 1.011-2.083.723-10.409 4.656-12.987 6.134-3.401 1.951-8.416 5.034-8.591 5.282-.11.155-.65.516-1.199.801-1.337.694-5.62 3.794-8.147 5.895-1.124.935-2.64 2.193-3.37 2.797-2.798 2.315-14.9 14.608-15.474 15.717-.331.641-.763 1.166-.959 1.166-.196 0-.719.584-1.162 1.299-.443.714-1.169 1.687-1.613 2.161-.444.475-1.443 1.856-2.219 3.071-.777 1.214-1.597 2.321-1.823 2.461-.225.139-.761.941-1.19 1.783-.429.841-1.011 1.773-1.293 2.07-.282.298-1.042 1.529-1.689 2.735-.647 1.207-1.571 2.778-2.055 3.49-.484.713-1.213 2.108-1.621 3.1-.408.991-.85 1.804-.982 1.804-.132.001-.737 1.216-1.344 2.699a127.76 127.76 0 01-2.458 5.525c-.744 1.554-1.353 3.086-1.353 3.402 0 .317-.352 1.233-.782 2.036-.431.804-1.251 3.139-1.823 5.189-.572 2.051-1.207 4.088-1.41 4.528-.573 1.236-1.409 4.801-2.157 9.19-.374 2.198-.848 4.356-1.052 4.796-1.77 3.802-3.04 113.303-1.423 122.672 1.257 7.287 4.856 12.927 12.079 18.934 3.185 2.648 8.829 4.7 14.425 5.244 5.107.497 92.915.503 103.422.008 8.183-.386 16.956-1.328 18.382-1.974.439-.199 1.968-.57 3.396-.824 3.535-.628 9.301-2.031 9.791-2.382.219-.157 1.838-.697 3.596-1.198 1.758-.502 3.736-1.155 4.396-1.451.659-.296 2.723-1.095 4.586-1.775 1.863-.681 3.481-1.363 3.596-1.517.115-.154 1.288-.707 2.607-1.228 1.319-.522 2.847-1.232 3.396-1.578.55-.347 2.168-1.222 3.597-1.945 1.428-.724 3.856-2.113 5.394-3.087a287.642 287.642 0 014.896-3.027c1.153-.69 2.097-1.421 2.097-1.625 0-.204.188-.37.417-.37.229 0 1.421-.765 2.649-1.699a141.244 141.244 0 013.079-2.291c.467-.325 2.287-1.832 4.045-3.348 7.841-6.76 14.897-14.283 20.853-22.233.906-1.209 1.979-2.75 2.385-3.425.406-.676 1.625-2.564 2.709-4.196 1.083-1.633 2.49-3.999 3.125-5.26.635-1.26 1.295-2.378 1.466-2.484.171-.106.915-1.592 1.653-3.303.738-1.71 1.455-3.2 1.594-3.31.138-.11.756-1.548 1.373-3.197.616-1.648 1.283-3.205 1.482-3.459.373-.479 2.321-6.36 2.321-7.008 0-.201.35-1.133.777-2.07.427-.938 1.256-4.12 1.841-7.071.585-2.952 1.217-5.726 1.404-6.166 1.588-3.739 2.474-23.654 1.55-34.843-.644-7.801-3.395-22.204-4.792-25.097-.213-.439-.82-2.238-1.349-3.996-.992-3.295-4.181-11.434-4.619-11.788-.136-.11-.561-1.009-.944-1.998-.383-.989-1.003-2.358-1.378-3.041a363.68 363.68 0 01-2.231-4.196c-.852-1.624-1.681-3.043-1.842-3.153-.161-.11-.614-.829-1.005-1.598-.392-.769-1.496-2.5-2.454-3.847-.957-1.347-1.741-2.641-1.741-2.877 0-.236-.241-.573-.536-.749-.295-.175-.875-.859-1.289-1.518-2.571-4.098-14.001-16.5-19.369-21.017-4.082-3.435-6.643-5.456-7.479-5.904a7.471 7.471 0 01-1.463-1.074c-.878-.878-7.699-5.372-8.153-5.372-.206 0-.561-.225-.79-.5-.228-.276-1.644-1.124-3.146-1.885-1.501-.761-2.825-1.515-2.941-1.677-.116-.161-1.555-.862-3.197-1.557-1.642-.694-3.18-1.419-3.417-1.61-.237-.191-1.675-.816-3.196-1.388-1.522-.573-3.716-1.475-4.876-2.006-1.16-.531-2.26-.965-2.443-.965-.184 0-2.123-.602-4.31-1.337-2.188-.735-6.033-1.742-8.546-2.238-2.513-.496-4.929-1.066-5.368-1.266-3.1-1.41-29.712-2.48-38.362-1.543m21.408 46.586c3.502.597 11.586 3.514 13.157 4.747.33.258 1.463.963 2.517 1.565 2.322 1.326 9.521 8.152 10.729 10.173.478.8 1.189 1.814 1.58 2.254 1.463 1.646 4.354 8.1 5.193 11.588.475 1.978 1.065 4.029 1.312 4.556.68 1.459.631 51.261-.052 51.488-.275.092-.499.558-.499 1.035 0 7.229-9.675 22.237-17.172 26.638-.936.549-2.029 1.302-2.429 1.672-.4.371-2.043 1.246-3.65 1.947-1.608.7-3.103 1.41-3.323 1.579-4.574 3.514-23.807 2.909-32.061-1.008-1.614-.766-3.079-1.393-3.257-1.393-.177 0-.648-.36-1.045-.799-.398-.44-.879-.8-1.07-.8-.653 0-3.705-2.197-4.856-3.496-.632-.714-1.401-1.299-1.708-1.299-.307 0-.558-.143-.558-.319 0-.175-.675-1.031-1.499-1.9-2.217-2.34-4.656-5.726-5.899-8.191-.604-1.197-1.228-2.267-1.386-2.377-.415-.288-1.812-4.227-2.409-6.793-.282-1.209-.653-2.291-.825-2.404-1.191-.783-1.617-50.057-.466-53.94 2.851-9.621 2.728-9.294 5.092-13.572.785-1.42 1.556-2.679 1.713-2.797.158-.118.791-.959 1.408-1.869 1.195-1.761 5.312-5.927 8.239-8.335 1.619-1.332 2.477-1.87 6.174-3.872 7.636-4.135 17.759-5.661 27.05-4.078m-14.415 14.587c-3.653.969-5.667 1.685-6.178 2.195-.307.307-.665.558-.795.558-.35 0-3.383 2.047-4.736 3.197-2.173 1.846-5.719 6.641-6.675 9.025-.521 1.3-1.095 2.466-1.277 2.59-1.441.991-2.355 44.928-1.096 52.686 1.478 9.111 9.321 18.2 17.96 20.813 1.648.499 3.429 1.107 3.957 1.353 1.296.602 10.537.585 11.271-.021.306-.253 1.244-.589 2.085-.746 1.998-.373 4.933-1.496 5.786-2.214.373-.313 1.127-.773 1.676-1.023 4.096-1.861 11.189-11.174 11.189-14.689 0-.316.176-.634.392-.708 1.777-.604 1.779-54.279.002-54.279-.162 0-.403-.542-.535-1.205-.328-1.636-2.226-5.588-2.685-5.588-.204 0-.371-.286-.371-.635 0-.966-6.47-7.156-8.342-7.983-.907-.399-1.648-.847-1.648-.995 0-.368-3.153-1.542-5.914-2.202-2.593-.619-11.895-.705-14.066-.129m10.973 27.778c3.089 2.359 3.013 1.807 3.013 21.98v17.86l-1.016 1.734c-2.654 4.528-9.599 4.385-12.05-.249l-.92-1.74v-17.732c0-19.722-.031-19.472 2.646-21.57 2.97-2.329 5.533-2.416 8.327-.283m65.79 55.723c3.829 2.727 4.95 6.8 2.935 10.663-.315.603-.573 1.327-.575 1.609-.006 1.408-3.042 9.02-4.975 12.475-2.169 3.877-3.594 6.142-4.438 7.052-.538.581-.979 1.207-.979 1.391 0 .938-10.79 11.864-14.186 14.365-3.174 2.337-9.438 6.363-9.899 6.363-.202 0-.9.379-1.551.843-.651.464-2.562 1.374-4.246 2.022-1.683.648-3.246 1.328-3.472 1.51-.737.594-10.299 3.283-14.398 4.049-8.227 1.539-22.502 1.399-30.37-.295a413.861 413.861 0 00-3.196-.681 2.975 2.975 0 01-.8-.32c-.219-.134-1.902-.629-3.739-1.102-1.837-.473-3.995-1.191-4.795-1.597-.801-.405-2.714-1.232-4.253-1.836-1.538-.605-3.067-1.319-3.396-1.587-.33-.268-1.67-1.009-2.978-1.646-1.308-.637-2.694-1.466-3.08-1.841-.386-.376-1.429-1.054-2.317-1.507-.889-.453-1.615-.972-1.615-1.154 0-.182-.35-.493-.778-.691-2.639-1.225-11.242-9.9-15.416-15.545-1.305-1.766-5.385-8.435-5.385-8.804 0-.128-.54-1.322-1.201-2.654-5.25-10.582-5.176-17.183.215-19.284 4.739-1.846 8.566.514 10.16 6.265 1.038 3.748 3.212 8.729 5.545 12.707 3.117 5.315 12.606 15.565 14.41 15.565.243 0 .442.172.442.383 0 .211.854.87 1.898 1.465 1.044.595 2.257 1.389 2.697 1.765 1.046.893 8.848 4.654 10.39 5.009.659.151 1.93.601 2.825.999 5.355 2.382 25.756 3.641 33.139 2.045 4.764-1.03 7.6-1.762 7.992-2.062.219-.169 1.388-.622 2.597-1.006 2.622-.833 9.685-4.33 11.426-5.657.68-.519 1.415-.943 1.632-.943.217 0 .92-.534 1.561-1.187.641-.654 1.353-1.193 1.582-1.199.824-.022 9.881-9.227 11.216-11.4.405-.659.861-1.29 1.012-1.402.28-.205 2.506-3.99 3.641-6.19 1.034-2.004 1.896-4.19 1.896-4.809 0-.322.153-.586.34-.586.188 0 .65-1.214 1.029-2.697 1.708-6.693 1.729-6.732 4.647-8.662 2.425-1.605 4.744-1.673 6.811-.201" fill="#00bf6f" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Discourse/discourse.svg b/packages/nodes-base/nodes/Discourse/discourse.svg
index f568d23ff6..3bb78593df 100644
--- a/packages/nodes-base/nodes/Discourse/discourse.svg
+++ b/packages/nodes-base/nodes/Discourse/discourse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><g data-name="Layer 2"><g data-name="Layer 3"><path d="M51.87 0C23.71 0 0 22.83 0 51v52.81l51.86-.05c28.16 0 51-23.71 51-51.87S80 0 51.87 0z" style="fill:#231f20"/><path d="M52.37 19.74a31.62 31.62 0 0 0-27.79 46.67l-5.72 18.4 20.54-4.64a31.61 31.61 0 1 0 13-60.43z" style="fill:#fff9ae"/><path d="M77.45 32.12a31.6 31.6 0 0 1-38.05 48l-20.54 4.7 20.91-2.47a31.6 31.6 0 0 0 37.68-50.23z" style="fill:#00aeef"/><path d="M71.63 26.29A31.6 31.6 0 0 1 38.8 78l-19.94 6.82 20.54-4.65a31.6 31.6 0 0 0 32.23-53.88z" style="fill:#00a94f"/><path d="M26.47 67.11a31.61 31.61 0 0 1 51-35 31.61 31.61 0 0 0-52.89 34.3l-5.72 18.4z" style="fill:#f15d22"/><path d="M24.58 66.41a31.61 31.61 0 0 1 47.05-40.12 31.61 31.61 0 0 0-49 39.63l-3.76 18.9z" style="fill:#e31b23"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -1 104 106"><g data-name="Layer 2"><g data-name="Layer 3"><path d="M51.87 0C23.71 0 0 22.83 0 51v52.81l51.86-.05c28.16 0 51-23.71 51-51.87S80 0 51.87 0z" fill="#231f20"/><path d="M52.37 19.74a31.62 31.62 0 00-27.79 46.67l-5.72 18.4 20.54-4.64a31.61 31.61 0 1013-60.43z" fill="#fff9ae"/><path d="M77.45 32.12a31.6 31.6 0 01-38.05 48l-20.54 4.7 20.91-2.47a31.6 31.6 0 0037.68-50.23z" fill="#00aeef"/><path d="M71.63 26.29A31.6 31.6 0 0138.8 78l-19.94 6.82 20.54-4.65a31.6 31.6 0 0032.23-53.88z" fill="#00a94f"/><path d="M26.47 67.11a31.61 31.61 0 0151-35 31.61 31.61 0 00-52.89 34.3l-5.72 18.4z" fill="#f15d22"/><path d="M24.58 66.41a31.61 31.61 0 0147.05-40.12 31.61 31.61 0 00-49 39.63l-3.76 18.9z" fill="#e31b23"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Dropbox/dropbox.svg b/packages/nodes-base/nodes/Dropbox/dropbox.svg
index 0701c5a726..9be2f8d406 100644
--- a/packages/nodes-base/nodes/Dropbox/dropbox.svg
+++ b/packages/nodes-base/nodes/Dropbox/dropbox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 62" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><path d="M18.874.02 0 12.18l13.066 10.526L32 11.032m-32 22 18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28 45.188 0 32 11.01l18.994 11.674M32.06 36.778 18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69" stroke="none" fill="#007ee5" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 62" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><path d="M18.874.02L0 12.18l13.066 10.526L32 11.032m-32 22l18.874 12.4L32 34.422 13.066 22.686M32 34.422l13.188 11.01L64 33.152 50.994 22.686M64 12.28L45.188 0 32 11.01l18.994 11.674M32.06 36.778L18.872 47.726l-5.686-3.69v4.174L32.06 59.522 50.934 48.21v-4.174l-5.686 3.69" stroke="none" fill="#007ee5" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ERPNext/erpnext.svg b/packages/nodes-base/nodes/ERPNext/erpnext.svg
index cbe9c55edc..4e61fdc20e 100644
--- a/packages/nodes-base/nodes/ERPNext/erpnext.svg
+++ b/packages/nodes-base/nodes/ERPNext/erpnext.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" xml:space="preserve"><path fill="#7574FF" d="M512 448c0 35.2-28.8 64-64 64H64c-35.2 0-64-28.8-64-64V64C0 28.8 28.8 0 64 0h384c35.2 0 64 28.8 64 64v384z"/><path fill="#FFF" d="M150.483 371.684V141.15c0-15.167 9.534-25.133 23.833-25.133h162.5c13.866 0 20.8 6.933 20.8 18.633v2.6c0 12.133-6.934 18.633-20.8 18.633h-141.7v78.434H304.75c14.3 0 20.8 6.066 20.8 17.767v1.3c0 12.133-6.934 18.633-20.8 18.633H195.117v84.934h144.3c13.867 0 20.367 6.066 20.367 17.767v2.167c0 12.566-6.5 19.5-20.367 19.5h-165.1c-14.3-.001-23.834-9.534-23.834-24.701z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><path fill="#7574FF" d="M512 448c0 35.2-28.8 64-64 64H64c-35.2 0-64-28.8-64-64V64C0 28.8 28.8 0 64 0h384c35.2 0 64 28.8 64 64v384z"/><path fill="#FFF" d="M150.483 371.684V141.15c0-15.167 9.534-25.133 23.833-25.133h162.5c13.866 0 20.8 6.933 20.8 18.633v2.6c0 12.133-6.934 18.633-20.8 18.633h-141.7v78.434H304.75c14.3 0 20.8 6.066 20.8 17.767v1.3c0 12.133-6.934 18.633-20.8 18.633H195.117v84.934h144.3c13.867 0 20.367 6.066 20.367 17.767v2.167c0 12.566-6.5 19.5-20.367 19.5h-165.1c-14.3-.001-23.834-9.534-23.834-24.701z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Emelia/emelia.svg b/packages/nodes-base/nodes/Emelia/emelia.svg
index fd34e9de0c..3a59dfc009 100644
--- a/packages/nodes-base/nodes/Emelia/emelia.svg
+++ b/packages/nodes-base/nodes/Emelia/emelia.svg
@@ -1 +1 @@
-<svg viewBox="-2 2 45 45" xmlns="http://www.w3.org/2000/svg"><path d="M29.714 6.539H9.078a2.109 2.109 0 0 0-2.007 2.762l5.484 16.863 4.219-1.817a2.69 2.69 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2416.71 2416.71 0 0 1-4.415 2.545l5.156 15.852a.865.865 0 0 0 1.645 0l11.48-35.293a2.026 2.026 0 0 0-1.925-2.653z" opacity=".9" fill="#f4b454"/><path d="M37.154 21.261 1.071 12.577a.865.865 0 0 0-.861 1.4l10.909 12.8 5.656-2.436a2.694 2.694 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081 2178.15 2178.15 0 0 1-4.86 2.8l11.291 13.255a2.11 2.11 0 0 0 3.4-.264l10.8-17.586a2.026 2.026 0 0 0-1.251-3.026z" fill="#ef6d4a" opacity=".9"/><path d="M37.636 12.577 1.553 21.261A2.025 2.025 0 0 0 .301 24.29l3.472 5.656 13-5.6a2.689 2.689 0 0 1-.024-.34 2.641 2.641 0 1 1 1.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 0 0 3.4.264l23.995-28.161a.865.865 0 0 0-.855-1.401z" fill="#20354c" opacity=".9"/></svg>
\ No newline at end of file
+<svg viewBox="-2 2 45 45" xmlns="http://www.w3.org/2000/svg"><path d="M29.714 6.539H9.078a2.109 2.109 0 00-2.007 2.762l5.484 16.863 4.219-1.817a2.69 2.69 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2416.71 2416.71 0 01-4.415 2.545l5.156 15.852a.865.865 0 001.645 0l11.48-35.293a2.026 2.026 0 00-1.925-2.653z" opacity=".9" fill="#f4b454"/><path d="M37.154 21.261L1.071 12.577a.865.865 0 00-.861 1.4l10.909 12.8 5.656-2.436a2.694 2.694 0 01-.024-.34 2.641 2.641 0 111.023 2.081 2178.15 2178.15 0 01-4.86 2.8l11.291 13.255a2.11 2.11 0 003.4-.264l10.8-17.586a2.026 2.026 0 00-1.251-3.026z" fill="#ef6d4a" opacity=".9"/><path d="M37.636 12.577L1.553 21.261A2.025 2.025 0 00.301 24.29l3.472 5.656 13-5.6a2.689 2.689 0 01-.024-.34 2.641 2.641 0 111.023 2.081c-3.1 1.791-9.073 5.234-12.108 6.94l5.432 8.848a2.11 2.11 0 003.4.264l23.995-28.161a.865.865 0 00-.855-1.401z" fill="#20354c" opacity=".9"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Gitlab/gitlab.svg b/packages/nodes-base/nodes/Gitlab/gitlab.svg
index 7cebf4c16b..3c9b970288 100644
--- a/packages/nodes-base/nodes/Gitlab/gitlab.svg
+++ b/packages/nodes-base/nodes/Gitlab/gitlab.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#E24329" d="m30.5 56.967 10.863-33.203H19.637z"/><path fill="#FC6D26" d="M30.5 56.967 19.637 23.764H4.41z"/><path d="M4.41 23.764 1.11 33.86c-.3.92.03 1.928.817 2.496L30.5 56.967 4.41 23.764z" fill="#FCA326"/><path d="M4.41 23.764h15.226L13.093 3.781c-.336-1.029-1.802-1.029-2.139 0L4.411 23.764z" fill="#E24329"/><path fill="#FC6D26" d="m30.5 56.967 10.863-33.203H56.59z"/><path d="m56.59 23.764 3.3 10.086a2.224 2.224 0 0 1-.817 2.497L30.5 56.967l26.09-33.203z" fill="#FCA326"/><path d="M56.59 23.764H41.362l6.544-19.992c.336-1.03 1.802-1.03 2.139 0l6.543 19.992z" fill="#E24329"/></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path fill="#E24329" d="M30.5 56.967l10.863-33.203H19.637z"/><path fill="#FC6D26" d="M30.5 56.967L19.637 23.764H4.41z"/><path d="M4.41 23.764L1.11 33.86c-.3.92.03 1.928.817 2.496L30.5 56.967 4.41 23.764z" fill="#FCA326"/><path d="M4.41 23.764h15.226L13.093 3.781c-.336-1.029-1.802-1.029-2.139 0L4.411 23.764z" fill="#E24329"/><path fill="#FC6D26" d="M30.5 56.967l10.863-33.203H56.59z"/><path d="M56.59 23.764l3.3 10.086a2.224 2.224 0 01-.817 2.497L30.5 56.967l26.09-33.203z" fill="#FCA326"/><path d="M56.59 23.764H41.362l6.544-19.992c.336-1.03 1.802-1.03 2.139 0l6.543 19.992z" fill="#E24329"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
index a6e5c354b7..1dc4713b80 100644
--- a/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
+++ b/packages/nodes-base/nodes/GoToWebinar/gotowebinar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85"><defs><clipPath id="a"><path d="M36.602.102h6.296v.097h-6.296zm-.5.097h7.296v.102h-7.296zM35.5.301H44v.097h-8.5zm-.602.097H44.5V.5h-9.602zm-.5.102h10.704v.102H34.398zm-.5.102H45.5v.097H33.898zm-.296.097h12.296v.102H33.602zM33.3.801h12.898v.097H33.301zM33 .898h13.5V1H33zM32.7 1h14.1v.102H32.7zm-.4.102h14.802v.097H32.3zm-.3.097h15.398v.102H32zm-.3.102h16.1v.097H31.7zm-.302.097H48V1.5H31.398zM31.2 1.5h17.102v.102H31.199zM31 1.602h17.5v.097H31zm-.2.097h17.9v.102H30.8zm-.198.102h18.296v.097H30.602zm-.301.097h18.8V2h-18.8zM30.1 2h19.2v.102H30.1zm-.203.102h19.704v.097H29.898zm-.199.097h20.102v.102H29.699zm-.199.102H50v.097H29.5zm-.2.097h20.9V2.5H29.3zm-.198.102h21.296v.102H29.102zm-.204.102h21.704v.097H28.898zm-.199.097h22v.102h-22zm-.097.102h22.296v.097H28.602zm-.204.097H51V3H28.398zM28.301 3h22.898v.102H28.301zm-.2.102h23.2v.097H28.1zm-.203.097H51.5v.102H27.898zm-.097.102h23.898v.097H27.801zm-.2.097h24.2V3.5H27.6zM27.5 3.5H52v.102H27.5zm-.2.102h24.802v.097H27.3zm-.1.097h25.1v.102H27.2zm-.2.102h25.5v.097H27zm-.2.097h25.802V4H26.8zM26.7 4h26v.102h-26zm-.098.102h26.296v.097H26.602zm-.102.097H53v.102H26.5zm-.102.102h26.704v.097H26.398zm-.199.097h27V4.5h-27zm-.097.102H53.3v.102H26.1zM26 4.602h27.5v.097H26zm-.102.097h27.704v.102H25.898zm-.199.102h28v.097h-28zm-.097.097H53.8V5H25.6zM25.5 5H54v.102H25.5zm-.102.102h28.704v.097H25.398zm-.097.097h28.898v.102H25.301zm-.2.102h29.2v.097H25.1zM25 5.398h29.398V5.5H25zm-.102.102h29.704v.102H24.898zm-.097.102h29.898v.097H24.801zm-.102.097h30.102v.102H24.699zm-.097.102h30.296v.097H24.602zm-.102.097H55V6H24.5zM24.398 6h30.704v.102H24.398zm-.097.102h30.898v.097H24.301zm-.102.097h31.102v.102H24.199zm-.097.102h31.296v.097H24.102zM24 6.398h31.5V6.5H24zm-.102.102h31.704v.102H23.898zm-.097.102h31.898v.097H23.801zm-.102.097h32v.102h-32zm-.097.102H55.8v.097H23.6zm-.102.097h32.398V7H23.5zM23.398 7H56v.102H23.398zm-.097.102h32.8v.097h-32.8zm-.102.097h33v.102h-33zm-.097.102H56.3v.097H23.1zM23 7.398h33.398V7.5H23zm-.102.102H56.5v.102H22.898zm-.097.102h33.8v.097h-33.8zm0 .097h33.898v.102H22.801zm-.102.102h34.102v.097H22.699zm-.097.097h34.296V8H22.602zM22.5 8h34.398v.102H22.5zm-.102.102H57v.097H22.398zm0 .097h34.704v.102H22.398zm-.097.102h34.898v.097H22.301zm-.102.097h35.102V8.5H22.199zm-.097.102H57.3v.102H22.1zM22 8.602h35.398v.097H22zm0 .097h35.5v.102H22zm-.102.102h35.704v.097H21.898zm-.097.097h35.898V9H21.801zM21.699 9h36v.102h-36zm-.097.102H57.8v.097H21.6zm0 .097h36.296v.102H21.602zm-.102.102H58v.097H21.5zm-.102.097H58V9.5H21.398zm-.097.102h36.8v.102h-36.8zm0 .102h36.898v.097H21.301zm-.102.097h37.102v.102H21.199zm-.097.102h37.296v.097H21.102zm-.801.097h39.3V10h-39.3zm-.7.102h40.797v.102H19.602zm-.703.102H61.2v.097H18.9zm-.699.097h43.403v.102H18.199zm-.398.102h44.3v.097h-44.3zm-.403.097H62.5v.102H17.398zM17 10.5h45.898v.102H17zm-.398.102h46.796v.097H16.602zm-.403.097h47.602v.102H16.199zm-.398.102h48.3v.097h-48.3zm-.403.097h49V11h-49zm-.296.102h49.5v.102h-49.5zm-.204.102h50v.097h-50zm-.296.097h50.597v.102H14.602zm-.204.102h51v.097h-51zm-.296.097h51.597v.102H14.102zm-.301.102H66v.102H13.8zm-.2.102h52.7v.097H13.6zm-.3.097H66.5v.102H13.3zm-.2.102H66.7v.097H13.102zm-.3.097h54.097V12H12.801zm-.2.102h54.5v.102h-54.5zm-.203.102h54.903v.097H12.398zm-.199.097H67.5v.102H12.2zm-.199.102h55.7v.097H12zm-.102.097h56v.102h-56zm-.199.102H68v.102H11.7zm-.199.102h56.7v.097H11.5zm-.2.097h57.098v.102H11.301zm-.198.102h57.5v.097h-57.5zm-.204.097h57.903V13H10.898zm-.097.102H69v.102H10.8zm-.2.102h58.5v.097h-58.5zm-.203.097h58.903v.102H10.398zm-.199.102h59.2v.097h-59.2zm-.097.097H69.5v.102H10.102zm-.204.102H69.7v.102H9.9zm-.097.102h60v.097h-60zm-.102.097H70v.102H9.7zm-.199.102h60.602v.097H9.5zm-.102.097h60.903V14H9.398zM9.2 14h61.2v.102h-61.2zm-.097.102h61.5v.097h-61.5zM9 14.199h61.7v.102H9zm-.2.102h62.098v.097H8.801zm-.1.097H71v.102H8.7zm-.2.102h62.602v.102H8.5zm-.102.102H71.2v.097H8.4zm-.097.097h63v.102h-63zm-.2.102H71.5v.097H8.102zM8 14.898h63.602V15H8zM7.898 15H71.7v.102H7.9zm-.097.102h64v.097h-64zm-.102.097h64.2v.102h-64.2zm-.097.102H72v.097H7.602zm-.102.097h64.602v.102H7.5zm-.2.102h65v.102h-65zm-.1.102h65.198v.097H7.2zm-.098.097H72.5v.102H7.102zM7 15.801h65.602v.097H7zm-.102.097H72.7V16H6.9zM6.801 16h66v.102h-66zm-.102.102h66.2v.097h-66.2zm-.097.097H73v.102H6.602zm-.102.102h66.602v.097H6.5zm-.102.097H73.2v.102H6.4zM6.2 16.5h67.102v.102H6.199zm-.097.102h67.296v.097H6.102zm0 .097H73.5v.102H6.102zM6 16.801h67.602v.097H6zm-.102.097H73.7V17H5.9zM5.801 17h67.898v.102H5.801zm-.102.102h68.102v.097H5.699zm-.097.097h68.296v.102H5.602zm-.102.102H74v.097H5.5zm0 .097h68.602v.102H5.5zm-.102.102H74.2v.102H5.4zm-.097.102h69v.097h-69zm-.102.097h69.2v.102h-69.2zm-.097.102H74.5v.097H5.102zM5 17.898h69.602V18H5zM4.898 18h69.704v.102H4.898zm-.097.102h69.898v.097H4.801zm0 .097h70v.102h-70zm-.102.102h70.2v.097h-70.2zm-.097.097h70.296v.102H4.602zM4.5 18.5H75v.102H4.5zm-.102.102h70.704v.097H4.398zm0 .097H75.2v.102H4.4zm-.097.102h70.898v.097H4.301zm-.102.097h71.102V19H4.199zM4.102 19h71.296v.2H4.102zM4 19.2h71.5v.1H4zm-.102.1h71.704v.2H3.898zm-.097.2h71.898v.102H3.801zm-.102.102h72.102v.199H3.699zm-.097.199h72.296v.097H3.602zm-.102.097H76V20H3.5zm0 .102h72.602v.102H3.5zm-.102.102h72.704v.097H3.398zm-.097.097h72.898v.102H3.301zm0 .102h73v.097h-73zm-.102.097h73.102v.102H3.199zm-.097.102h73.296v.2H3.102zM3 20.7h73.5v.1H3zm-.102.1H76.5v.098H2.898zm0 .098h73.704V21H2.898zM2.801 21h73.8v.102h-73.8zm0 .102h73.898v.097H2.801zm-.102.097h74v.102h-74zm0 .102h74.102v.097H2.699zm-.097.097H76.8v.102H2.6zm0 .102h74.296v.102H2.602zm-.102.102H77v.199H2.5zm-.102.199h74.704V22H2.398zM2.301 22h74.898v.2H2.301zm-.102.2h75.102v.198H2.199zm-.097.198h75.296v.204H2.102zM2 22.602h75.5v.199H2zm-.102.199h75.704V23H1.898zM1.801 23h75.8v.102h-75.8zm0 .102h75.898v.097H1.801zm-.102.097h76v.102h-76zm0 .102h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.2H1.5zm0 .2H78V24H1.5zM1.398 24H78v.102H1.398zm0 .102h76.704v.199H1.398zm-.097.199h76.8v.097h-76.8zm0 .097h76.898v.102H1.301zm-.102.102h77v.2h-77zm0 .2h77.102v.1H1.199zm-.097.1H78.3v.098H1.1zm0 .098h77.296v.204H1.102zM1 25.102h77.398v.097H1zm0 .097h77.5v.2H1zm-.102.2H78.5v.203H.898zm-.097.203h77.8V26H.802zM.8 26h77.898v.102H.801zm-.102.102h78v.296H.7zm0 .296h78.102v.102H.699zm-.097.102H78.8v.3H.6zm0 .3h78.296v.098H.602zm-.102.098h78.398v.301H.5zm0 .301H79v.2H.5zm-.102.2H79v.203H.398zm0 .203h78.704v.199H.398zm-.097.199h78.8v.398H.302zm-.102.398h78.903v.2H.199zm0 .2h79v.8H.2zm-.097.8H79.3v.903H.1zm0 .903h79.296v.097H.102zM0 30.199h79.398v3.102H0zm0 3.102h79.3v.398H0zm.102.398H79.3V34H.1zm0 .301h79.097v.398H.102zm.097.398h79v.301H.2zm0 .301h78.903V35H.199zM.301 35h78.8v.398H.302zm0 .398H79v.301H.3zm.097.301H79v.403H.398zm0 .403h78.5v.199H.398zM.5 36.3h78.398v.199H.5zm0 .199h78.3v.2H.5zm.102.2H78.8v.1H.6zm0 .1h78.097v.2H.602zm.097.2h78v.2H.7zm0 .2h77.903v.198H.699zm.102.198h77.8v.204H.802zm0 .204H78.5v.097H.8zm.097.097H78.5v.2H.898zm0 .2h77.5v.203H.898zm.102.203h77.398v.199H1zm0 .199h77.3v.097H1zm.102.097H78.3v.301H1.1zm.097.301h77V39h-77zm0 .301h76.903v.102H1.199zm.102.102h76.8v.097h-76.8zm0 .097H78v.102H1.3zm.097.102H78v.199H1.398zm0 .199h76.5v.102h-76.5zm.102.102h76.398v.097H1.5zm0 .097h76.3v.102H1.5zm.102.102H77.8V40H1.6zm0 .199h76.097v.102H1.602zm.097.102h76v.097h-76zm0 .097h75.903v.102H1.699zm.102.102h75.8v.199h-75.8zm.097.199H77.5v.3H1.898zm.102.3h75.398v.2H2zm.102.2H77.3v.2H2.1zm.097.2h75v.198h-75zm.102.198h74.8v.204h-74.8zm.097.204H77v.097H2.398zm0 .097h74.704v.102H2.398zm-.097.102h74.8v.097h-74.8zm0 .097h74.898v.204H2.301zm-.102.204h75.102v.199H2.199zm-.097.199h75.296v.199H2.102zM2 42.5h75.398v.102H2zm0 .102h75.5v.199H2zm-.102.199h75.704V43H1.898zM1.801 43h75.8v.102h-75.8zm0 .102h75.898v.199H1.801zm-.102.199h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.102H1.5zm0 .102H78V44H1.5zM1.398 44H78v.102H1.398zm0 .102h76.704v.097H1.398zm-.097.097h76.8v.102h-76.8zm0 .102h76.898v.3H1.301zm-.102.3h77v.098h-77zm0 .098h77.102v.2H1.199zm-.097.2H78.3V45H1.1zm0 .101h77.296v.2H1.102zM1 45.2h77.398v.1H1zm0 .1h77.5v.302H1zm-.102.302H78.5v.097H.898zm0 .097h77.704v.2H.898zm-.097.2h77.8V46H.802zM.8 46h77.898v.2H.801zm-.102.2h78v.1H.7zm0 .1h78.102v.302H.699zm-.097.302H78.8v.097H.6zm0 .097h78.296v.2H.602zm-.102.2h78.398v.203H.5zm0 .203H79v.296H.5zm-.102.296H79v.301H.398zm0 .301h78.704V48H.398zM.301 48h78.8v.2H.302zm0 .2h78.898v.402H.301zm-.102.402h79v.199H.2zm0 .199h79.102v.3H.199zm-.097.3H79.3v.297H.1zm0 .297h79.296v.801H.102zM0 50.2h79.398V51H0zM0 51h79.5v1.898H0zm0 1.898h79.398v.5H0zm.102.5h79.296v.704H.102zm0 .704H79.3v.5H.1zm.097.5h79.102V55H.199zM.2 55h79v.2H.2zm.102.2h78.898v.3H.301zm0 .3h78.8v.2H.302zm.097.2h78.704v.198H.398zm0 .198H79v.204H.398zm.102.204H79v.296H.5zm0 .296h78.398v.204H.5zm.102.204h78.296v.199H.602zm0 .199H78.8V57H.6zM.699 57h78.102v.3H.699zm0 .3h78v.2H.7zm.102.2h77.898v.102H.801zm0 .102h77.8v.097H.802zm.097.097h77.704v.2H.898zm0 .2H78.5V58H.898zM1 58h77.5v.2H1zm0 .2h77.398v.1H1zm.102.1h77.296v.2H1.102zm0 .2H78.3v.102H1.1zm.097.102h77.102v.097H1.199zm0 .097h77v.102h-77zm.102.102h76.898V59H1.301zm0 .199h76.8v.102h-76.8zm.097.102h76.704v.199H1.398zm0 .199H78v.097H1.398zm.102.097H78v.204H1.5zm0 .204h76.398v.097H1.5zm.102.097h76.296v.102H1.602zm0 .102H77.8v.097H1.6zm.097.097h76.102v.204H1.699zm0 .204h76v.097h-76zm.102.097h75.898v.102H1.801zm0 .102h75.8v.097h-75.8zm.097.097h75.704v.102H1.898zm0 .102H77.5v.102H1.898zm.102.102h75.5v.097H2zm0 .097h75.398v.102H2zm.102.102h75.296v.097H2.102zm0 .097H77.3V61H2.1zm.097.102h75.102v.102H2.199zm0 .102h75v.097h-75zm.102.097h74.898v.102H2.301zm0 .102h74.8v.097h-74.8zm.097.097h74.704v.102H2.398zm0 .102H77v.102H2.398zm.102.102H77v.097H2.5zm0 .097h74.398v.102H2.5zm.102.102h74.296v.097H2.602zm0 .097H76.8V62H2.6zm.097.102h74.102v.102H2.699zm0 .102h74v.097h-74zm.102.097h73.898v.102H2.801zm.097.102h73.704v.097H2.898zm0 .097H76.5v.102H2.898zM3 62.5h73.5v.102H3zm0 .102h73.398v.097H3zm.102.097h73.296v.102H3.102zm.097.102h73.102v.097H3.199zm0 .097h73V63h-73zm.102.102h72.898v.102H3.301zm0 .102h72.8v.097h-72.8zm.097.097h72.704v.102H3.398zm.102.102H76v.097H3.5zm0 .097h72.398v.102H3.5zm.102.102h72.296v.102H3.602zm.097.102h72.102v.097H3.699zm.102.097h71.898v.102H3.801zm0 .102h71.8v.097h-71.8zm.097.097h71.704V64H3.898zM4 64h71.5v.102H4zm0 .102h71.398v.097H4zm.102.097h71.296v.102H4.102zm.097.102h71.102v.097H4.199zm.102.097h70.898v.102H4.301zm0 .102h70.8v.102h-70.8zm.097.102h70.704v.097H4.398zm.102.097H75v.102H4.5zm0 .102h70.398v.097H4.5zm.102.097h70.296V65H4.602zm.097.102h70.102v.102H4.699zm.102.102h69.898v.097H4.801zm.097.097h69.704v.102H4.898zm0 .102H74.5v.097H4.898zm.102.097h69.398v.102H5zm.102.102H74.3v.102H5.1zm.097.102h69.102v.097H5.199zm.102.097h68.898v.102H5.301zm.097.102h68.704v.097H5.398zm.102.097H74V66H5.5zm.102.102h68.296v.102H5.602zm.097.102h68.102v.097H5.699zm0 .097h68v.102h-68zm.102.102h67.8v.097h-67.8zm.097.097h67.704v.102H5.898zM6 66.5h67.5v.102H6zm.102.102h67.296v.097H6.102zm.097.097h67.102v.102H6.199zm.102.102h66.898v.097H6.301zm.097.097h66.704V67H6.398zm0 .102H73v.102H6.398zm.204.102h66.296v.097H6.602zm.097.097h66.102v.102H6.699zm.102.102h65.898v.097H6.801zm.097.097h65.704v.102H6.898zM7 67.5h65.5v.102H7zm.102.102h65.296v.097H7.102zm.097.097h65v.102h-65zm.102.102h64.8v.097h-64.8zm.199.097H72V68H7.5zm.102.102h64.296v.102H7.602zm.097.102h64.102v.097H7.699zm.102.097h63.898v.102H7.801zm.097.102h63.704v.097H7.898zm.102.097h63.398v.102H8zm.102.102H71.3v.102H8.1zm.199.102h62.898v.097H8.301zm.097.097h62.704v.102H8.398zm.102.102H71v.097H8.5zm.102.097H70.8V69H8.6zM8.8 69h61.898v.102H8.801zm.097.102H70.5v.097H8.898zm.204.097h61.296v.102H9.102zm.097.102h61v.097h-61zm.2.097h60.703v.102H9.398zm.101.102h60.398v.102H9.5zm.2.102h60.1v.097H9.7zm.1.097h59.802v.102H9.8zm.2.102h59.5v.097H10zm.102.097H69.3V70H10.1zM10.3 70h58.898v.102H10.301zm.097.102H69v.097H10.398zm.204.097h58.296v.102H10.602zm.199.102h57.898v.097H10.801zm.199.097h57.5v.102H11zm.2.102h57.1v.102H11.2zm.198.102h56.704v.097H11.398zm.204.097h56.296v.102H11.602zm.199.102h55.898v.097H11.801zm.199.097h55.5V71H12zm.2.102h55.1v.102H12.2zm.198.102h54.704v.097H12.398zm.204.097h54.296v.102H12.602zm.199.102h53.898v.097H12.801zm.199.097h53.5v.102H13zm.2.102h53v.102h-53zm.3.102H66v.097H13.5zm.3.097h51.9v.102H13.8zm.302.102h51.296v.097H14.102zm.296.097h50.704V72H14.398zm.204.102H64.8v.102H14.6zm.296.102h49.704v.097H14.898zm.301.097h49.102v.102H15.199zm.301.102H64v.097H15.5zm.398.097h47.704v.102H15.898zm.403.102h46.898v.102H16.301zm.398.102h46.102v.097H16.699zm.5.097h45.102v.102H17.199zm.403.102h44.296v.097H17.602zm.398.097h43.5V73H18zm.5.102H61v.102H18.5zm.7.102h41.1v.097H19.2zm.698.097h39.704v.102H19.898zm.903.102h38v.097h-38zm.3.097h37.297v.102H21.102zm.098.102h37.102v.102H21.199zm.102.102h37v.097h-37zm0 .097h36.898v.102H21.301zm.097.102h36.704v.097H21.398zm.102.097H58v.204H21.5zm.102.204h36.296v.097H21.602zm.097.097h36.102v.102H21.699zm.102.102h35.898v.097H21.801zm.097.097H57.7v.102H21.9zm0 .102h35.704v.102H21.898zm.102.102h35.5v.097H22zm.102.097h35.296v.102H22.102zm.097.102h35.102v.097H22.199zm.102.097h35V75h-35zm.097.102H57.2v.102H22.4zm0 .102h34.704v.097H22.398zm.102.097H57v.102H22.5zm.102.102h34.296v.097H22.602zm.097.097h34.2v.102h-34.2zm.102.102h34v.102h-34zm0 .102h33.898v.097H22.801zm.097.097h33.704v.102H22.898zm.102.102h33.5v.097H23zm.102.097h33.296V76H23.102zm.097.102h33.102v.102H23.199zm.102.102h32.898v.097H23.301zm.097.097h32.704v.102H23.398zm.102.102H56v.097H23.5zm.102.097h32.296v.102H23.602zm.097.102h32.102v.102H23.699zm.102.102h31.898v.097H23.801zm.097.097h31.704v.102H23.898zm.102.102h31.5v.097H24zm.102.097h31.296V77H24.102zm.097.102h31.102v.102H24.199zm.102.102h30.898v.097H24.301zm.097.097h30.704v.102H24.398zm.102.102H55v.097H24.5zm.102.097h30.296v.102H24.602zm.097.102h30.102v.102H24.699zm.102.102h29.898v.097H24.801zm.097.097h29.704v.102H24.898zm.102.102h29.5v.097H25zm.2.097h29.198V78H25.2zm.1.102h28.9v.102H25.3zm.098.102h28.704v.097H25.398zm.204.097H54v.102H25.602zm.097.102h28.2v.097h-28.2zm.102.097h27.898v.102H25.801zm.097.102h27.704v.102H25.898zm.204.102H53.5v.097H26.102zm.097.097h27.102v.102H26.199zm.102.102h26.898v.097H26.301zm.199.097h26.602V79H26.5zm.102.102H53v.102H26.602zm.097.102h26.102v.097H26.699zm.102.097h25.898v.102H26.801zm.199.102h25.602v.097H27zm.102.097H52.5v.102H27.102zm.199.102h25v.102h-25zm.097.102h24.704v.097H27.398zm.204.097H52v.102H27.602zm.199.102h24v.097h-24zm.097.097h23.704V80H27.898zm.204.102H51.5v.102H28.102zm.199.102h23v.097h-23zm.097.097h22.704v.102H28.398zm.204.102H51v.097H28.602zm.199.097h22v.102h-22zm.097.102h21.704v.102H28.898zm.204.102H50.5v.097H29.102zm.199.097h21v.102h-21zm.097.102h20.704v.097H29.398zm.301.097h20.2V81h-20.2zm.2.102h19.8v.102H29.9zm.203.102h19.296v.097H30.102zm.199.097h18.898v.102H30.301zm.3.102H49v.097H30.602zm.2.097h18v.102h-18zM31 81.5h17.5v.102H31zm.2.102h17.1v.097H31.2zm.3.097h16.602v.102H31.5zm.2.102h16.198v.097H31.7zm.198.097h15.704V82H31.898zM32.2 82h15.102v.102H32.199zm.403.102H47v.097H32.602zm.296.097H46.7v.102H32.9zm.301.102h13.102v.097H33.199zm.403.097H46v.102H33.602zm.296.102H45.7v.102H33.9zm.301.102h11.2v.097h-11.2zm.403.097H45v.102H34.602zm.597.102h9.2v.097h-9.2zm.5.097h8.102V83h-8.102zm0 0"/></clipPath><clipPath id="b"><path d="M21.125 73.324c-7.77-.644-14.031-3.98-18.07-10.789-4.028-6.789-3.918-13.82-.578-20.8-7.329-14.208 2.5-30.813 18.68-31.79C25.62 3.543 31.827 0 39.746.004c7.866 0 14.042 3.516 18.526 9.894 15.504.602 26.067 16.75 18.692 31.75 3.344 7.004 3.488 14.079-.567 20.91-4.039 6.813-10.324 10.114-18.015 10.77-8.91 13.266-28.207 13.328-37.258-.004zm0 0"/></clipPath><image id="c" width="398" height="208" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg=="/></defs><g clip-path="url(#a)"><g clip-path="url(#b)"><use xlink:href="#c" transform="matrix(.2 0 0 -.4 0 83.3)"/></g></g><path style="stroke:none;fill-rule:nonzero;fill:#fff;fill-opacity:1" d="M39.715 68.582c3.031.012 5.633-1.82 6.605-4.652.946-2.758.012-5.73-2.383-7.598-.488-.379-1.003-.742-1.414-1.2-2.378-2.632-1.156-6.57 2.29-7.425 2.867-.715 5.343 1.25 5.734 4.54.504 4.214 4.226 6.956 8.351 6.144 3.907-.766 6.352-4.774 5.235-8.586-1.137-3.875-5.36-5.871-9.293-4.395-.54.2-1.07.438-1.625.578-1.918.489-3.942-.277-5.04-1.863a4.315 4.315 0 0 1 .016-4.988c1.145-1.621 3.082-2.344 5.04-1.84.64.168 1.25.45 1.878.664 3.196 1.105 6.649-.117 8.32-2.938 1.637-2.757 1.13-6.242-1.214-8.386-2.469-2.262-6.219-2.453-8.942-.438-1.753 1.297-2.523 3.102-2.753 5.238-.258 2.356-1.934 3.973-4.243 4.278-1.847.238-3.87-.945-4.62-2.703-.864-2.028-.231-4.188 1.656-5.668.382-.301.78-.586 1.136-.918 2.848-2.703 2.906-7.04.14-9.723-2.839-2.765-7.495-2.57-10.097.422-2.57 2.95-2.101 7.32 1.028 9.777.558.434 1.132.871 1.585 1.403a4.484 4.484 0 0 1 .375 5.324c-1.05 1.66-3.02 2.445-4.968 1.93-2.532-.668-3.356-2.57-3.715-4.946-.617-4.062-4.473-6.578-8.45-5.62-3.867.925-6.136 4.898-4.933 8.636 1.227 3.816 5.461 5.742 9.262 4.226.617-.242 1.238-.511 1.883-.628 2.636-.493 5.027 1.199 5.46 3.812.391 2.34-1.355 4.785-3.859 4.992-1.21.102-2.523-.308-3.71-.715-3.813-1.316-7.934.649-9.087 4.426-1.144 3.77 1.137 7.684 5.02 8.602a6.91 6.91 0 0 0 8.437-5.516c.094-.523.145-1.058.258-1.574.512-2.258 2.637-3.856 4.879-3.688 2.23.164 3.977 1.86 4.168 4.118.168 2.027-.875 3.414-2.441 4.566-2.57 1.887-3.493 4.766-2.543 7.633.933 2.816 3.554 4.687 6.574 4.699zm-13.942-3.168c-7.054 1.2-12.625-.812-16.332-6.93-2.558-4.218-2.886-11.156 2.305-16.808-4.621-5.512-5.715-11.504-1.762-17.82 3.118-4.985 7.711-6.653 15.743-6.09 2.37-6.461 6.945-10.348 13.984-10.36 6.992-.011 11.562 3.801 14.016 10.348 7.48-1.16 13.52 1.043 16.851 8.152 2.672 5.692 1.258 10.977-2.875 15.692 4.711 5.574 5.719 11.586 1.664 17.93-3.105 4.863-7.953 6.609-15.676 5.917-2.328 6.512-6.96 10.371-13.968 10.368-6.957-.008-11.578-3.813-13.95-10.399"/><path style="stroke:none;fill-rule:nonzero;fill:#020202;fill-opacity:1" d="M120.39 19.523c-5.902 0-10.628 1.735-14.18 5.207-3.554 3.473-5.327 7.961-5.327 13.47 0 5.476 1.625 9.777 4.875 12.898 3.25 3.12 7.695 4.68 13.336 4.68 5.086 0 9.957-.985 13.379-2.958V35.812H116.94v6.305h7.637v6.227c-1.11.539-3.226.808-5.117.808-3.145 0-5.645-.984-7.492-2.957-1.852-1.972-2.778-4.758-2.778-8.36 0-3.554 1.032-6.394 3.094-8.519 2.063-2.128 4.73-3.191 8.008-3.191 3.91 0 7.836.781 10.543 2.348v-7.41c-2.836-1.028-6.73-1.54-10.445-1.54M150.328 29.078c-4.332 0-7.77 1.188-10.312 3.567-2.54 2.378-3.813 5.671-3.813 9.882 0 4.078 1.227 7.305 3.676 9.684 2.45 2.379 5.816 3.566 10.098 3.566 4.347 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.215-7.055-3.637-9.433-2.425-2.38-5.77-3.567-10.035-3.567m-.101 20.684c-3.98 0-5.97-2.446-5.97-7.336 0-2.336.516-4.14 1.555-5.418 1.036-1.278 2.493-1.914 4.364-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.899 7.535-5.695 7.535M195.063 29.078c-4.333 0-7.766 1.188-10.31 3.567-2.542 2.378-3.812 5.671-3.812 9.882 0 4.078 1.223 7.305 3.672 9.684 2.45 2.379 5.817 3.566 10.098 3.566 4.348 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.21-7.055-3.636-9.433-2.426-2.38-5.77-3.567-10.036-3.567m-.097 20.684c-3.985 0-5.973-2.446-5.973-7.336 0-2.336.52-4.14 1.555-5.418 1.039-1.278 2.492-1.914 4.363-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.898 7.535-5.691 7.535"/><path style="stroke:none;fill-rule:nonzero;fill:#020202;fill-opacity:1" d="M186.813 20.11h-28.489v7.046h9.95v28.012h8.538V27.156h10V20.11M252.66 21.027h-3.582L241.414 48.2h-.941l-7.77-27.172h-2.226l-8.403 26.989h-.933l-7.965-26.989h-3.707l10.32 33.692h3.395l7.59-26.043h.953l7.585 26.043h3.028l10.32-33.692M262.36 29.723c-6.587 0-11.184 5.406-11.184 13.152 0 7.563 4.5 12.262 11.75 12.262 3.332 0 5.66-1.133 7.203-1.88.14-.066.273-.132.402-.194l.063-2.829c-1.637 1.196-4.184 2.336-7.051 2.336-5.559 0-8.938-3.465-9.035-9.27l-.008-.503h17.555c.05-.434.101-.988.101-1.649 0-1.171-.273-11.425-9.797-11.425m-7.855 10.77.059-.552c.445-3.937 2.917-7.914 7.437-7.914 1.91 0 3.473.602 4.637 1.79 2.047 2.081 2.152 5.265 2.136 6.19l-.011.485h-14.258M280.102 21.027h-3.489v27.754a115.5 115.5 0 0 1-.175 5.938h2.917l.118-2.36s2.867 3.258 8.675 3.504c.114.004.223.008.336.008 5.055 0 10.707-4.793 10.707-13.422.028-3.914-.765-7.89-2.968-10.11-1.758-1.769-4.457-3.253-7.036-3.253-6.722 0-9.085 3.996-9.085 3.996V21.027m7.511 32.118c-3.457 0-6.328-2.696-7.297-6.172-.101-.516-.214-1.121-.214-1.743v-4.476c0-.66.12-1.242.218-1.711l.059-.27c.95-3.543 2.785-6.39 7.437-6.39 5.457 0 7.836 3.707 7.836 10.222 0 6.114-3.144 10.54-8.039 10.54M304.758 19.879c-1.356 0-2.336.98-2.336 2.336 0 1.3.957 2.285 2.23 2.285.75 0 1.375-.238 1.813-.691.39-.407.598-.965.574-1.594 0-1.399-.918-2.336-2.281-2.336m1.77 10.355h-3.54V54.72h3.54V30.234M322.258 29.395l-1.113.039c-4.047 0-7.172 3.472-7.172 3.472l-.172-3.492h-3.02c.117 1.79.172 4.445.172 6.996V54.72h3.54V39.602c0-.872.12-1.684.327-2.258.758-2.477 3.078-4.98 6.547-4.98 4.035 0 6.254 2.788 6.254 7.855v14.5h3.543V39.703c0-9.617-7.52-10.308-8.906-10.308M344.07 29.414c-2.89 0-6.222.809-8.148 2.844l-.031 3.926c1.867-1.93 5.293-3.926 7.566-3.926 3.969 0 6.102 1.851 6.102 5.969v1.367l-.72-.004c-9.194 0-14.843 3.156-14.843 8.941 0 3.164 2.36 7.43 6.906 7.43.168 0 .336-.004.508-.016 4.246-.289 6.168-1.133 7.293-2.718.336-.477 1.266-1.532 1.266-1.532l.312 3.024h3.09c-.266-1.867-.324-4.184-.324-5.871v-9.516c0-6.582-3.02-9.918-8.977-9.918m-1.18 23.184c-2.898 0-5.64-1.004-5.64-3.985 0-2.843 2.723-5.93 11.246-5.93h1.164v3.692c0 .492-.101 1.07-.281 1.629-.711 2.117-2.832 4.594-6.488 4.594M366.945 29.352c-4.168 0-5.468 3.03-5.468 3.03h-1.04l-.156-2.402h-2.957c.121 2.024.176 4.297.176 7.278v17.46h3.488v-13.6c0-.806.078-2.497.196-3.134.453-2.472 2.433-5.906 5.746-5.906.203 0 .41.016.625.047 1.007.145 1.863.645 2.445 1v-3.094c-.113-.039-.242-.086-.379-.133-.469-.168-1.348-.484-1.605-.484a9.433 9.433 0 0 0-1.07-.062"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-3 -2 85 85"><defs><clipPath id="a"><path d="M36.602.102h6.296v.097h-6.296zm-.5.097h7.296v.102h-7.296zM35.5.301H44v.097h-8.5zm-.602.097H44.5V.5h-9.602zm-.5.102h10.704v.102H34.398zm-.5.102H45.5v.097H33.898zm-.296.097h12.296v.102H33.602zM33.3.801h12.898v.097H33.301zm-.3.097h13.5V1H33zM32.7 1h14.1v.102H32.7zm-.4.102h14.802v.097H32.3zm-.3.097h15.398v.102H32zm-.3.102h16.1v.097H31.7zm-.302.097H48V1.5H31.398zM31.2 1.5h17.102v.102H31.199zm-.2.102h17.5v.097H31zm-.2.097h17.9v.102H30.8zm-.198.102h18.296v.097H30.602zm-.301.097h18.8V2h-18.8zM30.1 2h19.2v.102H30.1zm-.203.102h19.704v.097H29.898zm-.199.097H49.8v.102H29.699zm-.199.102H50v.097H29.5zm-.2.097h20.9V2.5H29.3zm-.198.102h21.296v.102H29.102zm-.204.102h21.704v.097H28.898zm-.199.097h22v.102h-22zm-.097.102h22.296v.097H28.602zm-.204.097H51V3H28.398zM28.301 3h22.898v.102H28.301zm-.2.102h23.2v.097H28.1zm-.203.097H51.5v.102H27.898zm-.097.102h23.898v.097H27.801zm-.2.097h24.2V3.5H27.6zM27.5 3.5H52v.102H27.5zm-.2.102h24.802v.097H27.3zm-.1.097h25.1v.102H27.2zm-.2.102h25.5v.097H27zm-.2.097h25.802V4H26.8zM26.7 4h26v.102h-26zm-.098.102h26.296v.097H26.602zm-.102.097H53v.102H26.5zm-.102.102h26.704v.097H26.398zm-.199.097h27V4.5h-27zm-.097.102H53.3v.102H26.1zM26 4.602h27.5v.097H26zm-.102.097h27.704v.102H25.898zm-.199.102h28v.097h-28zm-.097.097H53.8V5H25.6zM25.5 5H54v.102H25.5zm-.102.102h28.704v.097H25.398zm-.097.097h28.898v.102H25.301zm-.2.102h29.2v.097H25.1zM25 5.398h29.398V5.5H25zm-.102.102h29.704v.102H24.898zm-.097.102h29.898v.097H24.801zm-.102.097h30.102v.102H24.699zm-.097.102h30.296v.097H24.602zm-.102.097H55V6H24.5zM24.398 6h30.704v.102H24.398zm-.097.102h30.898v.097H24.301zm-.102.097h31.102v.102H24.199zm-.097.102h31.296v.097H24.102zM24 6.398h31.5V6.5H24zm-.102.102h31.704v.102H23.898zm-.097.102h31.898v.097H23.801zm-.102.097h32v.102h-32zm-.097.102H55.8v.097H23.6zm-.102.097h32.398V7H23.5zM23.398 7H56v.102H23.398zm-.097.102h32.8v.097h-32.8zm-.102.097h33v.102h-33zm-.097.102H56.3v.097H23.1zM23 7.398h33.398V7.5H23zm-.102.102H56.5v.102H22.898zm-.097.102h33.8v.097h-33.8zm0 .097h33.898v.102H22.801zm-.102.102h34.102v.097H22.699zm-.097.097h34.296V8H22.602zM22.5 8h34.398v.102H22.5zm-.102.102H57v.097H22.398zm0 .097h34.704v.102H22.398zm-.097.102h34.898v.097H22.301zm-.102.097h35.102V8.5H22.199zm-.097.102H57.3v.102H22.1zM22 8.602h35.398v.097H22zm0 .097h35.5v.102H22zm-.102.102h35.704v.097H21.898zm-.097.097h35.898V9H21.801zM21.699 9h36v.102h-36zm-.097.102H57.8v.097H21.6zm0 .097h36.296v.102H21.602zm-.102.102H58v.097H21.5zm-.102.097H58V9.5H21.398zm-.097.102h36.8v.102h-36.8zm0 .102h36.898v.097H21.301zm-.102.097h37.102v.102H21.199zm-.097.102h37.296v.097H21.102zm-.801.097h39.3V10h-39.3zm-.7.102h40.797v.102H19.602zm-.703.102H61.2v.097H18.9zm-.699.097h43.403v.102H18.199zm-.398.102h44.3v.097h-44.3zm-.403.097H62.5v.102H17.398zM17 10.5h45.898v.102H17zm-.398.102h46.796v.097H16.602zm-.403.097h47.602v.102H16.199zm-.398.102h48.3v.097h-48.3zm-.403.097h49V11h-49zm-.296.102h49.5v.102h-49.5zm-.204.102h50v.097h-50zm-.296.097h50.597v.102H14.602zm-.204.102h51v.097h-51zm-.296.097h51.597v.102H14.102zm-.301.102H66v.102H13.8zm-.2.102h52.7v.097H13.6zm-.3.097H66.5v.102H13.3zm-.2.102H66.7v.097H13.102zm-.3.097h54.097V12H12.801zm-.2.102h54.5v.102h-54.5zm-.203.102h54.903v.097H12.398zm-.199.097H67.5v.102H12.2zm-.199.102h55.7v.097H12zm-.102.097h56v.102h-56zm-.199.102H68v.102H11.7zm-.199.102h56.7v.097H11.5zm-.2.097h57.098v.102H11.301zm-.198.102h57.5v.097h-57.5zm-.204.097h57.903V13H10.898zm-.097.102H69v.102H10.8zm-.2.102h58.5v.097h-58.5zm-.203.097h58.903v.102H10.398zm-.199.102h59.2v.097h-59.2zm-.097.097H69.5v.102H10.102zm-.204.102H69.7v.102H9.9zm-.097.102h60v.097h-60zm-.102.097H70v.102H9.7zm-.199.102h60.602v.097H9.5zm-.102.097h60.903V14H9.398zM9.2 14h61.2v.102H9.2zm-.097.102h61.5v.097h-61.5zM9 14.199h61.7v.102H9zm-.2.102h62.098v.097H8.801zm-.1.097H71v.102H8.7zm-.2.102h62.602v.102H8.5zm-.102.102H71.2v.097H8.4zm-.097.097h63v.102h-63zm-.2.102H71.5v.097H8.102zM8 14.898h63.602V15H8zM7.898 15H71.7v.102H7.9zm-.097.102h64v.097h-64zm-.102.097h64.2v.102h-64.2zm-.097.102H72v.097H7.602zm-.102.097h64.602v.102H7.5zm-.2.102h65v.102h-65zm-.1.102h65.198v.097H7.2zm-.098.097H72.5v.102H7.102zM7 15.801h65.602v.097H7zm-.102.097H72.7V16H6.9zM6.801 16h66v.102h-66zm-.102.102h66.2v.097h-66.2zm-.097.097H73v.102H6.602zm-.102.102h66.602v.097H6.5zm-.102.097H73.2v.102H6.4zM6.2 16.5h67.102v.102H6.199zm-.097.102h67.296v.097H6.102zm0 .097H73.5v.102H6.102zM6 16.801h67.602v.097H6zm-.102.097H73.7V17H5.9zM5.801 17h67.898v.102H5.801zm-.102.102h68.102v.097H5.699zm-.097.097h68.296v.102H5.602zm-.102.102H74v.097H5.5zm0 .097h68.602v.102H5.5zm-.102.102H74.2v.102H5.4zm-.097.102h69v.097h-69zm-.102.097h69.2v.102h-69.2zm-.097.102H74.5v.097H5.102zM5 17.898h69.602V18H5zM4.898 18h69.704v.102H4.898zm-.097.102h69.898v.097H4.801zm0 .097h70v.102h-70zm-.102.102h70.2v.097h-70.2zm-.097.097h70.296v.102H4.602zM4.5 18.5H75v.102H4.5zm-.102.102h70.704v.097H4.398zm0 .097H75.2v.102H4.4zm-.097.102h70.898v.097H4.301zm-.102.097h71.102V19H4.199zM4.102 19h71.296v.2H4.102zM4 19.2h71.5v.1H4zm-.102.1h71.704v.2H3.898zm-.097.2h71.898v.102H3.801zm-.102.102h72.102v.199H3.699zm-.097.199h72.296v.097H3.602zm-.102.097H76V20H3.5zm0 .102h72.602v.102H3.5zm-.102.102h72.704v.097H3.398zm-.097.097h72.898v.102H3.301zm0 .102h73v.097h-73zm-.102.097h73.102v.102H3.199zm-.097.102h73.296v.2H3.102zM3 20.7h73.5v.1H3zm-.102.1H76.5v.098H2.898zm0 .098h73.704V21H2.898zM2.801 21h73.8v.102h-73.8zm0 .102h73.898v.097H2.801zm-.102.097h74v.102h-74zm0 .102h74.102v.097H2.699zm-.097.097H76.8v.102H2.6zm0 .102h74.296v.102H2.602zm-.102.102H77v.199H2.5zm-.102.199h74.704V22H2.398zM2.301 22h74.898v.2H2.301zm-.102.2h75.102v.198H2.199zm-.097.198h75.296v.204H2.102zM2 22.602h75.5v.199H2zm-.102.199h75.704V23H1.898zM1.801 23h75.8v.102h-75.8zm0 .102h75.898v.097H1.801zm-.102.097h76v.102h-76zm0 .102h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.2H1.5zm0 .2H78V24H1.5zM1.398 24H78v.102H1.398zm0 .102h76.704v.199H1.398zm-.097.199h76.8v.097h-76.8zm0 .097h76.898v.102H1.301zm-.102.102h77v.2h-77zm0 .2h77.102v.1H1.199zm-.097.1H78.3v.098H1.1zm0 .098h77.296v.204H1.102zM1 25.102h77.398v.097H1zm0 .097h77.5v.2H1zm-.102.2H78.5v.203H.898zm-.097.203h77.8V26H.802zM.8 26h77.898v.102H.801zm-.102.102h78v.296H.7zm0 .296H78.8v.102H.699zm-.097.102H78.8v.3H.6zm0 .3h78.296v.098H.602zm-.102.098h78.398v.301H.5zm0 .301H79v.2H.5zm-.102.2H79v.203H.398zm0 .203h78.704v.199H.398zm-.097.199h78.8v.398H.302zm-.102.398h78.903v.2H.199zm0 .2h79v.8H.2zm-.097.8H79.3v.903H.1zm0 .903h79.296v.097H.102zM0 30.199h79.398v3.102H0zm0 3.102h79.3v.398H0zm.102.398H79.3V34H.1zm0 .301h79.097v.398H.102zm.097.398h79v.301H.2zm0 .301h78.903V35H.199zM.301 35h78.8v.398H.302zm0 .398H79v.301H.3zm.097.301H79v.403H.398zm0 .403h78.5v.199H.398zM.5 36.3h78.398v.199H.5zm0 .199h78.3v.2H.5zm.102.2H78.8v.1H.6zm0 .1h78.097v.2H.602zm.097.2h78v.2H.7zm0 .2h77.903v.198H.699zm.102.198h77.8v.204H.802zm0 .204H78.5v.097H.8zm.097.097H78.5v.2H.898zm0 .2h77.5v.203H.898zm.102.203h77.398v.199H1zm0 .199h77.3v.097H1zm.102.097H78.3v.301H1.1zm.097.301h77V39h-77zm0 .301h76.903v.102H1.199zm.102.102h76.8v.097h-76.8zm0 .097H78v.102H1.3zm.097.102H78v.199H1.398zm0 .199h76.5v.102h-76.5zm.102.102h76.398v.097H1.5zm0 .097h76.3v.102H1.5zm.102.102H77.8v.2H1.6zm0 .199h76.097v.102H1.602zm.097.102h76v.097h-76zm0 .097h75.903v.102H1.699zm.102.102h75.8v.199h-75.8zm.097.199H77.5v.3H1.898zm.102.3h75.398v.2H2zm.102.2H77.3v.2H2.1zm.097.2h75v.198h-75zm.102.198h74.8v.204h-74.8zm.097.204H77v.097H2.398zm0 .097h74.704v.102H2.398zm-.097.102h74.8v.097h-74.8zm0 .097h74.898v.204H2.301zm-.102.204h75.102v.199H2.199zm-.097.199h75.296v.199H2.102zM2 42.5h75.398v.102H2zm0 .102h75.5v.199H2zm-.102.199h75.704V43H1.898zM1.801 43h75.8v.102h-75.8zm0 .102h75.898v.199H1.801zm-.102.199h76.102v.199H1.699zm-.097.199H77.8v.102H1.6zm0 .102h76.296v.097H1.602zm-.102.097h76.398v.102H1.5zm0 .102H78V44H1.5zM1.398 44H78v.102H1.398zm0 .102h76.704v.097H1.398zm-.097.097h76.8v.102h-76.8zm0 .102h76.898v.3H1.301zm-.102.3h77v.098h-77zm0 .098h77.102v.2H1.199zm-.097.2H78.3V45H1.1zm0 .101h77.296v.2H1.102zM1 45.2h77.398v.1H1zm0 .1h77.5v.302H1zm-.102.302H78.5v.097H.898zm0 .097h77.704v.2H.898zm-.097.2h77.8V46H.802zM.8 46h77.898v.2H.801zm-.102.2h78v.1H.7zm0 .1H78.8v.302H.699zm-.097.302H78.8v.097H.6zm0 .097h78.296v.2H.602zm-.102.2h78.398v.203H.5zm0 .203H79v.296H.5zm-.102.296H79v.301H.398zm0 .301h78.704V48H.398zM.301 48h78.8v.2H.302zm0 .2h78.898v.402H.301zm-.102.402h79v.199H.2zm0 .199h79.102v.3H.199zm-.097.3H79.3v.297H.1zm0 .297h79.296v.801H.102zM0 50.2h79.398v.8H0zm0 .8h79.5v1.898H0zm0 1.898h79.398v.5H0zm.102.5h79.296v.704H.102zm0 .704H79.3v.5H.1zm.097.5h79.102V55H.199zM.2 55h79v.2H.2zm.102.2H79.2v.3H.301zm0 .3h78.8v.2H.302zm.097.2h78.704v.198H.398zm0 .198H79v.204H.398zm.102.204H79v.296H.5zm0 .296h78.398v.204H.5zm.102.204h78.296v.199H.602zm0 .199H78.8V57H.6zM.699 57h78.102v.3H.699zm0 .3h78v.2H.7zm.102.2h77.898v.102H.801zm0 .102h77.8v.097H.802zm.097.097h77.704v.2H.898zm0 .2H78.5V58H.898zM1 58h77.5v.2H1zm0 .2h77.398v.1H1zm.102.1h77.296v.2H1.102zm0 .2H78.3v.102H1.1zm.097.102h77.102v.097H1.199zm0 .097h77v.102h-77zm.102.102h76.898V59H1.301zm0 .199h76.8v.102h-76.8zm.097.102h76.704v.199H1.398zm0 .199H78v.097H1.398zm.102.097H78v.204H1.5zm0 .204h76.398v.097H1.5zm.102.097h76.296v.102H1.602zm0 .102H77.8v.097H1.6zm.097.097h76.102v.204H1.699zm0 .204h76v.097h-76zm.102.097h75.898v.102H1.801zm0 .102h75.8v.097h-75.8zm.097.097h75.704v.102H1.898zm0 .102H77.5v.102H1.898zm.102.102h75.5v.097H2zm0 .097h75.398v.102H2zm.102.102h75.296v.097H2.102zm0 .097H77.3V61H2.1zm.097.102h75.102v.102H2.199zm0 .102h75v.097h-75zm.102.097h74.898v.102H2.301zm0 .102h74.8v.097h-74.8zm.097.097h74.704v.102H2.398zm0 .102H77v.102H2.398zm.102.102H77v.097H2.5zm0 .097h74.398v.102H2.5zm.102.102h74.296v.097H2.602zm0 .097H76.8V62H2.6zm.097.102h74.102v.102H2.699zm0 .102h74v.097h-74zm.102.097h73.898v.102H2.801zm.097.102h73.704v.097H2.898zm0 .097H76.5v.102H2.898zM3 62.5h73.5v.102H3zm0 .102h73.398v.097H3zm.102.097h73.296v.102H3.102zm.097.102h73.102v.097H3.199zm0 .097h73V63h-73zm.102.102h72.898v.102H3.301zm0 .102h72.8v.097h-72.8zm.097.097h72.704v.102H3.398zm.102.102H76v.097H3.5zm0 .097h72.398v.102H3.5zm.102.102h72.296v.102H3.602zm.097.102h72.102v.097H3.699zm.102.097h71.898v.102H3.801zm0 .102h71.8v.097h-71.8zm.097.097h71.704V64H3.898zM4 64h71.5v.102H4zm0 .102h71.398v.097H4zm.102.097h71.296v.102H4.102zm.097.102h71.102v.097H4.199zm.102.097h70.898v.102H4.301zm0 .102h70.8v.102h-70.8zm.097.102h70.704v.097H4.398zm.102.097H75v.102H4.5zm0 .102h70.398v.097H4.5zm.102.097h70.296V65H4.602zm.097.102h70.102v.102H4.699zm.102.102h69.898v.097H4.801zm.097.097h69.704v.102H4.898zm0 .102H74.5v.097H4.898zm.102.097h69.398v.102H5zm.102.102H74.3v.102H5.1zm.097.102h69.102v.097H5.199zm.102.097h68.898v.102H5.301zm.097.102h68.704v.097H5.398zm.102.097H74V66H5.5zm.102.102h68.296v.102H5.602zm.097.102h68.102v.097H5.699zm0 .097h68v.102h-68zm.102.102h67.8v.097h-67.8zm.097.097h67.704v.102H5.898zM6 66.5h67.5v.102H6zm.102.102h67.296v.097H6.102zm.097.097h67.102v.102H6.199zm.102.102h66.898v.097H6.301zm.097.097h66.704V67H6.398zm0 .102H73v.102H6.398zm.204.102h66.296v.097H6.602zm.097.097h66.102v.102H6.699zm.102.102h65.898v.097H6.801zm.097.097h65.704v.102H6.898zM7 67.5h65.5v.102H7zm.102.102h65.296v.097H7.102zm.097.097h65v.102h-65zm.102.102h64.8v.097h-64.8zm.199.097H72V68H7.5zm.102.102h64.296v.102H7.602zm.097.102h64.102v.097H7.699zm.102.097h63.898v.102H7.801zm.097.102h63.704v.097H7.898zm.102.097h63.398v.102H8zm.102.102H71.3v.102H8.1zm.199.102h62.898v.097H8.301zm.097.097h62.704v.102H8.398zm.102.102H71v.097H8.5zm.102.097H70.8V69H8.6zM8.8 69h61.898v.102H8.801zm.097.102H70.5v.097H8.898zm.204.097h61.296v.102H9.102zm.097.102h61v.097h-61zm.2.097h60.703v.102H9.398zm.101.102h60.398v.102H9.5zm.2.102h60.1v.097H9.7zm.1.097h59.802v.102H9.8zm.2.102h59.5v.097H10zm.102.097H69.3V70H10.1zM10.3 70h58.898v.102H10.301zm.097.102H69v.097H10.398zm.204.097h58.296v.102H10.602zm.199.102h57.898v.097H10.801zm.199.097h57.5v.102H11zm.2.102h57.1v.102H11.2zm.198.102h56.704v.097H11.398zm.204.097h56.296v.102H11.602zm.199.102h55.898v.097H11.801zm.199.097h55.5V71H12zm.2.102h55.1v.102H12.2zm.198.102h54.704v.097H12.398zm.204.097h54.296v.102H12.602zm.199.102h53.898v.097H12.801zm.199.097h53.5v.102H13zm.2.102h53v.102h-53zm.3.102H66v.097H13.5zm.3.097h51.9v.102H13.8zm.302.102h51.296v.097H14.102zm.296.097h50.704V72H14.398zm.204.102H64.8v.102H14.6zm.296.102h49.704v.097H14.898zm.301.097H64.3v.102H15.199zm.301.102H64v.097H15.5zm.398.097h47.704v.102H15.898zm.403.102h46.898v.102H16.301zm.398.102H62.8v.097H16.699zm.5.097H62.3v.102H17.199zm.403.102h44.296v.097H17.602zm.398.097h43.5V73H18zm.5.102H61v.102H18.5zm.7.102h41.1v.097H19.2zm.698.097h39.704v.102H19.898zm.903.102h38v.097h-38zm.3.097h37.297v.102H21.102zm.098.102H58.3v.102H21.199zm.102.102h37v.097h-37zm0 .097h36.898v.102H21.301zm.097.102h36.704v.097H21.398zm.102.097H58v.204H21.5zm.102.204h36.296v.097H21.602zm.097.097H57.8v.102H21.699zm.102.102h35.898v.097H21.801zm.097.097H57.7v.102H21.9zm0 .102h35.704v.102H21.898zm.102.102h35.5v.097H22zm.102.097h35.296v.102H22.102zm.097.102H57.3v.097H22.199zm.102.097h35V75h-35zm.097.102H57.2v.102H22.4zm0 .102h34.704v.097H22.398zm.102.097H57v.102H22.5zm.102.102h34.296v.097H22.602zm.097.097h34.2v.102h-34.2zm.102.102h34v.102h-34zm0 .102h33.898v.097H22.801zm.097.097h33.704v.102H22.898zm.102.102h33.5v.097H23zm.102.097h33.296V76H23.102zm.097.102H56.3v.102H23.199zm.102.102h32.898v.097H23.301zm.097.097h32.704v.102H23.398zm.102.102H56v.097H23.5zm.102.097h32.296v.102H23.602zm.097.102H55.8v.102H23.699zm.102.102h31.898v.097H23.801zm.097.097h31.704v.102H23.898zm.102.102h31.5v.097H24zm.102.097h31.296V77H24.102zm.097.102H55.3v.102H24.199zm.102.102h30.898v.097H24.301zm.097.097h30.704v.102H24.398zm.102.102H55v.097H24.5zm.102.097h30.296v.102H24.602zm.097.102H54.8v.102H24.699zm.102.102h29.898v.097H24.801zm.097.097h29.704v.102H24.898zm.102.102h29.5v.097H25zm.2.097h29.198V78H25.2zm.1.102h28.9v.102H25.3zm.098.102h28.704v.097H25.398zm.204.097H54v.102H25.602zm.097.102h28.2v.097h-28.2zm.102.097h27.898v.102H25.801zm.097.102h27.704v.102H25.898zm.204.102H53.5v.097H26.102zm.097.097H53.3v.102H26.199zm.102.102h26.898v.097H26.301zm.199.097h26.602V79H26.5zm.102.102H53v.102H26.602zm.097.102H52.8v.097H26.699zm.102.097h25.898v.102H26.801zm.199.102h25.602v.097H27zm.102.097H52.5v.102H27.102zm.199.102h25v.102h-25zm.097.102h24.704v.097H27.398zm.204.097H52v.102H27.602zm.199.102h24v.097h-24zm.097.097h23.704V80H27.898zm.204.102H51.5v.102H28.102zm.199.102h23v.097h-23zm.097.097h22.704v.102H28.398zm.204.102H51v.097H28.602zm.199.097h22v.102h-22zm.097.102h21.704v.102H28.898zm.204.102H50.5v.097H29.102zm.199.097h21v.102h-21zm.097.102h20.704v.097H29.398zm.301.097h20.2V81h-20.2zm.2.102h19.8v.102H29.9zm.203.102h19.296v.097H30.102zm.199.097h18.898v.102H30.301zm.3.102H49v.097H30.602zm.2.097h18v.102h-18zm.2.102h17.5v.102H31zm.2.102h17.1v.097H31.2zm.3.097h16.602v.102H31.5zm.2.102h16.198v.097H31.7zm.198.097h15.704V82H31.898zM32.2 82h15.102v.102H32.199zm.403.102H47v.097H32.602zm.296.097H46.7v.102H32.9zm.301.102h13.102v.097H33.199zm.403.097H46v.102H33.602zm.296.102H45.7v.102H33.9zm.301.102h11.2v.097H34.2zm.403.097H45v.102H34.602zm.597.102h9.2v.097h-9.2zm.5.097h8.102V83H35.7zm0 0"/></clipPath><clipPath id="b"><path d="M21.125 73.324c-7.77-.644-14.031-3.98-18.07-10.789-4.028-6.789-3.918-13.82-.578-20.8-7.329-14.208 2.5-30.813 18.68-31.79C25.62 3.543 31.827 0 39.746.004c7.866 0 14.042 3.516 18.526 9.894 15.504.602 26.067 16.75 18.692 31.75 3.344 7.004 3.488 14.079-.567 20.91-4.039 6.813-10.324 10.114-18.015 10.77-8.91 13.266-28.207 13.328-37.258-.004zm0 0"/></clipPath><image id="c" width="398" height="208" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAY4AAADQCAIAAACflREYAAAABmJLR0QA/wD/AP+gvaeTAAAF7ElEQVR4nO3da47bRhCFUSpmHsgis8LsMflhYDwQBD2L7Lrd52zAAuaDutguSZe///l3A+jtt9EvAOCxfbuMfgnku4rovzGvgqlcRbV7p6KcqCi3bxddAd3to18AeR4ebh4AedXDqNxV8Rq9UO6ZqNxV8SypUO75qDwA8pg3Kcq9GpVrde55b+/OXRV3vBeVB0Bu+yQMUXHTJ2G4VueaIij3eVTuqvil6mNWHgD5UhWVuyq2zWdBOUBtVO6qVnfEm5SoFndEVO6q1mWSotxxUbmrWtGP0S+A+Rwd1X5xV7WYE4YpSa3mhKhMVQsxTFHutKjcVS3BmxTlTo7KVDU5b1KUGxKVZYVpDXyTEtWsBkZlBXRCJinKDY/KA+BU/Dkp1ySq3VA1h+GH3neamkOrqJq8Y/I+f0LKNYzKXVWwhj2Rrm1UbV8Y9/izUa55VO6qwjTv6SdNZYmIyqfrk0QkRZaUqNxVZfh99AtgPllR2VbvLuXQ+05UzSVG5ePKfWUdekTIjSrx7XV+uT3RVnpU3qp6Se+JhuaIyreAdjFHTz9JqomZojJVjTdTTzQxX1Su1Uf6Y/QLYD6zRmVZYYz5Dr3vRDXE3FFZAT3brIceA60QlQ/WnGqFpDjZIlG5qzrJIj1xpqWicld1uKV6+klUR1swKndVB1qwJ462bFT2qg7x5+gXwHwWj8pX6xVb9tD7TlO1RLWZqgotfuhxBFF98VZVQE+UE9UV1+of0RPlRHWTZYU36ekOUb1HVHdYAX2ZnignqofcVb3gr9EvgPmI6km+Wu9Zzr3nSepJonqeqeox5x7lRPUqK6D3OPTeo6k7RPUe/wN4m54+IaqbRPUJe1XX9EQ5UX3OVPWLT1pVEdUXUVWxV7VtDj0OIKpaq09VDr0jiIpy6y4rOPQoJ6rjrLgC6tA72nJJiep4az0A6ukcoqLcKtfqeqKcqM60xFQ196/ONiQqyk2+Aurco5yohph2qnLoDSQqyk14V+XQo5yohptqqnLoNSEqyk2yV6WnVmZISlTNxG+r64lyomoo+Kv14t9l5xXblKj6ivzTOPQoJ6rmwq7VI99Z1yMqysWsgDr0KCeqIBlTlXMvi6go1/1aXU+Jejclqkh9/2p9XxmxRJWr4wroj9EvgA+1S0pU+XodM71eDVMQ1Ry63FU59GbSoylRTWX8/wDqaT6iotzIvSo9UU5UsxozVelpbqKi3NlfracnyolqBedNVb+d9Q8xnKgod8b/5Dr0KCeq1Ry+AurcW9DRU5WoFnTgA6CeliUqyh1yra4nyolqccVTlZ7YqqcqUbEVroDqiXKi4kvBVKUnroiKch/dVemJcqLipjenquGfR6UzUVHu5b0qPVFOVDz0wra6nignKp701Ffr6YlyouIljy8xJUU5UfGqe9fqeqKcqHjP7RVQPVFOVHxi/HerMx9RUa7LL9YA3GE3GAjQ8deVAa6YqoAA7qqAAKYqIICpCgiwXyzBAO2d/evKAG+wrQ4EcK0OBLACCgQwVQEBLCsAAVyrAwEsKwABrIACAUxVQAB3VUAAUxUQwF0VEMBeFRDAtjoQwLU6EMC1OhDAtToQwFQFBHBXBQSwrAAE2DdPgEB7pioggBVQIICpCghgqgIC+HEtIIC9KiCAB0AggGt1IIAVUCCAqQoI4K4KCGCqAgKYqoAAVkCBAFZAgQC+sBgIYKoCAuybuyqgPVMVEMCyAhDACigQwAMgEMC1OhDAVAUEsAIKBDBVAQHcVQEBTFVAAHtVQADb6kAAUxUQwI9rAQFcqwMBrIACAUxVQAC/WAMEsKwABLCsAAQwVQEBTFVAACugQABTFRDAXRUQwFQFBNgv7qqA9jwAAgE8AAIBTFVAAFMVEMAKKBDAVAUE8NV6QABfWAwEsAIKBDBVAQHcVQEBTFVAAFMVEMC1OhDAAyAQwAMgEMBUBQRwVwUEMFUBAdxVAQF8CQwQwBcWAwH2i7EKaM9UBQRwVwUEMFUBAayAAgE8AAIBPAACAUxVQAB7VUCA/wGXywxEGFvWqgAAAABJRU5ErkJggg=="/></defs><g clip-path="url(#a)"><g clip-path="url(#b)"><use xlink:href="#c" transform="matrix(.2 0 0 -.4 0 83.3)"/></g></g><path d="M39.715 68.582c3.031.012 5.633-1.82 6.605-4.652.946-2.758.012-5.73-2.383-7.598-.488-.379-1.003-.742-1.414-1.2-2.378-2.632-1.156-6.57 2.29-7.425 2.867-.715 5.343 1.25 5.734 4.54.504 4.214 4.226 6.956 8.351 6.144 3.907-.766 6.352-4.774 5.235-8.586-1.137-3.875-5.36-5.871-9.293-4.395-.54.2-1.07.438-1.625.578-1.918.489-3.942-.277-5.04-1.863a4.315 4.315 0 01.016-4.988c1.145-1.621 3.082-2.344 5.04-1.84.64.168 1.25.45 1.878.664 3.196 1.105 6.649-.117 8.32-2.938 1.637-2.757 1.13-6.242-1.214-8.386-2.469-2.262-6.219-2.453-8.942-.438-1.753 1.297-2.523 3.102-2.753 5.238-.258 2.356-1.934 3.973-4.243 4.278-1.847.238-3.87-.945-4.62-2.703-.864-2.028-.231-4.188 1.656-5.668.382-.301.78-.586 1.136-.918 2.848-2.703 2.906-7.04.14-9.723-2.839-2.765-7.495-2.57-10.097.422-2.57 2.95-2.101 7.32 1.028 9.777.558.434 1.132.871 1.585 1.403a4.484 4.484 0 01.375 5.324c-1.05 1.66-3.02 2.445-4.968 1.93-2.532-.668-3.356-2.57-3.715-4.946-.617-4.062-4.473-6.578-8.45-5.62-3.867.925-6.136 4.898-4.933 8.636 1.227 3.816 5.461 5.742 9.262 4.226.617-.242 1.238-.511 1.883-.628 2.636-.493 5.027 1.199 5.46 3.812.391 2.34-1.355 4.785-3.859 4.992-1.21.102-2.523-.308-3.71-.715-3.813-1.316-7.934.649-9.087 4.426-1.144 3.77 1.137 7.684 5.02 8.602a6.91 6.91 0 008.437-5.516c.094-.523.145-1.058.258-1.574.512-2.258 2.637-3.856 4.879-3.688 2.23.164 3.977 1.86 4.168 4.118.168 2.027-.875 3.414-2.441 4.566-2.57 1.887-3.493 4.766-2.543 7.633.933 2.816 3.554 4.687 6.574 4.699zm-13.942-3.168c-7.054 1.2-12.625-.812-16.332-6.93-2.558-4.218-2.886-11.156 2.305-16.808-4.621-5.512-5.715-11.504-1.762-17.82 3.118-4.985 7.711-6.653 15.743-6.09 2.37-6.461 6.945-10.348 13.984-10.36 6.992-.011 11.562 3.801 14.016 10.348 7.48-1.16 13.52 1.043 16.851 8.152 2.672 5.692 1.258 10.977-2.875 15.692 4.711 5.574 5.719 11.586 1.664 17.93-3.105 4.863-7.953 6.609-15.676 5.917-2.328 6.512-6.96 10.371-13.968 10.368-6.957-.008-11.578-3.813-13.95-10.399" fill="#fff"/><path d="M120.39 19.523c-5.902 0-10.628 1.735-14.18 5.207-3.554 3.473-5.327 7.961-5.327 13.47 0 5.476 1.625 9.777 4.875 12.898 3.25 3.12 7.695 4.68 13.336 4.68 5.086 0 9.957-.985 13.379-2.958V35.812H116.94v6.305h7.637v6.227c-1.11.539-3.226.808-5.117.808-3.145 0-5.645-.984-7.492-2.957-1.852-1.972-2.778-4.758-2.778-8.36 0-3.554 1.032-6.394 3.094-8.519 2.063-2.128 4.73-3.191 8.008-3.191 3.91 0 7.836.781 10.543 2.348v-7.41c-2.836-1.028-6.73-1.54-10.445-1.54m29.938 9.555c-4.332 0-7.77 1.188-10.312 3.567-2.54 2.378-3.813 5.671-3.813 9.882 0 4.078 1.227 7.305 3.676 9.684 2.45 2.379 5.816 3.566 10.098 3.566 4.347 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.215-7.055-3.637-9.433-2.425-2.38-5.77-3.567-10.035-3.567m-.101 20.684c-3.98 0-5.97-2.446-5.97-7.336 0-2.336.516-4.14 1.555-5.418 1.036-1.278 2.493-1.914 4.364-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.899 7.535-5.695 7.535m44.836-20.684c-4.333 0-7.766 1.188-10.31 3.567-2.542 2.378-3.812 5.671-3.812 9.882 0 4.078 1.223 7.305 3.672 9.684 2.45 2.379 5.817 3.566 10.098 3.566 4.348 0 7.773-1.226 10.273-3.68 2.5-2.452 3.75-5.792 3.75-10.019 0-3.91-1.21-7.055-3.636-9.433-2.426-2.38-5.77-3.567-10.036-3.567m-.097 20.684c-3.985 0-5.973-2.446-5.973-7.336 0-2.336.52-4.14 1.555-5.418 1.039-1.278 2.492-1.914 4.363-1.914 3.832 0 5.746 2.379 5.746 7.133 0 5.023-1.898 7.535-5.691 7.535" fill="#020202"/><path d="M186.813 20.11h-28.489v7.046h9.95v28.012h8.538V27.156h10V20.11m65.848.917h-3.582L241.414 48.2h-.941l-7.77-27.172h-2.226l-8.403 26.989h-.933l-7.965-26.989h-3.707l10.32 33.692h3.395l7.59-26.043h.953l7.585 26.043h3.028l10.32-33.692m9.7 8.695c-6.587 0-11.184 5.406-11.184 13.152 0 7.563 4.5 12.262 11.75 12.262 3.332 0 5.66-1.133 7.203-1.88.14-.066.273-.132.402-.194l.063-2.829c-1.637 1.196-4.184 2.336-7.051 2.336-5.559 0-8.938-3.465-9.035-9.27l-.008-.503h17.555c.05-.434.101-.988.101-1.649 0-1.171-.273-11.425-9.797-11.425m-7.855 10.77l.059-.552c.445-3.937 2.917-7.914 7.437-7.914 1.91 0 3.473.602 4.637 1.79 2.047 2.081 2.152 5.265 2.136 6.19l-.011.485h-14.258m25.598-19.465h-3.489v27.754a115.5 115.5 0 01-.175 5.938h2.917l.118-2.36s2.867 3.258 8.675 3.504c.114.004.223.008.336.008 5.055 0 10.707-4.793 10.707-13.422.028-3.914-.765-7.89-2.968-10.11-1.758-1.769-4.457-3.253-7.036-3.253-6.722 0-9.085 3.996-9.085 3.996V21.027m7.511 32.118c-3.457 0-6.328-2.696-7.297-6.172-.101-.516-.214-1.121-.214-1.743v-4.476c0-.66.12-1.242.218-1.711l.059-.27c.95-3.543 2.785-6.39 7.437-6.39 5.457 0 7.836 3.707 7.836 10.222 0 6.114-3.144 10.54-8.039 10.54m17.145-33.266c-1.356 0-2.336.98-2.336 2.336 0 1.3.957 2.285 2.23 2.285.75 0 1.375-.238 1.813-.691.39-.407.598-.965.574-1.594 0-1.399-.918-2.336-2.281-2.336m1.77 10.355h-3.54V54.72h3.54V30.234m15.73-.839l-1.113.039c-4.047 0-7.172 3.472-7.172 3.472l-.172-3.492h-3.02c.117 1.79.172 4.445.172 6.996v18.31h3.54V39.602c0-.872.12-1.684.327-2.258.758-2.477 3.078-4.98 6.547-4.98 4.035 0 6.254 2.788 6.254 7.855v14.5h3.543V39.703c0-9.617-7.52-10.308-8.906-10.308m21.812.019c-2.89 0-6.222.809-8.148 2.844l-.031 3.926c1.867-1.93 5.293-3.926 7.566-3.926 3.969 0 6.102 1.851 6.102 5.969v1.367l-.72-.004c-9.194 0-14.843 3.156-14.843 8.941 0 3.164 2.36 7.43 6.906 7.43.168 0 .336-.004.508-.016 4.246-.289 6.168-1.133 7.293-2.718.336-.477 1.266-1.532 1.266-1.532l.312 3.024h3.09c-.266-1.867-.324-4.184-.324-5.871v-9.516c0-6.582-3.02-9.918-8.977-9.918m-1.18 23.184c-2.898 0-5.64-1.004-5.64-3.985 0-2.843 2.723-5.93 11.246-5.93h1.164v3.692c0 .492-.101 1.07-.281 1.629-.711 2.117-2.832 4.594-6.488 4.594m24.054-23.246c-4.168 0-5.468 3.03-5.468 3.03h-1.04l-.156-2.402h-2.957c.121 2.024.176 4.297.176 7.278v17.46h3.488v-13.6c0-.806.078-2.497.196-3.134.453-2.472 2.433-5.906 5.746-5.906.203 0 .41.016.625.047 1.007.145 1.863.645 2.445 1v-3.094c-.113-.039-.242-.086-.379-.133-.469-.168-1.348-.484-1.605-.484a9.433 9.433 0 00-1.07-.062" fill="#020202"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Analytics/analytics.svg b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
index 2a22a4e7c5..19b89e413e 100644
--- a/packages/nodes-base/nodes/Google/Analytics/analytics.svg
+++ b/packages/nodes-base/nodes/Google/Analytics/analytics.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" xml:space="preserve"><path fill="none" d="M0 0h192v192H0z"/><path fill="#F9AB00" d="M130 29v132c0 14.77 10.19 23 21 23 10 0 21-7 21-23V30c0-13.54-10-22-21-22s-21 9.33-21 21z"/><path fill="#E37400" d="M75 96v65c0 14.77 10.19 23 21 23 10 0 21-7 21-23V97c0-13.54-10-22-21-22s-21 9.33-21 21z"/><circle fill="#E37400" cx="41" cy="163" r="21"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192"><path fill="none" d="M0 0h192v192H0z"/><path fill="#F9AB00" d="M130 29v132c0 14.77 10.19 23 21 23 10 0 21-7 21-23V30c0-13.54-10-22-21-22s-21 9.33-21 21z"/><path fill="#E37400" d="M75 96v65c0 14.77 10.19 23 21 23 10 0 21-7 21-23V97c0-13.54-10-22-21-22s-21 9.33-21 21z"/><circle fill="#E37400" cx="41" cy="163" r="21"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
index b006a05d6a..35cf00485e 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
+++ b/packages/nodes-base/nodes/Google/BigQuery/googleBigQuery.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 58" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M14.48 54.473L.558 30.359c-.744-1.288-.744-2.876 0-4.164L14.48 2.082C15.223.795 16.595.002 18.08 0h27.857c1.48.007 2.845.8 3.585 2.082l13.92 24.113c.744 1.288.744 2.876 0 4.164L49.52 54.473c-.743 1.287-2.115 2.08-3.6 2.082H18.07c-1.483-.005-2.85-.798-3.593-2.082z" fill="#4386fa"/><path d="M40.697 20.512s3.87 9.283-1.406 14.545-14.883 1.894-14.883 1.894L43.95 56.547h1.984c1.486-.002 2.858-.796 3.6-2.082l9.216-15.958z" fill="#000" opacity=".1"/><path d="M45.266 39.507L41 35.23a.67.67 0 0 0-.158-.12c3.767-4.852 3.111-11.798-1.499-15.859a11.63 11.63 0 0 0-16.396 16.436 11.63 11.63 0 0 0 15.863 1.46c.031.055.069.106.113.15l4.277 4.277a.67.67 0 0 0 .947 0l1.12-1.12a.67.67 0 0 0 0-.947zM31.64 36.741a8.75 8.75 0 0 1-6.188-14.937 8.75 8.75 0 0 1 14.937 6.188 8.75 8.75 0 0 1-8.749 8.749zm-5.593-9.216v3.616c.557.983 1.363 1.803 2.338 2.375v-6.013zm4.375-2.998v9.772a6.45 6.45 0 0 0 2.338 0v-9.772zm6.764 6.606v-2.142H34.85v4.5a6.43 6.43 0 0 0 2.338-2.368z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 58" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M14.48 54.473L.558 30.359a4.163 4.163 0 010-4.164L14.48 2.082A4.163 4.163 0 0118.08 0h27.857c1.48.007 2.845.8 3.585 2.082l13.92 24.113a4.163 4.163 0 010 4.164L49.52 54.473a4.163 4.163 0 01-3.6 2.082H18.07a4.167 4.167 0 01-3.593-2.082z" fill="#4386fa"/><path d="M40.697 20.512s3.87 9.283-1.406 14.545-14.883 1.894-14.883 1.894L43.95 56.547h1.984a4.163 4.163 0 003.6-2.082l9.216-15.958z" fill="#000" opacity=".1"/><path d="M45.266 39.507L41 35.23a.67.67 0 00-.158-.12 11.63 11.63 0 00-1.499-15.859 11.63 11.63 0 00-16.396 16.436 11.63 11.63 0 0015.863 1.46.695.695 0 00.113.15l4.277 4.277a.67.67 0 00.947 0l1.12-1.12a.67.67 0 000-.947zM31.64 36.741a8.75 8.75 0 01-6.188-14.937 8.75 8.75 0 0114.937 6.188 8.75 8.75 0 01-8.749 8.749zm-5.593-9.216v3.616a6.426 6.426 0 002.338 2.375v-6.013zm4.375-2.998v9.772a6.45 6.45 0 002.338 0v-9.772zm6.764 6.606v-2.142H34.85v4.5a6.43 6.43 0 002.338-2.368z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Books/googlebooks.svg b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
index 85d3bf7fa0..f0715d1bf6 100644
--- a/packages/nodes-base/nodes/Google/Books/googlebooks.svg
+++ b/packages/nodes-base/nodes/Google/Books/googlebooks.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448.7 500" xml:space="preserve"><path fill="#0B5E9F" d="M428.2 221.9 49.2 6.5C33-2.6 18.5-1.7 9.7 6.8 3.4 12.8 0 22.4 0 34.9v429.9C0 477.4 3.7 487 9.7 493c9.1 8.8 23.3 9.7 39.5.3l379.1-215.4c27.2-15.4 27.2-40.4-.1-56z"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="223.168" y1="7682.241" x2="223.168" y2="8182.269" gradientTransform="matrix(.9998 0 0 -.9998 1.213 8180.705)"><stop offset="0" style="stop-color:#fff;stop-opacity:0"/><stop offset="1" style="stop-color:#fff;stop-opacity:.1"/></linearGradient><path fill-rule="evenodd" clip-rule="evenodd" fill="url(#a)" d="m428.3 221.9-95-54-1.7-1.1-.1.1L49.2 6.6c-15.7-9-29.9-8.3-38.9-.2L8.8 7.7C3.2 13.7 0 23 0 35.1v429.7c0 12.1 3.2 21.4 9.1 27.2l-.2.2c8.9 9.5 23.7 10.6 40.4 1.3L331.5 333l.1.1s1.7-1.1 1.8-1.1l95-54c27.1-15.5 27.1-40.8-.1-56.1z"/><path opacity=".25" fill-rule="evenodd" clip-rule="evenodd" fill="#FFF" d="m49.2 9.4 379 215.3c12.3 6.9 19.2 16 20.3 25.3 0-10.1-6.7-20.3-20.3-28.1L49.2 6.6C22-9 0 4 0 35.1v2.8C0 6.8 22-5.9 49.2 9.4z"/><path fill="#40DCFF" d="M358.2 70.2H135.9V444l242.9-138V90.9c0-11.4-9.2-20.7-20.6-20.7z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7121.753" y1="-324.192" x2="7123.592" y2="-327.498" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2)"><stop offset="0" style="stop-color:#5b7c8c;stop-opacity:0"/><stop offset="1" style="stop-color:#5b7c8c;stop-opacity:.4"/></linearGradient><path fill="url(#b)" d="M358.2 70.2H135.9v373.6l242.9-137.9v-215c0-11.4-9.2-20.7-20.6-20.7z"/><path fill="#009BF0" d="M135.9 70.2H70.3v411l65.6-37.2z"/><path opacity=".15" fill="#FFF" d="M358.2 70.2H70.3v2.3h287.9c11.4 0 20.7 6.9 20.7 18.3-.1-11.3-9.3-20.6-20.7-20.6z"/><path fill="#FAFAFA" d="m261.1 173.3 33.8-20.9 35 20.9V70.2h-68.8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448.7 500"><path fill="#0B5E9F" d="M428.2 221.9L49.2 6.5C33-2.6 18.5-1.7 9.7 6.8 3.4 12.8 0 22.4 0 34.9v429.9C0 477.4 3.7 487 9.7 493c9.1 8.8 23.3 9.7 39.5.3l379.1-215.4c27.2-15.4 27.2-40.4-.1-56z"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="223.168" y1="7682.241" x2="223.168" y2="8182.269" gradientTransform="matrix(.9998 0 0 -.9998 1.213 8180.705)"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity=".1"/></linearGradient><path fill-rule="evenodd" clip-rule="evenodd" fill="url(#a)" d="M428.3 221.9l-95-54-1.7-1.1-.1.1L49.2 6.6c-15.7-9-29.9-8.3-38.9-.2L8.8 7.7C3.2 13.7 0 23 0 35.1v429.7c0 12.1 3.2 21.4 9.1 27.2l-.2.2c8.9 9.5 23.7 10.6 40.4 1.3L331.5 333l.1.1s1.7-1.1 1.8-1.1l95-54c27.1-15.5 27.1-40.8-.1-56.1z"/><path opacity=".25" fill-rule="evenodd" clip-rule="evenodd" fill="#FFF" d="M49.2 9.4l379 215.3c12.3 6.9 19.2 16 20.3 25.3 0-10.1-6.7-20.3-20.3-28.1L49.2 6.6C22-9 0 4 0 35.1v2.8C0 6.8 22-5.9 49.2 9.4z"/><path fill="#40DCFF" d="M358.2 70.2H135.9V444l242.9-138V90.9c0-11.4-9.2-20.7-20.6-20.7z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7121.753" y1="-324.192" x2="7123.592" y2="-327.498" gradientTransform="matrix(38.316 0 0 -36.19 -272599.25 -11433.2)"><stop offset="0" stop-color="#5b7c8c" stop-opacity="0"/><stop offset="1" stop-color="#5b7c8c" stop-opacity=".4"/></linearGradient><path fill="url(#b)" d="M358.2 70.2H135.9v373.6l242.9-137.9v-215c0-11.4-9.2-20.7-20.6-20.7z"/><path fill="#009BF0" d="M135.9 70.2H70.3v411l65.6-37.2z"/><path opacity=".15" fill="#FFF" d="M358.2 70.2H70.3v2.3h287.9c11.4 0 20.7 6.9 20.7 18.3-.1-11.3-9.3-20.6-20.7-20.6z"/><path fill="#FAFAFA" d="M261.1 173.3l33.8-20.9 35 20.9V70.2h-68.8z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
index 869ae43b54..8e8fa53a09 100644
--- a/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
+++ b/packages/nodes-base/nodes/Google/Calendar/googleCalendar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 82" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.052 18.947H18.947v42.105h42.105V18.947z"/><path d="M61.053 80 80 61.053H61.053V80z" fill="#ea4335"/><path d="M80 18.947H61.053v42.105H80V18.947z" fill="#fbbc04"/><path d="M61.052 61.053H18.947V80h42.105V61.053z" fill="#34a853"/><path d="M0 61.053v12.632A6.314 6.314 0 0 0 6.316 80h12.632V61.053H0z" fill="#188038"/><path d="M80 18.947V6.316A6.314 6.314 0 0 0 73.685 0H61.053v18.947H80z" fill="#1967d2"/><path d="M61.053 0H6.316A6.314 6.314 0 0 0 0 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505c.332 1.263.911 2.242 1.737 2.937s1.821 1.037 2.989 1.037c1.195 0 2.221-.363 3.079-1.089s1.29-1.653 1.29-2.774a3.44 3.44 0 0 0-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1c1.168 0 2.153-.316 2.953-.947s1.2-1.495 1.2-2.595c0-.979-.358-1.758-1.074-2.342s-1.621-.879-2.721-.879c-1.074 0-1.926.284-2.558.858s-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558c1.479 0 2.811.284 3.989.858s2.105 1.368 2.774 2.379 1 2.153 1 3.416c0 1.289-.311 2.379-.932 3.274s-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 0 1 2.937 2.289c.763 1.026 1.147 2.253 1.147 3.684s-.363 2.711-1.089 3.832-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z" fill="#4285f4"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 82" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.052 18.947H18.947v42.105h42.105V18.947z"/><path d="M61.053 80L80 61.053H61.053V80z" fill="#ea4335"/><path d="M80 18.947H61.053v42.105H80V18.947z" fill="#fbbc04"/><path d="M61.052 61.053H18.947V80h42.105V61.053z" fill="#34a853"/><path d="M0 61.053v12.632A6.314 6.314 0 006.316 80h12.632V61.053H0z" fill="#188038"/><path d="M80 18.947V6.316A6.314 6.314 0 0073.685 0H61.053v18.947H80z" fill="#1967d2"/><path d="M61.053 0H6.316A6.314 6.314 0 000 6.316v54.737h18.947V18.947h42.105V0zM27.584 51.611c-1.574-1.063-2.663-2.616-3.258-4.668l3.653-1.505c.332 1.263.911 2.242 1.737 2.937s1.821 1.037 2.989 1.037c1.195 0 2.221-.363 3.079-1.089s1.29-1.653 1.29-2.774a3.44 3.44 0 00-1.358-2.811c-.905-.727-2.042-1.089-3.4-1.089h-2.111v-3.616H32.1c1.168 0 2.153-.316 2.953-.947s1.2-1.495 1.2-2.595c0-.979-.358-1.758-1.074-2.342s-1.621-.879-2.721-.879c-1.074 0-1.926.284-2.558.858s-1.106 1.301-1.379 2.111l-3.616-1.505c.479-1.358 1.358-2.558 2.647-3.595s2.937-1.558 4.937-1.558c1.479 0 2.811.284 3.989.858s2.105 1.368 2.774 2.379 1 2.153 1 3.416c0 1.289-.311 2.379-.932 3.274s-1.384 1.579-2.289 2.058v.216a6.95 6.95 0 012.937 2.289c.763 1.026 1.147 2.253 1.147 3.684s-.363 2.711-1.089 3.832-1.732 2.005-3.005 2.647c-1.279.642-2.716.968-4.311.968-1.847.005-3.553-.526-5.126-1.589zm22.437-18.126l-4.01 2.9-2.005-3.042 7.195-5.189h2.758v24.479h-3.937V33.484z" fill="#4285f4"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
index 9762077d2b..f312de582e 100644
--- a/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
+++ b/packages/nodes-base/nodes/Google/Drive/googleDrive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 73" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="m6.048 61.26 3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 0 0 1.1 4.124z" fill="#0066da"/><path d="M40 22.91 27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445A8.298 8.298 0 0 0 0 48.568h25.2z" fill="#00ac47"/><path d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 0 0 1.1-4.124H54.798l5.363 10.538z" fill="#ea4335"/><path d="M40 22.91 52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z" fill="#00832d"/><path d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z" fill="#2684fc"/><path d="M67.262 24.284 55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 0 0-1.1-4.124z" fill="#ffba00"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 73" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M6.048 61.26l3.528 6.094c.733 1.283 1.787 2.291 3.024 3.024l12.6-21.81H0a8.3 8.3 0 001.1 4.124z" fill="#0066da"/><path d="M40 22.91L27.4 1.1c-1.237.733-2.291 1.741-3.024 3.024L1.1 44.445A8.298 8.298 0 000 48.568h25.2z" fill="#00ac47"/><path d="M67.4 70.378c1.237-.733 2.291-1.741 3.024-3.024l1.466-2.52 7.01-12.142a8.3 8.3 0 001.1-4.124H54.798l5.363 10.538z" fill="#ea4335"/><path d="M40 22.91L52.6 1.1C51.363.367 49.943 0 48.477 0H31.524c-1.466 0-2.887.412-4.124 1.1z" fill="#00832d"/><path d="M54.799 48.568H25.2l-12.6 21.81c1.237.733 2.657 1.1 4.124 1.1h46.552c1.466 0 2.887-.412 4.124-1.1z" fill="#2684fc"/><path d="M67.262 24.284L55.624 4.124C54.891 2.841 53.837 1.833 52.6 1.1L40 22.91l14.8 25.659h25.155a8.3 8.3 0 00-1.1-4.124z" fill="#ffba00"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Gmail/gmail.svg b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
index 71e6ba1dc4..e9a598fe76 100644
--- a/packages/nodes-base/nodes/Google/Gmail/gmail.svg
+++ b/packages/nodes-base/nodes/Google/Gmail/gmail.svg
@@ -1 +1 @@
-<svg width="256" height="193" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M58.182 192.05V93.14L27.507 65.077 0 49.504v125.091c0 9.658 7.825 17.455 17.455 17.455h40.727z" fill="#4285F4"/><path d="M197.818 192.05h40.727c9.659 0 17.455-7.826 17.455-17.455V49.505l-31.156 17.837-27.026 25.798v98.91z" fill="#34A853"/><path fill="#EA4335" d="m58.182 93.14-4.174-38.647 4.174-36.989L128 69.868l69.818-52.364 4.67 34.992-4.67 40.644L128 145.504z"/><path d="M197.818 17.504V93.14L256 49.504V26.231c0-21.585-24.64-33.89-41.89-20.945l-16.292 12.218z" fill="#FBBC04"/><path d="m0 49.504 26.759 20.07L58.182 93.14V17.504L41.89 5.286C24.61-7.66 0 4.646 0 26.23v23.273z" fill="#C5221F"/></svg>
\ No newline at end of file
+<svg width="256" height="193" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M58.182 192.05V93.14L27.507 65.077 0 49.504v125.091c0 9.658 7.825 17.455 17.455 17.455h40.727z" fill="#4285F4"/><path d="M197.818 192.05h40.727c9.659 0 17.455-7.826 17.455-17.455V49.505l-31.156 17.837-27.026 25.798v98.91z" fill="#34A853"/><path fill="#EA4335" d="M58.182 93.14l-4.174-38.647 4.174-36.989L128 69.868l69.818-52.364 4.67 34.992-4.67 40.644L128 145.504z"/><path d="M197.818 17.504V93.14L256 49.504V26.231c0-21.585-24.64-33.89-41.89-20.945l-16.292 12.218z" fill="#FBBC04"/><path d="M0 49.504l26.759 20.07L58.182 93.14V17.504L41.89 5.286C24.61-7.66 0 4.646 0 26.23v23.273z" fill="#C5221F"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
index 8afa04ca8a..257f88ea8e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
+++ b/packages/nodes-base/nodes/Google/Sheet/googleSheets.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M35.69 1 52 17.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.71 3.71 0 0 1 48.293 60H12.707a3.71 3.71 0 0 1-2.623-1.078A3.67 3.67 0 0 1 9 56.312V4.688a3.67 3.67 0 0 1 1.084-2.61A3.71 3.71 0 0 1 12.707 1H35.69z" fill="#28B446"/><path d="M35.69 1 52 17.225H39.397c-2.054 0-3.707-1.829-3.707-3.872V1z" fill="#6ACE7C"/><path fill="#219B38" d="M39.211 17.225 52 22.48v-5.255z"/><path d="M20.12 31.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H21.603a1.476 1.476 0 0 1-1.482-1.474V31.974zm2.225 1.475h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/><g><path d="M34.69 0 51 16.225v39.087a3.67 3.67 0 0 1-1.084 2.61A3.71 3.71 0 0 1 47.293 59H11.707a3.71 3.71 0 0 1-2.623-1.078A3.67 3.67 0 0 1 8 55.312V3.688a3.67 3.67 0 0 1 1.084-2.61A3.71 3.71 0 0 1 11.707 0H34.69z" fill="#28B446"/><path d="M34.69 0 51 16.225H38.397c-2.054 0-3.707-1.829-3.707-3.872V0z" fill="#6ACE7C"/><path fill="#219B38" d="M38.211 16.225 51 21.48v-5.255z"/><path d="M19.12 30.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H20.603a1.476 1.476 0 0 1-1.482-1.474V30.974zm2.225 1.475h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/></g></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M35.69 1L52 17.225v39.087a3.67 3.67 0 01-1.084 2.61A3.71 3.71 0 0148.293 60H12.707a3.71 3.71 0 01-2.623-1.078A3.67 3.67 0 019 56.312V4.688a3.67 3.67 0 011.084-2.61A3.71 3.71 0 0112.707 1H35.69z" fill="#28B446"/><path d="M35.69 1L52 17.225H39.397c-2.054 0-3.707-1.829-3.707-3.872V1z" fill="#6ACE7C"/><path fill="#219B38" d="M39.211 17.225L52 22.48v-5.255z"/><path d="M20.12 31.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H21.603a1.476 1.476 0 01-1.482-1.474V31.974zm2.225 1.475h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V33.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/><path d="M34.69 0L51 16.225v39.087a3.67 3.67 0 01-1.084 2.61A3.71 3.71 0 0147.293 59H11.707a3.71 3.71 0 01-2.623-1.078A3.67 3.67 0 018 55.312V3.688a3.67 3.67 0 011.084-2.61A3.71 3.71 0 0111.707 0H34.69z" fill="#28B446"/><path d="M34.69 0L51 16.225H38.397c-2.054 0-3.707-1.829-3.707-3.872V0z" fill="#6ACE7C"/><path fill="#219B38" d="M38.211 16.225L51 21.48v-5.255z"/><path d="M19.12 30.975c0-.817.662-1.475 1.483-1.475h17.794c.821 0 1.482.658 1.482 1.475v15.487c0 .818-.661 1.475-1.482 1.475H20.603a1.476 1.476 0 01-1.482-1.474V30.974zm2.225 1.475h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212zm9.638-10.325h6.672v2.212h-6.672V32.45zm0 5.162h6.672v2.213h-6.672v-2.213zm0 5.163h6.672v2.212h-6.672v-2.212z" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/Slides/googleslides.svg b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
index b17df78263..666d185ea5 100644
--- a/packages/nodes-base/nodes/Google/Slides/googleslides.svg
+++ b/packages/nodes-base/nodes/Google/Slides/googleslides.svg
@@ -1 +1 @@
-<svg viewBox="-60 -60 630 630" xmlns="http://www.w3.org/2000/svg"><path d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z" fill="#f5b912"/><path d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5zm-.7 139.5h-133v-90.5h133z" fill="#fff"/><path d="m319.6 134.4 121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z" fill="#fadc87"/></svg>
\ No newline at end of file
+<svg viewBox="-60 -60 630 630" xmlns="http://www.w3.org/2000/svg"><path d="M440.8 140.2V479c0 18.2-14.8 33-33 33H102.9c-18.2 0-33-14.8-33-33V33c0-18.2 14.8-33 33-33h197.6z" fill="#f5b912"/><path d="M323.6 233.5H189.1c-12.5 0-22.6 10.1-22.6 22.6v134.5c0 12.5 10.1 22.6 22.6 22.6h134.5c12.5 0 22.6-10.1 22.6-22.6V256c0-12.4-10.1-22.5-22.6-22.5zm-.7 139.5h-133v-90.5h133z" fill="#fff"/><path d="M319.6 134.4l121.1 98.1v-92.2L372 100.5z" opacity=".19"/><path d="M441.4 140.2H334.2c-18.2 0-33-14.8-33-33V0z" fill="#fadc87"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/HelpScout/helpScout.svg b/packages/nodes-base/nodes/HelpScout/helpScout.svg
index c7be1bcb92..f82e8a8c1b 100644
--- a/packages/nodes-base/nodes/HelpScout/helpScout.svg
+++ b/packages/nodes-base/nodes/HelpScout/helpScout.svg
@@ -1 +1 @@
-<svg width="256" height="310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="m18.432 180.969 90.484-90.485a63.717 63.717 0 0 0 18.99-45.428A64.245 64.245 0 0 0 109.476 0L18.99 90.484A63.717 63.717 0 0 0 0 135.913c0 17.687 7.075 33.512 18.432 45.056zm219.136-52.876-90.484 90.484a63.717 63.717 0 0 0-18.99 45.429 64.245 64.245 0 0 0 18.431 45.056l90.484-90.485A63.717 63.717 0 0 0 256 173.15c0-17.687-7.075-33.513-18.432-45.056zm-.559-37.422A63.717 63.717 0 0 0 256 45.242 64.245 64.245 0 0 0 237.568.186L18.991 218.577C7.26 230.307 0 246.32 0 264.192a64.245 64.245 0 0 0 18.432 45.056L237.009 90.671z" fill="#1292EE"/></svg>
\ No newline at end of file
+<svg width="256" height="310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M18.432 180.969l90.484-90.485a63.717 63.717 0 0018.99-45.428A64.245 64.245 0 00109.476 0L18.99 90.484A63.717 63.717 0 000 135.913c0 17.687 7.075 33.512 18.432 45.056zm219.136-52.876l-90.484 90.484a63.717 63.717 0 00-18.99 45.429 64.245 64.245 0 0018.431 45.056l90.484-90.485A63.717 63.717 0 00256 173.15c0-17.687-7.075-33.513-18.432-45.056zm-.559-37.422A63.717 63.717 0 00256 45.242 64.245 64.245 0 00237.568.186L18.991 218.577C7.26 230.307 0 246.32 0 264.192a64.245 64.245 0 0018.432 45.056L237.009 90.671z" fill="#1292EE"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Hubspot/hubspot.svg b/packages/nodes-base/nodes/Hubspot/hubspot.svg
index 6c0bbb621e..d2ea2822e5 100644
--- a/packages/nodes-base/nodes/Hubspot/hubspot.svg
+++ b/packages/nodes-base/nodes/Hubspot/hubspot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 62.883 69.883" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.442" y="2.442"/><symbol id="a" overflow="visible"><path d="M55.504 30.401a16.26 16.26 0 0 0-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798a5.711 5.711 0 0 0 3.525-5.357 5.86 5.86 0 0 0-5.859-5.889 5.91 5.91 0 0 0-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754a17.036 17.036 0 0 0-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724A6.522 6.522 0 0 0 6.519 0 6.52 6.52 0 0 0 0 6.524a6.523 6.523 0 0 0 6.524 6.524 6.47 6.47 0 0 0 3.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586a16.388 16.388 0 0 0 1.025 5.645C26.5 45.324 27.33 46.73 28.361 48l-6.221 6.235a5.015 5.015 0 0 0-5.298 1.162c-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5.01 5.01 0 0 0 3.565-1.48 5.047 5.047 0 0 0 1.475-3.564 5.03 5.03 0 0 0-.234-1.514l6.426-6.426a16.09 16.09 0 0 0 2.856 1.563 16.7 16.7 0 0 0 6.685 1.406h.439a15.76 15.76 0 0 0 7.627-1.929 15.77 15.77 0 0 0 5.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.79 8.79 0 0 1-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 0 1 4.297-1.294h.147c1.416 0 2.769.278 4.038.928a8.558 8.558 0 0 1 3.174 2.886 9.18 9.18 0 0 1 1.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z" stroke="none" fill="#f8761f" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 62.883 69.883" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="2.442" y="2.442"/><symbol id="a" overflow="visible"><path d="M55.504 30.401a16.26 16.26 0 00-5.904-5.864c-1.865-1.084-3.794-1.773-5.972-2.07v-7.798a5.711 5.711 0 003.525-5.357 5.86 5.86 0 00-5.859-5.889 5.91 5.91 0 00-5.908 5.889c0 2.393 1.27 4.434 3.452 5.357v7.754a17.036 17.036 0 00-5.195 1.631L12.769 8.247c.146-.552.273-1.123.273-1.724A6.522 6.522 0 006.519 0 6.52 6.52 0 000 6.524a6.523 6.523 0 006.524 6.524 6.47 6.47 0 003.35-.952l1.367 1.035 18.726 13.501c-.991.908-1.914 1.943-2.651 3.105-1.494 2.368-2.407 4.971-2.407 7.813v.586a16.388 16.388 0 001.025 5.645C26.5 45.324 27.33 46.73 28.361 48l-6.221 6.235a5.015 5.015 0 00-5.298 1.162c-.947.942-1.48 2.227-1.475 3.565s.527 2.612 1.479 3.564 2.227 1.48 3.565 1.48a5.01 5.01 0 003.565-1.48 5.047 5.047 0 001.475-3.564 5.03 5.03 0 00-.234-1.514l6.426-6.426a16.09 16.09 0 002.856 1.563 16.7 16.7 0 006.685 1.406h.439a15.76 15.76 0 007.627-1.929 15.77 15.77 0 005.977-5.63c1.499-2.393 2.319-5.044 2.319-7.959v-.146c0-2.866-.664-5.508-2.051-7.93zm-7.847 13.487c-1.743 1.938-3.75 3.135-6.016 3.135h-.43c-1.294 0-2.564-.356-3.799-1.011a8.79 8.79 0 01-3.33-3.032c-.898-1.27-1.387-2.656-1.387-4.126v-.439c0-1.445.278-2.817.977-4.111.747-1.465 1.758-2.515 3.101-3.389a7.6 7.6 0 014.297-1.294h.147c1.416 0 2.769.278 4.038.928a8.558 8.558 0 013.174 2.886 9.18 9.18 0 011.421 4.053l.034.913c0 1.987-.762 3.828-2.28 5.498z" stroke="none" fill="#f8761f" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
index d39ba31b56..5e0000cd16 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
+++ b/packages/nodes-base/nodes/InvoiceNinja/invoiceNinja.svg
@@ -1 +1 @@
-<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M16.247 10.326a1.164 1.164 0 1 1-2.328 0 1.164 1.164 0 0 1 2.328 0zm-6.288 0a1.164 1.164 0 1 1-2.329 0 1.164 1.164 0 0 1 2.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65v7.19a790.1 790.1 0 0 0 3.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 0 1 1.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
\ No newline at end of file
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M16.247 10.326a1.164 1.164 0 11-2.328 0 1.164 1.164 0 012.328 0zm-6.288 0a1.164 1.164 0 11-2.329 0 1.164 1.164 0 012.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65v7.19a790.1 790.1 0 003.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 011.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Jira/jira.svg b/packages/nodes-base/nodes/Jira/jira.svg
index 0a289a27f5..760d690dac 100644
--- a/packages/nodes-base/nodes/Jira/jira.svg
+++ b/packages/nodes-base/nodes/Jira/jira.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 68.25 71.25" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="3.125" y="3.125"/><defs><linearGradient id="b" x1="91.9%" y1="40.22%" x2="28.49%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="c" x1="8.7%" y1="59.17%" x2="72.26%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.161 30.211 30.95 0 .74 30.211a2.54 2.54 0 0 0 0 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 0 0 0-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z" fill="#2684ff"/><path d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z" fill="url(#b)"/><path d="M40.437 31.973 30.95 41.46a15.93 15.93 0 0 1 0 22.536l20.749-20.749z" fill="url(#c)"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 68.25 71.25" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="3.125" y="3.125"/><defs><linearGradient id="b" x1="91.9%" y1="40.22%" x2="28.49%" y2="81.63%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient><linearGradient id="c" x1="8.7%" y1="59.17%" x2="72.26%" y2="17.99%"><stop offset="18%" stop-color="#0052cc"/><stop offset="100%" stop-color="#2684ff"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M61.161 30.211L30.95 0 .74 30.211a2.54 2.54 0 000 3.581l30.211 30.21 30.211-30.21a2.54 2.54 0 000-3.581zM30.95 41.46l-9.462-9.462 9.462-9.462 9.462 9.462z" fill="#2684ff"/><path d="M30.95 22.599C24.755 16.405 24.724 6.37 30.881.138L10.114 20.774l11.268 11.268z" fill="url(#b)"/><path d="M40.437 31.973L30.95 41.46a15.93 15.93 0 010 22.536l20.749-20.749z" fill="url(#c)"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Kafka/kafka.svg b/packages/nodes-base/nodes/Kafka/kafka.svg
index 87f5d75b7a..4499e6a9cd 100644
--- a/packages/nodes-base/nodes/Kafka/kafka.svg
+++ b/packages/nodes-base/nodes/Kafka/kafka.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid"><path d="M21.538 17.724a4.16 4.16 0 0 0-3.128 1.42l-1.96-1.388a5.354 5.354 0 0 0 .328-1.832 5.35 5.35 0 0 0-.317-1.802l1.956-1.373a4.16 4.16 0 0 0 3.122 1.414 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172 4.18 4.18 0 0 0-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374a5.393 5.393 0 0 0-3.336-1.94V8.25a4.18 4.18 0 0 0 3.313-4.082A4.18 4.18 0 0 0 11.388 0a4.18 4.18 0 0 0-4.172 4.172 4.177 4.177 0 0 0 3.24 4.063v2.4A5.371 5.371 0 0 0 6 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523a4.169 4.169 0 0 0-3.276 4.072A4.18 4.18 0 0 0 11.388 32a4.18 4.18 0 0 0 4.172-4.172 4.177 4.177 0 0 0-3.276-4.072v-2.523a5.386 5.386 0 0 0 3.28-1.907l1.973 1.397a4.15 4.15 0 0 0-.171 1.173 4.18 4.18 0 0 0 4.172 4.172 4.18 4.18 0 0 0 4.172-4.172 4.18 4.18 0 0 0-4.172-4.172zm0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023zM9.366 4.172a2.024 2.024 0 0 1 4.045 0c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022zM13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022zm-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82zm10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32" preserveAspectRatio="xMidYMid"><path d="M21.538 17.724a4.16 4.16 0 00-3.128 1.42l-1.96-1.388a5.354 5.354 0 00.328-1.832 5.35 5.35 0 00-.317-1.802l1.956-1.373a4.16 4.16 0 003.122 1.414 4.18 4.18 0 004.172-4.172 4.18 4.18 0 00-4.172-4.172 4.18 4.18 0 00-4.172 4.172c0 .412.062.8.174 1.185l-1.957 1.374a5.393 5.393 0 00-3.336-1.94V8.25a4.18 4.18 0 003.313-4.082A4.18 4.18 0 0011.388 0a4.18 4.18 0 00-4.172 4.172 4.177 4.177 0 003.24 4.063v2.4A5.371 5.371 0 006 15.925c0 2.665 1.947 4.88 4.493 5.308v2.523a4.169 4.169 0 00-3.276 4.072A4.18 4.18 0 0011.388 32a4.18 4.18 0 004.172-4.172 4.177 4.177 0 00-3.276-4.072v-2.523a5.386 5.386 0 003.28-1.907l1.973 1.397a4.15 4.15 0 00-.171 1.173 4.18 4.18 0 004.172 4.172 4.18 4.18 0 004.172-4.172 4.18 4.18 0 00-4.172-4.172zm0-9.754c1.115 0 2.022.908 2.022 2.023s-.907 2.022-2.022 2.022-2.022-.907-2.022-2.022.907-2.023 2.022-2.023zM9.366 4.172a2.024 2.024 0 014.045 0c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022zM13.41 27.83c0 1.115-.907 2.022-2.022 2.022s-2.023-.907-2.023-2.022.907-2.022 2.023-2.022 2.022.907 2.022 2.022zm-2.023-9.082c-1.556 0-2.82-1.265-2.82-2.82s1.265-2.82 2.82-2.82 2.82 1.265 2.82 2.82-1.265 2.82-2.82 2.82zm10.15 5.172c-1.115 0-2.022-.908-2.022-2.023s.907-2.022 2.022-2.022 2.022.907 2.022 2.022-.907 2.023-2.022 2.023z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Lemlist/lemlist.svg b/packages/nodes-base/nodes/Lemlist/lemlist.svg
index 7f153b0b02..b96f4b0d70 100644
--- a/packages/nodes-base/nodes/Lemlist/lemlist.svg
+++ b/packages/nodes-base/nodes/Lemlist/lemlist.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="266.667" height="266.667" viewBox="0 0 200 200"><path d="M31.5 1.4C18.8 5.4 9.7 13.3 4.1 25L.5 32.5V74c0 40.3.1 41.8 2.3 50 2.7 10 9.3 24.2 15.2 33.1 2.4 3.5 8.2 10.2 13 14.9 13.5 13.3 29.6 21.5 52 26.4 6.4 1.5 13.1 1.6 46.5 1.4l39-.3 7-3.4c8.8-4.3 16.3-11.9 20.7-20.8l3.3-6.8.3-65.5c.3-69.7.3-69.6-4.6-79.5C190 13 183 6.8 171.6 2.5L165 0l-64.8.1C50.8.1 34.6.4 31.5 1.4zm40.2 59 2.8 2.4.5 24.9c.8 37.7-.3 36.6 37.1 37.1 22.9.3 24.8.4 26.8 2.3 2.7 2.5 3.5 6 2.4 9.6-1.7 5.1-3.4 5.4-32.3 5.1l-26.5-.3-5.3-3c-7.3-4-14.7-12.3-16.9-18.8-1.3-4.1-1.7-10.1-2.1-28.5-.4-25.2 0-27.6 4.6-31.2 3.3-2.6 5.5-2.5 8.9.4zm65.4-.9c5.7 3 6.2 11.2.9 14-2.3 1.2-7.1 1.5-21.8 1.5-17.6 0-19.1-.1-21.6-2.1-4.8-3.8-2.9-11.9 3.4-14.2.8-.3 9.3-.6 18.8-.6 13.8-.1 17.9.2 20.3 1.4zM131 94c1.3 1.3 2 3.3 2 6s-.7 4.7-2 6c-1.8 1.8-3.3 2-18.2 2-15.2 0-16.3-.1-18.5-2.2-3-2.8-3.1-8.3-.1-11.5 2.1-2.2 2.7-2.3 18.5-2.3 15 0 16.5.2 18.3 2z" fill="#4d19ff"/></svg>
\ No newline at end of file
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="266.667" height="266.667" viewBox="0 0 200 200"><path d="M31.5 1.4C18.8 5.4 9.7 13.3 4.1 25L.5 32.5V74c0 40.3.1 41.8 2.3 50 2.7 10 9.3 24.2 15.2 33.1 2.4 3.5 8.2 10.2 13 14.9 13.5 13.3 29.6 21.5 52 26.4 6.4 1.5 13.1 1.6 46.5 1.4l39-.3 7-3.4c8.8-4.3 16.3-11.9 20.7-20.8l3.3-6.8.3-65.5c.3-69.7.3-69.6-4.6-79.5C190 13 183 6.8 171.6 2.5L165 0l-64.8.1C50.8.1 34.6.4 31.5 1.4zm40.2 59l2.8 2.4.5 24.9c.8 37.7-.3 36.6 37.1 37.1 22.9.3 24.8.4 26.8 2.3 2.7 2.5 3.5 6 2.4 9.6-1.7 5.1-3.4 5.4-32.3 5.1l-26.5-.3-5.3-3c-7.3-4-14.7-12.3-16.9-18.8-1.3-4.1-1.7-10.1-2.1-28.5-.4-25.2 0-27.6 4.6-31.2 3.3-2.6 5.5-2.5 8.9.4zm65.4-.9c5.7 3 6.2 11.2.9 14-2.3 1.2-7.1 1.5-21.8 1.5-17.6 0-19.1-.1-21.6-2.1-4.8-3.8-2.9-11.9 3.4-14.2.8-.3 9.3-.6 18.8-.6 13.8-.1 17.9.2 20.3 1.4zM131 94c1.3 1.3 2 3.3 2 6s-.7 4.7-2 6c-1.8 1.8-3.3 2-18.2 2-15.2 0-16.3-.1-18.5-2.2-3-2.8-3.1-8.3-.1-11.5 2.1-2.2 2.7-2.3 18.5-2.3 15 0 16.5.2 18.3 2z" fill="#4d19ff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
index 1733e23516..a3ed0a59c7 100644
--- a/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
+++ b/packages/nodes-base/nodes/Mailchimp/mailchimp.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(2)" fill="#000" fill-rule="nonzero"><path d="M56.798 39.115c-.36-.845-1.197-1.449-2.155-1.69-.36-1.57-.838-2.294-.838-2.415.12-.241.359-.362.359-.483 1.437-1.69.479-4.225-1.915-4.829-1.317-1.328-2.515-1.931-3.592-2.414-.958-.483-.599-.242-1.437-.725-.24-1.207-.359-3.863-.718-5.794-.36-1.69-1.078-3.019-2.035-3.743-.48-.966-.958-1.81-1.676-2.535 3.352-5.07 4.19-10.14 1.795-12.797C43.51.483 41.953 0 40.037 0c-2.754 0-5.986 1.087-9.338 3.139 0 0-2.155-1.811-2.275-1.811C19.086-6.036-7.373 26.68 1.966 33.803l2.394 1.81C2.804 39.84 4.96 44.91 9.388 46.48c.958.362 2.036.483 3.113.483 0 0 7.064 13.038 22.029 13.038C51.77 60 56.2 42.978 56.2 42.857c-.12.12 1.316-2.052.598-3.742zM2.564 31.63C.77 28.37 4.001 21.85 6.395 17.988 12.142 8.692 21.84 1.328 26.27 2.414l1.197-.482s3.233 2.776 3.352 2.776C33.093 3.38 35.966 1.932 38.6 1.69c-1.676.362-3.591 1.207-5.986 2.656 0 0-5.627 3.863-8.979 7.244-1.796 1.81-9.218 10.865-9.218 10.744 1.317-2.535 2.274-3.863 4.43-6.52 1.197-1.569 2.514-3.017 3.83-4.466.599-.604 1.198-1.207 1.916-1.81.479-.363.838-.846 1.317-1.208.24-.12.36-.362.599-.483l-4.31-3.622.239 1.57 3.113 2.776s-2.754 1.932-4.19 3.14c-5.627 4.828-11.015 12.192-13.05 19.315h.12c-.958.604-2.036 1.449-2.874 2.656-.359.12-2.634-1.449-2.993-2.052zm9.219 13.4c-3.352 0-5.986-2.897-5.986-6.398s2.753-6.399 5.986-6.399c.838 0 1.676.242 2.394.483 0 0 1.317.604 1.676 3.743.36-.966.599-1.811.599-1.811.479 1.328.599 2.777.599 4.105.359-.483.718-1.328.718-1.328.718 4.104-2.155 7.605-5.986 7.605zm7.423-22.575s2.633-4.95 8.26-8.33c-.479-.121-1.436.12-1.676.12 1.078-.845 2.993-1.448 4.31-1.81-.359-.242-1.317-.363-1.796-.363h-.24c1.198-.724 3.593-1.086 5.628-.724-.24-.362-.838-.604-1.317-.724h-.24.12c1.317-.242 2.754 0 3.95.483-.119-.363-.478-.725-.717-.966l-.12-.12c1.197.24 2.394.844 3.352 1.448a3.668 3.668 0 0 0-.599-.845c1.198.362 2.515 1.207 3.113 2.414v.121c-2.275-1.69-8.74-1.207-15.204 3.018-2.874 1.932-5.148 3.984-6.824 6.278zm35.197 19.678c-.12.12-.838 4.587-5.626 8.33-5.867 4.708-13.649 4.225-16.642 1.57-1.556-1.45-2.274-3.623-2.274-3.623s-.12 1.208-.24 1.69c-1.197-2.052-1.077-4.466-1.077-4.466s-.599 1.207-.958 1.81c-.838-2.293-.479-4.587-.479-4.587l-.718 1.087s-.36-2.536.479-4.588c.838-2.294 2.514-3.863 2.873-4.104-1.197-.363-2.634-1.57-2.634-1.57h.958s-2.514-1.81-2.993-4.587c.359.482 1.077.965 1.077.965-.24-.724-.359-2.293-.12-3.984.48-3.018 2.994-5.07 5.747-5.07 2.993 0 5.029.604 7.543-1.69.479-.483.957-.966 1.676-1.087.12 0 .24-.12.718-.12.36 0 .838.12 1.197.362 1.317.845 1.676 3.018 1.796 4.587.599 5.795.36 4.83 2.634 6.037 1.077.603 2.394 1.086 3.831 2.656 1.197 0 1.796.965 1.317 1.69-4.07 4.829-9.697 7.122-15.923 7.364h-.838c-2.514.12-3.352 3.38-1.796 5.312.958 1.207 2.993 1.69 4.55 1.69 6.824.12 13.768-4.708 14.965-7.485l.12-.242c-.24.363-6.944 6.64-15.085 6.399 0 0-.838 0-1.676-.242-1.078-.241-1.916-.724-2.275-1.81.718.12 1.556.241 2.514.241 5.866 0 10.057-2.656 9.697-2.777h-.12c-.718.121-7.781 2.898-12.21 1.449 0-.12 0-.241.119-.362.359-1.328 1.077-1.207 2.275-1.207 4.07-.121 7.302-1.208 9.817-2.294 2.633-1.207 4.669-2.898 5.387-3.743.958 1.57.958 3.622.958 3.622s.359-.12.838-.12c1.437.12 1.676 1.448.598 2.897z"/><path d="m25.25 4.8.7.2-.6-2-.3 1zM30 5.286 29 4l.364 2c.181-.286.363-.429.636-.714zM42.222 26.669c.667 0 1.222.11 1.778.331 0-1.545-.889-3.2-1.556-2.98-.444.11-.444.773-.444 1.214 0 .552 0 .993.222 1.435zM28 7.538 25 7l1.957 1c.39-.154.652-.308 1.043-.462zM34.939 29.5c.663.25 1.061.375 1.061.25 0 0 0-.25-.133-.375-.398-.5-1.06-1-1.724-1.125-1.46-.5-3.184-.25-4.378.75-.663.5-.929 1-.663 1 .132 0 .53-.125 1.061-.25 2.123-.875 3.184-.875 4.776-.25zM35.515 31.581h.476c.095-.19-.572-.663-1.62-.569-.095 0-.19.095-.38.095h-.096c-.19.095-.477.19-.667.38-.19.19-.286.379-.19.474.095.095.19 0 .476-.095.857-.285 1.429-.285 2-.285zM13.15 36.562c.365.527.243.791.365.923 0 0 .12.132.242 0 .243-.132.243-.396.243-.66 0-.527-.243-1.187-.607-1.583-.485-.528-1.092-1.055-1.942-1.187-.728-.132-1.456 0-1.577.132-.122 0-.243 0-.364.132-1.942.791-2.792 2.902-2.428 4.882a5.09 5.09 0 0 0 .607 1.45c.364.529.85.397.607 0 0-.131-.243-.659-.364-1.45 0-.924.121-1.848.728-2.64.364-.527.85-.791.97-.791.122 0 .122-.132.244-.132h.121c.243-.132.121 0 .364-.132 1.456-.264 2.427.396 2.791 1.056z"/><path d="M13.28 38.039c-.104-.104-.21-.208-.21-.312 0-.208 0-.311.21-.415.106-.104.212-.104.212-.208s-.422-.208-.844.104c-.316.311-.316.935.106 1.35.527.52 1.265.624 1.37 1.247v.623c-.105.623-.738 1.247-1.792 1.039h-.316c-.105.104.316.623 1.16.52 1.16 0 2.002-1.143 1.792-2.39-.106-1.039-1.265-1.247-1.687-1.558z"/><circle transform="rotate(-81.136 43.66 29.98)" cx="43.66" cy="29.981" r="1"/><circle transform="rotate(-61.277 40.817 30.927)" cx="40.817" cy="30.927" r="1"/></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(2)"><path d="M56.798 39.115c-.36-.845-1.197-1.449-2.155-1.69-.36-1.57-.838-2.294-.838-2.415.12-.241.359-.362.359-.483 1.437-1.69.479-4.225-1.915-4.829-1.317-1.328-2.515-1.931-3.592-2.414-.958-.483-.599-.242-1.437-.725-.24-1.207-.359-3.863-.718-5.794-.36-1.69-1.078-3.019-2.035-3.743-.48-.966-.958-1.81-1.676-2.535 3.352-5.07 4.19-10.14 1.795-12.797C43.51.483 41.953 0 40.037 0c-2.754 0-5.986 1.087-9.338 3.139 0 0-2.155-1.811-2.275-1.811C19.086-6.036-7.373 26.68 1.966 33.803l2.394 1.81c-1.556 4.227.6 9.297 5.028 10.867.958.362 2.036.483 3.113.483 0 0 7.064 13.038 22.029 13.038C51.77 60 56.2 42.978 56.2 42.857c-.12.12 1.316-2.052.598-3.742zM2.564 31.63C.77 28.37 4.001 21.85 6.395 17.988 12.142 8.692 21.84 1.328 26.27 2.414l1.197-.482s3.233 2.776 3.352 2.776C33.093 3.38 35.966 1.932 38.6 1.69c-1.676.362-3.591 1.207-5.986 2.656 0 0-5.627 3.863-8.979 7.244-1.796 1.81-9.218 10.865-9.218 10.744 1.317-2.535 2.274-3.863 4.43-6.52 1.197-1.569 2.514-3.017 3.83-4.466.599-.604 1.198-1.207 1.916-1.81.479-.363.838-.846 1.317-1.208.24-.12.36-.362.599-.483l-4.31-3.622.239 1.57 3.113 2.776s-2.754 1.932-4.19 3.14c-5.627 4.828-11.015 12.192-13.05 19.315h.12c-.958.604-2.036 1.449-2.874 2.656-.359.12-2.634-1.449-2.993-2.052zm9.219 13.4c-3.352 0-5.986-2.897-5.986-6.398s2.753-6.399 5.986-6.399c.838 0 1.676.242 2.394.483 0 0 1.317.604 1.676 3.743.36-.966.599-1.811.599-1.811.479 1.328.599 2.777.599 4.105.359-.483.718-1.328.718-1.328.718 4.104-2.155 7.605-5.986 7.605zm7.423-22.575s2.633-4.95 8.26-8.33c-.479-.121-1.436.12-1.676.12 1.078-.845 2.993-1.448 4.31-1.81-.359-.242-1.317-.363-1.796-.363h-.24c1.198-.724 3.593-1.086 5.628-.724-.24-.362-.838-.604-1.317-.724h-.24.12c1.317-.242 2.754 0 3.95.483-.119-.363-.478-.725-.717-.966l-.12-.12c1.197.24 2.394.844 3.352 1.448a3.668 3.668 0 00-.599-.845c1.198.362 2.515 1.207 3.113 2.414v.121c-2.275-1.69-8.74-1.207-15.204 3.018-2.874 1.932-5.148 3.984-6.824 6.278zm35.197 19.678c-.12.12-.838 4.587-5.626 8.33-5.867 4.708-13.649 4.225-16.642 1.57-1.556-1.45-2.274-3.623-2.274-3.623s-.12 1.208-.24 1.69c-1.197-2.052-1.077-4.466-1.077-4.466s-.599 1.207-.958 1.81c-.838-2.293-.479-4.587-.479-4.587l-.718 1.087s-.36-2.536.479-4.588c.838-2.294 2.514-3.863 2.873-4.104-1.197-.363-2.634-1.57-2.634-1.57h.958s-2.514-1.81-2.993-4.587c.359.482 1.077.965 1.077.965-.24-.724-.359-2.293-.12-3.984.48-3.018 2.994-5.07 5.747-5.07 2.993 0 5.029.604 7.543-1.69.479-.483.957-.966 1.676-1.087.12 0 .24-.12.718-.12.36 0 .838.12 1.197.362 1.317.845 1.676 3.018 1.796 4.587.599 5.795.36 4.83 2.634 6.037 1.077.603 2.394 1.086 3.831 2.656 1.197 0 1.796.965 1.317 1.69-4.07 4.829-9.697 7.122-15.923 7.364h-.838c-2.514.12-3.352 3.38-1.796 5.312.958 1.207 2.993 1.69 4.55 1.69 6.824.12 13.768-4.708 14.965-7.485l.12-.242c-.24.363-6.944 6.64-15.085 6.399 0 0-.838 0-1.676-.242-1.078-.241-1.916-.724-2.275-1.81.718.12 1.556.241 2.514.241 5.866 0 10.057-2.656 9.697-2.777h-.12c-.718.121-7.781 2.898-12.21 1.449 0-.12 0-.241.119-.362.359-1.328 1.077-1.207 2.275-1.207 4.07-.121 7.302-1.208 9.817-2.294 2.633-1.207 4.669-2.898 5.387-3.743.958 1.57.958 3.622.958 3.622s.359-.12.838-.12c1.437.12 1.676 1.448.598 2.897z"/><path d="M25.25 4.8l.7.2-.6-2-.3 1zm4.75.486L29 4l.364 2c.181-.286.363-.429.636-.714zm12.222 21.383c.667 0 1.222.11 1.778.331 0-1.545-.889-3.2-1.556-2.98-.444.11-.444.773-.444 1.214 0 .552 0 .993.222 1.435zM28 7.538L25 7l1.957 1c.39-.154.652-.308 1.043-.462zM34.939 29.5c.663.25 1.061.375 1.061.25 0 0 0-.25-.133-.375-.398-.5-1.06-1-1.724-1.125-1.46-.5-3.184-.25-4.378.75-.663.5-.929 1-.663 1 .132 0 .53-.125 1.061-.25 2.123-.875 3.184-.875 4.776-.25zm.576 2.081h.476c.095-.19-.572-.663-1.62-.569-.095 0-.19.095-.38.095h-.096c-.19.095-.477.19-.667.38-.19.19-.286.379-.19.474.095.095.19 0 .476-.095.857-.285 1.429-.285 2-.285zM13.15 36.562c.365.527.243.791.365.923 0 0 .12.132.242 0 .243-.132.243-.396.243-.66 0-.527-.243-1.187-.607-1.583-.485-.528-1.092-1.055-1.942-1.187-.728-.132-1.456 0-1.577.132-.122 0-.243 0-.364.132-1.942.791-2.792 2.902-2.428 4.882a5.09 5.09 0 00.607 1.45c.364.529.85.397.607 0 0-.131-.243-.659-.364-1.45 0-.924.121-1.848.728-2.64.364-.527.85-.791.97-.791.122 0 .122-.132.244-.132h.121c.243-.132.121 0 .364-.132 1.456-.264 2.427.396 2.791 1.056z"/><path d="M13.28 38.039c-.104-.104-.21-.208-.21-.312 0-.208 0-.311.21-.415.106-.104.212-.104.212-.208s-.422-.208-.844.104c-.316.311-.316.935.106 1.35.527.52 1.265.624 1.37 1.247v.623c-.105.623-.738 1.247-1.792 1.039h-.316c-.105.104.316.623 1.16.52 1.16 0 2.002-1.143 1.792-2.39-.106-1.039-1.265-1.247-1.687-1.558z"/><circle transform="rotate(-81.136 43.66 29.98)" cx="43.66" cy="29.981" r="1"/><circle transform="rotate(-61.277 40.817 30.927)" cx="40.817" cy="30.927" r="1"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mattermost/mattermost.svg b/packages/nodes-base/nodes/Mattermost/mattermost.svg
index fe21ec8b8d..9dc28e2687 100644
--- a/packages/nodes-base/nodes/Mattermost/mattermost.svg
+++ b/packages/nodes-base/nodes/Mattermost/mattermost.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg);transform:rotate(360deg)"><path d="m42.642.004.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874 16.496 5.584 34.228-2.767 39.605-18.651 3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006 3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683-2.669.534-5.686.8-9.05.8-2.724 0-5.22-.239-7.49-.72-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 0 1-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489 0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 0 1 4.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 0 1 6.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 0 0-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 0 0-3.646-.24c-2.883 0-5.954.56-9.21 1.682-.75-1.389-1.31-2.698-1.683-3.926-.373-1.228-.561-2.696-.561-4.406 2.35-.8 4.7-1.387 7.048-1.76 2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 0 1-5.813-.483l-1.563-39.455-12.67 27.27c-.81.107-1.648.202-2.517.281-.867.081-1.734.12-2.603.12-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 0 1-2.344-.322l-11.8-27.835-1.215 40.02a31.291 31.291 0 0 1-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 0 1 6.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718 14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522 2.243 1.014 4.152 2.404 5.727 4.166 1.576 1.761 2.765 3.858 3.566 6.287.8 2.43 1.2 5.034 1.2 7.81 0 1.015-.039 2.017-.12 3.005a25.251 25.251 0 0 1-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968 2.029 1.442 4.699 2.163 8.01 2.163 1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 0 0 5.407-1.48c.588 1.068 1.095 2.348 1.522 3.844.427 1.494.667 3.097.72 4.806-4.165 1.602-8.864 2.403-14.098 2.403-3.844 0-7.141-.534-9.892-1.602-2.75-1.068-4.992-2.55-6.728-4.446-1.736-1.895-3.018-4.151-3.845-6.769-.828-2.616-1.24-5.472-1.24-8.57 0-3.043.425-5.9 1.28-8.57.853-2.672 2.122-4.994 3.805-6.97 1.682-1.976 3.765-3.538 6.248-4.686 2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682 2.51 1.123 4.592 2.657 6.25 4.606 1.654 1.95 2.882 4.26 3.684 6.929.8 2.67 1.201 5.527 1.201 8.57 0 3.045-.4 5.874-1.201 8.491-.802 2.617-2.03 4.9-3.685 6.848-1.657 1.95-3.739 3.473-6.249 4.567-2.51 1.094-5.446 1.642-8.81 1.642-3.365 0-6.289-.548-8.77-1.642-2.485-1.094-4.54-2.617-6.17-4.567-1.628-1.948-2.856-4.231-3.684-6.848-.828-2.617-1.241-5.446-1.241-8.49 0-3.044.413-5.902 1.241-8.571.828-2.67 2.056-4.98 3.685-6.929 1.628-1.95 3.684-3.483 6.168-4.606 2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561a39.33 39.33 0 0 1 6.168 1.682 21.827 21.827 0 0 1-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 0 0-4.247-1.402 19.458 19.458 0 0 0-4.885-.601c-1.816 0-3.23.28-4.246.841-1.015.56-1.521 1.455-1.521 2.683 0 1.175.36 2.003 1.08 2.484.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561 1.201.615 2.23 1.376 3.084 2.283.855.908 1.522 2.03 2.002 3.364.481 1.335.722 2.964.722 4.886 0 1.976-.414 3.819-1.242 5.527-.827 1.71-2.03 3.191-3.604 4.445-1.576 1.256-3.485 2.244-5.728 2.964-2.242.722-4.78 1.082-7.61 1.082a47.4 47.4 0 0 1-3.523-.12 28.05 28.05 0 0 1-3.084-.4 36.158 36.158 0 0 1-2.924-.681 35.455 35.455 0 0 1-3.124-1.042 23.06 23.06 0 0 1 .76-4.365 27.54 27.54 0 0 1 1.563-4.286c1.763.695 3.431 1.215 5.007 1.562 1.575.348 3.217.521 4.926.521.748 0 1.561-.067 2.442-.2a8.974 8.974 0 0 0 2.444-.72 5.791 5.791 0 0 0 1.882-1.363c.508-.56.76-1.295.76-2.203 0-1.281-.387-2.203-1.16-2.764-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805-1.683-1.681-2.524-4.206-2.524-7.57 0-4.058 1.455-7.234 4.365-9.531 2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163.054.641.08 1.308.08 2.003 0 .747-.026 1.468-.08 2.162a21.984 21.984 0 0 1-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321.802 0 1.59-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.65 15.65 0 0 1 .8 3.163c.162 1.095.242 2.07.242 2.924 0 .588-.014 1.081-.04 1.483a15.83 15.83 0 0 1-.12 1.16c-2.457.589-4.993.88-7.61.88-4.86 0-8.571-1.134-11.134-3.402-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163.052.641.079 1.308.079 2.003 0 .747-.027 1.468-.079 2.162a22.255 22.255 0 0 1-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 0 0 1.883 1.2c.748.214 1.63.321 2.643.321.802 0 1.589-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 0 1 .802 3.163c.16 1.095.24 2.07.24 2.924 0 .588-.014 1.081-.04 1.483-.027.399-.067.788-.121 1.16a32.55 32.55 0 0 1-7.609.88c-4.86 0-8.572-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081.694.053 1.201.133 1.522.24.106.534.187 1.148.24 1.842.055.694.08 1.416.08 2.164 0 .907-.04 1.895-.12 2.963a21.374 21.374 0 0 1-.44 3.043 11.003 11.003 0 0 0-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28-1.12.188-2.189.682-3.204 1.484-1.015.8-1.855 2.001-2.522 3.604-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 0 1-5.567 0 29.813 29.813 0 0 1-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36.722-.08 1.509-.12 2.364-.12.801 0 1.59.054 2.362.16.775.107 1.536.24 2.283.4.161.268.308.654.441 1.162.134.508.254 1.042.361 1.602.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445 1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886 2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647-.72-1.55-2.175-2.324-4.365-2.324-.908 0-1.802.134-2.682.4-.883.267-1.683.76-2.404 1.482-.72.72-1.308 1.736-1.763 3.045-.454 1.306-.68 3.004-.68 5.085v22.349a34.61 34.61 0 0 1-5.688.48 34.61 34.61 0 0 1-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647-.722-1.55-2.176-2.324-4.366-2.324a9.66 9.66 0 0 0-2.724.4c-.907.267-1.721.788-2.443 1.562-.72.774-1.295 1.856-1.721 3.245-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48-1.869 0-3.764-.16-5.686-.48V29.275a21.73 21.73 0 0 1 2.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 0 1 2.402.12c.695.08 1.415.2 2.163.36.16.267.307.655.44 1.162.134.507.254 1.042.361 1.602.107.56.2 1.108.28 1.642.081.534.147.988.201 1.361.427-.8.988-1.601 1.682-2.403.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 0 1 3.244-1.562c1.201-.4 2.55-.601 4.045-.601 6.461 0 10.6 2.457 12.416 7.37 1.067-1.977 2.576-3.698 4.526-5.167 1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19.3 19.3 0 0 1 .321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 0 1-.08 2.162 21.72 21.72 0 0 1-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 0 0 1.883 1.2c.747.214 1.63.321 2.643.321.801 0 1.588-.067 2.364-.2.773-.134 1.454-.253 2.041-.36a15.52 15.52 0 0 1 .801 3.163 20.184 20.184 0 0 1 .2 4.407 14.81 14.81 0 0 1-.119 1.16c-2.456.589-4.992.88-7.61.88-4.86 0-8.57-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325-1.31 2.216-1.964 5.407-1.964 9.572 0 4.165.655 7.356 1.964 9.572 1.309 2.216 3.43 3.324 6.368 3.324 2.99 0 5.14-1.108 6.447-3.324 1.309-2.216 1.963-5.407 1.963-9.572 0-4.165-.654-7.356-1.963-9.572-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401-1.522.935-2.283 2.443-2.283 4.526 0 1.389.295 2.456.882 3.204.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 0 0 2.643.642c.936.08 1.75.12 2.443.12.802 0 1.603-.067 2.403-.2a135.91 135.91 0 0 0 2.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055.075-.038.013-.005a.973.973 0 0 1 .702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><path d="M42.642.004l.538.011-5.753 6.8c-10.65 1.925-19.847 9.197-23.46 19.874-5.378 15.885 3.635 33.29 20.131 38.874 16.496 5.584 34.228-2.767 39.605-18.651 3.55-10.487.828-21.636-6.179-29.61l-.312-.349-.442-8.926c14.507 10.53 21.161 29.638 15.111 47.51-7.446 21.995-31.312 33.788-53.306 26.343C6.58 74.434-5.215 50.568 2.23 28.574 8.23 10.852 24.89-.247 42.641.004zM190.4 28.314c5.554 0 9.893 1.335 13.017 4.006 3.124 2.67 4.686 6.941 4.686 12.815v24.03c-1.87.588-4.14 1.149-6.81 1.683-2.669.534-5.686.8-9.05.8-2.724 0-5.22-.239-7.49-.72-2.27-.48-4.22-1.282-5.846-2.403a11.318 11.318 0 01-3.767-4.325c-.88-1.763-1.32-3.925-1.32-6.489 0-2.563.547-4.712 1.641-6.448a12.659 12.659 0 014.245-4.165c1.736-1.042 3.672-1.789 5.808-2.243a30.728 30.728 0 016.408-.68c1.549 0 3.257.08 5.127.24v-.962c0-1.28-.214-2.323-.641-3.124a4.783 4.783 0 00-1.762-1.881c-.748-.455-1.67-.762-2.763-.922a25.3 25.3 0 00-3.646-.24c-2.883 0-5.954.56-9.21 1.682-.75-1.389-1.31-2.698-1.683-3.926-.373-1.228-.561-2.696-.561-4.406 2.35-.8 4.7-1.387 7.048-1.76 2.35-.375 4.54-.562 6.569-.562zm-30.328-12.202c2.198 0 4.309.161 6.334.483l2.95 54.57c-2.197.323-4.28.484-6.247.484a34.82 34.82 0 01-5.813-.483l-1.563-39.455-12.67 27.27c-.81.107-1.648.202-2.517.281-.867.081-1.734.12-2.603.12-.752 0-1.503-.025-2.255-.08a18.942 18.942 0 01-2.344-.322l-11.8-27.835-1.215 40.02a31.291 31.291 0 01-5.381.484c-1.851 0-3.76-.16-5.727-.483l2.43-54.57a48.504 48.504 0 016.681-.484c2.257 0 4.484.161 6.682.483l14.319 29.718 14.751-29.718c1.794-.322 3.789-.483 5.988-.483zm130.834 12.202c2.883 0 5.447.507 7.689 1.522 2.243 1.014 4.152 2.404 5.727 4.166 1.576 1.761 2.765 3.858 3.566 6.287.8 2.43 1.2 5.034 1.2 7.81 0 1.015-.039 2.017-.12 3.005a25.251 25.251 0 01-.28 2.363h-26.594c.215 3.203 1.335 5.526 3.365 6.968 2.029 1.442 4.699 2.163 8.01 2.163 1.816 0 3.671-.174 5.567-.522a31.577 31.577 0 005.407-1.48c.588 1.068 1.095 2.348 1.522 3.844.427 1.494.667 3.097.72 4.806-4.165 1.602-8.864 2.403-14.098 2.403-3.844 0-7.141-.534-9.892-1.602-2.75-1.068-4.992-2.55-6.728-4.446-1.736-1.895-3.018-4.151-3.845-6.769-.828-2.616-1.24-5.472-1.24-8.57 0-3.043.425-5.9 1.28-8.57.853-2.672 2.122-4.994 3.805-6.97 1.682-1.976 3.765-3.538 6.248-4.686 2.483-1.148 5.38-1.722 8.69-1.722zm136.092 0c3.364 0 6.3.561 8.81 1.682 2.51 1.123 4.592 2.657 6.25 4.606 1.654 1.95 2.882 4.26 3.684 6.929.8 2.67 1.201 5.527 1.201 8.57 0 3.045-.4 5.874-1.201 8.491-.802 2.617-2.03 4.9-3.685 6.848-1.657 1.95-3.739 3.473-6.249 4.567-2.51 1.094-5.446 1.642-8.81 1.642-3.365 0-6.289-.548-8.77-1.642-2.485-1.094-4.54-2.617-6.17-4.567-1.628-1.948-2.856-4.231-3.684-6.848-.828-2.617-1.241-5.446-1.241-8.49 0-3.044.413-5.902 1.241-8.571.828-2.67 2.056-4.98 3.685-6.929 1.628-1.95 3.684-3.483 6.168-4.606 2.482-1.12 5.406-1.682 8.77-1.682zm41.277 0c2.082 0 4.138.187 6.167.561a39.33 39.33 0 016.168 1.682 21.827 21.827 0 01-.802 4.325c-.426 1.496-.933 2.804-1.52 3.926a31.632 31.632 0 00-4.247-1.402 19.458 19.458 0 00-4.885-.601c-1.816 0-3.23.28-4.246.841-1.015.56-1.521 1.455-1.521 2.683 0 1.175.36 2.003 1.08 2.484.721.48 1.75.935 3.084 1.361l4.566 1.363c1.496.426 2.844.947 4.045 1.561 1.201.615 2.23 1.376 3.084 2.283.855.908 1.522 2.03 2.002 3.364.481 1.335.722 2.964.722 4.886 0 1.976-.414 3.819-1.242 5.527-.827 1.71-2.03 3.191-3.604 4.445-1.576 1.256-3.485 2.244-5.728 2.964-2.242.722-4.78 1.082-7.61 1.082a47.4 47.4 0 01-3.523-.12 28.05 28.05 0 01-3.084-.4 36.158 36.158 0 01-2.924-.681 35.455 35.455 0 01-3.124-1.042 23.06 23.06 0 01.76-4.365 27.54 27.54 0 011.563-4.286c1.763.695 3.431 1.215 5.007 1.562 1.575.348 3.217.521 4.926.521.748 0 1.561-.067 2.442-.2a8.974 8.974 0 002.444-.72 5.791 5.791 0 001.882-1.363c.508-.56.76-1.295.76-2.203 0-1.281-.387-2.203-1.16-2.764-.776-.56-1.857-1.055-3.244-1.481l-4.967-1.442c-2.991-.855-5.327-2.123-7.008-3.805-1.683-1.681-2.524-4.206-2.524-7.57 0-4.058 1.455-7.234 4.365-9.531 2.911-2.297 6.876-3.445 11.896-3.445zM256.952 17.18v12.095h9.693c.16.801.267 1.522.32 2.163.054.641.08 1.308.08 2.003 0 .747-.026 1.468-.08 2.162a21.984 21.984 0 01-.32 2.323h-9.693v16.261c0 1.655.135 2.99.402 4.005.267 1.014.654 1.815 1.16 2.404a3.828 3.828 0 001.883 1.2c.747.214 1.63.321 2.643.321.802 0 1.59-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.65 15.65 0 01.8 3.163c.162 1.095.242 2.07.242 2.924 0 .588-.014 1.081-.04 1.483a15.83 15.83 0 01-.12 1.16c-2.457.589-4.993.88-7.61.88-4.86 0-8.571-1.134-11.134-3.402-2.564-2.27-3.846-5.969-3.846-11.095V37.926h-5.206l-.401-1.602 14.98-19.144h1.841zm-30.052 0v12.095h9.692c.16.801.267 1.522.321 2.163.052.641.079 1.308.079 2.003 0 .747-.027 1.468-.079 2.162a22.255 22.255 0 01-.321 2.323H226.9v16.261c0 1.655.134 2.99.401 4.005.266 1.014.654 1.815 1.16 2.404a3.832 3.832 0 001.883 1.2c.748.214 1.63.321 2.643.321.802 0 1.589-.067 2.364-.2.774-.134 1.455-.253 2.042-.36a15.69 15.69 0 01.802 3.163c.16 1.095.24 2.07.24 2.924 0 .588-.014 1.081-.04 1.483-.027.399-.067.788-.121 1.16a32.55 32.55 0 01-7.609.88c-4.86 0-8.572-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.207l-.4-1.602 14.979-19.144h1.842zm107.84 11.614c.534 0 1.148.027 1.842.081.694.053 1.201.133 1.522.24.106.534.187 1.148.24 1.842.055.694.08 1.416.08 2.164 0 .907-.04 1.895-.12 2.963a21.374 21.374 0 01-.44 3.043 11.003 11.003 0 00-1.962-.16h-1.322c-.909 0-1.922.094-3.045.28-1.12.188-2.189.682-3.204 1.484-1.015.8-1.855 2.001-2.522 3.604-.668 1.602-1.002 3.845-1.002 6.729v19.705c-.961.159-1.922.266-2.884.319a48.116 48.116 0 01-5.567 0 29.813 29.813 0 01-2.923-.32V29.276c.8-.16 1.562-.28 2.282-.36.722-.08 1.509-.12 2.364-.12.801 0 1.59.054 2.362.16.775.107 1.536.24 2.283.4.161.268.308.654.441 1.162.134.508.254 1.042.361 1.602.107.561.199 1.121.28 1.683l.2 1.401c1.175-1.655 2.618-3.138 4.325-4.445 1.71-1.309 3.846-1.964 6.408-1.964zm55.395-.48c4.7 0 8.157 1.296 10.373 3.886 2.216 2.589 3.324 6.635 3.324 12.135v26.353c-1.922.32-3.818.48-5.687.48-1.869 0-3.765-.16-5.686-.48v-23.39c0-2.884-.362-5.1-1.083-6.647-.72-1.55-2.175-2.324-4.365-2.324-.908 0-1.802.134-2.682.4-.883.267-1.683.76-2.404 1.482-.72.72-1.308 1.736-1.763 3.045-.454 1.306-.68 3.004-.68 5.085v22.349a34.61 34.61 0 01-5.688.48 34.61 34.61 0 01-5.688-.48v-23.39c0-2.884-.36-5.1-1.08-6.647-.722-1.55-2.176-2.324-4.366-2.324a9.66 9.66 0 00-2.724.4c-.907.267-1.721.788-2.443 1.562-.72.774-1.295 1.856-1.721 3.245-.428 1.387-.642 3.203-.642 5.446v21.708c-1.922.32-3.817.48-5.687.48-1.869 0-3.764-.16-5.686-.48V29.275a21.73 21.73 0 012.242-.36c.748-.08 1.575-.12 2.484-.12a21 21 0 012.402.12c.695.08 1.415.2 2.163.36.16.267.307.655.44 1.162.134.507.254 1.042.361 1.602.107.56.2 1.108.28 1.642.081.534.147.988.201 1.361.427-.8.988-1.601 1.682-2.403.694-.8 1.522-1.52 2.483-2.162a13.483 13.483 0 013.244-1.562c1.201-.4 2.55-.601 4.045-.601 6.461 0 10.6 2.457 12.416 7.37 1.067-1.977 2.576-3.698 4.526-5.167 1.948-1.469 4.419-2.203 7.41-2.203zm110.33-11.134v12.095h9.692a19.3 19.3 0 01.321 2.163c.053.641.08 1.308.08 2.003a28.3 28.3 0 01-.08 2.162 21.72 21.72 0 01-.32 2.323h-9.692v16.261c0 1.655.134 2.99.4 4.005.267 1.014.654 1.815 1.161 2.404a3.832 3.832 0 001.883 1.2c.747.214 1.63.321 2.643.321.801 0 1.588-.067 2.364-.2.773-.134 1.454-.253 2.041-.36a15.52 15.52 0 01.801 3.163 20.184 20.184 0 01.2 4.407 14.81 14.81 0 01-.119 1.16c-2.456.589-4.992.88-7.61.88-4.86 0-8.57-1.134-11.134-3.402-2.563-2.27-3.845-5.969-3.845-11.095V37.926h-5.206l-.401-1.602 14.979-19.144h1.843zm-73.467 20.025c-2.937 0-5.06 1.108-6.368 3.325-1.31 2.216-1.964 5.407-1.964 9.572 0 4.165.655 7.356 1.964 9.572 1.309 2.216 3.43 3.324 6.368 3.324 2.99 0 5.14-1.108 6.447-3.324 1.309-2.216 1.963-5.407 1.963-9.572 0-4.165-.654-7.356-1.963-9.572-1.307-2.217-3.457-3.325-6.447-3.325zM192.963 51.304c-2.616 0-4.686.466-6.208 1.401-1.522.935-2.283 2.443-2.283 4.526 0 1.389.295 2.456.882 3.204.587.747 1.295 1.295 2.122 1.641a8.705 8.705 0 002.643.642c.936.08 1.75.12 2.443.12.802 0 1.603-.067 2.403-.2a135.91 135.91 0 002.084-.361V51.704c-.641-.107-1.335-.2-2.084-.28-.747-.08-1.413-.12-2.002-.12zM54.976 3.885c.195.067.353.19.467.343l.063.096.024.038.02.044c.056.106.103.226.125.375.04.271.06.882.07 1.53l.003.392.002.386v.699c-.001.368-.004.633-.004.687v.01l.165 6.222.244 7.18.305 12.48v.084c-.003.726-.154 5.933-3.85 9.553-3.98 3.9-8.868 3.542-12.048 2.466-3.18-1.077-7.28-3.763-8.074-9.278-.778-5.41 2.663-9.825 2.793-9.99l.003-.004 7.823-9.728 4.556-5.555 3.91-4.842s1.795-2.404 2.306-2.9c.068-.066.137-.116.205-.157l.102-.055.075-.038.013-.005a.973.973 0 01.702-.033zm235.77 33.08c-2.67 0-4.7.747-6.088 2.243-1.388 1.495-2.215 3.605-2.483 6.329h16.18c-.106-2.564-.814-4.633-2.123-6.208-1.308-1.576-3.137-2.365-5.487-2.365z" fill="#0058CC"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h512v85H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MessageBird/messagebird.svg b/packages/nodes-base/nodes/MessageBird/messagebird.svg
index 6b75eda427..6c4caa7ff3 100644
--- a/packages/nodes-base/nodes/MessageBird/messagebird.svg
+++ b/packages/nodes-base/nodes/MessageBird/messagebird.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.47 14.295c-2.371 0-4.49 1.186-5.783 2.982l-8.727 12.21a1.754 1.754 0 0 1-1.436.755 1.763 1.763 0 0 1-1.76-1.76c0-.37.109-.718.278-.97l7.361-11.025c.754-1.113 1.185-2.478 1.185-3.951a7.046 7.046 0 0 0-7.065-7.074H.462v7.074h31.747a3.564 3.564 0 0 1-3.556 3.556H.462c0 2.513.539 4.92 1.472 7.074h23.174a3.564 3.564 0 0 1-3.556 3.556H4.017a17.65 17.65 0 0 0 14.186 7.074h8.727c.97.002 1.757.789 1.76 1.76a1.763 1.763 0 0 1-1.76 1.76h-8.764L6.314 55.02h21.44c9.803 0 18.136-6.393 21.046-15.227L52.788 27.7a22.305 22.305 0 0 1 6.751-9.984 7.044 7.044 0 0 0-6.069-3.411v-.01zm0 4.848c-.719 0-1.33-.609-1.33-1.329.01-.73.6-1.32 1.33-1.33.73.01 1.319.6 1.328 1.33 0 .754-.609 1.33-1.329 1.33z" fill="#2481D7" fill-rule="nonzero" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.47 14.295c-2.371 0-4.49 1.186-5.783 2.982l-8.727 12.21a1.754 1.754 0 01-1.436.755 1.763 1.763 0 01-1.76-1.76c0-.37.109-.718.278-.97l7.361-11.025c.754-1.113 1.185-2.478 1.185-3.951a7.046 7.046 0 00-7.065-7.074H.462v7.074h31.747a3.564 3.564 0 01-3.556 3.556H.462c0 2.513.539 4.92 1.472 7.074h23.174a3.564 3.564 0 01-3.556 3.556H4.017a17.65 17.65 0 0014.186 7.074h8.727c.97.002 1.757.789 1.76 1.76a1.763 1.763 0 01-1.76 1.76h-8.764L6.314 55.02h21.44c9.803 0 18.136-6.393 21.046-15.227L52.788 27.7a22.305 22.305 0 016.751-9.984 7.044 7.044 0 00-6.069-3.411v-.01zm0 4.848c-.719 0-1.33-.609-1.33-1.329.01-.73.6-1.32 1.33-1.33.73.01 1.319.6 1.328 1.33 0 .754-.609 1.33-1.329 1.33z" fill="#2481D7"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
index 4831d52a9f..d6a2e5117e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
+++ b/packages/nodes-base/nodes/Microsoft/Excel/excel.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#02723B" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.1 20.227h9.512v4.692h-9.513zM43.1 13.193h9.512v4.69h-9.513zM43.1 27.42h9.512v4.691h-9.513zM43.1 34.456h9.512v4.691h-9.513z"/><path d="M43.1 41.649h9.512v4.69h-9.513v-4.69zM58.07 6.78H35.146V.37L.37 6.467v47.22l34.776 5.942v-7.186H58.07c.935 0 1.559-.781 1.559-1.555V8.344c0-.781-.624-1.555-1.56-1.555V6.78zM20.018 40.554l-3.274-8.593h-.148c0 .149-3.275 8.13-3.275 8.13l-4.366-.312L14.1 29.616 9.422 19.453l4.367-.312 2.963 7.974h.148c0-.148 3.274-8.287 3.274-8.287l4.522-.312-5.457 11.101 5.614 11.102-4.834-.149-.001-.016zM57.6 50.717H35.146v-4.37h5.458v-4.691h-5.458v-2.352h5.458v-4.69h-5.458v-2.347h5.458v-4.69h-5.458V25.23h5.458v-4.69h-5.458v-2.345h5.458v-4.692h-5.458v-4.69h22.456v41.903h-.001z"/><g><path d="M42.729 19.857h9.512v4.691H42.73zM42.729 12.822h9.512v4.691H42.73zM42.729 27.05h9.512v4.69H42.73zM42.729 34.086h9.512v4.691H42.73z"/><path d="M42.729 41.279h9.512v4.69H42.73v-4.69zM57.699 6.41H34.776V0L0 6.098v47.22l34.776 5.941v-7.185h22.923c.936 0 1.56-.781 1.56-1.555V7.974c0-.781-.624-1.555-1.56-1.555V6.41zM19.647 40.184l-3.274-8.593h-.148c0 .148-3.274 8.13-3.274 8.13l-4.367-.312 5.146-10.163-4.678-10.163 4.367-.313 2.962 7.974h.149c0-.148 3.274-8.286 3.274-8.286l4.522-.313-5.458 11.102 5.615 11.101-4.834-.148-.002-.016zM57.23 50.347H34.776v-4.37h5.457v-4.692h-5.457v-2.352h5.457v-4.69h-5.457v-2.347h5.457v-4.69h-5.457V24.86h5.457v-4.69h-5.457v-2.346h5.457v-4.692h-5.457v-4.69h22.456v41.904h-.002z"/></g></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#02723B" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.1 20.227h9.512v4.692h-9.513zm0-7.034h9.512v4.69h-9.513zm0 14.227h9.512v4.691h-9.513zm0 7.036h9.512v4.691h-9.513z"/><path d="M43.1 41.649h9.512v4.69h-9.513v-4.69zM58.07 6.78H35.146V.37L.37 6.467v47.22l34.776 5.942v-7.186H58.07c.935 0 1.559-.781 1.559-1.555V8.344c0-.781-.624-1.555-1.56-1.555V6.78zM20.018 40.554l-3.274-8.593h-.148c0 .149-3.275 8.13-3.275 8.13l-4.366-.312L14.1 29.616 9.422 19.453l4.367-.312 2.963 7.974h.148c0-.148 3.274-8.287 3.274-8.287l4.522-.312-5.457 11.101 5.614 11.102-4.834-.149-.001-.016zM57.6 50.717H35.146v-4.37h5.458v-4.691h-5.458v-2.352h5.458v-4.69h-5.458v-2.347h5.458v-4.69h-5.458V25.23h5.458v-4.69h-5.458v-2.345h5.458v-4.692h-5.458v-4.69h22.456v41.903h-.001z"/><path d="M42.729 19.857h9.512v4.691H42.73zm0-7.035h9.512v4.691H42.73zm0 14.228h9.512v4.69H42.73zm0 7.036h9.512v4.691H42.73z"/><path d="M42.729 41.279h9.512v4.69H42.73v-4.69zM57.699 6.41H34.776V0L0 6.098v47.22l34.776 5.941v-7.185h22.923c.936 0 1.56-.781 1.56-1.555V7.974c0-.781-.624-1.555-1.56-1.555V6.41zM19.647 40.184l-3.274-8.593h-.148c0 .148-3.274 8.13-3.274 8.13l-4.367-.312 5.146-10.163-4.678-10.163 4.367-.313 2.962 7.974h.149c0-.148 3.274-8.286 3.274-8.286l4.522-.313-5.458 11.102 5.615 11.101-4.834-.148-.002-.016zM57.23 50.347H34.776v-4.37h5.457v-4.692h-5.457v-2.352h5.457v-4.69h-5.457v-2.347h5.457v-4.69h-5.457V24.86h5.457v-4.69h-5.457v-2.346h5.457v-4.692h-5.457v-4.69h22.456v41.904h-.002z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
index 056f59b0f6..6dc221484f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/outlook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974zm55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23v31.873zm0-35.462-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575z" fill="#2372ba" stroke="none"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M77.9 19.2H46.86V0L0 8.232V71.98L46.86 80V61.847H77.9c1.266 0 2.1-1.055 2.1-2.1V21.32c0-1.266-.844-2.1-2.1-2.1zM21.952 54.46c-15.4-1.055-14.776-29.13.422-29.974 16.675-.844 16.253 31.03-.422 29.974zm55.515 4.644H46.86V35.04l9.5 9.077c.422.422.844.633 1.477.633s1.055-.2 1.478-.633L77.467 27.23v31.873zm0-35.462l-19.63 18.153L46.86 31.45v-9.7h30.396v1.9h.2zm-55.092 6.543c-8.232.422-8.443 18.364-.2 18.575 8.654.422 8.654-18.997.2-18.575z" fill="#2372ba" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
index 43b3bbd01c..79f8183d8b 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
+++ b/packages/nodes-base/nodes/Microsoft/Sql/mssql.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385" height="385"><defs><linearGradient x1="-411.527" y1="-29.89" x2="-23.847" y2="-258.964" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.66978 0 0 .66978 488.256 811.455)"/><linearGradient id="a"><stop style="stop-color:#909ca9;stop-opacity:1" offset="0"/><stop style="stop-color:#ededee;stop-opacity:1" offset="1"/></linearGradient><linearGradient x1="-447.797" y1="-889.058" x2="-135.859" y2="-889.058" id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.66978 0 0 .66978 488.256 811.455)"/><linearGradient id="b"><stop style="stop-color:#939fab;stop-opacity:1" offset="0"/><stop style="stop-color:#dcdee1;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="c"><stop style="stop-color:#ee352c;stop-opacity:1" offset="0"/><stop style="stop-color:#a91d22;stop-opacity:1" offset="1"/></linearGradient><radialGradient cx="-1259.098" cy="-245.428" r="414.156" fx="-1259.098" fy="-245.428" id="f" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.64353 -.09731 .19436 -1.28527 -377.154 -44.777)"/></defs><path d="m469.04 461.903-132.345 43.16-115.056 50.819-32.233 8.518a801.402 801.402 0 0 1-26.08 23.694c-10.151 8.834-19.698 16.84-26.958 22.626-8.084 6.443-20.103 18.37-26.247 26.017-9.14 11.377-16.287 23.51-19.36 32.84-5.53 16.786-2.836 33.788 7.827 49.48 13.622 20.044 40.738 40.409 72.274 54.273 16.086 7.071 43.232 16.188 63.587 21.328 33.922 8.566 99.482 17.873 135.588 19.256 7.323.28 17.071.254 17.52-.042.792-.523 6.413-11.166 12.934-24.489 22.19-45.33 38.245-87.824 46.885-124.118 5.231-21.976 9.31-51.28 11.951-86.025.74-9.733 1.009-42.193.44-53.226-.926-17.954-2.507-32.587-5.044-46.948-.373-2.104-.51-3.955-.314-4.123.368-.316 1.618-.717 17.874-5.442l-3.244-7.598zm-30.246 17.75c1.203 0 4.401 30.67 5.233 50.128.177 4.135.141 6.782-.105 6.782-.79 0-16.948-9.489-28.402-16.682-10.003-6.282-28.985-18.896-32.003-21.265-.953-.748-.852-.785 7.325-3.6 13.914-4.792 46.901-15.364 47.952-15.364zm-67.417 22.123c.855-.002 3.183 1.283 8.686 4.73 20.642 12.932 48.595 28.49 60.573 33.72 3.714 1.621 4.138.993-4.416 6.802-18.234 12.382-40.904 24.557-68.736 36.922-4.851 2.154-8.96 3.914-9.126 3.914-.166 0 .376-2.461 1.193-5.484 6.743-24.941 10.547-50.116 10.654-70.306.053-9.985.055-10.038 1.004-10.277a.756.756 0 0 1 .168-.02zm-13.877 5.296c.597.6.165 22.975-.565 29.072-1.751 14.627-4.613 28.155-9.189 43.536-1.093 3.675-2.118 6.843-2.281 7.032-.398.461-14.08-12.87-18.628-18.146-7.772-9.015-13.92-17.97-18.398-26.792-2.277-4.483-5.907-13.338-5.568-13.584 1.537-1.116 54.253-21.496 54.629-21.118zm-65.366 25.765c.123.012.218.046.272.105.197.217.894 1.842 1.549 3.62 3.187 8.657 10.353 21.517 16.577 29.743 6.794 8.981 15.653 18.551 23.065 24.908 2.38 2.04 4.6 3.945 4.919 4.227.635.563.848.468-15.468 6.656-18.91 7.173-39.503 14.355-63.147 21.998-9.01 2.913-16.637 5.374-16.933 5.484-.9.334-.625-.22 2.01-4.332 11.748-18.342 29.545-54.222 39.495-79.6 1.726-4.4 3.368-8.81 3.663-9.795.433-1.448.86-1.94 2.219-2.553.752-.34 1.41-.498 1.779-.46zm-20.03 8.268c.265.234-4.807 10.945-9.796 20.68-9.678 18.879-20.348 37.458-34.515 60.133-2.444 3.912-4.697 7.489-5.002 7.932-.504.73-.71.49-2.26-2.595-3.392-6.745-6.234-15.256-7.703-23.17-1.455-7.833-1.207-21.394.544-29.805 1.301-6.25 1.244-6.111 4.186-7.62 12.722-6.519 54.13-25.92 54.545-25.555zm172.53 7.011v4.25c-.021 22.316-2.404 52.868-5.86 75.161-.607 3.912-1.133 7.14-1.173 7.18-.04.039-2.86-.788-6.258-1.843-15.016-4.661-31.297-11.626-45.984-19.674-9.727-5.33-23.795-13.964-23.4-14.359.106-.107 4.25-2.303 9.209-4.877 19.64-10.194 38.402-21.185 54.712-32.086 6.12-4.09 15.277-10.71 17.31-12.496l1.444-1.256zm-248.07 29.575c.408-.02.305.755-.334 4.438-.445 2.561-.947 7.4-1.13 10.737-.805 14.628 1.567 25.42 8.832 40.187 2.02 4.105 3.6 7.528 3.516 7.598-.727.608-66.88 19.967-87.678 25.66-6.165 1.688-11.553 3.175-11.993 3.308-.722.217-.786.06-.523-1.633 2.278-14.676 13.473-33.938 29.114-50.108 10.4-10.75 18.725-17.118 32.882-25.2 10.16-5.8 25.94-14.506 27.105-14.945a.685.685 0 0 1 .21-.042zm156.038 27.943c.063-.076 2.514 1.236 5.442 2.93 21.368 12.357 51.185 23.948 76.606 29.763l2.302.524-3.16 1.758c-13.28 7.369-57.013 25.565-101.68 42.321-6.522 2.447-12.884 4.845-14.129 5.338-1.245.492-2.26.83-2.26.732 0-.098 1.842-3.644 4.102-7.87 12.54-23.446 25.056-51.938 31.48-71.708.654-2.015 1.234-3.713 1.297-3.788zm-15.907 5.211c.069.069-.713 2.17-1.737 4.647-8.718 21.08-20.14 44.076-34.703 69.908-3.706 6.574-6.83 11.941-6.95 11.93-.118-.01-3.132-1.794-6.697-3.976-21.213-12.987-39.982-28.973-52.306-44.52l-1.758-2.197 9.147-2.512c32.625-8.938 60.293-18.496 87.804-30.35 3.895-1.678 7.131-2.998 7.2-2.93zm98.813 34.494c.047.01.063.043.063.084 0 2.223-5.047 22.802-9.251 37.696-3.527 12.493-6.488 22.265-11.973 39.58-2.422 7.647-4.501 13.888-4.625 13.856a34.898 34.898 0 0 0-1.298-.252c-29.72-5.378-56.338-12.878-81.273-22.898-6.977-2.803-17.05-7.265-17.582-7.786-.18-.176 5.844-3.014 13.375-6.3 45.541-19.87 92.727-42.498 108.86-52.2 1.94-1.168 3.376-1.848 3.704-1.78zm-228.101 7.807c.244.231-12.495 18.467-30.287 43.368-6.184 8.655-13.448 18.856-16.137 22.668a476.901 476.901 0 0 0-9.063 13.417l-4.207 6.488-4.48-3.767c-5.255-4.413-14.455-13.782-18.628-18.984-8.587-10.705-14.406-21.97-16.702-32.317-1.06-4.777-1.092-7.21-.084-7.514 1.456-.439 28.172-6.728 53.226-12.538 13.917-3.227 30.007-7.004 35.77-8.393 5.764-1.389 10.535-2.481 10.592-2.428zm12.81 4.898 3.222 3.6c14.411 16.053 29.067 28.032 46.948 38.366 3.157 1.824 5.563 3.41 5.358 3.537-.744.46-61.833 22.18-90.085 32.024-15.933 5.551-29.022 10.078-29.094 10.067-.072-.01-.975-.6-1.988-1.318L152.736 743l2.888-4.165c9.374-13.578 21.152-28.51 46.927-59.527l17.665-21.265zm79.828 57.057c.071-.088 4.537 1.495 9.942 3.516 13.029 4.872 23.254 8.049 37.09 11.512 16.993 4.253 41.55 8.507 56.094 9.733 2.232.188 3.372.443 3.014.67-.676.427-15.4 5.345-26.226 8.748-17.185 5.402-69.702 20.917-112.523 33.238-7.944 2.286-14.736 4.217-15.091 4.291-.96.2-4.312-.68-4.312-1.13 0-.214 2.401-3.253 5.316-6.74 14.393-17.216 28.692-36.445 40.627-54.629 3.264-4.973 5.999-9.121 6.07-9.21zm-17.686.502c.129.129-6.966 11.49-19.444 31.145-5.27 8.299-11.244 17.746-13.291 20.993-2.048 3.247-5.048 8.182-6.656 10.989l-2.93 5.107-1.487-.398c-3.585-.97-28.88-9.906-35.56-12.558-8.282-3.287-16.912-7.257-23.276-10.696-7.952-4.297-18.037-10.675-17.246-10.926.227-.072 13.911-3.817 30.39-8.309 43.84-11.95 68.09-18.815 83.995-23.777 2.972-.927 5.448-1.627 5.505-1.57zm124.516 29.198c.095-.02.138-.02.147 0 .414 1.037-15.815 45.989-21.747 60.239-1.329 3.191-1.82 3.965-2.512 3.934-1.679-.073-25.211-3.363-39.454-5.525-24.933-3.785-66.695-11.078-77.234-13.48l-2.449-.544 14.945-3.37c32.032-7.217 47.415-11.087 63.022-15.865 19.682-6.025 39.172-13.538 58.857-22.689 3.112-1.446 5.764-2.556 6.425-2.7z" style="fill:url(#d);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/><path d="M332.647 153.475c-2.213-.258-37.732 12.539-60.552 21.81-30.922 12.563-54.93 24.6-69.74 34.996-5.514 3.87-12.446 10.83-13.46 13.5-.378 1-.556 2.168-.564 3.37l13.437 12.684 31.877 10.172 75.937 13.563 86.799 14.924.879-7.452c-.263-.04-.511-.084-.775-.125l-11.428-1.8-2.323-4.082c-11.797-20.816-24.834-46.575-32.4-64.005-5.86-13.5-11.488-29.05-14.61-40.313-1.854-6.688-2.047-7.121-3.077-7.242zm-1.674 5.15c.088-.017.132-.017.146 0 .07.083.474 2.875.88 6.195 1.708 13.98 4.836 27.54 9.732 42.133 3.69 10.997 3.742 10.351-.649 9.126-10.207-2.849-55.937-10.699-89.018-15.28-5.33-.738-9.767-1.394-9.837-1.465-.42-.42 23.857-13.14 34.62-18.147 13.802-6.422 51.389-22.07 54.126-22.563zm-96.386 44.77 3.872 1.318c21.239 7.23 74.474 17.399 103.9 19.843 3.32.275 6.11.571 6.195.648.085.078-2.735 1.585-6.258 3.35-14.195 7.11-29.819 15.777-40.626 22.542-3.174 1.986-6.085 3.588-6.468 3.558-.383-.03-2.476-.367-4.667-.733l-3.998-.649-10.047-9.753c-17.637-17.07-31.407-30.277-36.733-35.268l-5.17-4.856zm-3.935 3.14 14.066 17.56c7.743 9.66 15.503 19.245 17.225 21.308 1.723 2.062 3.056 3.81 2.973 3.872-.4.292-20.386-3.6-30.978-6.028-10.873-2.494-15.37-3.687-22.102-5.84l-5.484-1.758.02-1.36c.07-6.746 8.573-16.696 23.003-26.876l1.277-.879zm119.786 23.923c.422.033.867.89 2.114 3.621 3.412 7.474 14.03 27.729 16.598 31.647.845 1.29 2.186 1.377-11.91-.9-33.874-5.472-44.833-7.303-44.833-7.514 0-.129 1.016-.794 2.26-1.486 10.49-5.834 21.075-13.176 30.497-21.119 2.252-1.9 4.417-3.708 4.814-4.04.163-.136.32-.22.46-.209z" style="fill:url(#e);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/><path d="M189.496 222.43s-2.198 3.485-.125 8.666c1.282 3.205 5.133 7.056 9.377 11.135 0 0 44.452 43.361 49.898 49.647 24.63 28.426 35.327 56.41 36.315 95.046.634 24.793-4.148 46.587-15.761 71.917-20.815 45.4-64.672 95.467-132.407 151.14l9.942-3.286c6.39-4.787 15.069-9.9 35.54-21.098 47.145-25.787 100.087-49.508 165.122-73.948 93.568-35.163 247.48-76.42 335.057-89.834l9.125-1.402-1.402-2.198c-8.008-12.447-13.474-20.122-20.051-28.256-19.209-23.754-42.463-43.136-70.955-59.087-39.153-21.92-89.936-38.956-154.133-51.72-12.137-2.413-38.715-6.969-60.343-10.34-45.814-7.14-75.363-11.96-108.002-17.644-11.702-2.03-29.174-4.965-40.773-7.472-6.043-1.307-17.53-4.023-26.456-7.096-7.37-2.901-17.748-5.706-19.968-14.17zm25.766 25.012c.062-.056 1.732.46 3.767 1.152 3.752 1.273 8.702 2.764 14.463 4.374a618.885 618.885 0 0 0 13.187 3.516c6.014 1.538 10.987 2.86 11.051 2.93.666.75 10.767 32.988 14.212 45.357 1.315 4.721 2.313 8.655 2.219 8.75-.095.093-1.215-1.645-2.47-3.852-11.686-20.551-30.193-41.45-51.594-58.27-2.668-2.097-4.835-3.877-4.835-3.957zm49.25 13.605c.514-.035 2.733.336 5.379.921 17.042 3.769 47.471 9.644 67.04 12.935 3.26.549 5.945 1.14 5.945 1.319 0 .18-1.218.95-2.7 1.695-3.284 1.652-16.57 9.604-21.015 12.58-11.097 7.427-21.074 15.377-28.34 22.605-2.92 2.904-5.363 5.274-5.442 5.274-.078 0-.589-1.693-1.13-3.767-3.633-13.925-11.143-34.486-17.875-48.957-1.083-2.329-1.967-4.382-1.967-4.563 0-.023.03-.037.105-.041zm86.631 16.473c.57.19 1.648 3.554 3.558 11.114 3.658 14.476 5.36 30.734 4.794 45.775-.158 4.186-.423 8.073-.587 8.644l-.313 1.047-5.17-1.675c-10.658-3.406-28.07-8.533-42.992-12.663-8.477-2.346-15.426-4.44-15.426-4.646 0-.62 12.37-12.986 17.687-17.687 10.156-8.978 37.48-30.232 38.45-29.91zm6.886.983c.309-.287 41.399 6.828 60.071 10.403 13.918 2.664 34.055 6.881 35.268 7.388.586.245-1.498 1.38-8.184 4.396-26.445 11.926-46.037 22.57-65.512 35.603-5.13 3.433-9.393 6.237-9.482 6.237-.089 0-.165-2.865-.167-6.363-.014-18.992-3.805-38.161-10.759-54.357-.748-1.743-1.31-3.237-1.235-3.307zm106.244 21.015c.318.318-1.03 8.42-2.198 13.207-3.635 14.897-13.27 37.007-25.158 57.79-2.095 3.661-3.969 6.715-4.186 6.78-.218.067-2.925-1.357-6.007-3.16-11.626-6.8-24.79-13.232-39.245-19.193-4.031-1.662-7.464-3.142-7.64-3.307-.66-.619 31.465-21.887 48.496-32.108 13.623-8.174 35.556-20.392 35.938-20.01zm7.598 1.193c.925 0 19.148 4.968 28.57 7.786 23.47 7.02 50.545 16.91 68.108 24.886l7.305 3.307-5.149 1.193c-42.975 9.873-79.809 21.266-115.285 35.666-2.948 1.197-5.514 2.177-5.694 2.177-.18 0 .761-2.28 2.072-5.065 10.665-22.658 17.552-46.434 19.34-66.622.163-1.838.495-3.328.733-3.328zm-181.133 41.63c.29-.287 14.16 2.963 21.726 5.087 11.37 3.192 35.566 11.289 35.582 11.91 0 .12-2.667 2.445-5.924 5.17-13.081 10.943-25.7 22.386-40.815 36.984-4.48 4.327-8.288 7.849-8.476 7.849-.189 0-.272-.632-.168-1.403 2.276-16.803 1.787-38.38-1.381-60.343-.402-2.784-.645-5.154-.544-5.253zm292.065.273c.208.208-6.435 10.59-10.57 16.514-6.033 8.643-14.779 19.99-34.703 45.043a15399.201 15399.201 0 0 0-26.247 33.09c-3.976 5.04-7.313 9.169-7.41 9.169-.095 0-1.378-1.805-2.846-3.998-11.231-16.78-24.559-31.518-40.459-44.75-2.967-2.47-6.314-5.177-7.43-6.007-1.116-.83-2.025-1.598-2.03-1.716-.01-.274 16.97-7.557 29.93-12.83 22.564-9.182 53.403-20.177 76.48-27.252 12.17-3.731 25.1-7.448 25.285-7.263zm7.66 2.01c.365-.075 2.787 1.097 5.694 2.762 24.305 13.923 48.123 31.803 66.852 50.192 5.328 5.23 18.361 18.788 18.168 18.9-.05.029-4.551.385-10.005.795-42.119 3.168-95.968 12.128-147.812 24.594-3.52.846-6.565 1.549-6.76 1.549-.196 0 3.658-3.869 8.56-8.582 30.446-29.27 44.336-47.752 60.678-80.771 2.434-4.918 4.498-9.16 4.584-9.419.005-.016.017-.016.042-.02zm-222.617 22.813c1.39.313 14.375 6.354 24.175 11.261 8.961 4.487 22.535 11.714 23.212 12.35.085.079-4.697 2.576-10.633 5.546-18.794 9.402-34.891 18.282-51.699 28.55-4.792 2.927-8.81 5.336-8.937 5.336-.42 0-.254-.362 2.428-5.274 8.95-16.393 16.17-35.964 20.324-55.09.37-1.706.816-2.749 1.13-2.679zm-13.082 2.345c.271.27-3.098 12.647-5.232 19.256-4.094 12.676-11.015 28.611-17.666 40.605a313.089 313.089 0 0 1-5.316 9.168l-2.47 4.04-5.61-5.422c-6.518-6.319-11.827-10.243-18.607-13.73-2.664-1.37-4.831-2.64-4.835-2.826-.012-.824 17.053-16.344 30.224-27.482 9.428-7.972 29.271-23.85 29.512-23.61zm79.495 32.693 4.877 3.16c11.187 7.265 24.434 17.036 34.535 25.452 5.66 4.717 16.66 14.567 18.921 16.954l1.214 1.277-8.1 2.26c-45.813 12.711-81.208 24.027-122.507 39.203-4.583 1.685-8.54 3.077-8.812 3.077-.57 0-1.135.524 9.168-8.958 26.415-24.31 49.75-51.093 67.187-77.15l3.517-5.275zm-20.89 5.233c.24.24-13.538 19.536-21.725 30.433-9.795 13.037-27.241 34.831-39.245 49.02-5.015 5.927-9.312 10.846-9.544 10.925-.255.087-.414-1.365-.419-3.663-.023-12.106-3.086-25.044-8.498-36-2.285-4.628-2.668-5.748-2.197-6.175 1.883-1.707 31.025-18.324 49.396-28.172 12.619-6.765 31.993-16.608 32.233-16.368zm-126.336 30.956c.25 0 2.588 1.175 5.19 2.617 6.379 3.533 12.109 7.42 17.164 11.637.195.163-2.423 2.301-5.819 4.751-9.48 6.84-23.914 17.734-32.275 24.384-8.82 7.017-9.113 7.232-8.121 5.714 6.606-10.102 9.927-15.822 13.396-23.128 3.083-6.494 6.156-14.203 8.35-20.91.913-2.786 1.865-5.065 2.115-5.065zm33.656 26.415c.456-.057 1.104.791 3.81 4.835 5.702 8.52 10.07 19.884 11.197 29.135l.23 1.988-13.667 5.296c-24.534 9.52-47.118 18.905-62.373 25.891a651.678 651.678 0 0 0-16.724 8.016c-4.92 2.462-8.937 4.397-8.937 4.291 0-.106 3.09-2.429 6.865-5.17 29.94-21.736 55.755-45.532 75.204-69.322 2.08-2.544 3.969-4.75 4.207-4.897a.446.446 0 0 1 .188-.063zm-15.53 3.85c.396.397-11.047 13.338-18.754 21.204-19.289 19.686-38.412 35.121-62.101 50.15-2.964 1.88-5.673 3.58-6.028 3.788-.65.38.21-.598 10.612-11.93 6.554-7.142 11.571-13.07 17.267-20.47 3.752-4.874 4.468-5.558 9.963-9.524 14.803-10.685 48.647-33.61 49.04-33.217z" style="fill:url(#f);fill-opacity:1" transform="translate(-29.397 -82.923) scale(.5693)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="385" height="385"><defs><linearGradient x1="-411.527" y1="-29.89" x2="-23.847" y2="-258.964" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(488.256 811.455) scale(.66978)"/><linearGradient id="a"><stop offset="0" stop-color="#909ca9"/><stop offset="1" stop-color="#ededee"/></linearGradient><linearGradient x1="-447.797" y1="-889.058" x2="-135.859" y2="-889.058" id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(488.256 811.455) scale(.66978)"/><linearGradient id="b"><stop offset="0" stop-color="#939fab"/><stop offset="1" stop-color="#dcdee1"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#ee352c"/><stop offset="1" stop-color="#a91d22"/></linearGradient><radialGradient cx="-1259.098" cy="-245.428" r="414.156" fx="-1259.098" fy="-245.428" id="f" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.64353 -.09731 .19436 -1.28527 -377.154 -44.777)"/></defs><path d="M469.04 461.903l-132.345 43.16-115.056 50.819-32.233 8.518a801.402 801.402 0 01-26.08 23.694c-10.151 8.834-19.698 16.84-26.958 22.626-8.084 6.443-20.103 18.37-26.247 26.017-9.14 11.377-16.287 23.51-19.36 32.84-5.53 16.786-2.836 33.788 7.827 49.48 13.622 20.044 40.738 40.409 72.274 54.273 16.086 7.071 43.232 16.188 63.587 21.328 33.922 8.566 99.482 17.873 135.588 19.256 7.323.28 17.071.254 17.52-.042.792-.523 6.413-11.166 12.934-24.489 22.19-45.33 38.245-87.824 46.885-124.118 5.231-21.976 9.31-51.28 11.951-86.025.74-9.733 1.009-42.193.44-53.226-.926-17.954-2.507-32.587-5.044-46.948-.373-2.104-.51-3.955-.314-4.123.368-.316 1.618-.717 17.874-5.442l-3.244-7.598zm-30.246 17.75c1.203 0 4.401 30.67 5.233 50.128.177 4.135.141 6.782-.105 6.782-.79 0-16.948-9.489-28.402-16.682-10.003-6.282-28.985-18.896-32.003-21.265-.953-.748-.852-.785 7.325-3.6 13.914-4.792 46.901-15.364 47.952-15.364zm-67.417 22.123c.855-.002 3.183 1.283 8.686 4.73 20.642 12.932 48.595 28.49 60.573 33.72 3.714 1.621 4.138.993-4.416 6.802-18.234 12.382-40.904 24.557-68.736 36.922-4.851 2.154-8.96 3.914-9.126 3.914-.166 0 .376-2.461 1.193-5.484 6.743-24.941 10.547-50.116 10.654-70.306.053-9.985.055-10.038 1.004-10.277a.756.756 0 01.168-.02zm-13.877 5.296c.597.6.165 22.975-.565 29.072-1.751 14.627-4.613 28.155-9.189 43.536-1.093 3.675-2.118 6.843-2.281 7.032-.398.461-14.08-12.87-18.628-18.146-7.772-9.015-13.92-17.97-18.398-26.792-2.277-4.483-5.907-13.338-5.568-13.584 1.537-1.116 54.253-21.496 54.629-21.118zm-65.366 25.765c.123.012.218.046.272.105.197.217.894 1.842 1.549 3.62 3.187 8.657 10.353 21.517 16.577 29.743 6.794 8.981 15.653 18.551 23.065 24.908 2.38 2.04 4.6 3.945 4.919 4.227.635.563.848.468-15.468 6.656-18.91 7.173-39.503 14.355-63.147 21.998-9.01 2.913-16.637 5.374-16.933 5.484-.9.334-.625-.22 2.01-4.332 11.748-18.342 29.545-54.222 39.495-79.6 1.726-4.4 3.368-8.81 3.663-9.795.433-1.448.86-1.94 2.219-2.553.752-.34 1.41-.498 1.779-.46zm-20.03 8.268c.265.234-4.807 10.945-9.796 20.68-9.678 18.879-20.348 37.458-34.515 60.133-2.444 3.912-4.697 7.489-5.002 7.932-.504.73-.71.49-2.26-2.595-3.392-6.745-6.234-15.256-7.703-23.17-1.455-7.833-1.207-21.394.544-29.805 1.301-6.25 1.244-6.111 4.186-7.62 12.722-6.519 54.13-25.92 54.545-25.555zm172.53 7.011v4.25c-.021 22.316-2.404 52.868-5.86 75.161-.607 3.912-1.133 7.14-1.173 7.18-.04.039-2.86-.788-6.258-1.843-15.016-4.661-31.297-11.626-45.984-19.674-9.727-5.33-23.795-13.964-23.4-14.359.106-.107 4.25-2.303 9.209-4.877 19.64-10.194 38.402-21.185 54.712-32.086 6.12-4.09 15.277-10.71 17.31-12.496l1.444-1.256zm-248.07 29.575c.408-.02.305.755-.334 4.438-.445 2.561-.947 7.4-1.13 10.737-.805 14.628 1.567 25.42 8.832 40.187 2.02 4.105 3.6 7.528 3.516 7.598-.727.608-66.88 19.967-87.678 25.66-6.165 1.688-11.553 3.175-11.993 3.308-.722.217-.786.06-.523-1.633 2.278-14.676 13.473-33.938 29.114-50.108 10.4-10.75 18.725-17.118 32.882-25.2 10.16-5.8 25.94-14.506 27.105-14.945a.685.685 0 01.21-.042zm156.038 27.943c.063-.076 2.514 1.236 5.442 2.93 21.368 12.357 51.185 23.948 76.606 29.763l2.302.524-3.16 1.758c-13.28 7.369-57.013 25.565-101.68 42.321-6.522 2.447-12.884 4.845-14.129 5.338-1.245.492-2.26.83-2.26.732 0-.098 1.842-3.644 4.102-7.87 12.54-23.446 25.056-51.938 31.48-71.708.654-2.015 1.234-3.713 1.297-3.788zm-15.907 5.211c.069.069-.713 2.17-1.737 4.647-8.718 21.08-20.14 44.076-34.703 69.908-3.706 6.574-6.83 11.941-6.95 11.93-.118-.01-3.132-1.794-6.697-3.976-21.213-12.987-39.982-28.973-52.306-44.52l-1.758-2.197 9.147-2.512c32.625-8.938 60.293-18.496 87.804-30.35 3.895-1.678 7.131-2.998 7.2-2.93zm98.813 34.494c.047.01.063.043.063.084 0 2.223-5.047 22.802-9.251 37.696-3.527 12.493-6.488 22.265-11.973 39.58-2.422 7.647-4.501 13.888-4.625 13.856a34.898 34.898 0 00-1.298-.252c-29.72-5.378-56.338-12.878-81.273-22.898-6.977-2.803-17.05-7.265-17.582-7.786-.18-.176 5.844-3.014 13.375-6.3 45.541-19.87 92.727-42.498 108.86-52.2 1.94-1.168 3.376-1.848 3.704-1.78zm-228.101 7.807c.244.231-12.495 18.467-30.287 43.368-6.184 8.655-13.448 18.856-16.137 22.668a476.901 476.901 0 00-9.063 13.417l-4.207 6.488-4.48-3.767c-5.255-4.413-14.455-13.782-18.628-18.984-8.587-10.705-14.406-21.97-16.702-32.317-1.06-4.777-1.092-7.21-.084-7.514 1.456-.439 28.172-6.728 53.226-12.538 13.917-3.227 30.007-7.004 35.77-8.393 5.764-1.389 10.535-2.481 10.592-2.428zm12.81 4.898l3.222 3.6c14.411 16.053 29.067 28.032 46.948 38.366 3.157 1.824 5.563 3.41 5.358 3.537-.744.46-61.833 22.18-90.085 32.024-15.933 5.551-29.022 10.078-29.094 10.067-.072-.01-.975-.6-1.988-1.318l-1.842-1.32 2.888-4.165c9.374-13.578 21.152-28.51 46.927-59.527l17.665-21.265zm79.828 57.057c.071-.088 4.537 1.495 9.942 3.516 13.029 4.872 23.254 8.049 37.09 11.512 16.993 4.253 41.55 8.507 56.094 9.733 2.232.188 3.372.443 3.014.67-.676.427-15.4 5.345-26.226 8.748-17.185 5.402-69.702 20.917-112.523 33.238-7.944 2.286-14.736 4.217-15.091 4.291-.96.2-4.312-.68-4.312-1.13 0-.214 2.401-3.253 5.316-6.74 14.393-17.216 28.692-36.445 40.627-54.629 3.264-4.973 5.999-9.121 6.07-9.21zm-17.686.502c.129.129-6.966 11.49-19.444 31.145a9616.419 9616.419 0 00-13.291 20.993c-2.048 3.247-5.048 8.182-6.656 10.989l-2.93 5.107-1.487-.398c-3.585-.97-28.88-9.906-35.56-12.558-8.282-3.287-16.912-7.257-23.276-10.696-7.952-4.297-18.037-10.675-17.246-10.926.227-.072 13.911-3.817 30.39-8.309 43.84-11.95 68.09-18.815 83.995-23.777 2.972-.927 5.448-1.627 5.505-1.57zm124.516 29.198c.095-.02.138-.02.147 0 .414 1.037-15.815 45.989-21.747 60.239-1.329 3.191-1.82 3.965-2.512 3.934-1.679-.073-25.211-3.363-39.454-5.525-24.933-3.785-66.695-11.078-77.234-13.48l-2.449-.544 14.945-3.37c32.032-7.217 47.415-11.087 63.022-15.865 19.682-6.025 39.172-13.538 58.857-22.689 3.112-1.446 5.764-2.556 6.425-2.7z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#d)"/><path d="M332.647 153.475c-2.213-.258-37.732 12.539-60.552 21.81-30.922 12.563-54.93 24.6-69.74 34.996-5.514 3.87-12.446 10.83-13.46 13.5-.378 1-.556 2.168-.564 3.37l13.437 12.684 31.877 10.172 75.937 13.563 86.799 14.924.879-7.452c-.263-.04-.511-.084-.775-.125l-11.428-1.8-2.323-4.082c-11.797-20.816-24.834-46.575-32.4-64.005-5.86-13.5-11.488-29.05-14.61-40.313-1.854-6.688-2.047-7.121-3.077-7.242zm-1.674 5.15c.088-.017.132-.017.146 0 .07.083.474 2.875.88 6.195 1.708 13.98 4.836 27.54 9.732 42.133 3.69 10.997 3.742 10.351-.649 9.126-10.207-2.849-55.937-10.699-89.018-15.28-5.33-.738-9.767-1.394-9.837-1.465-.42-.42 23.857-13.14 34.62-18.147 13.802-6.422 51.389-22.07 54.126-22.563zm-96.386 44.77l3.872 1.318c21.239 7.23 74.474 17.399 103.9 19.843 3.32.275 6.11.571 6.195.648.085.078-2.735 1.585-6.258 3.35-14.195 7.11-29.819 15.777-40.626 22.542-3.174 1.986-6.085 3.588-6.468 3.558-.383-.03-2.476-.367-4.667-.733l-3.998-.649-10.047-9.753c-17.637-17.07-31.407-30.277-36.733-35.268l-5.17-4.856zm-3.935 3.14l14.066 17.56c7.743 9.66 15.503 19.245 17.225 21.308 1.723 2.062 3.056 3.81 2.973 3.872-.4.292-20.386-3.6-30.978-6.028-10.873-2.494-15.37-3.687-22.102-5.84l-5.484-1.758.02-1.36c.07-6.746 8.573-16.696 23.003-26.876l1.277-.879zm119.786 23.923c.422.033.867.89 2.114 3.621 3.412 7.474 14.03 27.729 16.598 31.647.845 1.29 2.186 1.377-11.91-.9-33.874-5.472-44.833-7.303-44.833-7.514 0-.129 1.016-.794 2.26-1.486 10.49-5.834 21.075-13.176 30.497-21.119 2.252-1.9 4.417-3.708 4.814-4.04.163-.136.32-.22.46-.209z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#e)"/><path d="M189.496 222.43s-2.198 3.485-.125 8.666c1.282 3.205 5.133 7.056 9.377 11.135 0 0 44.452 43.361 49.898 49.647 24.63 28.426 35.327 56.41 36.315 95.046.634 24.793-4.148 46.587-15.761 71.917-20.815 45.4-64.672 95.467-132.407 151.14l9.942-3.286c6.39-4.787 15.069-9.9 35.54-21.098 47.145-25.787 100.087-49.508 165.122-73.948 93.568-35.163 247.48-76.42 335.057-89.834l9.125-1.402-1.402-2.198c-8.008-12.447-13.474-20.122-20.051-28.256-19.209-23.754-42.463-43.136-70.955-59.087-39.153-21.92-89.936-38.956-154.133-51.72-12.137-2.413-38.715-6.969-60.343-10.34-45.814-7.14-75.363-11.96-108.002-17.644-11.702-2.03-29.174-4.965-40.773-7.472-6.043-1.307-17.53-4.023-26.456-7.096-7.37-2.901-17.748-5.706-19.968-14.17zm25.766 25.012c.062-.056 1.732.46 3.767 1.152 3.752 1.273 8.702 2.764 14.463 4.374a618.885 618.885 0 0013.187 3.516c6.014 1.538 10.987 2.86 11.051 2.93.666.75 10.767 32.988 14.212 45.357 1.315 4.721 2.313 8.655 2.219 8.75-.095.093-1.215-1.645-2.47-3.852-11.686-20.551-30.193-41.45-51.594-58.27-2.668-2.097-4.835-3.877-4.835-3.957zm49.25 13.605c.514-.035 2.733.336 5.379.921 17.042 3.769 47.471 9.644 67.04 12.935 3.26.549 5.945 1.14 5.945 1.319 0 .18-1.218.95-2.7 1.695-3.284 1.652-16.57 9.604-21.015 12.58-11.097 7.427-21.074 15.377-28.34 22.605-2.92 2.904-5.363 5.274-5.442 5.274-.078 0-.589-1.693-1.13-3.767-3.633-13.925-11.143-34.486-17.875-48.957-1.083-2.329-1.967-4.382-1.967-4.563 0-.023.03-.037.105-.041zm86.631 16.473c.57.19 1.648 3.554 3.558 11.114 3.658 14.476 5.36 30.734 4.794 45.775-.158 4.186-.423 8.073-.587 8.644l-.313 1.047-5.17-1.675c-10.658-3.406-28.07-8.533-42.992-12.663-8.477-2.346-15.426-4.44-15.426-4.646 0-.62 12.37-12.986 17.687-17.687 10.156-8.978 37.48-30.232 38.45-29.91zm6.886.983c.309-.287 41.399 6.828 60.071 10.403 13.918 2.664 34.055 6.881 35.268 7.388.586.245-1.498 1.38-8.184 4.396-26.445 11.926-46.037 22.57-65.512 35.603-5.13 3.433-9.393 6.237-9.482 6.237-.089 0-.165-2.865-.167-6.363-.014-18.992-3.805-38.161-10.759-54.357-.748-1.743-1.31-3.237-1.235-3.307zm106.244 21.015c.318.318-1.03 8.42-2.198 13.207-3.635 14.897-13.27 37.007-25.158 57.79-2.095 3.661-3.969 6.715-4.186 6.78-.218.067-2.925-1.357-6.007-3.16-11.626-6.8-24.79-13.232-39.245-19.193-4.031-1.662-7.464-3.142-7.64-3.307-.66-.619 31.465-21.887 48.496-32.108 13.623-8.174 35.556-20.392 35.938-20.01zm7.598 1.193c.925 0 19.148 4.968 28.57 7.786 23.47 7.02 50.545 16.91 68.108 24.886l7.305 3.307-5.149 1.193c-42.975 9.873-79.809 21.266-115.285 35.666-2.948 1.197-5.514 2.177-5.694 2.177-.18 0 .761-2.28 2.072-5.065 10.665-22.658 17.552-46.434 19.34-66.622.163-1.838.495-3.328.733-3.328zm-181.133 41.63c.29-.287 14.16 2.963 21.726 5.087 11.37 3.192 35.566 11.289 35.582 11.91 0 .12-2.667 2.445-5.924 5.17-13.081 10.943-25.7 22.386-40.815 36.984-4.48 4.327-8.288 7.849-8.476 7.849-.189 0-.272-.632-.168-1.403 2.276-16.803 1.787-38.38-1.381-60.343-.402-2.784-.645-5.154-.544-5.253zm292.065.273c.208.208-6.435 10.59-10.57 16.514-6.033 8.643-14.779 19.99-34.703 45.043a15399.201 15399.201 0 00-26.247 33.09c-3.976 5.04-7.313 9.169-7.41 9.169-.095 0-1.378-1.805-2.846-3.998-11.231-16.78-24.559-31.518-40.459-44.75-2.967-2.47-6.314-5.177-7.43-6.007-1.116-.83-2.025-1.598-2.03-1.716-.01-.274 16.97-7.557 29.93-12.83 22.564-9.182 53.403-20.177 76.48-27.252 12.17-3.731 25.1-7.448 25.285-7.263zm7.66 2.01c.365-.075 2.787 1.097 5.694 2.762 24.305 13.923 48.123 31.803 66.852 50.192 5.328 5.23 18.361 18.788 18.168 18.9-.05.029-4.551.385-10.005.795-42.119 3.168-95.968 12.128-147.812 24.594-3.52.846-6.565 1.549-6.76 1.549-.196 0 3.658-3.869 8.56-8.582 30.446-29.27 44.336-47.752 60.678-80.771 2.434-4.918 4.498-9.16 4.584-9.419.005-.016.017-.016.042-.02zm-222.617 22.813c1.39.313 14.375 6.354 24.175 11.261 8.961 4.487 22.535 11.714 23.212 12.35.085.079-4.697 2.576-10.633 5.546-18.794 9.402-34.891 18.282-51.699 28.55-4.792 2.927-8.81 5.336-8.937 5.336-.42 0-.254-.362 2.428-5.274 8.95-16.393 16.17-35.964 20.324-55.09.37-1.706.816-2.749 1.13-2.679zm-13.082 2.345c.271.27-3.098 12.647-5.232 19.256-4.094 12.676-11.015 28.611-17.666 40.605a313.089 313.089 0 01-5.316 9.168l-2.47 4.04-5.61-5.422c-6.518-6.319-11.827-10.243-18.607-13.73-2.664-1.37-4.831-2.64-4.835-2.826-.012-.824 17.053-16.344 30.224-27.482 9.428-7.972 29.271-23.85 29.512-23.61zm79.495 32.693l4.877 3.16c11.187 7.265 24.434 17.036 34.535 25.452 5.66 4.717 16.66 14.567 18.921 16.954l1.214 1.277-8.1 2.26c-45.813 12.711-81.208 24.027-122.507 39.203-4.583 1.685-8.54 3.077-8.812 3.077-.57 0-1.135.524 9.168-8.958 26.415-24.31 49.75-51.093 67.187-77.15l3.517-5.275zm-20.89 5.233c.24.24-13.538 19.536-21.725 30.433-9.795 13.037-27.241 34.831-39.245 49.02-5.015 5.927-9.312 10.846-9.544 10.925-.255.087-.414-1.365-.419-3.663-.023-12.106-3.086-25.044-8.498-36-2.285-4.628-2.668-5.748-2.197-6.175 1.883-1.707 31.025-18.324 49.396-28.172 12.619-6.765 31.993-16.608 32.233-16.368zm-126.336 30.956c.25 0 2.588 1.175 5.19 2.617 6.379 3.533 12.109 7.42 17.164 11.637.195.163-2.423 2.301-5.819 4.751-9.48 6.84-23.914 17.734-32.275 24.384-8.82 7.017-9.113 7.232-8.121 5.714 6.606-10.102 9.927-15.822 13.396-23.128 3.083-6.494 6.156-14.203 8.35-20.91.913-2.786 1.865-5.065 2.115-5.065zm33.656 26.415c.456-.057 1.104.791 3.81 4.835 5.702 8.52 10.07 19.884 11.197 29.135l.23 1.988-13.667 5.296c-24.534 9.52-47.118 18.905-62.373 25.891a651.678 651.678 0 00-16.724 8.016c-4.92 2.462-8.937 4.397-8.937 4.291 0-.106 3.09-2.429 6.865-5.17 29.94-21.736 55.755-45.532 75.204-69.322 2.08-2.544 3.969-4.75 4.207-4.897a.446.446 0 01.188-.063zm-15.53 3.85c.396.397-11.047 13.338-18.754 21.204-19.289 19.686-38.412 35.121-62.101 50.15-2.964 1.88-5.673 3.58-6.028 3.788-.65.38.21-.598 10.612-11.93 6.554-7.142 11.571-13.07 17.267-20.47 3.752-4.874 4.468-5.558 9.963-9.524 14.803-10.685 48.647-33.61 49.04-33.217z" transform="translate(-29.397 -82.923) scale(.5693)" fill="url(#f)"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
index 9374bc4d45..33eb50158c 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
+++ b/packages/nodes-base/nodes/Microsoft/Teams/teams.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2381.4 2354.5" style="enable-background:new 0 0 2381.4 2354.5" xml:space="preserve"><path d="M2015.6 899.2c19.5 19.5 42.5 35 67.9 45.8 53 22.2 112.7 22.2 165.8 0 51.2-21.8 92-62.5 113.7-113.7 22.2-53 22.2-112.7 0-165.8-21.8-51.2-62.5-92-113.7-113.7-53-22.2-112.7-22.2-165.8 0-51.2 21.8-92 62.5-113.7 113.7-22.2 53-22.2 112.7 0 165.8 10.8 25.3 26.4 48.4 45.8 67.9zm-62.4 197.8v642.1h107c36.8-.2 73.4-3.6 109.5-10.4 36.3-6.4 71.3-18.6 103.7-36.2 30.6-16.6 57-40 77.3-68.2 21.3-31.3 32-68.6 30.5-106.5V1097h-428zm-346.8-269.2c28.4.2 56.6-5.5 82.8-16.7 51.2-21.8 91.9-62.5 113.6-113.7 22.2-53 22.2-112.7-.1-165.8-21.8-51.2-62.5-92-113.7-113.7-26.2-11.2-54.4-16.9-82.9-16.7-28.3-.2-56.3 5.5-82.3 16.7-19.4 8.3-25.5 19.1-52.2 32.1v329c26.8 13.1 32.8 23.8 52.2 32.1 26.1 11.3 54.2 16.9 82.6 16.7zm-134.8 1081.1c26.8 5.8 36.4 10.3 55.4 12.9 20.8 3 41.8 4.5 62.8 4.6 32.4-.2 64.8-3.6 96.5-10.4 32.3-6.5 63.3-18.6 91.5-35.7 27.7-17 51-40.2 68.2-67.7 19-32.1 28.3-69.1 26.9-106.4v-743h-401.3v945.7zM0 2113.7l1391.3 240.8V0L0 240.8v1872.9z" style="fill:#5558af"/><path d="m1016.7 722.4-642.1 39.1v148.1l240.8-9.7v686.7l160.5 9.4V893.6l240.8-10.7V722.4z" style="fill:#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2381.4 2354.5"><path d="M2015.6 899.2c19.5 19.5 42.5 35 67.9 45.8 53 22.2 112.7 22.2 165.8 0 51.2-21.8 92-62.5 113.7-113.7 22.2-53 22.2-112.7 0-165.8-21.8-51.2-62.5-92-113.7-113.7-53-22.2-112.7-22.2-165.8 0-51.2 21.8-92 62.5-113.7 113.7-22.2 53-22.2 112.7 0 165.8 10.8 25.3 26.4 48.4 45.8 67.9zm-62.4 197.8v642.1h107c36.8-.2 73.4-3.6 109.5-10.4 36.3-6.4 71.3-18.6 103.7-36.2 30.6-16.6 57-40 77.3-68.2 21.3-31.3 32-68.6 30.5-106.5V1097h-428zm-346.8-269.2c28.4.2 56.6-5.5 82.8-16.7 51.2-21.8 91.9-62.5 113.6-113.7 22.2-53 22.2-112.7-.1-165.8-21.8-51.2-62.5-92-113.7-113.7-26.2-11.2-54.4-16.9-82.9-16.7-28.3-.2-56.3 5.5-82.3 16.7-19.4 8.3-25.5 19.1-52.2 32.1v329c26.8 13.1 32.8 23.8 52.2 32.1 26.1 11.3 54.2 16.9 82.6 16.7zm-134.8 1081.1c26.8 5.8 36.4 10.3 55.4 12.9 20.8 3 41.8 4.5 62.8 4.6 32.4-.2 64.8-3.6 96.5-10.4 32.3-6.5 63.3-18.6 91.5-35.7 27.7-17 51-40.2 68.2-67.7 19-32.1 28.3-69.1 26.9-106.4v-743h-401.3v945.7zM0 2113.7l1391.3 240.8V0L0 240.8v1872.9z" fill="#5558af"/><path d="M1016.7 722.4l-642.1 39.1v148.1l240.8-9.7v686.7l160.5 9.4V893.6l240.8-10.7V722.4z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MondayCom/mondayCom.svg b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
index da02fc14d3..e327f8e0c4 100644
--- a/packages/nodes-base/nodes/MondayCom/mondayCom.svg
+++ b/packages/nodes-base/nodes/MondayCom/mondayCom.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M8.184 47.393A7.195 7.195 0 0 1 1.9 43.674a7.215 7.215 0 0 1 .196-7.307l12.945-20.73a7.182 7.182 0 0 1 6.356-3.376 7.196 7.196 0 0 1 6.097 3.824 7.212 7.212 0 0 1-.258 7.2L14.286 44.012a7.186 7.186 0 0 1-6.103 3.379l.001.002z" fill="#FF3D57"/><path d="M30.494 47.393a7.196 7.196 0 0 1-6.295-3.713 7.212 7.212 0 0 1 .194-7.313l12.954-20.73a7.174 7.174 0 0 1 6.411-3.634A7.193 7.193 0 0 1 50 15.923a7.211 7.211 0 0 1-.476 7.36l-12.93 20.73a7.186 7.186 0 0 1-6.102 3.378l.003.002z" fill="#FFCB00"/><path d="M45.591 40.357c0-3.895 3.214-7.034 7.205-7.034 3.99 0 7.204 3.137 7.204 7.034s-3.214 7.034-7.204 7.034c-3.991 0-7.205-3.137-7.205-7.034z" fill="#00D647"/></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M8.184 47.393A7.195 7.195 0 011.9 43.674a7.215 7.215 0 01.196-7.307l12.945-20.73a7.182 7.182 0 016.356-3.376 7.196 7.196 0 016.097 3.824 7.212 7.212 0 01-.258 7.2l-12.95 20.727a7.186 7.186 0 01-6.103 3.379l.001.002z" fill="#FF3D57"/><path d="M30.494 47.393a7.196 7.196 0 01-6.295-3.713 7.212 7.212 0 01.194-7.313l12.954-20.73a7.174 7.174 0 016.411-3.634A7.193 7.193 0 0150 15.923a7.211 7.211 0 01-.476 7.36l-12.93 20.73a7.186 7.186 0 01-6.102 3.378l.003.002z" fill="#FFCB00"/><path d="M45.591 40.357c0-3.895 3.214-7.034 7.205-7.034 3.99 0 7.204 3.137 7.204 7.034s-3.214 7.034-7.204 7.034c-3.991 0-7.205-3.137-7.205-7.034z" fill="#00D647"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MongoDb/mongodb.svg b/packages/nodes-base/nodes/MongoDb/mongodb.svg
index afc160f09b..d9f0144262 100644
--- a/packages/nodes-base/nodes/MongoDb/mongodb.svg
+++ b/packages/nodes-base/nodes/MongoDb/mongodb.svg
@@ -1 +1 @@
-<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m15.9.087.854 1.604c.192.296.4.558.645.802a22.406 22.406 0 0 1 2.004 2.266c1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12a12.7 12.7 0 0 1-1.57 1.342c-.296 0-.436-.227-.558-.436a3.589 3.589 0 0 1-.436-1.255c-.105-.523-.174-1.046-.14-1.586v-.244C16.057 24.21 15.796.21 15.9.087z" fill="#599636"/><path d="M15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a4.78 4.78 0 0 0 .157-.68l.35-2.614z" fill="#6cac48"/><path d="M16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453a3.235 3.235 0 0 1-.26-.575c-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17.37 17.37 0 0 1-.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z" fill="#c2bfbf"/></svg>
\ No newline at end of file
+<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M15.9.087l.854 1.604c.192.296.4.558.645.802a22.406 22.406 0 012.004 2.266c1.447 1.9 2.423 4.01 3.12 6.292.418 1.394.645 2.824.662 4.27.07 4.323-1.412 8.035-4.4 11.12a12.7 12.7 0 01-1.57 1.342c-.296 0-.436-.227-.558-.436a3.589 3.589 0 01-.436-1.255c-.105-.523-.174-1.046-.14-1.586v-.244C16.057 24.21 15.796.21 15.9.087z" fill="#599636"/><path d="M15.9.034c-.035-.07-.07-.017-.105.017.017.35-.105.662-.296.96-.21.296-.488.523-.767.767-1.55 1.342-2.77 2.963-3.747 4.776-1.3 2.44-1.97 5.055-2.16 7.808-.087.993.314 4.497.627 5.508.854 2.684 2.388 4.933 4.375 6.885.488.47 1.01.906 1.55 1.325.157 0 .174-.14.21-.244a4.78 4.78 0 00.157-.68l.35-2.614z" fill="#6cac48"/><path d="M16.754 28.845c.035-.4.227-.732.436-1.063-.21-.087-.366-.26-.488-.453a3.235 3.235 0 01-.26-.575c-.244-.732-.296-1.5-.366-2.248v-.453c-.087.07-.105.662-.105.75a17.37 17.37 0 01-.314 2.353c-.052.314-.087.627-.28.906 0 .035 0 .07.017.122.314.924.4 1.865.453 2.824v.35c0 .418-.017.33.33.47.14.052.296.07.436.174.105 0 .122-.087.122-.157l-.052-.575v-1.604c-.017-.28.035-.558.07-.82z" fill="#c2bfbf"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Orbit/orbit.svg b/packages/nodes-base/nodes/Orbit/orbit.svg
index fe9542abd8..ea0e0d1567 100644
--- a/packages/nodes-base/nodes/Orbit/orbit.svg
+++ b/packages/nodes-base/nodes/Orbit/orbit.svg
@@ -1 +1 @@
-<svg width="80" height="80" fill="none" viewBox="13.5 9.957 132 91.59" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M119.047 49.098A44.997 44.997 0 0 0 73.23 10.016a44.999 44.999 0 0 0-26.781 80.218c4.416-1.966 9.245-4.262 14.375-6.837a31.493 31.493 0 0 1-1.95-55.788 31.496 31.496 0 0 1 46.923 30.239 405.85 405.85 0 0 0 13.25-8.75zm.379 5.1c-4.546 3.362-9.583 6.846-15 10.358a31.493 31.493 0 0 1-37.411 21.045c-5.937 2.854-11.57 5.325-16.729 7.37a44.999 44.999 0 0 0 69.14-38.773z" fill="#1D2125"/><path fill-rule="evenodd" clip-rule="evenodd" d="M121.709 17.6a3.082 3.082 0 0 0 2.845-1.902 3.078 3.078 0 0 0-4.023-4.023 3.076 3.076 0 0 0-1.901 2.845 3.077 3.077 0 0 0 3.079 3.08zM18.104 69.914a4.104 4.104 0 1 0 0-8.208 4.104 4.104 0 0 0 0 8.208zM87.414 45.74c4.433-2.45 8.75-4.775 12.916-6.92.155.25.321.545.496.879a615.52 615.52 0 0 0-12.878 6.945l-.534-.904zm57.582-21.862c-1.979-3.429-13.979.213-30.962 8.15.159.262.317.533.467.808 16.27-7.745 27.624-11.474 29.066-8.474 2.266 3.924-23.75 23.182-58.082 43.01-34.332 19.83-64.023 32.72-66.29 28.795-1.29-2.333 5.096-8.69 10.834-13.75-8.263 6.667-12.596 11.805-11.17 14.271 3.232 5.604 34.527-5.416 69.364-25.516 34.836-20.099 60.023-41.69 56.773-47.294z" fill="#00ADE8"/><path d="M83.335 48.998a6.3 6.3 0 1 1 3.825 2.917 6.078 6.078 0 0 1-3.825-2.917z" fill="#DD078C"/></svg>
\ No newline at end of file
+<svg width="80" height="80" fill="none" viewBox="13.5 9.957 132 91.59" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M119.047 49.098A44.997 44.997 0 0073.23 10.016a44.999 44.999 0 00-26.781 80.218c4.416-1.966 9.245-4.262 14.375-6.837a31.493 31.493 0 01-1.95-55.788 31.496 31.496 0 0146.923 30.239 405.85 405.85 0 0013.25-8.75zm.379 5.1c-4.546 3.362-9.583 6.846-15 10.358a31.493 31.493 0 01-37.411 21.045c-5.937 2.854-11.57 5.325-16.729 7.37a44.999 44.999 0 0069.14-38.773z" fill="#1D2125"/><path fill-rule="evenodd" clip-rule="evenodd" d="M121.709 17.6a3.082 3.082 0 002.845-1.902 3.078 3.078 0 00-4.023-4.023 3.076 3.076 0 00-1.901 2.845 3.077 3.077 0 003.079 3.08zM18.104 69.914a4.104 4.104 0 100-8.208 4.104 4.104 0 000 8.208zm69.31-24.174c4.433-2.45 8.75-4.775 12.916-6.92.155.25.321.545.496.879a615.52 615.52 0 00-12.878 6.945l-.534-.904zm57.582-21.862c-1.979-3.429-13.979.213-30.962 8.15.159.262.317.533.467.808 16.27-7.745 27.624-11.474 29.066-8.474 2.266 3.924-23.75 23.182-58.082 43.01-34.332 19.83-64.023 32.72-66.29 28.795-1.29-2.333 5.096-8.69 10.834-13.75-8.263 6.667-12.596 11.805-11.17 14.271 3.232 5.604 34.527-5.416 69.364-25.516 34.836-20.099 60.023-41.69 56.773-47.294z" fill="#00ADE8"/><path d="M83.335 48.998a6.3 6.3 0 113.825 2.917 6.078 6.078 0 01-3.825-2.917z" fill="#DD078C"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Oura/oura.svg b/packages/nodes-base/nodes/Oura/oura.svg
index ba4972a412..190442d3d9 100644
--- a/packages/nodes-base/nodes/Oura/oura.svg
+++ b/packages/nodes-base/nodes/Oura/oura.svg
@@ -1 +1 @@
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="12 12 35 35"><path d="M24 16.5c0 1.2 1.3 1.5 6 1.5s6-.3 6-1.5-1.3-1.5-6-1.5-6 .3-6 1.5zM26 21.3c-4.1 1.4-8 6.8-8 11.1 0 7.7 7.9 13.8 15.1 11.7 9.8-2.9 12.1-15.4 3.9-21.2-3.5-2.4-6.9-2.9-11-1.6zm10 4.4c4.9 4.3 4.3 12.1-1 14.8-4.2 2.2-7.4 1.8-10.9-1.1-4.3-3.6-4.4-9.3-.2-13.5 3.8-3.8 8-3.9 12.1-.2z"/></svg>
\ No newline at end of file
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="12 12 35 35"><path d="M24 16.5c0 1.2 1.3 1.5 6 1.5s6-.3 6-1.5-1.3-1.5-6-1.5-6 .3-6 1.5zm2 4.8c-4.1 1.4-8 6.8-8 11.1 0 7.7 7.9 13.8 15.1 11.7 9.8-2.9 12.1-15.4 3.9-21.2-3.5-2.4-6.9-2.9-11-1.6zm10 4.4c4.9 4.3 4.3 12.1-1 14.8-4.2 2.2-7.4 1.8-10.9-1.1-4.3-3.6-4.4-9.3-.2-13.5 3.8-3.8 8-3.9 12.1-.2z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PayPal/paypal.svg b/packages/nodes-base/nodes/PayPal/paypal.svg
index d52a394513..a1cbd86d47 100644
--- a/packages/nodes-base/nodes/PayPal/paypal.svg
+++ b/packages/nodes-base/nodes/PayPal/paypal.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M59.444 21.742c0 6.191-2.574 11.192-7.71 14.99-5.137 3.798-12.315 5.692-21.545 5.692h-5.102l-3.913 16.963H7.69L20.14 7.361h18.258c3.41 0 6.36.238 8.901.703 2.529.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.952 1.814 1.429 4.093 1.429 6.815l.01-.009z" fill="#009CDE"/><path d="M21.627 59.945H6.987L19.71 6.795h18.687c3.413 0 6.441.239 8.992.704 2.586.477 4.854 1.316 6.748 2.484 1.893 1.19 3.368 2.765 4.366 4.672C59.5 16.56 60 18.949 60 21.742c0 6.35-2.673 11.555-7.928 15.444-5.216 3.856-12.575 5.806-21.885 5.806h-4.661l-3.899 16.953zM8.404 58.833H20.73l3.912-16.963h5.545c9.06 0 16.205-1.882 21.217-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.246-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.444-.692-8.8-.692H20.583L8.405 58.833z" fill="#FFF"/><path d="M53.457 15.957c0 6.192-2.573 11.192-7.71 14.99-5.137 3.798-12.315 5.693-21.543 5.693H19.1l-3.904 16.953H1.703L13.722 1.556h18.7c3.41 0 6.36.238 8.9.703 2.53.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.953 1.814 1.43 4.093 1.43 6.826h-.002z" fill="#0F3572"/><path d="M15.628 54.15H1L13.258 1h19.153c3.413 0 6.441.238 8.992.703 2.586.477 4.854 1.316 6.748 2.484 1.894 1.191 3.368 2.766 4.366 4.672.999 1.906 1.497 4.287 1.497 7.087 0 6.35-2.673 11.555-7.928 15.445-5.216 3.855-12.574 5.806-21.885 5.806H19.53L15.628 54.15zM2.406 53.027h12.337l3.913-16.963H24.2c9.06 0 16.205-1.882 21.216-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.247-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.443-.692-8.8-.692H14.142L2.406 53.028zm37.193-35.221c-.092 1.587-.42 2.765-1.395 4.105-.964 1.35-2.098 2.212-3.617 2.948a9.836 9.836 0 0 1-2.87.85c-.997.137-2.188.217-3.583.217h-6.702l3.752-13.46h6.09c1.553 0 2.8.023 3.742.238.94.203 1.712.489 2.291.83.805.476 1.451 1.054 1.825 1.791.465.862.522 1.418.465 2.461l.002.02z" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M59.444 21.742c0 6.191-2.574 11.192-7.71 14.99-5.137 3.798-12.315 5.692-21.545 5.692h-5.102l-3.913 16.963H7.69L20.14 7.361h18.258c3.41 0 6.36.238 8.901.703 2.529.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.952 1.814 1.429 4.093 1.429 6.815l.01-.009z" fill="#009CDE"/><path d="M21.627 59.945H6.987L19.71 6.795h18.687c3.413 0 6.441.239 8.992.704 2.586.477 4.854 1.316 6.748 2.484 1.893 1.19 3.368 2.765 4.366 4.672C59.5 16.56 60 18.949 60 21.742c0 6.35-2.673 11.555-7.928 15.444-5.216 3.856-12.575 5.806-21.885 5.806h-4.661l-3.899 16.953zM8.404 58.833H20.73l3.912-16.963h5.545c9.06 0 16.205-1.882 21.217-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.246-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.444-.692-8.8-.692H20.583L8.405 58.833z" fill="#FFF"/><path d="M53.457 15.957c0 6.192-2.573 11.192-7.71 14.99-5.137 3.798-12.315 5.693-21.543 5.693H19.1l-3.904 16.953H1.703L13.722 1.556h18.7c3.41 0 6.36.238 8.9.703 2.53.465 4.718 1.27 6.546 2.416 1.814 1.145 3.208 2.63 4.161 4.456.953 1.814 1.43 4.093 1.43 6.826h-.002z" fill="#0F3572"/><path d="M15.628 54.15H1L13.258 1h19.153c3.413 0 6.441.238 8.992.703 2.586.477 4.854 1.316 6.748 2.484 1.894 1.191 3.368 2.766 4.366 4.672.999 1.906 1.497 4.287 1.497 7.087 0 6.35-2.673 11.555-7.928 15.445-5.216 3.855-12.574 5.806-21.885 5.806H19.53L15.628 54.15zM2.406 53.027h12.337l3.913-16.963H24.2c9.06 0 16.205-1.882 21.216-5.59 2.483-1.837 4.377-3.992 5.623-6.396 1.247-2.404 1.86-5.148 1.86-8.142 0-2.618-.465-4.83-1.372-6.576-.907-1.735-2.234-3.153-3.958-4.241-1.77-1.1-3.912-1.883-6.36-2.336-2.484-.454-5.443-.692-8.8-.692H14.142L2.406 53.028zm37.193-35.221c-.092 1.587-.42 2.765-1.395 4.105-.964 1.35-2.098 2.212-3.617 2.948a9.836 9.836 0 01-2.87.85c-.997.137-2.188.217-3.583.217h-6.702l3.752-13.46h6.09c1.553 0 2.8.023 3.742.238.94.203 1.712.489 2.291.83.805.476 1.451 1.054 1.825 1.791.465.862.522 1.418.465 2.461l.002.02z" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Plivo/plivo.svg b/packages/nodes-base/nodes/Plivo/plivo.svg
index 82994465ad..fb428c04f1 100644
--- a/packages/nodes-base/nodes/Plivo/plivo.svg
+++ b/packages/nodes-base/nodes/Plivo/plivo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170"><defs><path id="a" d="M0 .549h152V119H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" fill-opacity=".01" d="M0 0h250v218H0z"/><g transform="translate(49 49.451)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#43A046" d="M75.735.548C62.831.594 50.927 4.841 41.311 11.99c-9.616 7.15-16.943 17.202-20.695 28.853a4.275 4.275 0 0 1-.684 1.3 4.372 4.372 0 0 1-1.08.997 41.635 41.635 0 0 0-14.14 15.496C1.402 64.93-.328 72.182.052 79.872c.548 11.117 5.601 20.919 13.3 27.93 7.697 7.014 18.041 11.236 29.173 11.198h67.233a42.937 42.937 0 0 0 29.096-11.513c7.65-7.122 12.635-17.015 13.108-28.137.326-7.693-1.454-14.932-4.807-21.203a41.637 41.637 0 0 0-14.244-15.4 4.378 4.378 0 0 1-1.089-.988 4.257 4.257 0 0 1-.692-1.296c-3.832-11.625-11.228-21.626-20.894-28.71C100.572 4.672 88.64.506 75.736.549m.05 14.778c9.526-.032 18.572 3.124 25.92 8.568 7.347 5.444 12.998 13.175 15.734 22.293l.592 1.973.593 1.974a4.25 4.25 0 0 0 1.913 2.441l1.776 1.047 1.775 1.046c4.261 2.513 7.634 6.024 9.894 10.143 2.26 4.119 3.408 8.847 3.22 13.794-.277 7.18-3.503 13.548-8.458 18.128a27.908 27.908 0 0 1-18.824 7.392l-33.83.116-33.83.117a27.913 27.913 0 0 1-18.874-7.263c-4.986-4.545-8.257-10.891-8.58-18.07-.225-4.945.89-9.68 3.122-13.815 2.233-4.135 5.582-7.67 9.826-10.211l1.768-1.058 1.767-1.06a4.254 4.254 0 0 0 1.898-2.454l.578-1.978.58-1.977c2.673-9.136 8.27-16.906 15.58-22.401 7.31-5.493 16.333-8.711 25.86-8.745" mask="url(#b)"/></g><path fill="#43A046" d="M113.281 100.651c0 .87-.35 1.658-.918 2.229a3.147 3.147 0 0 1-2.224.934l-3.174.012-3.175.011a3.154 3.154 0 0 1-2.229-.919 3.155 3.155 0 0 1-.934-2.223l-.01-3.175-.01-3.175a3.159 3.159 0 0 1 3.141-3.163l3.174-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.933 2.223l.011 3.175.011 3.174zm17.961 0c0 .87-.35 1.658-.918 2.229a3.146 3.146 0 0 1-2.223.934l-3.175.012-3.174.011c-.87 0-1.658-.351-2.23-.919a3.15 3.15 0 0 1-.933-2.223l-.012-3.175-.01-3.175a3.159 3.159 0 0 1 3.141-3.163l3.175-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.934 2.223l.01 3.175.011 3.174zm17.962.002c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.225.934l-3.174.011-3.174.011a3.146 3.146 0 0 1-2.232-.916 3.146 3.146 0 0 1-.931-2.226l-.012-3.175-.01-3.175a3.133 3.133 0 0 1 .916-2.231 3.145 3.145 0 0 1 2.226-.931l3.175-.011 3.173-.011a3.152 3.152 0 0 1 2.26.867c.587.557.96 1.338.984 2.21v.064l-.03 3.175-.029 3.175zm-35.915 17.955c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.224.934l-3.174.011-3.175.011a3.153 3.153 0 0 1-2.23-.918 3.157 3.157 0 0 1-.933-2.224l-.011-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.229.919.573.567.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0c0 .869-.35 1.657-.917 2.229a3.155 3.155 0 0 1-2.223.934l-3.175.011-3.174.011a3.154 3.154 0 0 1-2.23-.918 3.152 3.152 0 0 1-.933-2.224l-.012-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 0 1 2.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919a3.15 3.15 0 0 1 .934 2.222l.01 3.175.01 3.175zm17.962 0c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 0 1-2.224.934l-3.174.011-3.175.011a3.142 3.142 0 0 1-2.232-.916 3.145 3.145 0 0 1-.93-2.226l-.012-3.175-.01-3.174a3.134 3.134 0 0 1 .915-2.232 3.145 3.145 0 0 1 2.226-.931l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919.572.567.928 1.353.933 2.222l.011 3.175.011 3.175zm-35.914 17.95a3.14 3.14 0 0 1-.916 2.232 3.139 3.139 0 0 1-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 0 1-2.232-.915 3.146 3.146 0 0 1-.931-2.226l-.011-3.175-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.155 3.155 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.142 3.142 0 0 1 2.229.917c.573.568.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0a3.14 3.14 0 0 1-.915 2.232 3.138 3.138 0 0 1-2.225.931l-3.175.011-3.174.011a3.146 3.146 0 0 1-3.163-3.14l-.012-3.176-.01-3.175a3.15 3.15 0 0 1 .918-2.229 3.155 3.155 0 0 1 2.223-.934l3.175-.01 3.174-.01a3.146 3.146 0 0 1 2.23.917c.572.568.928 1.353.934 2.222l.01 3.175.01 3.175zm17.962 0a3.14 3.14 0 0 1-.916 2.232 3.139 3.139 0 0 1-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 0 1-2.232-.915 3.146 3.146 0 0 1-.93-2.226l-.012-3.175-.01-3.175c-.004-.87.346-1.66.915-2.232a3.145 3.145 0 0 1 2.226-.93l3.175-.01 3.174-.012a3.142 3.142 0 0 1 2.23.918c.572.568.928 1.353.933 2.222l.011 3.175.011 3.175z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="40 30 170 170"><defs><path id="a" d="M0 .549h152V119H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" fill-opacity=".01" d="M0 0h250v218H0z"/><g transform="translate(49 49.451)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#43A046" d="M75.735.548C62.831.594 50.927 4.841 41.311 11.99c-9.616 7.15-16.943 17.202-20.695 28.853a4.275 4.275 0 01-.684 1.3 4.372 4.372 0 01-1.08.997 41.635 41.635 0 00-14.14 15.496C1.402 64.93-.328 72.182.052 79.872c.548 11.117 5.601 20.919 13.3 27.93 7.697 7.014 18.041 11.236 29.173 11.198h67.233a42.937 42.937 0 0029.096-11.513c7.65-7.122 12.635-17.015 13.108-28.137.326-7.693-1.454-14.932-4.807-21.203a41.637 41.637 0 00-14.244-15.4 4.378 4.378 0 01-1.089-.988 4.257 4.257 0 01-.692-1.296c-3.832-11.625-11.228-21.626-20.894-28.71C100.572 4.672 88.64.506 75.736.549m.05 14.778c9.526-.032 18.572 3.124 25.92 8.568 7.347 5.444 12.998 13.175 15.734 22.293l.592 1.973.593 1.974a4.25 4.25 0 001.913 2.441l1.776 1.047 1.775 1.046c4.261 2.513 7.634 6.024 9.894 10.143 2.26 4.119 3.408 8.847 3.22 13.794-.277 7.18-3.503 13.548-8.458 18.128a27.908 27.908 0 01-18.824 7.392l-33.83.116-33.83.117a27.913 27.913 0 01-18.874-7.263c-4.986-4.545-8.257-10.891-8.58-18.07-.225-4.945.89-9.68 3.122-13.815 2.233-4.135 5.582-7.67 9.826-10.211l1.768-1.058 1.767-1.06a4.254 4.254 0 001.898-2.454l.578-1.978.58-1.977c2.673-9.136 8.27-16.906 15.58-22.401 7.31-5.493 16.333-8.711 25.86-8.745" mask="url(#b)"/></g><path fill="#43A046" d="M113.281 100.651c0 .87-.35 1.658-.918 2.229a3.147 3.147 0 01-2.224.934l-3.174.012-3.175.011a3.154 3.154 0 01-2.229-.919 3.155 3.155 0 01-.934-2.223l-.01-3.175-.01-3.175a3.159 3.159 0 013.141-3.163l3.174-.01 3.174-.011c.87 0 1.658.35 2.23.918a3.15 3.15 0 01.933 2.223l.011 3.175.011 3.174zm17.961 0c0 .87-.35 1.658-.918 2.229a3.146 3.146 0 01-2.223.934l-3.175.012-3.174.011c-.87 0-1.658-.351-2.23-.919a3.15 3.15 0 01-.933-2.223l-.012-3.175-.01-3.175a3.159 3.159 0 013.141-3.163l3.175-.01 3.174-.011c.87 0 1.658.35 2.23.918.572.568.928 1.354.934 2.223l.01 3.175.011 3.174zm17.962.002c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.225.934l-3.174.011-3.174.011a3.146 3.146 0 01-2.232-.916 3.146 3.146 0 01-.931-2.226l-.012-3.175-.01-3.175a3.133 3.133 0 01.916-2.231 3.145 3.145 0 012.226-.931l3.175-.011 3.173-.011a3.152 3.152 0 012.26.867c.587.557.96 1.338.984 2.21v.064l-.03 3.175-.029 3.175zm-35.915 17.955c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.224.934l-3.174.011-3.175.011a3.153 3.153 0 01-2.23-.918 3.157 3.157 0 01-.933-2.224l-.011-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 012.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.229.919.573.567.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0c0 .869-.35 1.657-.917 2.229a3.155 3.155 0 01-2.223.934l-3.175.011-3.174.011a3.154 3.154 0 01-2.23-.918 3.152 3.152 0 01-.933-2.224l-.012-3.175-.01-3.174c-.001-.87.35-1.658.918-2.229a3.15 3.15 0 012.223-.934l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919a3.15 3.15 0 01.934 2.222l.01 3.175.01 3.175zm17.962 0c0 .869-.35 1.657-.918 2.229a3.155 3.155 0 01-2.224.934l-3.174.011-3.175.011a3.142 3.142 0 01-2.232-.916 3.145 3.145 0 01-.93-2.226l-.012-3.175-.01-3.174a3.134 3.134 0 01.915-2.232 3.145 3.145 0 012.226-.931l3.175-.01 3.174-.012c.87 0 1.658.35 2.23.919.572.567.928 1.353.933 2.222l.011 3.175.011 3.175zm-35.914 17.95a3.14 3.14 0 01-.916 2.232 3.139 3.139 0 01-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 01-2.232-.915 3.146 3.146 0 01-.931-2.226l-.011-3.175-.01-3.175a3.15 3.15 0 01.918-2.229 3.155 3.155 0 012.223-.934l3.175-.01 3.174-.01a3.142 3.142 0 012.229.917c.573.568.929 1.353.934 2.222l.01 3.175.012 3.175zm17.96 0a3.14 3.14 0 01-.915 2.232 3.138 3.138 0 01-2.225.931l-3.175.011-3.174.011a3.146 3.146 0 01-3.163-3.14l-.012-3.176-.01-3.175a3.15 3.15 0 01.918-2.229 3.155 3.155 0 012.223-.934l3.175-.01 3.174-.01a3.146 3.146 0 012.23.917c.572.568.928 1.353.934 2.222l.01 3.175.01 3.175zm17.962 0a3.14 3.14 0 01-.916 2.232 3.139 3.139 0 01-2.226.931l-3.174.011-3.175.011a3.145 3.145 0 01-2.232-.915 3.146 3.146 0 01-.93-2.226l-.012-3.175-.01-3.175c-.004-.87.346-1.66.915-2.232a3.145 3.145 0 012.226-.93l3.175-.01 3.174-.012a3.142 3.142 0 012.23.918c.572.568.928 1.353.933 2.222l.011 3.175.011 3.175z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/PostHog/postHog.svg b/packages/nodes-base/nodes/PostHog/postHog.svg
index 1f6cc79322..8f0c42e17d 100644
--- a/packages/nodes-base/nodes/PostHog/postHog.svg
+++ b/packages/nodes-base/nodes/PostHog/postHog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none"><path fill="#fff" d="M0 0h300v300H0z"/><path fill="#F9BD2B" d="m33 179.379 39.004 38.951H33v-38.951zm0-9.738 48.755 48.689h39.004L33 130.689v38.952zm0-48.69 97.51 97.379h39.003L33 82v38.951zm48.755 0 97.509 97.379v-38.951L81.754 82v38.951zM130.51 82v38.951l48.754 48.69v-38.952L130.51 82z"/><path fill="#000" d="M267.023 202.75a37.692 37.692 0 0 1-26.632-11.016l-54.231-54.158v80.754h80.863v-15.58z"/><path fill="#fff" d="M209.563 202.75c4.308 0 7.8-3.488 7.8-7.791 0-4.302-3.492-7.79-7.8-7.79-4.309 0-7.801 3.488-7.801 7.79 0 4.303 3.492 7.791 7.801 7.791z"/><path fill="#1D4AFF" d="M33 218.33h39.004L33 179.379v38.951zM81.755 130.689 33 82v38.951l48.755 48.69v-38.952zM33 130.689v38.952l48.755 48.689v-38.951L33 130.689z"/><path fill="#F54E00" d="M130.51 130.689 81.755 82v38.951l48.755 48.69v-38.952zM81.755 218.33h39.004l-39.004-38.951v38.951zM81.755 130.689v38.952l48.755 48.689v-38.951l-48.755-48.69z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" fill="none"><path fill="#fff" d="M0 0h300v300H0z"/><path fill="#F9BD2B" d="M33 179.379l39.004 38.951H33v-38.951zm0-9.738l48.755 48.689h39.004L33 130.689v38.952zm0-48.69l97.51 97.379h39.003L33 82v38.951zm48.755 0l97.509 97.379v-38.951L81.754 82v38.951zM130.51 82v38.951l48.754 48.69v-38.952L130.51 82z"/><path fill="#000" d="M267.023 202.75a37.692 37.692 0 01-26.632-11.016l-54.231-54.158v80.754h80.863v-15.58z"/><path fill="#fff" d="M209.563 202.75c4.308 0 7.8-3.488 7.8-7.791 0-4.302-3.492-7.79-7.8-7.79-4.309 0-7.801 3.488-7.801 7.79 0 4.303 3.492 7.791 7.801 7.791z"/><path fill="#1D4AFF" d="M33 218.33h39.004L33 179.379v38.951zm48.755-87.641L33 82v38.951l48.755 48.69v-38.952zm-48.755 0v38.952l48.755 48.689v-38.951L33 130.689z"/><path fill="#F54E00" d="M130.51 130.689L81.755 82v38.951l48.755 48.69v-38.952zM81.755 218.33h39.004l-39.004-38.951v38.951zm0-87.641v38.952l48.755 48.689v-38.951l-48.755-48.69z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
index 47018c4218..b51a3fd61f 100644
--- a/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
+++ b/packages/nodes-base/nodes/Pushbullet/pushbullet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg);transform:rotate(360deg)"><defs><linearGradient x1="8.59%" y1="1.954%" x2="77.471%" y2="73.896%" id="c"><stop stop-color="#4CB36B" offset="0%"/><stop stop-color="#3EA16F" offset="100%"/></linearGradient><path id="a" d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128"/></defs><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#67BF79" xlink:href="#a"/><path d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128" fill="#67BF79" mask="url(#b)"/><path d="M63.111 187.022 96.178 72l64.533 60.978L200 90.133l87.533 86.289-110.844 124.889L63.111 187.022" fill="url(#c)" mask="url(#b)"/><path d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733H77zM121.041 189.6c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025 0 30.752-20.628 62.308-52.628 62.308h-37.537z" fill="#FFF" mask="url(#b)"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h256v256H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" style="-ms-transform:rotate(360deg);-webkit-transform:rotate(360deg)" transform="rotate(360)"><defs><linearGradient x1="8.59%" y1="1.954%" x2="77.471%" y2="73.896%" id="c"><stop stop-color="#4CB36B" offset="0%"/><stop stop-color="#3EA16F" offset="100%"/></linearGradient><path id="a" d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128"/></defs><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#67BF79" xlink:href="#a"/><path d="M256 128c0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0c70.692 0 128 57.308 128 128" fill="#67BF79" mask="url(#b)"/><path d="M63.111 187.022L96.178 72l64.533 60.978L200 90.133l87.533 86.289-110.844 124.889L63.111 187.022" fill="url(#c)" mask="url(#b)"/><path d="M77 189.6c-16.733 0-16.733 0-16.733-16.733V81c0-16.733 0-16.733 16.733-16.733h3.334c16.733 0 16.733 0 16.733 16.733v91.867c0 16.733 0 16.733-16.733 16.733H77zm44.041 0c-5.699 0-8.508-2.809-8.508-8.508V72.774c0-5.698 2.809-8.507 8.508-8.507h37.537c32.178 0 52.628 32.273 52.628 63.025 0 30.752-20.628 62.308-52.628 62.308h-37.537z" fill="#FFF" mask="url(#b)"/><path fill="rgba(0, 0, 0, 0)" d="M0 0h256v256H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
index d954aaf8e6..f4e89f3a83 100644
--- a/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
+++ b/packages/nodes-base/nodes/QuickBooks/quickbooks.svg
@@ -1 +1 @@
-<svg viewBox="0 0 2500 2500" xmlns="http://www.w3.org/2000/svg"><circle cx="1250" cy="1250" fill="#2ca01c" r="1250"/><path d="M301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1a322 322 0 0 1 137.5 0H987v1002.9c-.9 106.1 84.4 192.9 190.5 193.9V729.6H813c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1a322 322 0 0 1-137.5 0h-175.6V571c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 2500 2500" xmlns="http://www.w3.org/2000/svg"><circle cx="1250" cy="1250" fill="#2ca01c" r="1250"/><path d="M301.3 1249.6c.1 282.6 228 512.4 510.6 514.9h72.3v-188.9h-72.3c-175.2 47.8-355.9-55.5-403.6-230.7-.4-1.4-.7-2.8-1.1-4.2-49.1-177.5 53.7-361.4 230.6-412.5h36.1a322 322 0 01137.5 0H987v1002.9c-.9 106.1 84.4 192.9 190.5 193.9V729.6H813c-284.6 1.5-514 233.4-512.5 518v.1zm1387.5-519.8h-72.3v198.9h72.3c174.8-47.7 355.1 55.3 402.8 230 .4 1.3.7 2.7 1.1 4 48.8 176.9-53.7 360.1-229.9 411.1h-36.1a322 322 0 01-137.5 0h-175.6V571c.9-106.1-84.4-192.9-190.5-193.9v1397.4h364.5c287.1-4.5 516.2-240.8 511.8-527.9-4.4-280.8-230.9-507.4-511.8-511.8z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Raindrop/raindrop.svg b/packages/nodes-base/nodes/Raindrop/raindrop.svg
index e841d0959c..3ea52bc0fe 100644
--- a/packages/nodes-base/nodes/Raindrop/raindrop.svg
+++ b/packages/nodes-base/nodes/Raindrop/raindrop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 0 1 9.5 9.5v9.5H9.5a9.5 9.5 0 0 1 0-19z"/><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 1 1 9.496 9.77H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863-.17.165-.343.325-.519.479L19 31l-8.673-7.958c-.176-.154-.35-.314-.52-.479-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0z"/><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#2CD4ED" xlink:href="#a"/><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L19 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#b)"/></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use fill="#3169FF" xlink:href="#c"/><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L0 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#d)"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-2 -5 42 42"><defs><path id="a" d="M9.5.917a9.5 9.5 0 019.5 9.5v9.5H9.5a9.5 9.5 0 010-19z"/><path id="c" d="M0 19.917v-9.5l.004-.27a9.5 9.5 0 119.496 9.77H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M28.192 4.7c5.077 4.933 5.077 12.93 0 17.863-.17.165-.343.325-.519.479L19 31l-8.673-7.958c-.176-.154-.35-.314-.52-.479-5.076-4.932-5.076-12.93 0-17.863 5.077-4.933 13.309-4.933 18.385 0z"/><g transform="translate(0 11.083)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#2CD4ED" xlink:href="#a"/><path fill="#0DB4E2" d="M28.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L19 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#b)"/></g><g transform="translate(19 11.083)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use fill="#3169FF" xlink:href="#c"/><path fill="#3153FF" d="M9.192-6.384c5.077 4.933 5.077 12.931 0 17.864-.17.165-.343.324-.519.478L0 19.917l-8.673-7.959c-.176-.154-.35-.313-.52-.478-5.076-4.933-5.076-12.93 0-17.864 5.077-4.933 13.309-4.933 18.385 0z" mask="url(#d)"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Reddit/reddit.svg b/packages/nodes-base/nodes/Reddit/reddit.svg
index 64a9bd454e..810345c370 100644
--- a/packages/nodes-base/nodes/Reddit/reddit.svg
+++ b/packages/nodes-base/nodes/Reddit/reddit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 513 514" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z" fill="#ff4500"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305z"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#b"/><use xlink:href="#b" x="-118"/></g></g><g stroke="#fff" fill="none"><use xlink:href="#b" x="75" y="-160" stroke-width="25"/><path d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45 24-83 80 16" stroke-width="22"/></g></symbol><defs><path id="b" d="M287 285a27.94 27.94 0 1 1 56 0 27.94 27.94 0 1 1-56 0z"/></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 513 514" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 76.8C0 34.253 34.253 0 76.8 0h358.4C477.747 0 512 34.253 512 76.8v358.4c0 42.547-34.253 76.8-76.8 76.8H76.8C34.253 512 0 477.747 0 435.2z" fill="#ff4500"/><path d="M79 305c0-68.142 78.942-123 177-123s177 54.858 177 123-78.942 123-177 123S79 373.142 79 305z"/><g fill="#ff4500"><path d="M199 347c35 29 79 29 114 0l12 11c-42 35-96 35-138 0z"/><use xlink:href="#b"/><use xlink:href="#b" x="-118"/></g></g><g stroke="#fff" fill="none"><use xlink:href="#b" x="75" y="-160" stroke-width="25"/><path d="M87 282c-45-22-5-92 40-50m298 50c45-22 5-92-40-50m-127-45l24-83 80 16" stroke-width="22"/></g></symbol><defs><path id="b" d="M287 285a27.94 27.94 0 1156 0 27.94 27.94 0 11-56 0z"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Redis/redis.svg b/packages/nodes-base/nodes/Redis/redis.svg
index df3df0ac29..6e8301d99d 100644
--- a/packages/nodes-base/nodes/Redis/redis.svg
+++ b/packages/nodes-base/nodes/Redis/redis.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388c3.711-1.342 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124l.006-.003z" fill="#A41E11"/><path d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225 3.16 1.165 19.643 7.78 22.747 8.951 3.103 1.17 3.24 2.086.037 3.786l.028-.015z" fill="#D82C20"/><path d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123l.006-.003z" fill="#A41E11"/><path d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935 3.121 1.15 3.24 2.085.038 3.785h.01z" fill="#D82C20"/><path d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419-3.532 1.858-5.494 1.838-8.283.495-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123l.006-.002z" fill="#A41E11"/><path d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936 3.122 1.15 3.24 2.085.038 3.785l.01.001z" fill="#D82C20"/><path d="m31.497 15.032-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546-1.164 2.827zm-10.014 6.275 13.903-2.153-4.2 6.211-9.703-4.058zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905z" fill="#FFF"/><path fill="#7A0C00" d="m52.233 15.714-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="m44.01 18.991-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M57.656 43.99c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.535-23.629-10.067C.834 44.066.002 43.422.002 42.811v-6.117s22.98-5.045 26.69-6.388c3.711-1.342 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.603 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.124l.006-.003z" fill="#A41E11"/><path d="M57.656 37.872c-3.201 1.685-19.787 8.56-23.318 10.417-3.532 1.856-5.494 1.838-8.283.494-2.79-1.343-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.34 4.994-1.39 8.153-.225 3.16 1.165 19.643 7.78 22.747 8.951 3.103 1.17 3.24 2.086.037 3.786l.028-.015z" fill="#D82C20"/><path d="M57.656 34.015c-3.201 1.683-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.536-23.629-10.067C.834 34.092.002 33.447.002 32.836V26.72s22.98-5.045 26.69-6.387c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.602 25.154 5.756v6.032c0 .605-.72 1.283-2.35 2.123l.006-.003z" fill="#A41E11"/><path d="M57.656 27.898c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.067-3.18-1.534-3.243-2.588-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.225 3.16 1.166 19.644 7.785 22.765 8.935 3.121 1.15 3.24 2.085.038 3.785h.01z" fill="#D82C20"/><path d="M57.656 23.671c-3.201 1.683-19.787 8.561-23.318 10.419-3.532 1.858-5.494 1.838-8.283.495-2.79-1.344-20.449-8.535-23.629-10.069-1.592-.765-2.424-1.411-2.424-2.02v-6.11s22.98-5.045 26.69-6.388c3.711-1.343 4.995-1.39 8.154-.225 3.16 1.165 22.035 4.591 25.154 5.745v6.032c0 .605-.72 1.283-2.35 2.123l.006-.002z" fill="#A41E11"/><path d="M57.656 17.553c-3.201 1.685-19.787 8.561-23.318 10.417-3.532 1.856-5.494 1.838-8.283.495-2.79-1.344-20.449-8.534-23.63-10.068-3.18-1.533-3.243-2.587-.122-3.82l24.388-9.52c3.71-1.343 4.994-1.39 8.153-.226 3.16 1.165 19.643 7.785 22.765 8.936 3.122 1.15 3.24 2.085.038 3.785l.01.001z" fill="#D82C20"/><path d="M31.497 15.032l-1.88-3.153-6.002-.545 4.48-1.63L26.75 7.2l4.192 1.653 3.955-1.305-1.07 2.586 4.032 1.524-5.198.546-1.164 2.827zm-10.014 6.275l13.903-2.153-4.2 6.211-9.703-4.058zm-11.17-5.167c0-1.61 3.314-2.906 7.431-2.906 4.118 0 7.432 1.296 7.432 2.906s-3.314 2.905-7.432 2.905c-4.117 0-7.431-1.295-7.431-2.905z" fill="#FFF"/><path fill="#7A0C00" d="M52.233 15.714l-8.224 3.276-.007-6.556z"/><path fill="#AD2115" d="M44.01 18.991l-.89.353-8.217-3.276 9.094-3.63z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Salesforce/salesforce.svg b/packages/nodes-base/nodes/Salesforce/salesforce.svg
index b93dde12b2..2a7c9a54d7 100644
--- a/packages/nodes-base/nodes/Salesforce/salesforce.svg
+++ b/packages/nodes-base/nodes/Salesforce/salesforce.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773a15.739 15.739 0 0 1 6.46-1.366c8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313a11.677 11.677 0 0 1-10.2 5.977 11.75 11.75 0 0 1-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 0 1 6.176-10.815 14.097 14.097 0 0 1-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0 1 11.441 5.663" fill="#00a1e0"/><path d="m10.712 26.856.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0 .313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 0 0 1.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 0 0-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366a2.813 2.813 0 0 1-.57 1.1 2.75 2.75 0 0 1-.968.74c-.398.17-.854.256-1.366.256s-.968-.085-1.366-.256-.7-.427-.968-.74a2.96 2.96 0 0 1-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 0 1 .968-.74 3.44 3.44 0 0 1 1.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a2.96 2.96 0 0 1 .57 1.1zm-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736zm11.697 2.134.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313-1.1 0-1.935-.313-2.504-.94s-.854-1.48-.854-2.533c0-.484.057-.94.2-1.366s.342-.797.626-1.1a2.96 2.96 0 0 1 1.025-.74 3.62 3.62 0 0 1 1.423-.285 8.3 8.3 0 0 1 .939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085a4.007 4.007 0 0 0-1.338-.2c-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025zm-7.542-.228.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a7.69 7.69 0 0 1 1.138-.114c.854 0 1.508.2 1.964.598s.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.59 6.59 0 0 1-1.3.114c-.427 0-.797-.028-1.138-.114a2.78 2.78 0 0 1-.882-.37 1.923 1.923 0 0 1-.57-.683c-.142-.256-.2-.598-.2-.968a2.26 2.26 0 0 1 .228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427a4.293 4.293 0 0 1 1.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.12 1.12 0 0 0 .142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 0 0-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.93 1.93 0 0 1 .7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.32 4.32 0 0 0-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057a1.619 1.619 0 0 1-.398-.114c-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028.2 0 .37-.028.512-.085.17-.057.285-.17.398-.313s.2-.342.313-.598c.105-.346.191-.697.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655c.201.002.401.021.598.057.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 75 53" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M30.777 5.653c2.4-2.476 5.72-4.04 9.392-4.04 4.895 0 9.136 2.732 11.412 6.773a15.739 15.739 0 016.46-1.366c8.823 0 15.937 7.2 15.937 16.08s-7.143 16.088-15.937 16.088c-1.08 0-2.134-.114-3.13-.313a11.677 11.677 0 01-10.2 5.977 11.75 11.75 0 01-5.094-1.167c-2.02 4.753-6.745 8.1-12.238 8.1-5.72 0-10.615-3.614-12.494-8.7-.833.171-1.682.257-2.533.256C5.522 43.341 0 37.763 0 30.847a12.52 12.52 0 016.176-10.815 14.097 14.097 0 01-1.195-5.72C4.955 6.432 11.415 0 19.325 0a14.34 14.34 0 0111.441 5.663" fill="#00a1e0"/><path d="M10.712 26.856l.313-.825c.057-.142.142-.085.2-.057l.256.17a3.53 3.53 0 001.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 00-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256-.028-.057-.085-.085-.028-.2zm22.2 0l.313-.825c.057-.142.17-.085.2-.057l.256.17a3.53 3.53 0 001.964.57c.655 0 1.08-.342 1.08-.825v-.028c0-.512-.626-.7-1.366-.94l-.17-.057c-.996-.285-2.078-.7-2.078-1.964v-.028c0-1.195.968-2.05 2.362-2.05h.142c.825 0 1.594.228 2.163.598.057.028.114.085.085.17l-.313.825c-.057.142-.2.057-.2.057a4.32 4.32 0 00-1.935-.484c-.598 0-.968.313-.968.74v.028c0 .484.655.7 1.395.94l.142.028c.996.313 2.05.74 2.05 1.964v.028c0 1.3-.94 2.106-2.448 2.106-.74 0-1.45-.114-2.22-.512-.142-.085-.285-.142-.427-.256 0-.057-.057-.085-.028-.2zm16.45-3.9c.114.427.2.882.2 1.366s-.057.94-.2 1.366a2.813 2.813 0 01-.57 1.1 2.75 2.75 0 01-.968.74c-.398.17-.854.256-1.366.256s-.968-.085-1.366-.256-.7-.427-.968-.74a2.96 2.96 0 01-.57-1.1c-.115-.417-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1a2.75 2.75 0 01.968-.74 3.44 3.44 0 011.366-.285c.512 0 .968.085 1.366.285.398.17.7.427.968.74a2.96 2.96 0 01.57 1.1zm-1.28 1.338c0-.74-.142-1.3-.398-1.708s-.683-.598-1.224-.598c-.57 0-.968.2-1.224.598s-.398.968-.398 1.708.142 1.3.398 1.736c.256.398.655.598 1.224.598s.968-.2 1.224-.598c.285-.398.398-.996.398-1.736zm11.697 2.134l.313.854c.028.114-.057.142-.057.142-.484.2-1.138.313-1.793.313-1.1 0-1.935-.313-2.504-.94s-.854-1.48-.854-2.533c0-.484.057-.94.2-1.366s.342-.797.626-1.1a2.96 2.96 0 011.025-.74 3.62 3.62 0 011.423-.285 8.3 8.3 0 01.939.057c.285.057.683.142.854.228.028 0 .114.057.085.142l-.313.854c-.057.142-.142.085-.142.085a4.007 4.007 0 00-1.338-.2c-.626 0-1.1.2-1.395.626-.313.398-.484.94-.484 1.68 0 .797.2 1.366.54 1.736s.825.54 1.45.54c.256 0 .484-.028.683-.057s.398-.085.598-.17c-.028.057.085.028.142.142zm6.46-3.728c.285.968.142 1.793.114 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.142.114.398.54.512.94zm-4.27.9h3.045c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.17.256-.256.598-.342 1.025zm-30.082-.9c.285.968.142 1.793.142 1.85 0 .114-.114.114-.114.114h-4.297c.028.655.17 1.1.512 1.423.313.313.797.512 1.48.512 1.025 0 1.45-.2 1.765-.313 0 0 .114-.028.17.085l.285.797c.057.142 0 .17-.028.2-.256.142-.9.427-2.163.427-.598 0-1.138-.085-1.565-.256s-.797-.398-1.08-.7-.484-.683-.626-1.08c-.142-.427-.2-.882-.2-1.366s.057-.94.2-1.366c.114-.427.313-.797.57-1.1s.598-.57.996-.74c.398-.2.882-.285 1.423-.285.455 0 .882.085 1.224.256.256.114.54.313.825.626.114.114.398.54.484.94zm-4.27.9h3.074c-.028-.398-.114-.74-.285-1.025-.256-.398-.626-.626-1.195-.626s-.968.228-1.224.626c-.2.256-.285.598-.37 1.025zm-7.542-.228l.7.085v-.17c0-.57-.114-.854-.342-1.025s-.598-.285-1.053-.285c0 0-1.053 0-1.878.427-.028.028-.057.028-.057.028s-.114.028-.142-.057l-.313-.825c-.057-.114.028-.17.028-.17.398-.313 1.3-.484 1.3-.484a7.69 7.69 0 011.138-.114c.854 0 1.508.2 1.964.598s.683 1.025.683 1.907v3.927s0 .114-.085.142c0 0-.17.057-.313.085l-1.08.2a6.59 6.59 0 01-1.3.114c-.427 0-.797-.028-1.138-.114a2.78 2.78 0 01-.882-.37 1.923 1.923 0 01-.57-.683c-.142-.256-.2-.598-.2-.968a2.26 2.26 0 01.228-.996c.143-.296.37-.512.626-.7s.57-.313.882-.427a4.293 4.293 0 011.053-.142l.74.028zm-1.708 3.017s.398.313 1.252.256c.626-.028 1.167-.142 1.167-.142v-1.955s-.54-.085-1.167-.085c-.882 0-1.252.313-1.252.313-.256.17-.37.455-.37.825a1.12 1.12 0 00.142.569c.028.057.057.114.228.228zm36.286-5.208c-.028.114-.256.7-.313.9-.028.085-.085.114-.17.114 0 0-.256-.057-.484-.057a2.3 2.3 0 00-.569.085c-.2.057-.37.17-.54.313s-.285.37-.37.626-.142.683-.142 1.138v3.187c0 .085-.057.142-.142.142h-1.128c-.085 0-.142-.057-.142-.142v-6.4c0-.085.057-.142.114-.142h1.1c.085 0 .114.057.114.142v.512a1.93 1.93 0 01.7-.54c.245-.113.57-.2 1.1-.17.285.028.655.085.7.114.114.028.17.057.142.17zm-10.56-2.96c.028 0 .114.057.085.142l-.342.9c-.028.057-.057.114-.2.057-.028 0-.085-.028-.228-.057-.085-.028-.228-.028-.342-.028-.17 0-.313.028-.455.057s-.256.114-.37.228-.228.256-.313.455a4.32 4.32 0 00-.228.968h1.366c.114 0 .142.057.142.142l-.17.882c-.028.142-.142.114-.142.114h-1.423l-.9 5.493c-.114.57-.228 1.053-.37 1.45s-.313.683-.57.968c-.228.256-.484.455-.797.54-.285.114-.655.17-1.053.17-.2 0-.398 0-.626-.057a1.619 1.619 0 01-.398-.114c-.057-.028-.085-.085-.057-.17l.293-.863c.057-.114.142-.057.142-.057l.228.085c.114.028.228.028.342.028.2 0 .37-.028.512-.085.17-.057.285-.17.398-.313s.2-.342.313-.598c.105-.346.191-.697.256-1.053l.968-5.38h-.94c-.114 0-.142-.057-.142-.142l.17-.882c.028-.142.142-.114.142-.114h.968l.057-.285c.142-.854.427-1.508.854-1.935s1.053-.655 1.82-.655c.201.002.401.021.598.057.114-.028.256 0 .398.057zm-19.182 9.25c0 .085-.057.142-.114.142h-1.138c-.085 0-.114-.057-.114-.142v-9.136c0-.057.057-.142.114-.142h1.138c.085 0 .114.057.114.142z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
index 9f846a2f77..dd1d2a6bfa 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
+++ b/packages/nodes-base/nodes/SecurityScorecard/securityScorecard.svg
@@ -1 +1 @@
-<svg width="195" height="195" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M-1-1h197v197H-1z"/><g><g fill="none" class="mark"><path stroke="#619E73" fill="#4e878c" class="st0" d="M140.6 126.918v36l31.3-18.1-.1-36.1-31.2-18zM65.8 170.018l31.2 18 31.2-18v-35.9zM171.8 94.318v-35.9l-31.2-18-31.1 17.9zM65.8 83.618v36l31.2 18 31.2-17.9v-36.1l-31.2-18zM22.1 108.818v36l31.2 18 31.2-18zM53.3 40.418l-31.2 18v36l31.2 18zM97 51.218l31.2-18-31.2-18-31.2 18v36z"/></g></g></svg>
\ No newline at end of file
+<svg width="195" height="195" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M-1-1h197v197H-1z"/><g fill="none" class="mark"><path stroke="#619E73" fill="#4e878c" class="st0" d="M140.6 126.918v36l31.3-18.1-.1-36.1-31.2-18zm-74.8 43.1l31.2 18 31.2-18v-35.9zm106-75.7v-35.9l-31.2-18-31.1 17.9zm-106-10.7v36l31.2 18 31.2-17.9v-36.1l-31.2-18zm-43.7 25.2v36l31.2 18 31.2-18zm31.2-68.4l-31.2 18v36l31.2 18zm43.7 10.8l31.2-18-31.2-18-31.2 18v36z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SendGrid/sendGrid.svg b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
index 28ac52c52f..f8ba825549 100644
--- a/packages/nodes-base/nodes/SendGrid/sendGrid.svg
+++ b/packages/nodes-base/nodes/SendGrid/sendGrid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 21.25h21.374v21.374H0z"/><path d="M0 21.25h21.374v21.374H0z" fill="#99e1f4"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path d="M21.374 42.626h21.25v21.25h-21.25z" fill="#99e1f4"/><path d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z" fill="#1a82e2"/><path d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z" fill="#00b3e3"/><path d="M21.374 42.626h21.25V21.25h-21.25z" fill="#009dd9"/><g fill="#1a82e2"><path d="M42.626 0H64v21.25H42.626zM42.626 21.25H64v.123H42.626z"/></g></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 21.25h21.374v21.374H0z"/><path d="M0 21.25h21.374v21.374H0z" fill="#99e1f4"/><path d="M21.374 42.626h21.25v21.25h-21.25z"/><path d="M21.374 42.626h21.25v21.25h-21.25z" fill="#99e1f4"/><path d="M0 63.877h21.374V64H0zm0-21.25h21.374v21.25H0z" fill="#1a82e2"/><path d="M21.374 0h21.25v21.25h-21.25zm21.252 21.374H64v21.25H42.626z" fill="#00b3e3"/><path d="M21.374 42.626h21.25V21.25h-21.25z" fill="#009dd9"/><path d="M42.626 0H64v21.25H42.626zm0 21.25H64v.123H42.626z" fill="#1a82e2"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SentryIo/sentryio.svg b/packages/nodes-base/nodes/SentryIo/sentryio.svg
index 0aef7aca49..60643b76f6 100644
--- a/packages/nodes-base/nodes/SentryIo/sentryio.svg
+++ b/packages/nodes-base/nodes/SentryIo/sentryio.svg
@@ -1 +1 @@
-<svg class="css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 44" width="400" height="352"><path d="M29 2.26a4.67 4.67 0 0 0-8 0l-6.58 11.27a32.21 32.21 0 0 1 17.75 26.66h-4.62a27.68 27.68 0 0 0-15.46-22.72L6 28a15.92 15.92 0 0 1 9.23 12.17H4.62A.76.76 0 0 1 4 39.06l2.94-5a10.74 10.74 0 0 0-3.36-1.9l-2.91 5a4.54 4.54 0 0 0 1.69 6.24 4.66 4.66 0 0 0 2.26.6h14.53a19.4 19.4 0 0 0-8-17.31l2.31-4A23.87 23.87 0 0 1 23.76 44h12.31a35.88 35.88 0 0 0-16.41-31.8l4.67-8a.77.77 0 0 1 1.05-.27c.53.29 20.29 34.77 20.66 35.17a.76.76 0 0 1-.68 1.13H40.6q.09 1.91 0 3.81h4.78A4.59 4.59 0 0 0 50 39.43a4.49 4.49 0 0 0-.62-2.28z" fill="#362d59"/></svg>
\ No newline at end of file
+<svg class="css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 44" width="400" height="352"><path d="M29 2.26a4.67 4.67 0 00-8 0l-6.58 11.27a32.21 32.21 0 0117.75 26.66h-4.62a27.68 27.68 0 00-15.46-22.72L6 28a15.92 15.92 0 019.23 12.17H4.62A.76.76 0 014 39.06l2.94-5a10.74 10.74 0 00-3.36-1.9l-2.91 5a4.54 4.54 0 001.69 6.24 4.66 4.66 0 002.26.6h14.53a19.4 19.4 0 00-8-17.31l2.31-4A23.87 23.87 0 0123.76 44h12.31a35.88 35.88 0 00-16.41-31.8l4.67-8a.77.77 0 011.05-.27c.53.29 20.29 34.77 20.66 35.17a.76.76 0 01-.68 1.13H40.6q.09 1.91 0 3.81h4.78A4.59 4.59 0 0050 39.43a4.49 4.49 0 00-.62-2.28z" fill="#362d59"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Spotify/spotify.svg b/packages/nodes-base/nodes/Spotify/spotify.svg
index 8a72e2aeb6..96c9e3a6dc 100644
--- a/packages/nodes-base/nodes/Spotify/spotify.svg
+++ b/packages/nodes-base/nodes/Spotify/spotify.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0zm14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 0 1 .688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z" stroke="none" fill="#1ed760" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><path d="M32 0C14.3 0 0 14.337 0 32c0 17.7 14.337 32 32 32 17.7 0 32-14.337 32-32S49.663 0 32 0zm14.68 46.184c-.573.956-1.797 1.223-2.753.65-7.532-4.588-16.975-5.62-28.14-3.097-1.07.23-2.14-.42-2.37-1.5s.42-2.14 1.5-2.37c12.196-2.8 22.67-1.606 31.082 3.556a2 2 0 01.688 2.753zm3.9-8.717c-.726 1.185-2.256 1.53-3.44.84-8.602-5.276-21.716-6.805-31.885-3.747-1.338.382-2.714-.344-3.097-1.644-.382-1.338.344-2.714 1.682-3.097 11.622-3.517 26.074-1.835 35.976 4.244 1.147.688 1.5 2.217.765 3.403zm.344-9.1c-10.323-6.117-27.336-6.7-37.2-3.708-1.568.497-3.25-.42-3.747-1.988s.42-3.25 1.988-3.747c11.317-3.44 30.127-2.753 41.98 4.282 1.415.84 1.873 2.676 1.032 4.1-.765 1.453-2.638 1.912-4.053 1.07z" stroke="none" fill="#1ed760" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Storyblok/storyblok.svg b/packages/nodes-base/nodes/Storyblok/storyblok.svg
index 0a99709ec8..c47cb1e56a 100644
--- a/packages/nodes-base/nodes/Storyblok/storyblok.svg
+++ b/packages/nodes-base/nodes/Storyblok/storyblok.svg
@@ -1 +1 @@
-<svg width="87" height="103" xmlns="http://www.w3.org/2000/svg"><g fill="#09B3AF" fill-rule="nonzero"><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/><g><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 0 0-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 0 1 3.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 0 1-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/></g></g></svg>
\ No newline at end of file
+<svg width="87" height="103" xmlns="http://www.w3.org/2000/svg"><g fill="#09B3AF"><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 00-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 013.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 01-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/><path d="M51.8 49H31v10h20.3c1.2 0 2.3-.5 3.2-1.3.8-.8 1.3-2 1.3-3.5a6 6 0 00-1.1-3.6c-.8-1-1.7-1.6-2.9-1.6zm.7-12.1c.9-.6 1.3-1.9 1.3-3.6 0-1.5-.4-2.6-1.1-3.3-.7-.6-1.6-1-2.6-1H31v9h18.7c1 0 2-.5 2.8-1.1z"/><path d="M83 0H4.5C2 0 0 2 0 4.4V83c0 2.4 2 3.9 4.4 3.9H16v15.7L30.4 87H83c2.4 0 3.9-1.5 3.9-4V4.5c0-2.4-1.5-4.4-4-4.4L83 0zM69.8 63.7c-1 1.8-2.5 3.3-4.3 4.4-1.9 1.2-4 2.3-6.4 2.8-2.4.6-5 1.1-7.7 1.1H16V16h40.2c2 0 3.7.4 5.3 1.3 1.5.8 2.9 1.9 4 3.2a15 15 0 013.4 9.7c0 2.6-.7 5.1-2 7.5a12.5 12.5 0 01-6 5.4c3.2.9 5.7 2.5 7.6 4.8 1.8 2.4 2.7 5.5 2.7 9.4 0 2.5-.5 4.6-1.5 6.4h.1z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Strava/strava.svg b/packages/nodes-base/nodes/Strava/strava.svg
index 9293ddce3b..d94ac6a66f 100644
--- a/packages/nodes-base/nodes/Strava/strava.svg
+++ b/packages/nodes-base/nodes/Strava/strava.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="m6.9 8.8 2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="m7.2 2.5 3.1 6.3H4zm0 3.8 1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" width="2500" height="2500"><path d="M0 0h16v16H0z" fill="#fc4c02"/><g fill="#fff" fill-rule="evenodd"><path d="M6.9 8.8l2.5 4.5 2.4-4.5h-1.5l-.9 1.7-1-1.7z" opacity=".6"/><path d="M7.2 2.5l3.1 6.3H4zm0 3.8l1.2 2.5H5.9z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Telegram/telegram.svg b/packages/nodes-base/nodes/Telegram/telegram.svg
index 0f5adee4fc..7169647621 100644
--- a/packages/nodes-base/nodes/Telegram/telegram.svg
+++ b/packages/nodes-base/nodes/Telegram/telegram.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32" fill="#37aee2"/><path d="m21.661 34.338 3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z" fill="#c8daea"/><path d="m26.695 37.034-.729 7.746s-.305 2.373 2.068 0l4.644-4.203" fill="#a9c6d8"/><path d="m21.73 34.712-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58a.34.34 0 0 1-.146-.239c-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32c0 17.673 14.327 32 32 32s32-14.327 32-32S49.673 0 32 0 0 14.327 0 32" fill="#37aee2"/><path d="M21.661 34.338l3.797 10.508s.475.983.983.983 8.068-7.864 8.068-7.864l8.407-16.237-21.119 9.898z" fill="#c8daea"/><path d="M26.695 37.034l-.729 7.746s-.305 2.373 2.068 0l4.644-4.203" fill="#a9c6d8"/><path d="M21.73 34.712l-7.809-2.545s-.932-.378-.633-1.237c.062-.177.186-.328.559-.588 1.731-1.206 32.028-12.096 32.028-12.096s.856-.288 1.361-.097c.231.088.378.187.503.548.045.132.071.411.068.689-.003.201-.027.386-.045.678-.184 2.978-5.706 25.198-5.706 25.198s-.33 1.3-1.514 1.345c-.432.016-.956-.071-1.582-.61-2.323-1.998-10.352-7.394-12.126-8.58a.34.34 0 01-.146-.239c-.025-.125.108-.28.108-.28s13.98-12.427 14.352-13.731c.029-.101-.079-.151-.226-.107-.929.342-17.025 10.506-18.801 11.629-.104.066-.395.023-.395.023"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TheHive/thehive.svg b/packages/nodes-base/nodes/TheHive/thehive.svg
index 1b1f5b457b..03ef3ed41b 100644
--- a/packages/nodes-base/nodes/TheHive/thehive.svg
+++ b/packages/nodes-base/nodes/TheHive/thehive.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 1 1 150 10a140 140 0 0 1 140 140" style="fill:#f3d02f"/><path class="cls-2" d="M204.62 210.6a15.13 15.13 0 0 1-6.68 1.38 17.49 17.49 0 0 1-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 0 0-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 0 1-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 0 1-16.53 10.83m42.63-45.16 5.69-13.69 5.57 13.71zm-7.79 19.29 3.19-8.06 20.37.07 3.13 8.08zm-5 11.57 36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44M136.88 106.1a3.75 3.75 0 0 1-3.39-2.15l-5.81-12.34a3.74 3.74 0 1 1 6.77-3.19l5.81 12.34a3.74 3.74 0 0 1-1.79 5 3.79 3.79 0 0 1-1.59.36M163.12 106.1a3.79 3.79 0 0 1-1.59-.36 3.74 3.74 0 0 1-1.79-5l5.82-12.35a3.74 3.74 0 1 1 6.77 3.2L166.51 104a3.75 3.75 0 0 1-3.39 2.15"/><path class="cls-2" d="M204.36 157.81a3.74 3.74 0 0 1-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 0 1-6.4 3.87L77 128.28a3.72 3.72 0 0 1 0-3.81l35-60.41a3.77 3.77 0 0 1 3.24-1.87h69.6a3.75 3.75 0 0 1 3.16 1.87l35 60.41a3.73 3.73 0 0 1 0 3.7l-15.44 27.72a3.75 3.75 0 0 1-3.28 1.92"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-2{fill:#fff}</style></defs><path d="M290 150A140 140 0 11150 10a140 140 0 01140 140" fill="#f3d02f"/><path class="cls-2" d="M204.62 210.6a15.13 15.13 0 01-6.68 1.38 17.49 17.49 0 01-16.11-10.93l-4.83-11.6-7.31-18.28a5.05 5.05 0 00-.7-2.12l-10.1-25.31c16.15 2.86 45.93 20.16 55.68 43.72 3.48 9.49-.76 19.66-9.9 23.14m-54.87 27.21c-11.58 0-21-8.5-24.85-21.5l49.85.16c-3.9 13.33-13.41 21.38-25 21.34m-48-26.14a14.3 14.3 0 01-6.67-1.43c-8.76-3.89-13.29-14.09-9.4-22.85 9.91-23.85 39.81-40.95 56-43.36L131 170l-7.79 19.29-5 11.57a18.34 18.34 0 01-16.53 10.83m42.63-45.16l5.69-13.69 5.57 13.71zm-7.79 19.29l3.19-8.06 20.37.07 3.13 8.08zm-5 11.57l36.17.12 3.13 8.09-42.48-.15zm18.56-90.87c9.48 0 17.53 9.18 17.5 16.56 0 8.77-14.43 9.43-17.23 9.41-3.16 0-17.21-.4-17.18-9.53-.67-7.38 7.43-16.48 16.91-16.44m-13.2-.42a3.75 3.75 0 01-3.39-2.15l-5.81-12.34a3.74 3.74 0 116.77-3.19l5.81 12.34a3.74 3.74 0 01-1.79 5 3.79 3.79 0 01-1.59.36m26.24-.02a3.79 3.79 0 01-1.59-.36 3.74 3.74 0 01-1.79-5l5.82-12.35a3.74 3.74 0 116.77 3.2L166.51 104a3.75 3.75 0 01-3.39 2.15"/><path class="cls-2" d="M204.36 157.81a3.74 3.74 0 01-3.26-5.56l14.41-25.87-32.87-56.7h-65.28L84.54 126.3l15.66 25.83a3.74 3.74 0 01-6.4 3.87L77 128.28a3.72 3.72 0 010-3.81l35-60.41a3.77 3.77 0 013.24-1.87h69.6a3.75 3.75 0 013.16 1.87l35 60.41a3.73 3.73 0 010 3.7l-15.44 27.72a3.75 3.75 0 01-3.28 1.92"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TimescaleDb/timescale.svg b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
index 2afad3022c..744a244156 100644
--- a/packages/nodes-base/nodes/TimescaleDb/timescale.svg
+++ b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 0 0-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 0 1 3.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 0 0-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 0 1 3.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 0 1-2.9-4.75h-.85a8.294 8.294 0 0 0 3.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 0 1-2.9-4.75h-.85a8.294 8.294 0 0 0 3.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 0 0-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 0 0-5.54-4.84z" id="t"/><path d="m25.11 18.5-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="m25.11 18.5-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="m15.85 18.5.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="m15.85 18.5.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 0 1-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 0 0 3.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 0 1-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 0 0 3.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 0 0-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 0 0-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 0 0-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 0 0-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 0 0-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 0 0-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g><use xlink:href="#v" fill-opacity="0"/><use xlink:href="#v" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#x" fill-opacity="0"/><use xlink:href="#x" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#z" fill-opacity="0"/><use xlink:href="#z" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#B" fill-opacity="0"/><use xlink:href="#B" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#D" fill-opacity="0"/><use xlink:href="#D" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#F" fill-opacity="0"/><use xlink:href="#F" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#H" fill-opacity="0"/><use xlink:href="#H" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#J" fill-opacity="0"/><use xlink:href="#J" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#L" fill-opacity="0"/><use xlink:href="#L" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#N" fill-opacity="0"/><use xlink:href="#N" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#P" fill-opacity="0"/><use xlink:href="#P" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="t"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#v"/><use xlink:href="#v" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#x"/><use xlink:href="#x" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#z"/><use xlink:href="#z" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#B"/><use xlink:href="#B" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#D"/><use xlink:href="#D" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#F"/><use xlink:href="#F" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#H"/><use xlink:href="#H" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#J"/><use xlink:href="#J" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#L"/><use xlink:href="#L" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#N"/><use xlink:href="#N" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#P"/><use xlink:href="#P" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Typeform/typeform.svg b/packages/nodes-base/nodes/Typeform/typeform.svg
index dd5e81c753..c3176af180 100644
--- a/packages/nodes-base/nodes/Typeform/typeform.svg
+++ b/packages/nodes-base/nodes/Typeform/typeform.svg
@@ -1 +1 @@
-<svg width="256" height="257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M121.24.474c33.019-2.718 56.734 6.045 82.25 31.547 27.549 27.532 45.864 63.212 50.8 101.218 5.492 42.266-2.062 73.807-25.326 96.898-22.247 22.08-54.74 29.364-98.146 25.735l-1.797-.158c-36.963-3.398-63.107-15.517-88.438-41.171C13.526 187.14-.732 156.026.029 123.37.401 107.383 4.93 93.758 13.664 80.39c5.726-8.765 11.54-15.602 23.704-28.14l4.06-4.158 4.474-4.536C74.73 14.58 93.707 2.741 121.24.475zm80.288 33.51C176.586 9.057 153.672.59 121.468 3.241c-27.14 2.234-45.78 14.091-74.95 43.635l-2.11 2.141C30.198 63.465 23.538 70.852 17.67 79.395l-.854 1.26-.828 1.252c-8.461 12.95-12.824 26.078-13.184 41.528-.743 31.846 13.194 62.258 39.754 89.157 25.267 25.59 51.225 37.4 88.49 40.514l1.85.148c41.744 3.21 72.867-4.002 94.11-25.087 22.57-22.402 29.92-53.088 24.53-94.57-4.855-37.382-22.884-72.503-50.01-99.613zM166.984 93.39v13.56h-28.797v77.712h-14.345V106.95H95.045V93.39h71.94z" fill="#262627"/></svg>
\ No newline at end of file
+<svg width="256" height="257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M121.24.474c33.019-2.718 56.734 6.045 82.25 31.547 27.549 27.532 45.864 63.212 50.8 101.218 5.492 42.266-2.062 73.807-25.326 96.898-22.247 22.08-54.74 29.364-98.146 25.735l-1.797-.158c-36.963-3.398-63.107-15.517-88.438-41.171C13.526 187.14-.732 156.026.029 123.37c.372-15.987 4.901-29.612 13.635-42.98 5.726-8.765 11.54-15.602 23.704-28.14l4.06-4.158 4.474-4.536C74.73 14.58 93.707 2.741 121.24.475zm80.288 33.51C176.586 9.057 153.672.59 121.468 3.241c-27.14 2.234-45.78 14.091-74.95 43.635l-2.11 2.141c-14.21 14.448-20.87 21.835-26.738 30.378l-.854 1.26-.828 1.252c-8.461 12.95-12.824 26.078-13.184 41.528-.743 31.846 13.194 62.258 39.754 89.157 25.267 25.59 51.225 37.4 88.49 40.514l1.85.148c41.744 3.21 72.867-4.002 94.11-25.087 22.57-22.402 29.92-53.088 24.53-94.57-4.855-37.382-22.884-72.503-50.01-99.613zM166.984 93.39v13.56h-28.797v77.712h-14.345V106.95H95.045V93.39h71.94z" fill="#262627"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Webflow/webflow.svg b/packages/nodes-base/nodes/Webflow/webflow.svg
index fb80355245..80675e0218 100644
--- a/packages/nodes-base/nodes/Webflow/webflow.svg
+++ b/packages/nodes-base/nodes/Webflow/webflow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x="1" y="1"/><symbol id="A" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z" fill="#4353ff"/><path d="M41.4 28.2l-2.9 9.14c0-.7-2-15.86-2-15.86-4.6 0-7.04 3.26-8.32 6.72l-3.54 9.16c0-.66-.5-9.08-.5-9.08a7.48 7.48 0 0 0-7.26-6.78l3.76 22.96c4.8 0 7.4-3.26 8.74-6.72l3-7.8c0 .32 2 14.52 2 14.52a9.24 9.24 0 0 0 8.8-6.46l6.8-16.52c-4.8 0-7.32 3.26-8.6 6.72z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 66" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x="1" y="1"/><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M0 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z" fill="#4353ff"/><path d="M41.4 28.2l-2.9 9.14c0-.7-2-15.86-2-15.86-4.6 0-7.04 3.26-8.32 6.72l-3.54 9.16c0-.66-.5-9.08-.5-9.08a7.48 7.48 0 00-7.26-6.78l3.76 22.96c4.8 0 7.4-3.26 8.74-6.72l3-7.8c0 .32 2 14.52 2 14.52a9.24 9.24 0 008.8-6.46l6.8-16.52c-4.8 0-7.32 3.26-8.6 6.72z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wise/wise.svg b/packages/nodes-base/nodes/Wise/wise.svg
index ee51582125..16f4d8336a 100644
--- a/packages/nodes-base/nodes/Wise/wise.svg
+++ b/packages/nodes-base/nodes/Wise/wise.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -3 25 26"><path d="m2.471 0 3.282 5.496L0 10.983h9.947l.935-2.199H5.394l3.32-3.302-1.94-3.283h9.051L7.88 20.966h2.722L19.486 0H2.471" style="fill:#00cdff;fill-opacity:1;stroke:none"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -3 25 26"><path d="M2.471 0l3.282 5.496L0 10.983h9.947l.935-2.199H5.394l3.32-3.302-1.94-3.283h9.051L7.88 20.966h2.722L19.486 0H2.471" fill="#00cdff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Xero/xero.svg b/packages/nodes-base/nodes/Xero/xero.svg
index 14ed475e5f..34d4008f91 100644
--- a/packages/nodes-base/nodes/Xero/xero.svg
+++ b/packages/nodes-base/nodes/Xero/xero.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M30 59.538c16.336 0 29.538-13.202 29.538-29.538S46.336.462 30 .462.462 13.664.462 30 13.664 59.538 30 59.538z" fill="#00B2D5"/><path d="m14.588 29.908 5.035-5.035a.95.95 0 0 0 .256-.616.92.92 0 0 0-.925-.925c-.256 0-.461.092-.667.256l-5.034 5.035-5.035-5.035a.95.95 0 0 0-.616-.256.92.92 0 0 0-.925.925c0 .256.092.461.256.667l5.035 5.034-5.045 5.027c-.206.154-.257.41-.257.667 0 .514.411.925.925.925a.85.85 0 0 0 .617-.257l5.034-5.034 5.035 5.034a.85.85 0 0 0 .667.257.92.92 0 0 0 .925-.925.85.85 0 0 0-.256-.617l-5.025-5.127zm29.95 0c0 .925.72 1.643 1.644 1.643.923 0 1.643-.72 1.643-1.643s-.72-1.643-1.643-1.643c-.874 0-1.644.77-1.644 1.643zm-4.984 0a6.646 6.646 0 0 0 6.627 6.626 6.646 6.646 0 0 0 6.626-6.626 6.646 6.646 0 0 0-6.626-6.627 6.646 6.646 0 0 0-6.627 6.627zm1.901 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.769 4.769 0 0 1-4.778-4.778zm-2.363-6.474h-.256c-.831 0-1.643.257-2.312.77-.092-.41-.461-.72-.873-.72a.865.865 0 0 0-.873.874v11.148c0 .514.41.925.925.925a.92.92 0 0 0 .925-.925v-6.832c0-2.262.206-3.185 2.157-3.444h.37c.513 0 .924-.369.924-.873-.052-.565-.461-.925-.976-.925l-.01.002zm-6.215 5.23c-.41-1.849-1.387-3.338-2.928-4.315-2.261-1.438-5.24-1.336-7.397.206-1.747 1.233-2.774 3.339-2.774 5.446 0 .514.052 1.08.206 1.592.667 2.62 2.928 4.616 5.6 4.932.79.104 1.592.052 2.362-.154a7.215 7.215 0 0 0 2.003-.83c.668-.411 1.182-.976 1.696-1.593l.052-.052c.369-.461.308-1.08-.093-1.387-.308-.257-.873-.37-1.335.206-.093.154-.206.256-.309.41-.369.411-.77.771-1.292 1.08a4.592 4.592 0 0 1-2.209.565c-2.62-.051-4.006-1.848-4.52-3.184a5.413 5.413 0 0 1-.206-.77v-.155h9.452c1.233-.052 1.902-.976 1.696-2.003l-.004.006zm-11.095.154v-.092c.514-2.055 2.415-3.596 4.615-3.596 2.262 0 4.161 1.592 4.675 3.699l-9.29-.01z" fill="#FFF"/><g><path d="M29.538 59.077c16.336 0 29.539-13.203 29.539-29.539C59.077 13.203 45.874 0 29.538 0 13.203 0 0 13.203 0 29.538c0 16.336 13.203 29.539 29.538 29.539z" fill="#00B2D5"/><path d="m14.127 29.446 5.034-5.034a.95.95 0 0 0 .257-.617.92.92 0 0 0-.925-.925c-.257 0-.462.092-.667.257L12.79 28.16l-5.034-5.034a.95.95 0 0 0-.617-.257.92.92 0 0 0-.925.925c0 .257.092.462.257.667l5.034 5.035-5.044 5.026c-.206.154-.257.41-.257.667 0 .515.41.925.925.925a.85.85 0 0 0 .616-.256l5.035-5.035 5.034 5.035a.85.85 0 0 0 .668.256.92.92 0 0 0 .925-.925.85.85 0 0 0-.257-.616l-5.024-5.128zm29.95 0c0 .925.72 1.643 1.643 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.873 0-1.643.77-1.643 1.643zm-4.985 0a6.646 6.646 0 0 0 6.627 6.627 6.646 6.646 0 0 0 6.627-6.627 6.646 6.646 0 0 0-6.627-6.627 6.646 6.646 0 0 0-6.627 6.627zm1.902 0a4.77 4.77 0 0 1 4.778-4.778 4.77 4.77 0 0 1 4.778 4.778 4.735 4.735 0 0 1-4.778 4.778 4.769 4.769 0 0 1-4.778-4.778zm-2.363-6.473h-.257c-.83 0-1.643.256-2.311.77-.093-.41-.462-.72-.873-.72a.865.865 0 0 0-.874.874v11.148c0 .514.411.925.925.925a.92.92 0 0 0 .925-.925v-6.833c0-2.262.206-3.185 2.157-3.443h.37c.514 0 .925-.37.925-.873-.052-.565-.462-.925-.976-.925l-.011.002zm-6.215 5.23c-.411-1.85-1.388-3.339-2.928-4.316-2.262-1.438-5.24-1.335-7.398.206-1.746 1.233-2.774 3.339-2.774 5.446 0 .515.052 1.08.206 1.593.668 2.62 2.928 4.615 5.6 4.932.79.104 1.593.051 2.363-.154a7.215 7.215 0 0 0 2.003-.831c.667-.411 1.181-.976 1.695-1.593l.052-.051c.37-.462.308-1.08-.092-1.388-.309-.256-.873-.369-1.336.206-.092.154-.206.257-.308.411-.37.41-.771.77-1.293 1.08a4.592 4.592 0 0 1-2.208.565c-2.62-.052-4.007-1.849-4.52-3.185a5.413 5.413 0 0 1-.207-.77v-.155h9.453c1.233-.051 1.901-.975 1.695-2.003l-.003.007zm-11.096.154v-.092c.514-2.055 2.415-3.597 4.616-3.597 2.261 0 4.16 1.593 4.674 3.7l-9.29-.011z" fill="#FFF"/></g></g></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M30 59.538c16.336 0 29.538-13.202 29.538-29.538S46.336.462 30 .462.462 13.664.462 30 13.664 59.538 30 59.538z" fill="#00B2D5"/><path d="M14.588 29.908l5.035-5.035a.95.95 0 00.256-.616.92.92 0 00-.925-.925c-.256 0-.461.092-.667.256l-5.034 5.035-5.035-5.035a.95.95 0 00-.616-.256.92.92 0 00-.925.925c0 .256.092.461.256.667l5.035 5.034-5.045 5.027c-.206.154-.257.41-.257.667 0 .514.411.925.925.925a.85.85 0 00.617-.257l5.034-5.034 5.035 5.034a.85.85 0 00.667.257.92.92 0 00.925-.925.85.85 0 00-.256-.617l-5.025-5.127zm29.95 0c0 .925.72 1.643 1.644 1.643.923 0 1.643-.72 1.643-1.643s-.72-1.643-1.643-1.643c-.874 0-1.644.77-1.644 1.643zm-4.984 0a6.646 6.646 0 006.627 6.626 6.646 6.646 0 006.626-6.626 6.646 6.646 0 00-6.626-6.627 6.646 6.646 0 00-6.627 6.627zm1.901 0a4.77 4.77 0 014.778-4.778 4.77 4.77 0 014.778 4.778 4.735 4.735 0 01-4.778 4.778 4.769 4.769 0 01-4.778-4.778zm-2.363-6.474h-.256a3.78 3.78 0 00-2.312.77c-.092-.41-.461-.72-.873-.72a.865.865 0 00-.873.874v11.148c0 .514.41.925.925.925a.92.92 0 00.925-.925v-6.832c0-2.262.206-3.185 2.157-3.444h.37c.513 0 .924-.369.924-.873-.052-.565-.461-.925-.976-.925l-.01.002zm-6.215 5.23c-.41-1.849-1.387-3.338-2.928-4.315-2.261-1.438-5.24-1.336-7.397.206-1.747 1.233-2.774 3.339-2.774 5.446 0 .514.052 1.08.206 1.592.667 2.62 2.928 4.616 5.6 4.932a6.07 6.07 0 002.362-.154 7.215 7.215 0 002.003-.83c.668-.411 1.182-.976 1.696-1.593l.052-.052c.369-.461.308-1.08-.093-1.387-.308-.257-.873-.37-1.335.206-.093.154-.206.256-.309.41a5.39 5.39 0 01-1.292 1.08 4.592 4.592 0 01-2.209.565c-2.62-.051-4.006-1.848-4.52-3.184a5.413 5.413 0 01-.206-.77v-.155h9.452c1.233-.052 1.902-.976 1.696-2.003l-.004.006zm-11.095.154v-.092c.514-2.055 2.415-3.596 4.615-3.596 2.262 0 4.161 1.592 4.675 3.699l-9.29-.01z" fill="#FFF"/><path d="M29.538 59.077c16.336 0 29.539-13.203 29.539-29.539C59.077 13.203 45.874 0 29.538 0 13.203 0 0 13.203 0 29.538c0 16.336 13.203 29.539 29.538 29.539z" fill="#00B2D5"/><path d="M14.127 29.446l5.034-5.034a.95.95 0 00.257-.617.92.92 0 00-.925-.925c-.257 0-.462.092-.667.257L12.79 28.16l-5.034-5.034a.95.95 0 00-.617-.257.92.92 0 00-.925.925c0 .257.092.462.257.667l5.034 5.035-5.044 5.026c-.206.154-.257.41-.257.667 0 .515.41.925.925.925a.85.85 0 00.616-.256l5.035-5.035 5.034 5.035a.85.85 0 00.668.256.92.92 0 00.925-.925.85.85 0 00-.257-.616l-5.024-5.128zm29.95 0c0 .925.72 1.643 1.643 1.643s1.643-.72 1.643-1.643-.72-1.643-1.643-1.643c-.873 0-1.643.77-1.643 1.643zm-4.985 0a6.646 6.646 0 006.627 6.627 6.646 6.646 0 006.627-6.627 6.646 6.646 0 00-6.627-6.627 6.646 6.646 0 00-6.627 6.627zm1.902 0a4.77 4.77 0 014.778-4.778 4.77 4.77 0 014.778 4.778 4.735 4.735 0 01-4.778 4.778 4.769 4.769 0 01-4.778-4.778zm-2.363-6.473h-.257c-.83 0-1.643.256-2.311.77-.093-.41-.462-.72-.873-.72a.865.865 0 00-.874.874v11.148c0 .514.411.925.925.925a.92.92 0 00.925-.925v-6.833c0-2.262.206-3.185 2.157-3.443h.37c.514 0 .925-.37.925-.873-.052-.565-.462-.925-.976-.925l-.011.002zm-6.215 5.23c-.411-1.85-1.388-3.339-2.928-4.316-2.262-1.438-5.24-1.335-7.398.206-1.746 1.233-2.774 3.339-2.774 5.446 0 .515.052 1.08.206 1.593.668 2.62 2.928 4.615 5.6 4.932.79.104 1.593.051 2.363-.154a7.215 7.215 0 002.003-.831c.667-.411 1.181-.976 1.695-1.593l.052-.051c.37-.462.308-1.08-.092-1.388-.309-.256-.873-.369-1.336.206-.092.154-.206.257-.308.411-.37.41-.771.77-1.293 1.08a4.592 4.592 0 01-2.208.565c-2.62-.052-4.007-1.849-4.52-3.185a5.413 5.413 0 01-.207-.77v-.155h9.453c1.233-.051 1.901-.975 1.695-2.003l-.003.007zm-11.096.154v-.092c.514-2.055 2.415-3.597 4.616-3.597 2.261 0 4.16 1.593 4.674 3.7l-9.29-.011z" fill="#FFF"/></g></svg>
\ No newline at end of file

From a90e18e1b8df5f8f6d490b5384afbbf477fffb09 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:34:04 +0000
Subject: [PATCH 050/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.56.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 8c5bf0b1d7..7f53397619 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 659232c2b1785de1527ea695f61642579da05ad7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:34:20 +0000
Subject: [PATCH 051/231] :arrow_up: Set n8n-workflow@0.56.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 2d5a5c1d30..a41a82559b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.55.0",
+    "n8n-workflow": "~0.56.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",

From 3dacb283acb79f28745496efe92215a9eb438de2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:34:20 +0000
Subject: [PATCH 052/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.68?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index a41a82559b..70e6874e66 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.67.0",
+  "version": "0.68.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From bde065352e9419cd6b2edd6ec7244e39defd0c48 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:34:35 +0000
Subject: [PATCH 053/231] :arrow_up: Set n8n-core@0.68.0 and
 n8n-workflow@0.56.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4f9fdc3ff3..0f133eb198 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -580,7 +580,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.55.0",
+    "n8n-workflow": "~0.56.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -617,7 +617,7 @@
     "mqtt": "4.2.1",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.67.0",
+    "n8n-core": "~0.68.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",

From 135472dbd892a8e68ccbd6cd5026303e2b5ecb08 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:34:36 +0000
Subject: [PATCH 054/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.113.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 0f133eb198..4e933f1a1e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.112.0",
+  "version": "0.113.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From c49e70d4f65774fe3aa1ce058fcfe909d0a8e10b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:35:29 +0000
Subject: [PATCH 055/231] :arrow_up: Set n8n-workflow@0.56.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 4bbd604ca1..219b301710 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -65,7 +65,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.55.0",
+    "n8n-workflow": "~0.56.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",

From 0b611d5c61174ccd9cd5c2f97a357326b6937b93 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:35:30 +0000
Subject: [PATCH 056/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.86.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 219b301710..a13b4f0b25 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 91909ed509b42d8b6316b9f9b5e8ef716edc47ab Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:36:29 +0000
Subject: [PATCH 057/231] :arrow_up: Set n8n-core@0.68.0, n8n-editor-ui@0.86.0,
 n8n-nodes-base@0.113.0 and n8n-workflow@0.56.0 on n8n

---
 packages/cli/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 98468899ea..7f96830af1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -103,10 +103,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.67.0",
-    "n8n-editor-ui": "~0.85.0",
-    "n8n-nodes-base": "~0.112.0",
-    "n8n-workflow": "~0.55.0",
+    "n8n-core": "~0.68.0",
+    "n8n-editor-ui": "~0.86.0",
+    "n8n-nodes-base": "~0.113.0",
+    "n8n-workflow": "~0.56.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",
@@ -134,4 +134,4 @@
       "json"
     ]
   }
-}
\ No newline at end of file
+}

From 4d966eaa26d3e3119a7acddd1bbf5e2bc0804b31 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 15:36:30 +0000
Subject: [PATCH 058/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.116.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7f96830af1..dacc637efd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.115.0",
+  "version": "0.116.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 28098854221a87695890faf84f43ec57d3ff4822 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 17 Apr 2021 17:52:38 +0200
Subject: [PATCH 059/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.113.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4e933f1a1e..2483866586 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.113.0",
+  "version": "0.113.1",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From b2e65dceffb430755afd16064ba8af9913232586 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 20 Apr 2021 08:55:54 +0200
Subject: [PATCH 060/231] :bug: Fix issue that workflows in main process did
 timeout

---
 packages/cli/src/WorkflowRunner.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index bb92501d96..7ded8d81b3 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -198,8 +198,7 @@ export class WorkflowRunner {
 
 		this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
 
-
-		if (workflowTimeout) {
+		if (workflowTimeout > 0) {
 			const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
 			executionTimeout = setTimeout(() => {
 				this.activeExecutions.stopExecution(executionId, 'timeout');

From 5c65a73cc21ac4348eaae6b6b010980ff789cefe Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 20 Apr 2021 08:57:47 +0200
Subject: [PATCH 061/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.116.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index dacc637efd..a93df5d13f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.116.0",
+  "version": "0.116.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 1b754daa2fd1b055dcd84d342634288944280e98 Mon Sep 17 00:00:00 2001
From: Umair Kamran <umair.kamran96@gmail.com>
Date: Fri, 23 Apr 2021 11:52:53 +0500
Subject: [PATCH 062/231] :bug: Fix sending "lastActive" with Mautic

---
 packages/nodes-base/nodes/Mautic/Mautic.node.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index d3f30c036f..56d7eb8f2b 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -314,7 +314,7 @@ export class Mautic implements INodeType {
 						body.ipAddress = additionalFields.ipAddress as string;
 					}
 					if (additionalFields.lastActive) {
-						body.ipAddress = additionalFields.lastActive as string;
+						body.lastActive = additionalFields.lastActive as string;
 					}
 					if (additionalFields.ownerId) {
 						body.ownerId = additionalFields.ownerId as string;
@@ -423,7 +423,7 @@ export class Mautic implements INodeType {
 						body.ipAddress = updateFields.ipAddress as string;
 					}
 					if (updateFields.lastActive) {
-						body.ipAddress = updateFields.lastActive as string;
+						body.lastActive = updateFields.lastActive as string;
 					}
 					if (updateFields.ownerId) {
 						body.ownerId = updateFields.ownerId as string;

From d9f7ebdea904d75506c29698d5e7a42f689d3429 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Sat, 24 Apr 2021 00:08:08 +0200
Subject: [PATCH 063/231] :sparkles: Extend NextCloud User-Resource (#1641)

* Add get/getAll:User in NextCloud node

* Add update/delete:User in NextCloud node

* Fix getAll:User operation
---
 .../nodes/NextCloud/GenericFunctions.ts       |   4 +-
 .../nodes/NextCloud/NextCloud.node.ts         | 313 +++++++++++++++++-
 2 files changed, 301 insertions(+), 16 deletions(-)

diff --git a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
index 263e6dd38c..f71b9ea0a0 100644
--- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
@@ -25,7 +25,7 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
 		headers,
 		method,
 		body,
-		qs: {},
+		qs: query ?? {},
 		uri: '',
 		json: false,
 	};
@@ -50,7 +50,7 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
 
 			options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`;
 
-			if (resource === 'user' && operation === 'create') {
+			if (resource === 'user') {
 				options.uri = options.uri.replace('/remote.php/webdav', '');
 			}
 			return await this.helpers.request(options);
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 55a7025d9f..c5b5acf121 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -204,6 +204,26 @@ export class NextCloud implements INodeType {
 						value: 'create',
 						description: 'Invite a user to a NextCloud organization',
 					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a user.',
+					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Retrieve information about a single user.',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Retrieve a list of users.',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Edit attributes related to a user.',
+					},
 				],
 				default: 'create',
 				description: 'The operation to perform.',
@@ -574,6 +594,185 @@ export class NextCloud implements INodeType {
 					},
 				],
 			},
+			// ----------------------------------
+			//         user:get/delete/update
+			// ----------------------------------
+			{
+				displayName: 'Username',
+				name: 'userId',
+				type: 'string',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'delete',
+							'get',
+							'update',
+						],
+					},
+				},
+				placeholder: 'john',
+				description: 'Username the user will have.',
+			},
+			// ----------------------------------
+			//         user:getAll
+			// ----------------------------------
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				default: false,
+				description: 'If all results should be returned or only up to a given limit.',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'getAll',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 100,
+				},
+				default: 50,
+				description: 'How many results to return.',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'getAll',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Search',
+						name: 'search',
+						type: 'string',
+						default: '',
+						description: 'Optional search string.',
+					},
+					{
+						displayName: 'Offset',
+						name: 'offset',
+						type: 'number',
+						default: '',
+						description: 'Optional offset value.',
+					},
+				],
+			},
+			// ----------------------------------
+			//         user:update
+			// ----------------------------------
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'fixedCollection',
+				typeOptions:{
+					multipleValues:false,
+				},
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						resource: [
+							'user',
+						],
+						operation: [
+							'update',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Options',
+						name: 'option',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'options',
+								default: 'email',
+								options:
+								[
+									{
+										name: 'Email',
+										value: 'email',
+										description: 'The new email for the user.',
+									},
+									{
+										name: 'Display Name',
+										value: 'displayname',
+										description: 'The new display name for the user.',
+									},
+									{
+										name: 'Address',
+										value: 'address',
+										description: 'The new address for the user.',
+									},
+									{
+										name: 'Website',
+										value: 'website',
+										description: 'The new website for the user.',
+									},
+									{
+										name: 'Twitter',
+										value: 'twitter',
+										description: 'The new twitter for the user.',
+									},
+									{
+										name: 'Password',
+										value: 'password',
+										description: 'The new password for the user.',
+									},
+								],
+								description: 'Key of the updated attribut.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the updated attribut.',
+							},
+						],
+					},
+				],
+			},
 		],
 	};
 
@@ -602,8 +801,9 @@ export class NextCloud implements INodeType {
 		let requestMethod = '';
 		let responseData: any; // tslint:disable-line:no-any
 
-		let body: string | Buffer = '';
+		let body: string | Buffer | IDataObject = '';
 		const headers: IDataObject = {};
+		let qs;
 
 		for (let i = 0; i < items.length; i++) {
 			if (resource === 'file') {
@@ -718,7 +918,62 @@ export class NextCloud implements INodeType {
 						body += `&displayName=${additionalFields.displayName}`;
 					}
 				}
+				if (operation === 'delete') {
+					// ----------------------------------
+					//         user:delete
+					// ----------------------------------
+					requestMethod = 'DELETE';
 
+					const userid = this.getNodeParameter('userId', i) as string;
+					endpoint = `ocs/v1.php/cloud/users/${userid}`;
+
+					headers['OCS-APIRequest'] = true;
+					headers['Content-Type'] = 'application/x-www-form-urlencoded';
+				}
+				if (operation === 'get') {
+					// ----------------------------------
+					//         user:get
+					// ----------------------------------
+					requestMethod = 'GET';
+
+					const userid = this.getNodeParameter('userId', i) as string;
+					endpoint = `ocs/v1.php/cloud/users/${userid}`;
+
+					headers['OCS-APIRequest'] = true;
+					headers['Content-Type'] = 'application/x-www-form-urlencoded';
+				}
+				if (operation === 'getAll') {
+					// ----------------------------------
+					//         user:getAll
+					// ----------------------------------
+					requestMethod = 'GET';
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					qs = this.getNodeParameter('options', i) as IDataObject;
+					if (!returnAll) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+					endpoint = `ocs/v1.php/cloud/users`;
+
+					headers['OCS-APIRequest'] = true;
+					headers['Content-Type'] = 'application/x-www-form-urlencoded';
+				}
+				if (operation === 'update') {
+					// ----------------------------------
+					//         user:get
+					// ----------------------------------
+					requestMethod = 'PUT';
+
+					const userid = this.getNodeParameter('userId', i) as string;
+					endpoint = `ocs/v1.php/cloud/users/${userid}`;
+
+					body = Object.entries((this.getNodeParameter('options', i) as IDataObject).option as IDataObject).map(entry=> {
+						const [key,value] = entry;
+						return `${key}=${value}`;
+					}).join('&');
+
+					headers['OCS-APIRequest'] = true;
+					headers['Content-Type'] = 'application/x-www-form-urlencoded';
+				}
 			} else {
 				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
@@ -737,7 +992,7 @@ export class NextCloud implements INodeType {
 			}
 
 			try {
-				responseData = await nextCloudApiRequest.call(this, requestMethod, endpoint, body, headers, encoding);
+				responseData = await nextCloudApiRequest.call(this, requestMethod, endpoint, body, headers, encoding, qs);
 			} catch (error) {
 				if (this.continueOnFail() === true) {
 					returnData.push({ error });
@@ -767,23 +1022,53 @@ export class NextCloud implements INodeType {
 
 				items[i].binary![binaryPropertyName] = await this.helpers.prepareBinaryData(responseData, endpoint);
 
-			} else if (resource === 'user' && operation === 'create') {
+			} else if (resource === 'user' ) {
 
-				const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
-					parseString(responseData, { explicitArray: false }, (err, data) => {
-						if (err) {
-							return reject(err);
-						}
+				if (operation !== 'getAll'){
 
-						if (data.ocs.meta.status !== 'ok') {
-							return reject(new Error(data.ocs.meta.message));
-						}
+					const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
+						parseString(responseData, { explicitArray: false }, (err, data) => {
+							if (err) {
+								return reject(err);
+							}
 
-						resolve(data.ocs.data as IDataObject);
+							if (data.ocs.meta.status !== 'ok') {
+								return reject(new Error(data.ocs.meta.message || data.ocs.meta.status));
+							}
+
+							if (operation === 'delete' || operation === 'update'){
+								resolve(data.ocs.meta as IDataObject);
+							} else {
+								resolve(data.ocs.data as IDataObject);
+							}
+						});
 					});
-				});
 
-				returnData.push(jsonResponseData as IDataObject);
+					returnData.push(jsonResponseData as IDataObject);
+				} else {
+
+					const jsonResponseData: IDataObject[] = await new Promise((resolve, reject) => {
+						parseString(responseData, { explicitArray: false }, (err, data) => {
+							if (err) {
+								return reject(err);
+							}
+
+							if (data.ocs.meta.status !== 'ok') {
+								return reject(new Error(data.ocs.meta.message));
+							}
+
+							if (typeof(data.ocs.data.users.element) === 'string') {
+								resolve([data.ocs.data.users.element] as IDataObject[]);
+							} else {
+								resolve(data.ocs.data.users.element as IDataObject[]);
+							}
+						});
+					});
+
+					jsonResponseData.forEach(value => {
+						returnData.push( {id:value} as IDataObject);
+					});
+				}
 
 			} else if (resource === 'folder' && operation === 'list') {
 

From 35e790b8dd3459f19b4a03fa7088e3c34f5fbdaa Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 00:11:44 +0200
Subject: [PATCH 064/231] :zap: Minor improvements on NextCloud Node

---
 .../nodes/NextCloud/NextCloud.node.ts         | 101 +++++++++---------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index c5b5acf121..a05ddea926 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -699,11 +699,11 @@ export class NextCloud implements INodeType {
 			//         user:update
 			// ----------------------------------
 			{
-				displayName: 'Options',
-				name: 'options',
+				displayName: 'Update Fields',
+				name: 'updateFields',
 				type: 'fixedCollection',
-				typeOptions:{
-					multipleValues:false,
+				typeOptions: {
+					multipleValues: false,
 				},
 				placeholder: 'Add Option',
 				default: {},
@@ -719,8 +719,8 @@ export class NextCloud implements INodeType {
 				},
 				options: [
 					{
-						displayName: 'Options',
-						name: 'option',
+						displayName: 'Fields',
+						name: 'field',
 						values: [
 							{
 								displayName: 'Key',
@@ -728,46 +728,46 @@ export class NextCloud implements INodeType {
 								type: 'options',
 								default: 'email',
 								options:
-								[
-									{
-										name: 'Email',
-										value: 'email',
-										description: 'The new email for the user.',
-									},
-									{
-										name: 'Display Name',
-										value: 'displayname',
-										description: 'The new display name for the user.',
-									},
-									{
-										name: 'Address',
-										value: 'address',
-										description: 'The new address for the user.',
-									},
-									{
-										name: 'Website',
-										value: 'website',
-										description: 'The new website for the user.',
-									},
-									{
-										name: 'Twitter',
-										value: 'twitter',
-										description: 'The new twitter for the user.',
-									},
-									{
-										name: 'Password',
-										value: 'password',
-										description: 'The new password for the user.',
-									},
-								],
-								description: 'Key of the updated attribut.',
+									[
+										{
+											name: 'Address',
+											value: 'address',
+											description: 'The new address for the user.',
+										},
+										{
+											name: 'Display Name',
+											value: 'displayname',
+											description: 'The new display name for the user.',
+										},
+										{
+											name: 'Email',
+											value: 'email',
+											description: 'The new email for the user.',
+										},
+										{
+											name: 'Password',
+											value: 'password',
+											description: 'The new password for the user.',
+										},
+										{
+											name: 'Twitter',
+											value: 'twitter',
+											description: 'The new twitter handle for the user.',
+										},
+										{
+											name: 'Website',
+											value: 'website',
+											description: 'The new website for the user.',
+										},
+									],
+								description: 'Key of the updated attribute.',
 							},
 							{
 								displayName: 'Value',
 								name: 'value',
 								type: 'string',
 								default: '',
-								description: 'Value of the updated attribut.',
+								description: 'Value of the updated attribute.',
 							},
 						],
 					},
@@ -900,6 +900,7 @@ export class NextCloud implements INodeType {
 					// ----------------------------------
 					//         user:create
 					// ----------------------------------
+
 					requestMethod = 'POST';
 
 					endpoint = 'ocs/v1.php/cloud/users';
@@ -922,6 +923,7 @@ export class NextCloud implements INodeType {
 					// ----------------------------------
 					//         user:delete
 					// ----------------------------------
+
 					requestMethod = 'DELETE';
 
 					const userid = this.getNodeParameter('userId', i) as string;
@@ -934,6 +936,7 @@ export class NextCloud implements INodeType {
 					// ----------------------------------
 					//         user:get
 					// ----------------------------------
+
 					requestMethod = 'GET';
 
 					const userid = this.getNodeParameter('userId', i) as string;
@@ -946,6 +949,7 @@ export class NextCloud implements INodeType {
 					// ----------------------------------
 					//         user:getAll
 					// ----------------------------------
+
 					requestMethod = 'GET';
 					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					qs = this.getNodeParameter('options', i) as IDataObject;
@@ -959,15 +963,16 @@ export class NextCloud implements INodeType {
 				}
 				if (operation === 'update') {
 					// ----------------------------------
-					//         user:get
+					//         user:update
 					// ----------------------------------
+
 					requestMethod = 'PUT';
 
 					const userid = this.getNodeParameter('userId', i) as string;
 					endpoint = `ocs/v1.php/cloud/users/${userid}`;
 
-					body = Object.entries((this.getNodeParameter('options', i) as IDataObject).option as IDataObject).map(entry=> {
-						const [key,value] = entry;
+					body = Object.entries((this.getNodeParameter('updateFields', i) as IDataObject).field as IDataObject).map(entry => {
+						const [key, value] = entry;
 						return `${key}=${value}`;
 					}).join('&');
 
@@ -1022,9 +1027,9 @@ export class NextCloud implements INodeType {
 
 				items[i].binary![binaryPropertyName] = await this.helpers.prepareBinaryData(responseData, endpoint);
 
-			} else if (resource === 'user' ) {
+			} else if (resource === 'user') {
 
-				if (operation !== 'getAll'){
+				if (operation !== 'getAll') {
 
 					const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
 						parseString(responseData, { explicitArray: false }, (err, data) => {
@@ -1036,7 +1041,7 @@ export class NextCloud implements INodeType {
 								return reject(new Error(data.ocs.meta.message || data.ocs.meta.status));
 							}
 
-							if (operation === 'delete' || operation === 'update'){
+							if (operation === 'delete' || operation === 'update') {
 								resolve(data.ocs.meta as IDataObject);
 							} else {
 								resolve(data.ocs.data as IDataObject);
@@ -1057,7 +1062,7 @@ export class NextCloud implements INodeType {
 								return reject(new Error(data.ocs.meta.message));
 							}
 
-							if (typeof(data.ocs.data.users.element) === 'string') {
+							if (typeof (data.ocs.data.users.element) === 'string') {
 								resolve([data.ocs.data.users.element] as IDataObject[]);
 							} else {
 								resolve(data.ocs.data.users.element as IDataObject[]);
@@ -1066,7 +1071,7 @@ export class NextCloud implements INodeType {
 					});
 
 					jsonResponseData.forEach(value => {
-						returnData.push( {id:value} as IDataObject);
+						returnData.push({ id: value } as IDataObject);
 					});
 				}
 

From a3c5f41b0f363b7357589c76d05a57e78da08bee Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Sat, 24 Apr 2021 00:37:37 +0200
Subject: [PATCH 065/231] :sparkles: Add update/delete to Team, Release and
 Project in SentryIo node (#1605)

* Add update/delete to Team, Release and Project in SentryIo node

* Add create/delete:Project in SentryIo node

* Minor fix

* Fix descriptions & display names

* Fix casing in descriptions

* Add getTeams load function & Update operations fields

* Change 'Additional Field' to 'Update Fields' for Team,Release,Project & Organization operations
---
 .../SentryIoServerApi.credentials.ts          |   2 +-
 .../nodes/SentryIo/EventDescription.ts        |  16 +-
 .../nodes/SentryIo/IssueDescription.ts        |  28 +-
 .../nodes/SentryIo/OrganizationDescription.ts |  88 +++++-
 .../nodes/SentryIo/ProjectDescription.ts      | 205 +++++++++++-
 .../nodes/SentryIo/ReleaseDescription.ts      | 297 ++++++++++++++++--
 .../nodes/SentryIo/SentryIo.node.ts           | 152 ++++++++-
 .../nodes/SentryIo/TeamDescription.ts         | 127 ++++++--
 8 files changed, 821 insertions(+), 94 deletions(-)

diff --git a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
index 02c06ee096..c493d1657c 100644
--- a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
@@ -5,7 +5,7 @@ import {
 
 export class SentryIoServerApi implements ICredentialType {
 	name = 'sentryIoServerApi';
-	displayName = 'Sentry.io API';
+	displayName = 'Sentry.io Server API';
 	documentationUrl = 'sentryIo';
 	properties = [
 		{
diff --git a/packages/nodes-base/nodes/SentryIo/EventDescription.ts b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
index 8248b867a2..c9e00d035d 100644
--- a/packages/nodes-base/nodes/SentryIo/EventDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
@@ -54,7 +54,7 @@ export const eventFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the events belong to',
+		description: 'The slug of the organization the events belong to.',
 	},
 	{
 		displayName: 'Project Slug',
@@ -78,7 +78,7 @@ export const eventFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the project the events belong to',
+		description: 'The slug of the project the events belong to.',
 	},
 	{
 		displayName: 'Full',
@@ -95,7 +95,7 @@ export const eventFields = [
 				],
 			},
 		},
-		description: 'If this is set to true, then the event payload will include the full event body, including the stack trace',
+		description: 'If this is set to true, then the event payload will include the full event body, including the stack trace.',
 	},
 	{
 		displayName: 'Return All',
@@ -112,7 +112,7 @@ export const eventFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -136,7 +136,7 @@ export const eventFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                event:get                                   */
@@ -160,7 +160,7 @@ export const eventFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the events belong to',
+		description: 'The slug of the organization the events belong to.',
 	},
 	{
 		displayName: 'Project Slug',
@@ -181,7 +181,7 @@ export const eventFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the project the events belong to',
+		description: 'The slug of the project the events belong to.',
 	},
 	{
 		displayName: 'Event ID',
@@ -199,6 +199,6 @@ export const eventFields = [
 			},
 		},
 		required: true,
-		description: 'The id of the event to retrieve (either the numeric primary-key or the hexadecimal id as reported by the raven client).',
+		description: 'The ID of the event to retrieve (either the numeric primary-key or the hexadecimal ID as reported by the raven client).',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
index 8ac624f7d3..79800c1c16 100644
--- a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
@@ -63,7 +63,7 @@ export const issueFields = [
 			},
 		},
 		required: true,
-		description: 'ID of issue to get',
+		description: 'ID of issue to get.',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                issue:getAll                                */
@@ -87,7 +87,7 @@ export const issueFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the issues belong to',
+		description: 'The slug of the organization the issues belong to.',
 	},
 	{
 		displayName: 'Project Slug',
@@ -111,7 +111,7 @@ export const issueFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the project the issues belong to',
+		description: 'The slug of the project the issues belong to.',
 	},
 	{
 		displayName: 'Return All',
@@ -128,7 +128,7 @@ export const issueFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -152,7 +152,7 @@ export const issueFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -183,7 +183,7 @@ export const issueFields = [
 				name: 'statsPeriod',
 				type: 'options',
 				default: '',
-				description: 'Time period of stats',
+				description: 'Time period of stats.',
 				options: [
 					{
 						name: '14 Days',
@@ -200,7 +200,7 @@ export const issueFields = [
 				name: 'shortIdLookUp',
 				type: 'boolean',
 				default: true,
-				description: 'If this is set to true then short IDs are looked up by this function as well. This can cause the return value of the function to return an event issue of a different project which is why this is an opt-in',
+				description: 'If this is set to true then short IDs are looked up by this function as well. This can cause the return value of the function to return an event issue of a different project which is why this is an opt-in.',
 			},
 		],
 	},
@@ -224,10 +224,10 @@ export const issueFields = [
 			},
 		},
 		required: true,
-		description: 'ID of issue to get',
+		description: 'ID of issue to get.',
 	},
 	{
-		displayName: 'Additional Fields',
+		displayName: 'Update Fields',
 		name: 'additionalFields',
 		type: 'collection',
 		placeholder: 'Add Field',
@@ -248,28 +248,28 @@ export const issueFields = [
 				name: 'assignedTo',
 				type: 'string',
 				default: '',
-				description: 'The actor id (or username) of the user or team that should be assigned to this issue',
+				description: 'The actor ID (or username) of the user or team that should be assigned to this issue.',
 			},
 			{
 				displayName: 'Has Seen',
 				name: 'hasSeen',
 				type: 'boolean',
 				default: true,
-				description: 'In case this API call is invoked with a user context this allows changing of the flag that indicates if the user has seen the event',
+				description: 'In case this API call is invoked with a user context this allows changing of the flag that indicates if the user has seen the event.',
 			},
 			{
 				displayName: 'Is Bookmarked',
 				name: 'isBookmarked',
 				type: 'boolean',
 				default: true,
-				description: 'In case this API call is invoked with a user context this allows changing of the bookmark flag',
+				description: 'In case this API call is invoked with a user context this allows changing of the bookmark flag.',
 			},
 			{
 				displayName: 'Is Public',
 				name: 'isPublic',
 				type: 'boolean',
 				default: true,
-				description: 'Sets the issue to public or private',
+				description: 'Sets the issue to public or private.',
 			},
 			{
 				displayName: 'Is Subscribed',
@@ -282,7 +282,7 @@ export const issueFields = [
 				name: 'status',
 				type: 'options',
 				default: '',
-				description: 'The new status for the issue',
+				description: 'The new status for the issue.',
 				options: [
 					{
 						name: 'Ignored',
diff --git a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
index 50a7c8ea06..32e8b0b990 100644
--- a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
@@ -30,6 +30,11 @@ export const organizationOperations = [
 				value: 'getAll',
 				description: 'Get all organizations',
 			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an organization',
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -55,7 +60,7 @@ export const organizationFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -79,7 +84,7 @@ export const organizationFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -103,14 +108,14 @@ export const organizationFields = [
 				name: 'member',
 				type: 'boolean',
 				default: true,
-				description: 'Restrict results to organizations which you have membership',
+				description: 'Restrict results to organizations which you have membership.',
 			},
 			{
 				displayName: 'Owner',
 				name: 'owner',
 				type: 'boolean',
 				default: true,
-				description: 'Restrict results to organizations which you are the owner',
+				description: 'Restrict results to organizations which you are the owner.',
 			},
 		],
 	},
@@ -136,7 +141,7 @@ export const organizationFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the team should be created for',
+		description: 'The slug of the organization the team should be created for.',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                organization:create                         */
@@ -157,7 +162,7 @@ export const organizationFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the team should be created for',
+		description: 'The slug of the organization the team should be created for.',
 	},
 	{
 		displayName: 'Agree to Terms',
@@ -174,7 +179,7 @@ export const organizationFields = [
 				],
 			},
 		},
-		description: 'Signaling you agree to the applicable terms of service and privacy policy of Sentry.io',
+		description: 'Signaling you agree to the applicable terms of service and privacy policy of Sentry.io.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -198,7 +203,74 @@ export const organizationFields = [
 				name: 'slug',
 				type: 'string',
 				default: '',
-				description: 'The unique URL slug for this organization. If this is not provided a slug is automatically generated based on the name',
+				description: 'The unique URL slug for this organization. If this is not provided a slug is automatically generated based on the name.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                organization:update                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Slug',
+		name: 'organization_slug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getOrganizations',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'organization',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the organization to update.',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'organization',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The name of the organization.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'organization',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Slug',
+				name: 'slug',
+				type: 'string',
+				default: '',
+				description: 'The updated URL slug for this organization.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
index a499a320bc..78f4e4c794 100644
--- a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
@@ -15,6 +15,11 @@ export const projectOperations = [
 			},
 		},
 		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new project',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -25,6 +30,16 @@ export const projectOperations = [
 				value: 'getAll',
 				description: 'Get all projects',
 			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a project',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a project',
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -51,13 +66,11 @@ export const projectFields = [
 				operation: [
 					'create',
 					'get',
-					'update',
-					'delete',
 				],
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the events belong to',
+		description: 'The slug of the organization the events belong to.',
 	},
 	{
 		displayName: 'Project Slug',
@@ -81,12 +94,18 @@ export const projectFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the project to retrieve',
+		description: 'The slug of the project to retrieve.',
 	},
 	{
 		displayName: 'Team Slug',
 		name: 'teamSlug',
-		type: 'string',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
 		default: '',
 		displayOptions: {
 			show: {
@@ -95,13 +114,11 @@ export const projectFields = [
 				],
 				operation: [
 					'create',
-					'update',
-					'delete',
 				],
 			},
 		},
 		required: true,
-		description: 'The slug of the team to create a new project for',
+		description: 'The slug of the team to create a new project for.',
 	},
 	{
 		displayName: 'Name',
@@ -119,7 +136,7 @@ export const projectFields = [
 			},
 		},
 		required: true,
-		description: 'The name for the new project',
+		description: 'The name for the new project.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -143,7 +160,7 @@ export const projectFields = [
 				name: 'slug',
 				type: 'string',
 				default: '',
-				description: 'Optionally a slug for the new project. If it’s not provided a slug is generated from the name',
+				description: 'Optionally a slug for the new project. If it’s not provided a slug is generated from the name.',
 			},
 		],
 	},
@@ -165,7 +182,7 @@ export const projectFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -189,6 +206,170 @@ export const projectFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                project:update                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Organization Slug',
+		name: 'organizationSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getOrganizations',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the organization the project belong to.',
+	},
+	{
+		displayName: 'Project Slug',
+		name: 'projectSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the project to update.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Team',
+				name: 'team',
+				type: 'string',
+				default: '',
+				description: 'The new team name.',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The new name for the updated project.',
+			},
+			{
+				displayName: 'Slug',
+				name: 'slug',
+				type: 'string',
+				default: '',
+				description: 'The new slug for the updated project.',
+			},
+			{
+				displayName: 'Platform',
+				name: 'platform',
+				type: 'string',
+				default: '',
+				description: 'The new platform for the updated project.',
+			},
+			{
+				displayName: 'Bookmarked',
+				name: 'isBookmarked',
+				type: 'boolean',
+				default: false,
+				description: 'The new platform for the updated project.',
+			},
+			{
+				displayName: 'Digests Minimun Delay',
+				name: 'digestsMinDelay',
+				type: 'number',
+				default: 60,
+				description: 'Minium interval to digest alerts.',
+			},
+			{
+				displayName: 'Digests Maximum Delay',
+				name: 'digestsMaxDelay',
+				type: 'number',
+				default: 1800,
+				description: 'Maximum interval to digest alerts.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                project:delete                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Organization Slug',
+		name: 'organizationSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getOrganizations',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the organization the project belong to.',
+	},
+	{
+		displayName: 'Project Slug',
+		name: 'projectSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'project',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the project to delete.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
index f4045a77f5..821f3a7442 100644
--- a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
@@ -30,6 +30,16 @@ export const releaseOperations = [
 				value: 'getAll',
 				description: 'Get all releases',
 			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a release',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a release',
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -59,7 +69,7 @@ export const releaseFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the releases belong to',
+		description: 'The slug of the organization the releases belong to.',
 	},
 	{
 		displayName: 'Return All',
@@ -76,7 +86,7 @@ export const releaseFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -100,7 +110,7 @@ export const releaseFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -124,12 +134,12 @@ export const releaseFields = [
 				name: 'query',
 				type: 'string',
 				default: '',
-				description: 'This parameter can be used to create a “starts with” filter for the version',
+				description: 'This parameter can be used to create a “starts with” filter for the version.',
 			},
 		],
 	},
 	/* -------------------------------------------------------------------------- */
-	/*                                release:get                                   */
+	/*                                release:get/delete                          */
 	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
@@ -146,11 +156,12 @@ export const releaseFields = [
 				],
 				operation: [
 					'get',
+					'delete',
 				],
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the release belongs to',
+		description: 'The slug of the organization the release belongs to.',
 	},
 	{
 		displayName: 'Version',
@@ -164,11 +175,12 @@ export const releaseFields = [
 				],
 				operation: [
 					'get',
+					'delete',
 				],
 			},
 		},
 		required: true,
-		description: 'The version identifier of the release',
+		description: 'The version identifier of the release.',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                release:create                               */
@@ -192,7 +204,7 @@ export const releaseFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the release belongs to',
+		description: 'The slug of the organization the release belongs to.',
 	},
 	{
 		displayName: 'Version',
@@ -210,7 +222,7 @@ export const releaseFields = [
 			},
 		},
 		required: true,
-		description: ' a version identifier for this release. Can be a version number, a commit hash etc',
+		description: 'A version identifier for this release. Can be a version number, a commit hash etc.',
 	},
 	{
 		displayName: 'URL',
@@ -228,7 +240,7 @@ export const releaseFields = [
 			},
 		},
 		required: true,
-		description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance',
+		description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
 	},
 	{
 		displayName: 'Projects',
@@ -249,7 +261,7 @@ export const releaseFields = [
 			},
 		},
 		required: true,
-		description: 'A list of project slugs that are involved in this release',
+		description: 'A list of project slugs that are involved in this release.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -273,12 +285,12 @@ export const releaseFields = [
 				name: 'dateReleased',
 				type: 'dateTime',
 				default: '',
-				description: 'an optional date that indicates when the release went live. If not provided the current time is assumed',
+				description: 'An optional date that indicates when the release went live. If not provided the current time is assumed.',
 			},
 			{
 				displayName: 'Commits',
 				name: 'commits',
-				description: 'an optional list of commit data to be associated with the release',
+				description: 'An optional list of commit data to be associated with the release.',
 				type: 'fixedCollection',
 				typeOptions: {
 					multipleValues: true,
@@ -290,11 +302,11 @@ export const releaseFields = [
 						displayName: 'Commit Properties',
 						values: [
 							{
-								displayName: 'Id',
+								displayName: 'ID',
 								name: 'id',
 								type: 'string',
 								default: '',
-								description: 'the sha of the commit',
+								description: 'The sha of the commit.',
 								required: true,
 							},
 							{
@@ -302,26 +314,26 @@ export const releaseFields = [
 								name: 'authorEmail',
 								type: 'string',
 								default: '',
-								description: 'Authors email',
+								description: 'Authors email.',
 							},
 							{
 								displayName: 'Author Name',
 								name: 'authorName',
 								type: 'string',
 								default: '',
-								description: 'Name of author',
+								description: 'Name of author.',
 							},
 							{
 								displayName: 'Message',
 								name: 'message',
 								type: 'string',
 								default: '',
-								description: 'Message of commit',
+								description: 'Message of commit.',
 							},
 							{
 								displayName: 'Patch Set',
 								name: 'patchSet',
-								description: 'A list of the files that have been changed in the commit. Specifying the patch_set is necessary to power suspect commits and suggested assignees',
+								description: 'A list of the files that have been changed in the commit. Specifying the patch_set is necessary to power suspect commits and suggested assignees.',
 								type: 'fixedCollection',
 								typeOptions: {
 									multipleValues: true,
@@ -337,7 +349,7 @@ export const releaseFields = [
 												name: 'path',
 												type: 'string',
 												default: '',
-												description: 'he path to the file. Both forward and backward slashes are supported',
+												description: 'The path to the file. Both forward and backward slashes are supported.',
 												required: true,
 											},
 											{
@@ -345,7 +357,7 @@ export const releaseFields = [
 												name: 'type',
 												type: 'options',
 												default: '',
-												description: 'he types of changes that happend in that commit',
+												description: 'The types of changes that happend in that commit.',
 												options: [
 													{
 														name: 'Add',
@@ -370,14 +382,14 @@ export const releaseFields = [
 								name: 'repository',
 								type: 'string',
 								default: '',
-								description: 'Repository name',
+								description: 'Repository name.',
 							},
 							{
 								displayName: 'Timestamp',
 								name: 'timestamp',
 								type: 'dateTime',
 								default: '',
-								description: 'Timestamp of commit',
+								description: 'Timestamp of commit.',
 							},
 						],
 					},
@@ -386,7 +398,7 @@ export const releaseFields = [
 			{
 				displayName: 'Refs',
 				name: 'refs',
-				description: 'an optional way to indicate the start and end commits for each repository included in a release',
+				description: 'An optional way to indicate the start and end commits for each repository included in a release.',
 				type: 'fixedCollection',
 				typeOptions: {
 					multipleValues: true,
@@ -402,7 +414,7 @@ export const releaseFields = [
 								name: 'commit',
 								type: 'string',
 								default: '',
-								description: 'the head sha of the commit',
+								description: 'The head sha of the commit.',
 								required: true,
 							},
 							{
@@ -410,7 +422,7 @@ export const releaseFields = [
 								name: 'repository',
 								type: 'string',
 								default: '',
-								description: 'Repository name',
+								description: 'Repository name.',
 								required: true,
 							},
 							{
@@ -418,7 +430,238 @@ export const releaseFields = [
 								name: 'previousCommit',
 								type: 'string',
 								default: '',
-								description: 'the sha of the HEAD of the previous release',
+								description: 'The sha of the HEAD of the previous release.',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                release:update                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Organization Slug',
+		name: 'organizationSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getOrganizations',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'release',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the organization the release belongs to.',
+	},
+	{
+		displayName: 'Version',
+		name: 'version',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'release',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'A version identifier for this release. Can be a version number, a commit hash etc.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'release',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Ref',
+				name: 'ref',
+				type: 'string',
+				default: '',
+				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
+			},
+			{
+				displayName: 'URL',
+				name: 'url',
+				type: 'string',
+				default: '',
+				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
+			},
+			{
+				displayName: 'Date released',
+				name: 'dateReleased',
+				type: 'dateTime',
+				default: '',
+				description: 'an optional date that indicates when the release went live. If not provided the current time is assumed.',
+			},
+			{
+				displayName: 'Commits',
+				name: 'commits',
+				description: 'An optional list of commit data to be associated with the release.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'commitProperties',
+						displayName: 'Commit Properties',
+						values: [
+							{
+								displayName: 'ID',
+								name: 'id',
+								type: 'string',
+								default: '',
+								description: 'The sha of the commit.',
+								required: true,
+							},
+							{
+								displayName: 'Author Email',
+								name: 'authorEmail',
+								type: 'string',
+								default: '',
+								description: 'Authors email.',
+							},
+							{
+								displayName: 'Author Name',
+								name: 'authorName',
+								type: 'string',
+								default: '',
+								description: 'Name of author.',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								default: '',
+								description: 'Message of commit.',
+							},
+							{
+								displayName: 'Patch Set',
+								name: 'patchSet',
+								description: 'A list of the files that have been changed in the commit. Specifying the patch_set is necessary to power suspect commits and suggested assignees.',
+								type: 'fixedCollection',
+								typeOptions: {
+									multipleValues: true,
+								},
+								default: {},
+								options: [
+									{
+										name: 'patchSetProperties',
+										displayName: 'Patch Set Properties',
+										values: [
+											{
+												displayName: 'Path',
+												name: 'path',
+												type: 'string',
+												default: '',
+												description: 'The path to the file. Both forward and backward slashes are supported.',
+												required: true,
+											},
+											{
+												displayName: 'Type',
+												name: 'type',
+												type: 'options',
+												default: '',
+												description: 'The types of changes that happend in that commit.',
+												options: [
+													{
+														name: 'Add',
+														value: 'add',
+													},
+													{
+														name: 'Modify',
+														value: 'modify',
+													},
+													{
+														name: 'Delete',
+														value: 'delete',
+													},
+												],
+											},
+										],
+									},
+								],
+							},
+							{
+								displayName: 'Repository',
+								name: 'repository',
+								type: 'string',
+								default: '',
+								description: 'Repository name.',
+							},
+							{
+								displayName: 'Timestamp',
+								name: 'timestamp',
+								type: 'dateTime',
+								default: '',
+								description: 'Timestamp of commit.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Refs',
+				name: 'refs',
+				description: 'An optional way to indicate the start and end commits for each repository included in a release.',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'refProperties',
+						displayName: 'Ref Properties',
+						values: [
+							{
+								displayName: 'Commit',
+								name: 'commit',
+								type: 'string',
+								default: '',
+								description: 'The head sha of the commit.',
+								required: true,
+							},
+							{
+								displayName: 'Repository',
+								name: 'repository',
+								type: 'string',
+								default: '',
+								description: 'Repository name.',
+								required: true,
+							},
+							{
+								displayName: 'Previous Commit',
+								name: 'previousCommit',
+								type: 'string',
+								default: '',
+								description: 'The sha of the HEAD of the previous release.',
 							},
 						],
 					},
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index f545683416..8fa277e067 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -279,6 +279,28 @@ export class SentryIo implements INodeType {
 					return 0;
 				});
 
+				return returnData;
+			},
+			// Get an organization teams
+			async getTeams(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const organizationSlug = this.getNodeParameter('organizationSlug') as string;
+				const teams = await sentryApiRequestAllItems.call(this, 'GET', `/api/0/organizations/${organizationSlug}/teams/`, {});
+
+				for (const team of teams) {
+					returnData.push({
+						name: team.slug,
+						value: team.slug,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) { return -1; }
+					if (a.name > b.name) { return 1; }
+					return 0;
+				});
+
 				return returnData;
 			},
 		},
@@ -452,8 +474,36 @@ export class SentryIo implements INodeType {
 
 					responseData = await sentryIoApiRequest.call(this, 'POST', endpoint, qs);
 				}
+				if (operation === 'update') {
+					const name = this.getNodeParameter('name', i) as string;
+					const organizationSlug = this.getNodeParameter('organization_slug', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const endpoint = `/api/0/organizations/${organizationSlug}/`;
+
+					const body = {name};
+
+					if (updateFields.slug) {
+						Object.assign(body, updateFields.slug as string);
+					}
+
+					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
+				}
 			}
 			if (resource === 'project') {
+				if (operation === 'create') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const teamSlug = this.getNodeParameter('teamSlug', i) as string;
+					const name = this.getNodeParameter('name', i) as string;
+
+					const endpoint = `/api/0/teams/${organizationSlug}/${teamSlug}/projects/`;
+
+					const body = {
+						name,
+						...this.getNodeParameter('additionalFields', i) as IDataObject,
+					};
+
+					responseData = await sentryIoApiRequest.call(this, 'POST', endpoint, body, qs);
+				}
 				if (operation === 'get') {
 					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
 					const projectSlug = this.getNodeParameter('projectSlug', i) as string;
@@ -477,6 +527,22 @@ export class SentryIo implements INodeType {
 						responseData = responseData.splice(0, limit);
 					}
 				}
+				if (operation === 'update') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const projectSlug = this.getNodeParameter('projectSlug', i) as string;
+					const endpoint = `/api/0/projects/${organizationSlug}/${projectSlug}/`;
+					const body = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
+				}
+				if (operation === 'delete') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const projectSlug = this.getNodeParameter('projectSlug', i) as string;
+					const endpoint = `/api/0/projects/${organizationSlug}/${projectSlug}/`;
+
+					responseData = await sentryIoApiRequest.call(this, 'DELETE', endpoint, qs);
+					responseData = { success: true };
+				}
 			}
 			if (resource === 'release') {
 				if (operation === 'get') {
@@ -508,7 +574,13 @@ export class SentryIo implements INodeType {
 						responseData = responseData.splice(0, limit);
 					}
 				}
-
+				if (operation === 'delete') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const version = this.getNodeParameter('version', i) as string;
+					const endpoint = `/api/0/organizations/${organizationSlug}/releases/${version}/`;
+					responseData = await sentryIoApiRequest.call(this, 'DELETE', endpoint, qs);
+					responseData = { success: true };
+				}
 				if (operation === 'create') {
 					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
 					const endpoint = `/api/0/organizations/${organizationSlug}/releases/`;
@@ -571,6 +643,60 @@ export class SentryIo implements INodeType {
 
 					responseData = await sentryIoApiRequest.call(this, 'POST', endpoint, qs);
 				}
+				if (operation === 'update') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const version = this.getNodeParameter('version', i) as string;
+					const endpoint = `/api/0/organizations/${organizationSlug}/releases/${version}/`;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body = {...updateFields};
+
+					if (updateFields.commits) {
+						const commits: ICommit[] = [];
+						//@ts-ignore
+						// tslint:disable-next-line: no-any
+						updateFields.commits.commitProperties.map((commit: any) => {
+							const commitObject: ICommit = { id: commit.id };
+
+							if (commit.repository) {
+								commitObject.repository = commit.repository;
+							}
+							if (commit.message) {
+								commitObject.message = commit.message;
+							}
+							if (commit.patchSet && Array.isArray(commit.patchSet)) {
+								commit.patchSet.patchSetProperties.map((patchSet: IPatchSet) => {
+									commitObject.patch_set?.push(patchSet);
+								});
+							}
+							if (commit.authorName) {
+								commitObject.author_name = commit.authorName;
+							}
+							if (commit.authorEmail) {
+								commitObject.author_email = commit.authorEmail;
+							}
+							if (commit.timestamp) {
+								commitObject.timestamp = commit.timestamp;
+							}
+
+							commits.push(commitObject);
+						});
+
+						body.commits = commits;
+					}
+					if (updateFields.refs) {
+						const refs: IRef[] = [];
+						//@ts-ignore
+						updateFields.refs.refProperties.map((ref: IRef) => {
+							refs.push(ref);
+						});
+
+						body.refs = refs;
+					}
+					
+					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
+				}
 			}
 			if (resource === 'team') {
 				if (operation === 'get') {
@@ -613,6 +739,30 @@ export class SentryIo implements INodeType {
 
 					responseData = await sentryIoApiRequest.call(this, 'POST', endpoint, qs);
 				}
+				if (operation === 'update') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const teamSlug = this.getNodeParameter('teamSlug', i) as string;
+					const name = this.getNodeParameter('name', i) as string;
+					const endpoint = `/api/0/teams/${organizationSlug}/${teamSlug}/`;
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					const body={name};
+
+					if (updateFields.slug) {
+						Object.assign(body, updateFields);
+					}
+					
+					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
+				}
+				if (operation === 'delete') {
+					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
+					const teamSlug = this.getNodeParameter('teamSlug', i) as string;
+					const endpoint = `/api/0/teams/${organizationSlug}/${teamSlug}/`;
+
+					responseData = await sentryIoApiRequest.call(this, 'DELETE', endpoint, qs);
+					responseData = { success: true };
+				}
 			}
 
 			if (Array.isArray(responseData)) {
diff --git a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
index 4bc74fa398..d3bcac3dd1 100644
--- a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
@@ -30,6 +30,16 @@ export const teamOperations = [
 				value: 'getAll',
 				description: 'Get all teams',
 			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a team',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a team',
+			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -59,7 +69,7 @@ export const teamFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization for which the teams should be listed',
+		description: 'The slug of the organization for which the teams should be listed.',
 	},
 	{
 		displayName: 'Return All',
@@ -76,7 +86,7 @@ export const teamFields = [
 			},
 		},
 		default: false,
-		description: 'If all results should be returned or only up to a given limit',
+		description: 'If all results should be returned or only up to a given limit.',
 	},
 	{
 		displayName: 'Limit',
@@ -100,7 +110,7 @@ export const teamFields = [
 			maxValue: 500,
 		},
 		default: 100,
-		description: 'How many results to return',
+		description: 'How many results to return.',
 	},
 /* -------------------------------------------------------------------------- */
 /*                                team:get                                   */
@@ -124,12 +134,18 @@ export const teamFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the team belongs to',
+		description: 'The slug of the organization the team belongs to.',
 	},
 	{
 		displayName: 'Team Slug',
 		name: 'teamSlug',
-		type: 'string',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
 		default: '',
 		displayOptions: {
 			show: {
@@ -142,7 +158,7 @@ export const teamFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the team to get',
+		description: 'The slug of the team to get.',
 	},
 /* -------------------------------------------------------------------------- */
 /*                                team:create                                 */
@@ -166,7 +182,7 @@ export const teamFields = [
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the team belongs to',
+		description: 'The slug of the organization the team belongs to.',
 	},
 	{
 		displayName: 'Name',
@@ -184,7 +200,7 @@ export const teamFields = [
 			},
 		},
 		required: true,
-		description: 'The name of the team',
+		description: 'The name of the team.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -208,7 +224,7 @@ export const teamFields = [
 				name: 'slug',
 				type: 'string',
 				default: '',
-				description: 'The optional slug for this team. If not provided it will be auto generated from the name',
+				description: 'The optional slug for this team. If not provided it will be auto generated from the name.',
 			},
 		],
 	},
@@ -229,16 +245,40 @@ export const teamFields = [
 					'team',
 				],
 				operation: [
-					'update', 'delete',
+					'update',
 				],
 			},
 		},
 		required: true,
-		description: 'The slug of the organization the team belongs to',
+		description: 'The slug of the organization the team belongs to.',
 	},
 	{
 		displayName: 'Team Slug',
 		name: 'teamSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'team',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the team to update.',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
 		type: 'string',
 		default: '',
 		displayOptions: {
@@ -247,16 +287,16 @@ export const teamFields = [
 					'team',
 				],
 				operation: [
-					'update', 'delete',
+					'update',
 				],
 			},
 		},
 		required: true,
-		description: 'The slug of the team to get',
+		description: 'The new name of the team.',
 	},
 	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
+		displayName: 'Update Fields',
+		name: 'updateFields',
 		type: 'collection',
 		placeholder: 'Add Field',
 		default: {},
@@ -276,15 +316,56 @@ export const teamFields = [
 				name: 'slug',
 				type: 'string',
 				default: '',
-				description: 'The new slug of the team. Must be unique and available',
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				description: 'The new name of the team',
+				description: 'The new slug of the team. Must be unique and available.',
 			},
 		],
 	},
+/* -------------------------------------------------------------------------- */
+/*                                team:delete                                 */
+/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Organization Slug',
+		name: 'organizationSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getOrganizations',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'team',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the organization the team belongs to.',
+	},
+	{
+		displayName: 'Team Slug',
+		name: 'teamSlug',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTeams',
+			loadOptionsDependsOn: [
+				'organizationSlug',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'team',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+		description: 'The slug of the team to delete.',
+	},
 ] as INodeProperties[];

From cc5b1d9cd2c8d955c91b6522459d9a625b6b7804 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 00:38:15 +0200
Subject: [PATCH 066/231] :zap: Improvements on Sentry Node

---
 .../nodes/SentryIo/EventDescription.ts        |  1 +
 .../nodes/SentryIo/IssueDescription.ts        |  2 +
 .../nodes/SentryIo/OrganizationDescription.ts | 30 +++-----
 .../nodes/SentryIo/ProjectDescription.ts      | 65 ++++++++---------
 .../nodes/SentryIo/ReleaseDescription.ts      | 55 ++++++++-------
 .../nodes/SentryIo/SentryIo.node.ts           | 21 ++----
 .../nodes/SentryIo/TeamDescription.ts         | 69 +++++++++----------
 7 files changed, 112 insertions(+), 131 deletions(-)

diff --git a/packages/nodes-base/nodes/SentryIo/EventDescription.ts b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
index c9e00d035d..b4d1d024aa 100644
--- a/packages/nodes-base/nodes/SentryIo/EventDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/EventDescription.ts
@@ -138,6 +138,7 @@ export const eventFields = [
 		default: 100,
 		description: 'How many results to return.',
 	},
+	
 	/* -------------------------------------------------------------------------- */
 	/*                                event:get                                   */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
index 79800c1c16..69b5b11a10 100644
--- a/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/IssueDescription.ts
@@ -65,6 +65,7 @@ export const issueFields = [
 		required: true,
 		description: 'ID of issue to get.',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                issue:getAll                                */
 	/* -------------------------------------------------------------------------- */
@@ -204,6 +205,7 @@ export const issueFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                issue:update                                */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
index 32e8b0b990..ed8fb7008c 100644
--- a/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/OrganizationDescription.ts
@@ -119,6 +119,7 @@ export const organizationFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                organization:get                            */
 	/* -------------------------------------------------------------------------- */
@@ -143,6 +144,7 @@ export const organizationFields = [
 		required: true,
 		description: 'The slug of the organization the team should be created for.',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                organization:create                         */
 	/* -------------------------------------------------------------------------- */
@@ -207,6 +209,7 @@ export const organizationFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                organization:update                         */
 	/* -------------------------------------------------------------------------- */
@@ -230,24 +233,6 @@ export const organizationFields = [
 		required: true,
 		description: 'The slug of the organization to update.',
 	},
-	{
-		displayName: 'Name',
-		name: 'name',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'organization',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		required: true,
-		description: 'The name of the organization.',
-	},
 	{
 		displayName: 'Update Fields',
 		name: 'updateFields',
@@ -265,12 +250,19 @@ export const organizationFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The new name of the organization.',
+			},
 			{
 				displayName: 'Slug',
 				name: 'slug',
 				type: 'string',
 				default: '',
-				description: 'The updated URL slug for this organization.',
+				description: 'The new URL slug for this organization.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
index 78f4e4c794..d19de2e7d8 100644
--- a/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ProjectDescription.ts
@@ -20,6 +20,11 @@ export const projectOperations = [
 				value: 'create',
 				description: 'Create a new project',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a project',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -35,11 +40,6 @@ export const projectOperations = [
 				value: 'update',
 				description: 'Update a project',
 			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a project',
-			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -164,6 +164,7 @@ export const projectFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                project:getAll                              */
 	/* -------------------------------------------------------------------------- */
@@ -208,6 +209,7 @@ export const projectFields = [
 		default: 100,
 		description: 'How many results to return.',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                project:update                              */
 	/* -------------------------------------------------------------------------- */
@@ -274,11 +276,25 @@ export const projectFields = [
 		},
 		options: [
 			{
-				displayName: 'Team',
-				name: 'team',
-				type: 'string',
-				default: '',
-				description: 'The new team name.',
+				displayName: 'Bookmarked',
+				name: 'isBookmarked',
+				type: 'boolean',
+				default: false,
+				description: 'The new platform for the updated project.',
+			},
+			{
+				displayName: 'Digests Maximum Delay',
+				name: 'digestsMaxDelay',
+				type: 'number',
+				default: 1800,
+				description: 'Maximum interval to digest alerts.',
+			},
+			{
+				displayName: 'Digests Minimun Delay',
+				name: 'digestsMinDelay',
+				type: 'number',
+				default: 60,
+				description: 'Minium interval to digest alerts.',
 			},
 			{
 				displayName: 'Name',
@@ -294,6 +310,13 @@ export const projectFields = [
 				default: '',
 				description: 'The new slug for the updated project.',
 			},
+			{
+				displayName: 'Team',
+				name: 'team',
+				type: 'string',
+				default: '',
+				description: 'The new team name.',
+			},
 			{
 				displayName: 'Platform',
 				name: 'platform',
@@ -301,29 +324,9 @@ export const projectFields = [
 				default: '',
 				description: 'The new platform for the updated project.',
 			},
-			{
-				displayName: 'Bookmarked',
-				name: 'isBookmarked',
-				type: 'boolean',
-				default: false,
-				description: 'The new platform for the updated project.',
-			},
-			{
-				displayName: 'Digests Minimun Delay',
-				name: 'digestsMinDelay',
-				type: 'number',
-				default: 60,
-				description: 'Minium interval to digest alerts.',
-			},
-			{
-				displayName: 'Digests Maximum Delay',
-				name: 'digestsMaxDelay',
-				type: 'number',
-				default: 1800,
-				description: 'Maximum interval to digest alerts.',
-			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                project:delete                              */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
index 821f3a7442..3322efe143 100644
--- a/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/ReleaseDescription.ts
@@ -20,6 +20,11 @@ export const releaseOperations = [
 				value: 'create',
 				description: 'Create a release',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a release',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -35,11 +40,6 @@ export const releaseOperations = [
 				value: 'update',
 				description: 'Update a release',
 			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a release',
-			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -138,6 +138,7 @@ export const releaseFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                release:get/delete                          */
 	/* -------------------------------------------------------------------------- */
@@ -182,6 +183,7 @@ export const releaseFields = [
 		required: true,
 		description: 'The version identifier of the release.',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                release:create                               */
 	/* -------------------------------------------------------------------------- */
@@ -438,6 +440,7 @@ export const releaseFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                release:update                              */
 	/* -------------------------------------------------------------------------- */
@@ -497,27 +500,6 @@ export const releaseFields = [
 			},
 		},
 		options: [
-			{
-				displayName: 'Ref',
-				name: 'ref',
-				type: 'string',
-				default: '',
-				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
-			},
-			{
-				displayName: 'URL',
-				name: 'url',
-				type: 'string',
-				default: '',
-				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
-			},
-			{
-				displayName: 'Date released',
-				name: 'dateReleased',
-				type: 'dateTime',
-				default: '',
-				description: 'an optional date that indicates when the release went live. If not provided the current time is assumed.',
-			},
 			{
 				displayName: 'Commits',
 				name: 'commits',
@@ -626,6 +608,20 @@ export const releaseFields = [
 					},
 				],
 			},
+			{
+				displayName: 'Date released',
+				name: 'dateReleased',
+				type: 'dateTime',
+				default: '',
+				description: 'an optional date that indicates when the release went live. If not provided the current time is assumed.',
+			},
+			{
+				displayName: 'Ref',
+				name: 'ref',
+				type: 'string',
+				default: '',
+				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
+			},
 			{
 				displayName: 'Refs',
 				name: 'refs',
@@ -667,6 +663,13 @@ export const releaseFields = [
 					},
 				],
 			},
+			{
+				displayName: 'URL',
+				name: 'url',
+				type: 'string',
+				default: '',
+				description: 'A URL that points to the release. This can be the path to an online interface to the sourcecode for instance.',
+			},
 		],
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index 8fa277e067..fa8aeab7c8 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -475,16 +475,10 @@ export class SentryIo implements INodeType {
 					responseData = await sentryIoApiRequest.call(this, 'POST', endpoint, qs);
 				}
 				if (operation === 'update') {
-					const name = this.getNodeParameter('name', i) as string;
 					const organizationSlug = this.getNodeParameter('organization_slug', i) as string;
-					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 					const endpoint = `/api/0/organizations/${organizationSlug}/`;
 
-					const body = {name};
-
-					if (updateFields.slug) {
-						Object.assign(body, updateFields.slug as string);
-					}
+					const body = this.getNodeParameter('updateFields', i) as IDataObject;
 
 					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
 				}
@@ -650,7 +644,7 @@ export class SentryIo implements INodeType {
 
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
 
-					const body = {...updateFields};
+					const body = { ...updateFields };
 
 					if (updateFields.commits) {
 						const commits: ICommit[] = [];
@@ -694,7 +688,7 @@ export class SentryIo implements INodeType {
 
 						body.refs = refs;
 					}
-					
+
 					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
 				}
 			}
@@ -742,17 +736,10 @@ export class SentryIo implements INodeType {
 				if (operation === 'update') {
 					const organizationSlug = this.getNodeParameter('organizationSlug', i) as string;
 					const teamSlug = this.getNodeParameter('teamSlug', i) as string;
-					const name = this.getNodeParameter('name', i) as string;
 					const endpoint = `/api/0/teams/${organizationSlug}/${teamSlug}/`;
 
-					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body = this.getNodeParameter('updateFields', i) as IDataObject;
 
-					const body={name};
-
-					if (updateFields.slug) {
-						Object.assign(body, updateFields);
-					}
-					
 					responseData = await sentryIoApiRequest.call(this, 'PUT', endpoint, body, qs);
 				}
 				if (operation === 'delete') {
diff --git a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
index d3bcac3dd1..f57ad9cec5 100644
--- a/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
+++ b/packages/nodes-base/nodes/SentryIo/TeamDescription.ts
@@ -20,6 +20,11 @@ export const teamOperations = [
 				value: 'create',
 				description: 'Create a new team',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a team',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -35,11 +40,6 @@ export const teamOperations = [
 				value: 'update',
 				description: 'Update a team',
 			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a team',
-			},
 		],
 		default: 'get',
 		description: 'The operation to perform',
@@ -47,9 +47,9 @@ export const teamOperations = [
 ] as INodeProperties[];
 
 export const teamFields = [
-/* -------------------------------------------------------------------------- */
-/*                                team:getAll                                 */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                team:getAll                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
 		name: 'organizationSlug',
@@ -112,9 +112,10 @@ export const teamFields = [
 		default: 100,
 		description: 'How many results to return.',
 	},
-/* -------------------------------------------------------------------------- */
-/*                                team:get                                   */
-/* -------------------------------------------------------------------------- */
+
+	/* -------------------------------------------------------------------------- */
+	/*                                team:get                                   */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
 		name: 'organizationSlug',
@@ -160,9 +161,10 @@ export const teamFields = [
 		required: true,
 		description: 'The slug of the team to get.',
 	},
-/* -------------------------------------------------------------------------- */
-/*                                team:create                                 */
-/* -------------------------------------------------------------------------- */
+
+	/* -------------------------------------------------------------------------- */
+	/*                                team:create                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
 		name: 'organizationSlug',
@@ -228,9 +230,10 @@ export const teamFields = [
 			},
 		],
 	},
-/* -------------------------------------------------------------------------- */
-/*                                team:update                                 */
-/* -------------------------------------------------------------------------- */
+
+	/* -------------------------------------------------------------------------- */
+	/*                                team:update                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
 		name: 'organizationSlug',
@@ -276,24 +279,6 @@ export const teamFields = [
 		required: true,
 		description: 'The slug of the team to update.',
 	},
-	{
-		displayName: 'Name',
-		name: 'name',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				resource: [
-					'team',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		required: true,
-		description: 'The new name of the team.',
-	},
 	{
 		displayName: 'Update Fields',
 		name: 'updateFields',
@@ -311,6 +296,13 @@ export const teamFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The new name of the team.',
+			},
 			{
 				displayName: 'Slug',
 				name: 'slug',
@@ -320,9 +312,10 @@ export const teamFields = [
 			},
 		],
 	},
-/* -------------------------------------------------------------------------- */
-/*                                team:delete                                 */
-/* -------------------------------------------------------------------------- */
+
+	/* -------------------------------------------------------------------------- */
+	/*                                team:delete                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Organization Slug',
 		name: 'organizationSlug',

From 6fcbb2ad45d745ce548bfd82260b1c7a4d196085 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Sat, 24 Apr 2021 17:29:09 +0200
Subject: [PATCH 067/231] :bug: Fix users:Company operation in Intercom node
 (#1666)

---
 packages/nodes-base/nodes/Intercom/Intercom.node.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 57903ca91d..44b50406cd 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -512,13 +512,13 @@ export class Intercom implements INodeType {
 					}
 				}
 				if (operation === 'users') {
-					const filterBy = this.getNodeParameter('filterBy', 0) as string;
+					const listBy = this.getNodeParameter('listBy', 0) as string;
 					const value = this.getNodeParameter('value', i) as string;
-					if (filterBy === 'companyId') {
+					if (listBy === 'companyId') {
 						qs.company_id = value;
 					}
 					try {
-						if (filterBy === 'id') {
+						if (listBy === 'id') {
 							responseData = await intercomApiRequest.call(this, `/companies/${value}/users`, 'GET', {}, qs);
 						} else {
 							qs.type = 'users';

From 223f0130f066c880a1708d4fe9d09984e57597d7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 17:42:31 +0200
Subject: [PATCH 068/231] :zap: Fix company:users response

---
 .../nodes/Intercom/CompanyDescription.ts      | 43 ++++++++++++++++++-
 .../nodes/Intercom/Intercom.node.ts           | 21 ++++++++-
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
index d8734b5122..d547588fce 100644
--- a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
@@ -49,7 +49,6 @@ export const companyFields = [
 /* -------------------------------------------------------------------------- */
 /*                                company:users                               */
 /* -------------------------------------------------------------------------- */
-
 	{
 		displayName: 'List By',
 		name: 'listBy',
@@ -97,6 +96,48 @@ export const companyFields = [
 		},
 		description: 'View by value',
 	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'users',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'company',
+				],
+				operation: [
+					'users',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 60,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
 /* -------------------------------------------------------------------------- */
 /*                                company:getAll                                */
 /* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 44b50406cd..fd13f91e96 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -514,15 +514,32 @@ export class Intercom implements INodeType {
 				if (operation === 'users') {
 					const listBy = this.getNodeParameter('listBy', 0) as string;
 					const value = this.getNodeParameter('value', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
 					if (listBy === 'companyId') {
 						qs.company_id = value;
 					}
+
 					try {
 						if (listBy === 'id') {
-							responseData = await intercomApiRequest.call(this, `/companies/${value}/users`, 'GET', {}, qs);
+							if (returnAll === true) {
+								responseData = await intercomApiRequestAllItems.call(this, 'users', `/companies/${value}/users`, 'GET', {}, qs);
+							} else {
+								qs.per_page = this.getNodeParameter('limit', i) as number;
+								responseData = await intercomApiRequest.call(this, `/companies/${value}/users`, 'GET', {}, qs);
+								responseData = responseData.users;
+							}
+
 						} else {
 							qs.type = 'users';
-							responseData = await intercomApiRequest.call(this, '/companies', 'GET', {}, qs);
+
+							if (returnAll === true) {
+								responseData = await intercomApiRequestAllItems.call(this, 'users', '/companies', 'GET', {}, qs);
+							} else {
+								qs.per_page = this.getNodeParameter('limit', i) as number;
+								responseData = await intercomApiRequest.call(this, '/companies', 'GET', {}, qs);
+								responseData = responseData.users;
+							}
 						}
 					} catch (error) {
 						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);

From 3904f7d568523fd888219d4694b83cbcdf61872f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 17:49:52 +0200
Subject: [PATCH 069/231] :zap: Basic code cleanup on Intercom Node

---
 .../nodes/Intercom/CompanyDescription.ts      |  27 ++-
 .../nodes/Intercom/Intercom.node.ts           |  18 +-
 .../nodes/Intercom/LeadDescription.ts         | 117 +++++++------
 .../nodes/Intercom/UserDescription.ts         | 157 +++++++++---------
 4 files changed, 153 insertions(+), 166 deletions(-)

diff --git a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
index d547588fce..77b6bb6c3a 100644
--- a/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/CompanyDescription.ts
@@ -46,9 +46,9 @@ export const companyOperations = [
 
 export const companyFields = [
 
-/* -------------------------------------------------------------------------- */
-/*                                company:users                               */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                company:users                               */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'List By',
 		name: 'listBy',
@@ -138,10 +138,9 @@ export const companyFields = [
 		description: 'How many results to return.',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                company:getAll                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                company:getAll                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Return All',
 		name: 'returnAll',
@@ -217,10 +216,9 @@ export const companyFields = [
 		],
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                company:get                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                company:get                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Select By',
 		name: 'selectBy',
@@ -274,10 +272,9 @@ export const companyFields = [
 		description: 'View by value',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                            company:create/update                           */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                            company:create/update                           */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Company Id',
 		name: 'companyId',
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index fd13f91e96..d1f677dbcb 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -24,7 +24,7 @@ import {
 	IAvatar,
 	ILead,
 	ILeadCompany,
- } from './LeadInterface';
+} from './LeadInterface';
 import {
 	userFields,
 	userOpeations,
@@ -179,7 +179,7 @@ export class Intercom implements INodeType {
 					if (additionalFields.companies) {
 						const companies: ILeadCompany[] = [];
 						// @ts-ignore
-						additionalFields.companies.forEach( o => {
+						additionalFields.companies.forEach(o => {
 							const company: ILeadCompany = {};
 							company.company_id = o;
 							companies.push(company);
@@ -270,9 +270,9 @@ export class Intercom implements INodeType {
 							qs.user_id = value;
 							responseData = await intercomApiRequest.call(this, '/contacts', 'DELETE', {}, qs);
 						}
-						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
-						}
+					} catch (error) {
+						throw new NodeApiError(this.getNode(), error);
+					}
 				}
 			}
 			//https://developers.intercom.com/intercom-api-reference/reference#users
@@ -337,7 +337,7 @@ export class Intercom implements INodeType {
 					if (additionalFields.companies) {
 						const companies: IUserCompany[] = [];
 						// @ts-ignore
-						additionalFields.companies.forEach( o => {
+						additionalFields.companies.forEach(o => {
 							const company: IUserCompany = {};
 							company.company_id = o;
 							companies.push(company);
@@ -421,9 +421,9 @@ export class Intercom implements INodeType {
 					const id = this.getNodeParameter('id', i) as string;
 					try {
 						responseData = await intercomApiRequest.call(this, `/users/${id}`, 'DELETE');
-						} catch (error) {
-							throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
-						}
+					} catch (error) {
+						throw new NodeOperationError(this.getNode(), `Intercom Error: ${JSON.stringify(error)}`);
+					}
 				}
 			}
 			//https://developers.intercom.com/intercom-api-reference/reference#companies
diff --git a/packages/nodes-base/nodes/Intercom/LeadDescription.ts b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
index 6ed0b459e7..de41a9cf7a 100644
--- a/packages/nodes-base/nodes/Intercom/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/LeadDescription.ts
@@ -18,6 +18,11 @@ export const leadOpeations = [
 				value: 'create',
 				description: 'Create a new lead',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a lead',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -33,11 +38,6 @@ export const leadOpeations = [
 				value: 'update',
 				description: 'Update new lead',
 			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a lead',
-			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -46,10 +46,9 @@ export const leadOpeations = [
 
 export const leadFields = [
 
-/* -------------------------------------------------------------------------- */
-/*                                 lead:delete                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 lead:delete                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Delete By',
 		name: 'deleteBy',
@@ -97,10 +96,9 @@ export const leadFields = [
 		description: 'Delete by value',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                  lead:get                                 */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                  lead:get                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Select By',
 		name: 'selectBy',
@@ -159,10 +157,9 @@ export const leadFields = [
 		description: 'View by value',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                  lead:getAll                                 */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                  lead:getAll                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Return All',
 		name: 'returnAll',
@@ -238,10 +235,9 @@ export const leadFields = [
 		],
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 lead:update                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 lead:update                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Update By',
 		name: 'updateBy',
@@ -290,10 +286,9 @@ export const leadFields = [
 		description: 'Value of the property to identify the lead to update',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 lead:create                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 lead:create                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Email',
 		name: 'email',
@@ -355,6 +350,33 @@ export const leadFields = [
 				default: '',
 				description: 'An avatar image URL. note: the image url needs to be https.',
 			},
+			{
+				displayName: 'Companies',
+				name: 'companies',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+				description: 'Identifies the companies this user belongs to.',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/resource': [
+							'lead',
+						],
+						'/operation': [
+							'update',
+						],
+					},
+				},
+				description: 'The email of the user.',
+			},
 			{
 				displayName: 'Name',
 				name: 'name',
@@ -384,38 +406,18 @@ export const leadFields = [
 				description: 'A boolean value, which if true, instructs Intercom to update the<br />users last_request_at value to the current API service time in<br />UTC. default value if not sent is false.',
 			},
 			{
-				displayName: 'Companies',
-				name: 'companies',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanies',
-				},
-				default: [],
-				description: 'Identifies the companies this user belongs to.',
-			},
-			{
-				displayName: 'Email',
-				name: 'email',
+				displayName: 'UTM Campaign',
+				name: 'utmCampaign',
 				type: 'string',
 				default: '',
-				displayOptions: {
-					show: {
-						'/resource': [
-							'lead',
-						],
-						'/operation': [
-							'update',
-						],
-					},
-				},
-				description: 'The email of the user.',
+				description: 'Identifies a specific product promotion or strategic campaign',
 			},
 			{
-				displayName: 'UTM Source',
-				name: 'utmSource',
+				displayName: 'UTM Content',
+				name: 'utmContent',
 				type: 'string',
 				default: '',
-				description: 'An avatar image URL. note: the image url needs to be https.',
+				description: 'Identifies what specifically was clicked to bring the user to the site',
 			},
 			{
 				displayName: 'UTM Medium',
@@ -425,11 +427,11 @@ export const leadFields = [
 				description: 'Identifies what type of link was used',
 			},
 			{
-				displayName: 'UTM Campaign',
-				name: 'utmCampaign',
+				displayName: 'UTM Source',
+				name: 'utmSource',
 				type: 'string',
 				default: '',
-				description: 'Identifies a specific product promotion or strategic campaign',
+				description: 'An avatar image URL. note: the image url needs to be https.',
 			},
 			{
 				displayName: 'UTM Term',
@@ -438,13 +440,6 @@ export const leadFields = [
 				default: '',
 				description: 'Identifies search terms',
 			},
-			{
-				displayName: 'UTM Content',
-				name: 'utmContent',
-				type: 'string',
-				default: '',
-				description: 'Identifies what specifically was clicked to bring the user to the site',
-			},
 		],
 	},
 	{
diff --git a/packages/nodes-base/nodes/Intercom/UserDescription.ts b/packages/nodes-base/nodes/Intercom/UserDescription.ts
index a9439ff267..f446205e2d 100644
--- a/packages/nodes-base/nodes/Intercom/UserDescription.ts
+++ b/packages/nodes-base/nodes/Intercom/UserDescription.ts
@@ -18,6 +18,11 @@ export const userOpeations = [
 				value: 'create',
 				description: 'Create a new user',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a user',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -33,11 +38,6 @@ export const userOpeations = [
 				value: 'update',
 				description: 'Update a user',
 			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a user',
-			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -46,10 +46,9 @@ export const userOpeations = [
 
 export const userFields = [
 
-/* -------------------------------------------------------------------------- */
-/*                                 user:delete                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:delete                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'ID',
 		name: 'id',
@@ -69,10 +68,9 @@ export const userFields = [
 		description: 'The Intercom defined id representing the Lead',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                  user:getAll                                 */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                  user:getAll                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Return All',
 		name: 'returnAll',
@@ -145,13 +143,6 @@ export const userFields = [
 				default: '',
 				description: 'The email address of the user',
 			},
-			{
-				displayName: 'Tag ID',
-				name: 'tag_id',
-				type: 'string',
-				default: '',
-				description: 'Tag representing the user',
-			},
 			{
 				displayName: 'Segment ID',
 				name: 'segment_id',
@@ -159,14 +150,20 @@ export const userFields = [
 				default: '',
 				description: 'Segment representing the user',
 			},
+			{
+				displayName: 'Tag ID',
+				name: 'tag_id',
+				type: 'string',
+				default: '',
+				description: 'Tag representing the user',
+			},
 		],
 	},
 
 
-/* -------------------------------------------------------------------------- */
-/*                                  user:get                                 */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                  user:get                                 */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Select By',
 		name: 'selectBy',
@@ -217,10 +214,9 @@ export const userFields = [
 		description: 'View by value',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 user:update                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:update                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Update By',
 		name: 'updateBy',
@@ -275,10 +271,9 @@ export const userFields = [
 		description: 'Value of the property to identify the user to update',
 	},
 
-/* -------------------------------------------------------------------------- */
-/*                                 user:create                                */
-/* -------------------------------------------------------------------------- */
-
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:create                                */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Identifier Type',
 		name: 'identifierType',
@@ -362,6 +357,23 @@ export const userFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Avatar',
+				name: 'avatar',
+				type: 'string',
+				default: '',
+				description: 'An avatar image URL. note: the image url needs to be https.',
+			},
+			{
+				displayName: 'Companies',
+				name: 'companies',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getCompanies',
+				},
+				default: [],
+				description: 'Identifies the companies this user belongs to.',
+			},
 			{
 				displayName: 'Email',
 				name: 'email',
@@ -384,6 +396,29 @@ export const userFields = [
 				default: '',
 				description: 'Email of the user',
 			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				placeholder: '',
+				description: 'Name of the user',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'The phone number of the user',
+			},
+			{
+				displayName: 'Session Count',
+				name: 'sessionCount',
+				type: 'number',
+				default: false,
+				options: [],
+				description: `How many sessions the user has recorded`,
+			},
 			{
 				displayName: 'User ID',
 				name: 'userId',
@@ -407,21 +442,6 @@ export const userFields = [
 				default: '',
 				description: 'Email of the user',
 			},
-			{
-				displayName: 'Phone',
-				name: 'phone',
-				type: 'string',
-				default: '',
-				description: 'The phone number of the user',
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				placeholder: '',
-				description: 'Name of the user',
-			},
 			{
 				displayName: 'Unsubscribed From Emails',
 				name: 'unsubscribedFromEmails',
@@ -439,36 +459,18 @@ export const userFields = [
 				description: 'A boolean value, which if true, instructs Intercom to update the users<br />last_request_at value to the current API service time in UTC.',
 			},
 			{
-				displayName: 'Session Count',
-				name: 'sessionCount',
-				type: 'number',
-				default: false,
-				options: [],
-				description: `How many sessions the user has recorded`,
-			},
-			{
-				displayName: 'Companies',
-				name: 'companies',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getCompanies',
-				},
-				default: [],
-				description: 'Identifies the companies this user belongs to.',
-			},
-			{
-				displayName: 'Avatar',
-				name: 'avatar',
+				displayName: 'UTM Campaign',
+				name: 'utmCampaign',
 				type: 'string',
 				default: '',
-				description: 'An avatar image URL. note: the image url needs to be https.',
+				description: 'Identifies a specific product promotion or strategic campaign',
 			},
 			{
-				displayName: 'UTM Source',
-				name: 'utmSource',
+				displayName: 'UTM Content',
+				name: 'utmContent',
 				type: 'string',
 				default: '',
-				description: 'An avatar image URL. note: the image url needs to be https.',
+				description: 'Identifies what specifically was clicked to bring the user to the site',
 			},
 			{
 				displayName: 'UTM Medium',
@@ -478,11 +480,11 @@ export const userFields = [
 				description: 'Identifies what type of link was used',
 			},
 			{
-				displayName: 'UTM Campaign',
-				name: 'utmCampaign',
+				displayName: 'UTM Source',
+				name: 'utmSource',
 				type: 'string',
 				default: '',
-				description: 'Identifies a specific product promotion or strategic campaign',
+				description: 'An avatar image URL. note: the image url needs to be https.',
 			},
 			{
 				displayName: 'UTM Term',
@@ -491,13 +493,6 @@ export const userFields = [
 				default: '',
 				description: 'Identifies search terms',
 			},
-			{
-				displayName: 'UTM Content',
-				name: 'utmContent',
-				type: 'string',
-				default: '',
-				description: 'Identifies what specifically was clicked to bring the user to the site',
-			},
 		],
 	},
 	{

From 4d74e1fdea4d652a5b61befb707f7434f4cccebb Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 24 Apr 2021 12:56:47 -0400
Subject: [PATCH 070/231] :bug: Fix issue looking up values with multiple empty
 rows (#1701)

---
 packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index 479ab3cdd5..80e7c6831d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -409,9 +409,18 @@ export class GoogleSheet {
 			inputData[keyRowIndex],
 		];
 
+		// Standardise values array, if rows is [[]], map it to [['']] (Keep the columns into consideration)
+		for (let rowIndex = 0; rowIndex < inputData?.length; rowIndex++) {
+			if (inputData[rowIndex].length === 0) {
+				for (let i = 0; i < keys.length; i++) {
+					inputData[rowIndex][i] = '';
+				}
+			}
+		}
 		// Loop over all the lookup values and try to find a row to return
 		let rowIndex: number;
 		let returnColumnIndex: number;
+
 		lookupLoop:
 		for (const lookupValue of lookupValues) {
 			returnColumnIndex = keys.indexOf(lookupValue.lookupColumn);

From 66d4fe491147b5602a3434393c3fe49bbb78e5b9 Mon Sep 17 00:00:00 2001
From: Craig McElroy <camcelroy@users.noreply.github.com>
Date: Sat, 24 Apr 2021 12:25:30 -0500
Subject: [PATCH 071/231] :zap: Salesforce Case/Lead Owner - Add Queues to
 Owner picklist (#1689)

---
 .../nodes/Salesforce/CaseDescription.ts       |  4 +-
 .../nodes/Salesforce/LeadDescription.ts       |  4 +-
 .../nodes/Salesforce/Salesforce.node.ts       | 64 +++++++++++++++++++
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
index 381d5085fb..0c98360708 100644
--- a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
@@ -140,7 +140,7 @@ export const caseFields = [
 				name: 'owner',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getUsers',
+					loadOptionsMethod: 'getCaseOwners',
 				},
 				default: '',
 				description: 'The owner of the case.',
@@ -303,7 +303,7 @@ export const caseFields = [
 				name: 'owner',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getUsers',
+					loadOptionsMethod: 'getCaseOwners',
 				},
 				default: '',
 				description: 'The owner of the case.',
diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 4f0c57d119..2bb553dfa1 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -251,7 +251,7 @@ export const leadFields = [
 				name: 'owner',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getUsers',
+					loadOptionsMethod: 'getLeadOwners',
 				},
 				default: '',
 				description: 'The owner of the lead.',
@@ -509,7 +509,7 @@ export const leadFields = [
 				name: 'owner',
 				type: 'options',
 				typeOptions: {
-					loadOptionsMethod: 'getUsers',
+					loadOptionsMethod: 'getLeadOwners',
 				},
 				default: '',
 				description: 'The owner of the lead.',
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index e558234f84..3bae184ef4 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -298,6 +298,70 @@ export class Salesforce implements INodeType {
 				sortOptions(returnData);
 				return returnData;
 			},
+			// Get all the users and case queues to display them to user so that he can
+			// select them easily
+			async getCaseOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qsQueues = {
+					q: "SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type='Queue' and SobjectType = 'Case'",
+				};
+				const queues = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsQueues);
+				for (const queue of queues) {
+					const queueName = queue.Queue.Name;
+					const queueId = queue.Queue.Id;
+					returnData.push({
+						name: `Queue: ${queueName}`,
+						value: queueId,
+					});
+				}
+				const qsUsers = {
+					q: 'SELECT id, Name FROM User',
+				};
+				const users = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsUsers);
+				const userPrefix = returnData.length > 0 ? 'User: ' : '';
+				for (const user of users) {
+					const userName = user.Name;
+					const userId = user.Id;
+					returnData.push({
+						name: userPrefix + userName,
+						value: userId,
+					});
+				}
+				sortOptions(returnData);
+				return returnData;
+			},
+			// Get all the users and lead queues to display them to user so that he can
+			// select them easily
+			async getLeadOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qsQueues = {
+					q: "SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type='Queue' and SobjectType = 'Lead'",
+				};
+				const queues = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsQueues);
+				for (const queue of queues) {
+					const queueName = queue.Queue.Name;
+					const queueId = queue.Queue.Id;
+					returnData.push({
+						name: `Queue: ${queueName}`,
+						value: queueId,
+					});
+				}
+				const qsUsers = {
+					q: 'SELECT id, Name FROM User',
+				};
+				const users = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsUsers);
+				const userPrefix = returnData.length > 0 ? 'User: ' : '';
+				for (const user of users) {
+					const userName = user.Name;
+					const userId = user.Id;
+					returnData.push({
+						name: userPrefix + userName,
+						value: userId,
+					});
+				}
+				sortOptions(returnData);
+				return returnData;
+			},
 			// Get all the lead sources to display them to user so that he can
 			// select them easily
 			async getLeadSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {

From d57ae97669b6bfa62f434a23f92e5109ca1997b3 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 24 Apr 2021 13:34:59 -0400
Subject: [PATCH 072/231] :sparkles: Add Mailcheck Node (#1690)

* Add Mailcheck integration

* compress logo

* Add mailcheck node info

* :zap: Improvements

Co-authored-by: bugagashenkj <bugagashenkj@gmail.com>
Co-authored-by: Nosov Konstantin <nosov@nodeart.io>
---
 .../credentials/MailcheckApi.credentials.ts   |  18 +++
 .../nodes/Mailcheck/GenericFunctions.ts       |  47 ++++++++
 .../nodes/Mailcheck/Mailcheck.node.json       |  15 +++
 .../nodes/Mailcheck/Mailcheck.node.ts         | 112 ++++++++++++++++++
 .../nodes-base/nodes/Mailcheck/mailcheck.svg  |   1 +
 packages/nodes-base/package.json              |   2 +
 6 files changed, 195 insertions(+)
 create mode 100644 packages/nodes-base/credentials/MailcheckApi.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
 create mode 100644 packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
 create mode 100644 packages/nodes-base/nodes/Mailcheck/mailcheck.svg

diff --git a/packages/nodes-base/credentials/MailcheckApi.credentials.ts b/packages/nodes-base/credentials/MailcheckApi.credentials.ts
new file mode 100644
index 0000000000..c84d857495
--- /dev/null
+++ b/packages/nodes-base/credentials/MailcheckApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class MailcheckApi implements ICredentialType {
+	name = 'mailcheckApi';
+	displayName = 'Mailcheck API';
+	documentationUrl = 'mailcheck';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
new file mode 100644
index 0000000000..ba9ef974e1
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -0,0 +1,47 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject
+} from 'n8n-workflow';
+
+export async function mailCheckApiRequest(this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const credentials = this.getCredentials('mailcheckApi') as IDataObject;
+
+	let options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+			'Authorization': `Bearer ${credentials.apiKey}`,
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://api.mailcheck.co/v1${resource}`,
+		json: true,
+	};
+	try {
+		options = Object.assign({}, options, option);
+		if (Object.keys(headers).length !== 0) {
+			options.headers = Object.assign({}, options.headers, headers);
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		//@ts-ignore
+		return await this.helpers.request.call(this, options);
+	} catch (error) {
+		if (error.response && error.response.body && error.response.body.message) {
+			// Try to return the error prettier
+			throw new Error(`Mailcheck error response [${error.statusCode}]: ${error.response.body.message}`);
+		}
+		throw error;
+	}
+}
\ 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
new file mode 100644
index 0000000000..b205ef1b28
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
@@ -0,0 +1,15 @@
+{
+	"node": "n8n-nodes-base.mailcheck",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Utility"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/mailcheck"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
new file mode 100644
index 0000000000..fc0e1ef6e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
@@ -0,0 +1,112 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	mailCheckApiRequest,
+} from './GenericFunctions';
+
+export class Mailcheck implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Mailcheck',
+		name: 'mailcheck',
+		icon: 'file:mailcheck.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Mailcheck API',
+		defaults: {
+			name: 'Mailcheck',
+			color: '#4f44d7',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'mailcheckApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+				],
+				default: 'email',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Check',
+						value: 'check',
+					},
+				],
+				default: 'check',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				displayOptions: {
+					show: {
+						resource: [
+							'email',
+						],
+						operation: [
+							'check',
+						],
+					},
+				},
+				default: '',
+				description: 'Email address to check.',
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length as unknown as number;
+		let responseData;
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+			if (resource === 'email') {
+				if (operation === 'check') {
+					const email = this.getNodeParameter('email', i) as string;
+					responseData = await mailCheckApiRequest.call(this, 'POST', '/singleEmail:check', { email });
+				}
+			}
+			if (Array.isArray(responseData)) {
+				returnData.push.apply(returnData, responseData as IDataObject[]);
+			} else {
+				returnData.push(responseData as IDataObject);
+			}
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailcheck/mailcheck.svg b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
new file mode 100644
index 0000000000..9e9829db7e
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="60" height="60" rx="8" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="m9.524 25 1.175-7.483L13.753 25h1.41l3.217-7.483L19.555 25h3.524l-2.314-13H17.26l-2.71 6.931L11.818 12H8.313L6 25h3.524zm20.025-4.828 1.59-4.327 1.59 4.327h-3.18zM34.483 25h3.777l-5.187-13h-3.868L24.02 25h3.777l.813-2.259h5.06L34.483 25zm5.331-13v13h3.542V12h-3.542zm6.397 0v13H54v-2.862h-4.247V12H46.21zM13.968 37.539a7.359 7.359 0 0 0-1.265-.41 5.792 5.792 0 0 0-1.22-.129c-.727 0-1.423.135-2.086.406a5.447 5.447 0 0 0-2.947 2.86A5.312 5.312 0 0 0 6 42.473c0 .802.152 1.543.456 2.22a5.683 5.683 0 0 0 1.21 1.755A5.416 5.416 0 0 0 11.47 48a5.4 5.4 0 0 0 1.063-.105 8.472 8.472 0 0 0 1.16-.323l.276-.097v-3.206c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 0 1-2.59-1.74 2.997 2.997 0 0 1-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.89-.602.344-.147.72-.221 1.126-.221.92 0 1.693.381 2.32 1.147v-3.231zm4.419-.249H15.68v10.42h2.707v-4.298h3.908v4.298H25V37.29h-2.706v4.022h-3.908V37.29zm14.72 0h-5.924v10.42h5.924v-2.294H29.89v-1.797h3.038v-2.294H29.89v-1.74h3.217V37.29zm9.445.249a7.41 7.41 0 0 0-1.262-.41A5.857 5.857 0 0 0 40.067 37c-.727 0-1.423.135-2.085.406-.663.271-1.246.65-1.749 1.133a5.446 5.446 0 0 0-1.201 1.728 5.341 5.341 0 0 0-.447 2.203c0 .801.151 1.542.455 2.219a5.684 5.684 0 0 0 1.21 1.755 5.42 5.42 0 0 0 4.866 1.448c.36-.069.746-.177 1.16-.323l.276-.097V44.27c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 0 1-2.59-1.74 2.997 2.997 0 0 1-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.889-.602.345-.147.72-.221 1.127-.221.92 0 1.693.381 2.32 1.147v-3.231h.002zm4.42-.249h-2.707v10.42h2.706V43.19l3.522 4.519H54l-4.516-5.486 4.13-4.934h-3.342l-3.3 4.298V37.29zM54 29.5H6v3h48v-3z" fill="#fff"/><defs><linearGradient id="a" x1="0" y1="-1" x2="60" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#4849C2"/><stop offset="1" stop-color="#2327A5"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 2483866586..c2dcda32b5 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -138,6 +138,7 @@
       "dist/credentials/LingvaNexApi.credentials.js",
       "dist/credentials/LinkedInOAuth2Api.credentials.js",
       "dist/credentials/MailerLiteApi.credentials.js",
+      "dist/credentials/MailcheckApi.credentials.js",
       "dist/credentials/MailchimpApi.credentials.js",
       "dist/credentials/MailchimpOAuth2Api.credentials.js",
       "dist/credentials/MailgunApi.credentials.js",
@@ -413,6 +414,7 @@
       "dist/nodes/LinkedIn/LinkedIn.node.js",
       "dist/nodes/MailerLite/MailerLite.node.js",
       "dist/nodes/MailerLite/MailerLiteTrigger.node.js",
+      "dist/nodes/Mailcheck/Mailcheck.node.js",
       "dist/nodes/Mailchimp/Mailchimp.node.js",
       "dist/nodes/Mailchimp/MailchimpTrigger.node.js",
       "dist/nodes/Mailgun/Mailgun.node.js",

From 08b42aef9773791a5bbf1d0939ca4cd998c243e6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 19:45:33 +0200
Subject: [PATCH 073/231] :shirt: Fix lint issue

---
 packages/nodes-base/nodes/Salesforce/Salesforce.node.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 3bae184ef4..6b5655bc88 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -303,7 +303,7 @@ export class Salesforce implements INodeType {
 			async getCaseOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const qsQueues = {
-					q: "SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type='Queue' and SobjectType = 'Case'",
+					q: 'SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type=\'Queue\' and SobjectType = \'Case\'',
 				};
 				const queues = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsQueues);
 				for (const queue of queues) {
@@ -335,7 +335,7 @@ export class Salesforce implements INodeType {
 			async getLeadOwners(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const qsQueues = {
-					q: "SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type='Queue' and SobjectType = 'Lead'",
+					q: 'SELECT Queue.Id, Queue.Name FROM QueuesObject where Queue.Type=\'Queue\' and SobjectType = \'Lead\'',
 				};
 				const queues = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/query', {}, qsQueues);
 				for (const queue of queues) {

From adad513718ebfdf85a434f3691d2db81edac248e Mon Sep 17 00:00:00 2001
From: Bart Vollebregt <3983932+bartvollebregt@users.noreply.github.com>
Date: Sat, 24 Apr 2021 19:57:49 +0200
Subject: [PATCH 074/231] :zap: Add ability to retrieve custom fields to
 Zendesk Trigger node. (#1685)

---
 .../nodes/Zendesk/TriggerPlaceholders.ts      | 231 +++++++++++++++
 .../nodes/Zendesk/ZendeskTrigger.node.ts      | 262 +++---------------
 2 files changed, 266 insertions(+), 227 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts

diff --git a/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts b/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts
new file mode 100644
index 0000000000..ef2a76fc38
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts
@@ -0,0 +1,231 @@
+import {
+	INodePropertyOptions,
+} from 'n8n-workflow';
+
+export const triggerPlaceholders = [
+	{
+		name: 'Title',
+		value: 'ticket.title',
+		description: `Ticket's subject`,
+	},
+	{
+		name: 'Description',
+		value: 'ticket.description',
+		description: `Ticket's description`,
+	},
+	{
+		name: 'URL',
+		value: 'ticket.url',
+		description: `Ticket's URL`,
+	},
+	{
+		name: 'ID',
+		value: 'ticket.id',
+		description: `Ticket's ID`,
+	},
+	{
+		name: 'External ID',
+		value: 'ticket.external_id',
+		description: `Ticket's external ID`,
+	},
+	{
+		name: 'Via',
+		value: 'ticket.via',
+		description: `Ticket's source`,
+	},
+	{
+		name: 'Status',
+		value: 'ticket.status',
+		description: `Ticket's status`,
+	},
+	{
+		name: 'Priority',
+		value: 'ticket.priority',
+		description: `Ticket's priority`,
+	},
+	{
+		name: 'Type',
+		value: 'ticket.ticket_type',
+		description: `Ticket's type`,
+	},
+	{
+		name: 'Group Name',
+		value: 'ticket.group.name',
+		description: `Ticket's assigned group`,
+	},
+	{
+		name: 'Brand Name',
+		value: 'ticket.brand.name',
+		description: `Ticket's brand`,
+	},
+	{
+		name: 'Due Date',
+		value: 'ticket.due_date',
+		description: `Ticket's due date (relevant for tickets of type Task)`,
+	},
+	{
+		name: 'Account',
+		value: 'ticket.account',
+		description: `This Zendesk Support's account name`,
+	},
+	{
+		name: 'Assignee Email',
+		value: 'ticket.assignee.email',
+		description: `Ticket assignee email (if any)`,
+	},
+	{
+		name: 'Assignee Name',
+		value: 'ticket.assignee.name',
+		description: `Assignee's full name`,
+	},
+	{
+		name: 'Assignee First Name',
+		value: 'ticket.assignee.first_name',
+		description: `Assignee's first name`,
+	},
+	{
+		name: 'Assignee Last Name',
+		value: 'ticket.assignee.last_name',
+		description: `Assignee's last name`,
+	},
+	{
+		name: 'Requester Full Name',
+		value: 'ticket.requester.name',
+		description: `Requester's full name`,
+	},
+	{
+		name: 'Requester First Name',
+		value: 'ticket.requester.first_name',
+		description: `Requester's first name`,
+	},
+	{
+		name: 'Requester Last Name',
+		value: 'ticket.requester.last_name',
+		description: `Requester's last name`,
+	},
+	{
+		name: 'Requester Email',
+		value: 'ticket.requester.email',
+		description: `Requester's email`,
+	},
+	{
+		name: 'Requester Language',
+		value: 'ticket.requester.language',
+		description: `Requester's language`,
+	},
+	{
+		name: 'Requester Phone',
+		value: 'ticket.requester.phone',
+		description: `Requester's phone number`,
+	},
+	{
+		name: 'Requester External ID',
+		value: 'ticket.requester.external_id',
+		description: `Requester's external ID`,
+	},
+	{
+		name: 'Requester Field',
+		value: 'ticket.requester.requester_field',
+		description: `Name or email`,
+	},
+	{
+		name: 'Requester Details',
+		value: 'ticket.requester.details',
+		description: `Detailed information about the ticket's requester`,
+	},
+	{
+		name: 'Requester Organization',
+		value: 'ticket.organization.name',
+		description: `Requester's organization`,
+	},
+	{
+		name: `Ticket's Organization External ID`,
+		value: 'ticket.organization.external_id',
+		description: `Ticket's organization external ID`,
+	},
+	{
+		name: `Organization details`,
+		value: 'ticket.organization.details',
+		description: `The details about the organization of the ticket's requester`,
+	},
+	{
+		name: `Organization Note`,
+		value: 'ticket.organization.notes',
+		description: `The notes about the organization of the ticket's requester`,
+	},
+	{
+		name: `Ticket's CCs`,
+		value: 'ticket.ccs',
+		description: `Ticket's CCs`,
+	},
+	{
+		name: `Ticket's CCs names`,
+		value: 'ticket.cc_names',
+		description: `Ticket's CCs names`,
+	},
+	{
+		name: `Ticket's tags`,
+		value: 'ticket.tags',
+		description: `Ticket's tags`,
+	},
+	{
+		name: `Current Holiday Name`,
+		value: 'ticket.current_holiday_name',
+		description: `Displays the name of the current holiday on the ticket's schedule`,
+	},
+	{
+		name: `Current User Name `,
+		value: 'current_user.name',
+		description: `Your full name`,
+	},
+	{
+		name: `Current User First Name `,
+		value: 'current_user.first_name',
+		description: 'Your first name',
+	},
+	{
+		name: `Current User Email `,
+		value: 'current_user.email',
+		description: 'Your primary email',
+	},
+	{
+		name: `Current User Organization Name `,
+		value: 'current_user.organization.name',
+		description: 'Your default organization',
+	},
+	{
+		name: `Current User Organization Details `,
+		value: 'current_user.organization.details',
+		description: `Your default organization's details`,
+	},
+	{
+		name: `Current User Organization Notes `,
+		value: 'current_user.organization.notes',
+		description: `Your default organization's note`,
+	},
+	{
+		name: `Current User Language `,
+		value: 'current_user.language',
+		description: `Your chosen language`,
+	},
+	{
+		name: `Current User External ID `,
+		value: 'current_user.external_id',
+		description: 'Your external ID',
+	},
+	{
+		name: `Current User Notes `,
+		value: 'current_user.notes',
+		description: 'Your notes, stored in your profile',
+	},
+	{
+		name: `Satisfation Current Rating `,
+		value: 'satisfaction.current_rating',
+		description: 'The text of the current satisfaction rating',
+	},
+	{
+		name: `Satisfation Current Comment `,
+		value: 'satisfaction.current_comment',
+		description: 'The text of the current satisfaction rating comment',
+	},
+] as INodePropertyOptions[];
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 85ff81ef1e..dc8c256207 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -25,6 +25,10 @@ import {
 	conditionFields,
  } from './ConditionDescription';
 
+import {
+	triggerPlaceholders
+} from './TriggerPlaceholders';
+
 export class ZendeskTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Zendesk Trigger',
@@ -122,233 +126,9 @@ export class ZendeskTrigger implements INodeType {
 						description: 'The fields to return the values of.',
 						type: 'multiOptions',
 						default: [],
-						options: [
-							{
-								name: 'Title',
-								value: 'ticket.title',
-								description: `Ticket's subject`,
-							},
-							{
-								name: 'Description',
-								value: 'ticket.description',
-								description: `Ticket's description`,
-							},
-							{
-								name: 'URL',
-								value: 'ticket.url',
-								description: `Ticket's URL`,
-							},
-							{
-								name: 'ID',
-								value: 'ticket.id',
-								description: `Ticket's ID`,
-							},
-							{
-								name: 'External ID',
-								value: 'ticket.external_id',
-								description: `Ticket's external ID`,
-							},
-							{
-								name: 'Via',
-								value: 'ticket.via',
-								description: `Ticket's source`,
-							},
-							{
-								name: 'Status',
-								value: 'ticket.status',
-								description: `Ticket's status`,
-							},
-							{
-								name: 'Priority',
-								value: 'ticket.priority',
-								description: `Ticket's priority`,
-							},
-							{
-								name: 'Type',
-								value: 'ticket.ticket_type',
-								description: `Ticket's type`,
-							},
-							{
-								name: 'Group Name',
-								value: 'ticket.group.name',
-								description: `Ticket's assigned group`,
-							},
-							{
-								name: 'Brand Name',
-								value: 'ticket.brand.name',
-								description: `Ticket's brand`,
-							},
-							{
-								name: 'Due Date',
-								value: 'ticket.due_date',
-								description: `Ticket's due date (relevant for tickets of type Task)`,
-							},
-							{
-								name: 'Account',
-								value: 'ticket.account',
-								description: `This Zendesk Support's account name`,
-							},
-							{
-								name: 'Assignee Email',
-								value: 'ticket.assignee.email',
-								description: `Ticket assignee email (if any)`,
-							},
-							{
-								name: 'Assignee Name',
-								value: 'ticket.assignee.name',
-								description: `Assignee's full name`,
-							},
-							{
-								name: 'Assignee First Name',
-								value: 'ticket.assignee.first_name',
-								description: `Assignee's first name`,
-							},
-							{
-								name: 'Assignee Last Name',
-								value: 'ticket.assignee.last_name',
-								description: `Assignee's last name`,
-							},
-							{
-								name: 'Requester Full Name',
-								value: 'ticket.requester.name',
-								description: `Requester's full name`,
-							},
-							{
-								name: 'Requester First Name',
-								value: 'ticket.requester.first_name',
-								description: `Requester's first name`,
-							},
-							{
-								name: 'Requester Last Name',
-								value: 'ticket.requester.last_name',
-								description: `Requester's last name`,
-							},
-							{
-								name: 'Requester Email',
-								value: 'ticket.requester.email',
-								description: `Requester's email`,
-							},
-							{
-								name: 'Requester Language',
-								value: 'ticket.requester.language',
-								description: `Requester's language`,
-							},
-							{
-								name: 'Requester Phone',
-								value: 'ticket.requester.phone',
-								description: `Requester's phone number`,
-							},
-							{
-								name: 'Requester External ID',
-								value: 'ticket.requester.external_id',
-								description: `Requester's external ID`,
-							},
-							{
-								name: 'Requester Field',
-								value: 'ticket.requester.requester_field',
-								description: `Name or email`,
-							},
-							{
-								name: 'Requester Details',
-								value: 'ticket.requester.details',
-								description: `Detailed information about the ticket's requester`,
-							},
-							{
-								name: 'Requester Organization',
-								value: 'ticket.organization.name',
-								description: `Requester's organization`,
-							},
-							{
-								name: `Ticket's Organization External ID`,
-								value: 'ticket.organization.external_id',
-								description: `Ticket's organization external ID`,
-							},
-							{
-								name: `Organization details`,
-								value: 'ticket.organization.details',
-								description: `The details about the organization of the ticket's requester`,
-							},
-							{
-								name: `Organization Note`,
-								value: 'ticket.organization.notes',
-								description: `The notes about the organization of the ticket's requester`,
-							},
-							{
-								name: `Ticket's CCs`,
-								value: 'ticket.ccs',
-								description: `Ticket's CCs`,
-							},
-							{
-								name: `Ticket's CCs names`,
-								value: 'ticket.cc_names',
-								description: `Ticket's CCs names`,
-							},
-							{
-								name: `Ticket's tags`,
-								value: 'ticket.tags',
-								description: `Ticket's tags`,
-							},
-							{
-								name: `Current Holiday Name`,
-								value: 'ticket.current_holiday_name',
-								description: `Displays the name of the current holiday on the ticket's schedule`,
-							},
-							{
-								name: `Current User Name `,
-								value: 'current_user.name',
-								description: `Your full name`,
-							},
-							{
-								name: `Current User First Name `,
-								value: 'current_user.first_name',
-								description: 'Your first name',
-							},
-							{
-								name: `Current User Email `,
-								value: 'current_user.email',
-								description: 'Your primary email',
-							},
-							{
-								name: `Current User Organization Name `,
-								value: 'current_user.organization.name',
-								description: 'Your default organization',
-							},
-							{
-								name: `Current User Organization Details `,
-								value: 'current_user.organization.details',
-								description: `Your default organization's details`,
-							},
-							{
-								name: `Current User Organization Notes `,
-								value: 'current_user.organization.notes',
-								description: `Your default organization's note`,
-							},
-							{
-								name: `Current User Language `,
-								value: 'current_user.language',
-								description: `Your chosen language`,
-							},
-							{
-								name: `Current User External ID `,
-								value: 'current_user.external_id',
-								description: 'Your external ID',
-							},
-							{
-								name: `Current User Notes `,
-								value: 'current_user.notes',
-								description: 'Your notes, stored in your profile',
-							},
-							{
-								name: `Satisfation Current Rating `,
-								value: 'satisfaction.current_rating',
-								description: 'The text of the current satisfaction rating',
-							},
-							{
-								name: `Satisfation Current Comment `,
-								value: 'satisfaction.current_comment',
-								description: 'The text of the current satisfaction rating comment``',
-							},
-						],
+						typeOptions: {
+							loadOptionsMethod: 'getFields',
+						},
 					},
 				],
 				placeholder: 'Add Option',
@@ -392,6 +172,34 @@ export class ZendeskTrigger implements INodeType {
 	};
 	methods = {
 		loadOptions: {
+			// Get all the fields to display them to user so that he can
+			// select them easily
+			async getFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = triggerPlaceholders;
+				const customFields = [
+					'text',
+					'textarea',
+					'date',
+					'integer',
+					'decimal',
+					'regexp',
+					'multiselect',
+					'tagger',
+				];
+				const fields = await zendeskApiRequestAllItems.call(this, 'ticket_fields', 'GET', '/ticket_fields');
+				for (const field of fields) {
+					if (customFields.includes(field.type) && field.removable && field.active) {
+						const fieldName = field.title;
+						const fieldId = field.id;
+						returnData.push({
+							name: fieldName,
+							value: `ticket.ticket_field_${fieldId}`,
+							description: `Custom field ${fieldName}`,
+						});
+					}
+				}
+				return returnData;
+			},
 			// Get all the groups to display them to user so that he can
 			// select them easily
 			async getGroups(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {

From 9271e737774221ddab1ab3814f10a250f8e32957 Mon Sep 17 00:00:00 2001
From: Craig McElroy <camcelroy@users.noreply.github.com>
Date: Sat, 24 Apr 2021 15:10:53 -0500
Subject: [PATCH 075/231] :zap: Add custom fields for Salesforce case
 create/update and alphabetize fields for update (#1688)

---
 .../nodes/Salesforce/CaseDescription.ts       | 210 ++++++++++++------
 .../nodes/Salesforce/Salesforce.node.ts       |  18 ++
 2 files changed, 159 insertions(+), 69 deletions(-)

diff --git a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
index 0c98360708..69bed22293 100644
--- a/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/CaseDescription.ts
@@ -111,6 +111,42 @@ export const caseFields = [
 				default: '',
 				description: 'ID of the associated Contact.',
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -259,14 +295,68 @@ export const caseFields = [
 		},
 		options: [
 			{
-				displayName: 'Type',
-				name: 'type',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCaseTypes',
-				},
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'string',
 				default: '',
-				description: 'The type of case',
+				description: 'ID of the account associated with this case.',
+			},
+			{
+				displayName: 'Contact ID',
+				name: 'contactId',
+				type: 'string',
+				default: '',
+				description: 'ID of the associated Contact.',
+			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields ',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								default: '',
+								description: 'The ID of the field to add custom field to.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'A text description of the case. Limit: 32 KB.',
+			},
+			{
+				displayName: 'Is Escalated',
+				name: 'isEscalated',
+				type: 'boolean',
+				default: false,
+				description: 'Indicates whether the case has been escalated (true) or not.',
 			},
 			{
 				displayName: 'Origin',
@@ -278,6 +368,33 @@ export const caseFields = [
 				default: '',
 				description: 'The source of the case, such as Email, Phone, or Web. Label is Case Origin.',
 			},
+			{
+				displayName: 'Owner',
+				name: 'owner',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCaseOwners',
+				},
+				default: '',
+				description: 'The owner of the case.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'ParentId',
+				type: 'string',
+				default: '',
+				description: 'The ID of the parent case in the hierarchy. The label is Parent Case.',
+			},
+			{
+				displayName: 'Priority',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCasePriorities',
+				},
+				default: '',
+				description: 'The importance or urgency of the case, such as High, Medium, or Low.',
+			},
 			{
 				displayName: 'Reason',
 				name: 'reason',
@@ -298,16 +415,6 @@ export const caseFields = [
 				default: '',
 				description: 'The status of the case, such as “New,” “Closed,” or “Escalated.” This field directly controls the IsClosed flag',
 			},
-			{
-				displayName: 'Owner',
-				name: 'owner',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCaseOwners',
-				},
-				default: '',
-				description: 'The owner of the case.',
-			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
@@ -316,56 +423,11 @@ export const caseFields = [
 				description: 'The subject of the case. Limit: 255 characters.',
 			},
 			{
-				displayName: 'Parent ID',
-				name: 'ParentId',
+				displayName: 'Supplied Company',
+				name: 'suppliedCompany',
 				type: 'string',
 				default: '',
-				description: 'The ID of the parent case in the hierarchy. The label is Parent Case.',
-			},
-			{
-				displayName: 'Priority',
-				name: 'priority',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getCasePriorities',
-				},
-				default: '',
-				description: 'The importance or urgency of the case, such as High, Medium, or Low.',
-			},
-			{
-				displayName: 'Account ID',
-				name: 'accountId',
-				type: 'string',
-				default: '',
-				description: 'ID of the account associated with this case.',
-			},
-			{
-				displayName: 'Contact ID',
-				name: 'contactId',
-				type: 'string',
-				default: '',
-				description: 'ID of the associated Contact.',
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				description: 'A text description of the case. Limit: 32 KB.',
-			},
-			{
-				displayName: 'Is Escalated',
-				name: 'isEscalated',
-				type: 'boolean',
-				default: false,
-				description: 'Indicates whether the case has been escalated (true) or not.',
-			},
-			{
-				displayName: 'Supplied Name',
-				name: 'suppliedName',
-				type: 'string',
-				default: '',
-				description: `The name that was entered when the case was created. This field can't be updated after the case has been created`,
+				description: `The company name that was entered when the case was created. This field can't be updated after the case has been created..`,
 			},
 			{
 				displayName: 'Supplied Email',
@@ -374,6 +436,13 @@ export const caseFields = [
 				default: '',
 				description: `The email address that was entered when the case was created. This field can't be updated after the case has been created.`,
 			},
+			{
+				displayName: 'Supplied Name',
+				name: 'suppliedName',
+				type: 'string',
+				default: '',
+				description: `The name that was entered when the case was created. This field can't be updated after the case has been created`,
+			},
 			{
 				displayName: 'Supplied Phone',
 				name: 'suppliedPhone',
@@ -382,11 +451,14 @@ export const caseFields = [
 				description: `The phone number that was entered when the case was created. This field can't be updated after the case has been created.`,
 			},
 			{
-				displayName: 'Supplied Company',
-				name: 'suppliedCompany',
-				type: 'string',
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getCaseTypes',
+				},
 				default: '',
-				description: `The company name that was entered when the case was created. This field can't be updated after the case has been created..`,
+				description: 'The type of case',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 6b5655bc88..977c25cdb1 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1982,6 +1982,15 @@ export class Salesforce implements INodeType {
 					if (additionalFields.suppliedCompany !== undefined) {
 						body.SuppliedCompany = additionalFields.suppliedCompany as string;
 					}
+					if (additionalFields.customFieldsUi) {
+						const customFields = (additionalFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/case', body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Case/patch-case-id
@@ -2034,6 +2043,15 @@ export class Salesforce implements INodeType {
 					if (updateFields.suppliedCompany !== undefined) {
 						body.SuppliedCompany = updateFields.suppliedCompany as string;
 					}
+					if (updateFields.customFieldsUi) {
+						const customFields = (updateFields.customFieldsUi as IDataObject).customFieldsValues as IDataObject[];
+						if (customFields) {
+							for (const customField of customFields) {
+								//@ts-ignore
+								body[customField.fieldId] = customField.value;
+							}
+						}
+					}
 					responseData = await salesforceApiRequest.call(this, 'PATCH', `/sobjects/case/${caseId}`, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Case/get-case-id

From b9fbd2c0bb4b0acd29649704f34de99dc7f88464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 24 Apr 2021 22:41:00 +0200
Subject: [PATCH 076/231] :zap: Set new credentials dropdown to open by default
 (#1379)

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
---
 packages/editor-ui/src/components/CredentialsEdit.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CredentialsEdit.vue b/packages/editor-ui/src/components/CredentialsEdit.vue
index 6d01db51ac..77a64de7bd 100644
--- a/packages/editor-ui/src/components/CredentialsEdit.vue
+++ b/packages/editor-ui/src/components/CredentialsEdit.vue
@@ -30,7 +30,7 @@
 						Credential type:
 					</el-col>
 					<el-col :span="18">
-						<el-select v-model="credentialType" filterable placeholder="Select Type" size="small">
+						<el-select v-model="credentialType" filterable placeholder="Select Type" size="small" ref="credentialsDropdown">
 							<el-option
 								v-for="item in credentialTypes"
 								:key="item.name"
@@ -198,6 +198,9 @@ export default mixins(
 
 					this.credentialData = currentCredentials;
 				} else {
+					Vue.nextTick(() => {
+						(this.$refs.credentialsDropdown as HTMLDivElement).focus();
+					});
 					if (this.credentialType || this.setCredentialType) {
 						const credentialType = this.$store.getters.credentialType(this.credentialType || this.setCredentialType);
 						if (credentialType === null) {

From 41669c0e0f8911661ef22c1efc029e7abe324029 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 24 Apr 2021 22:55:14 +0200
Subject: [PATCH 077/231] :sparkles: Add options to run queries as transactions
 (#1612)

* add multi return

* add independently and transaction to query

* pgInsert normal and transaction

* independently for pgInsert

* normal, transaction and independently for pgUpdate

* cleanup

* implement it in other nodes

* multiple fixes

* add optional returning support

* clean up Postgres functions

* fix other postgres based dbs

* Added option to run queries as a transaction to Postgres

This commit allows users to configure Postgres, CrateDB, TimescaleDB and
QuestDB to run queries independently or as transactions as well as the
previous mode which is to execute multiple queries at once.

Previous behavior remains untouched so we only added new options.

* Standardize behavior across nodes that use postgres protocol

Also fixed unit tests.

* Added breaking change notice

* Added more information to breaking changes

* :zap: Styling fixes

Co-authored-by: lublak <lublak.de@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/cli/BREAKING-CHANGES.md              |  20 ++
 .../nodes-base/nodes/CrateDb/CrateDb.node.ts  | 161 ++++++++----
 .../nodes/Postgres/Postgres.node.functions.ts | 237 +++++++++++++-----
 .../nodes/Postgres/Postgres.node.ts           |  87 +++++--
 .../nodes-base/nodes/QuestDb/QuestDb.node.ts  | 118 ++++++---
 .../nodes/TimescaleDb/TimescaleDb.node.ts     |  81 ++++--
 .../Postgres/Postgres.node.functions.test.js  |  70 +++---
 packages/nodes-base/tsconfig.json             |   3 +-
 8 files changed, 559 insertions(+), 218 deletions(-)

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index aeb4f7e275..5435714e8e 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,26 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.117.0
+
+### What changed?
+
+Changed the behavior for nodes that use Postgres Wire Protocol: Postgres, QuestDB, CrateDB and TimescaleDB.
+
+All nodes have been standardized and now follow the same patterns. Behavior will be the same for most cases, but new added functionality can now be explored.
+
+You can now also inform how you would like n8n to execute queries. Default mode is `Multiple queries` which translates to previous behavior, but you can now run them `Independently` or `Transaction`. Also, `Continue on Fail` now plays a major role for the new modes.
+
+The node output for `insert` operations now rely on the new parameter `Return fields`, just like `update` operations did previously.
+
+### When is action necessary?
+
+If you rely on the output returned by `insert` operations for any of the mentioned nodes, we recommend you review your workflows.
+
+By default, all `insert` operations will have `Return fields: *` as the default, setting, returning all information inserted.
+
+Previously, the node would return all information it received, without taking into account what actually happened in the database.
+
 ## 0.113.0
 
 ### What changed?
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index a2577282b8..da74abdd6c 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -8,9 +8,12 @@ import {
 } from 'n8n-workflow';
 
 import {
+	generateReturning,
 	getItemCopy,
+	getItemsCopy,
 	pgInsert,
 	pgQuery,
+	pgUpdate,
 } from '../Postgres/Postgres.node.functions';
 
 import * as pgPromise from 'pg-promise';
@@ -125,22 +128,23 @@ export class CrateDb implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for the new rows.',
 			},
-			{
-				displayName: 'Return Fields',
-				name: 'returnFields',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['insert'],
-					},
-				},
-				default: '*',
-				description: 'Comma separated list of the fields that the operation will return',
-			},
 
 			// ----------------------------------
 			//         update
 			// ----------------------------------
+			{
+				displayName: 'Schema',
+				name: 'schema',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['update'],
+					},
+				},
+				default: 'doc',
+				required: true,
+				description: 'Name of the schema the table belongs to',
+			},
 			{
 				displayName: 'Table',
 				name: 'table',
@@ -166,7 +170,7 @@ export class CrateDb implements INodeType {
 				default: 'id',
 				required: true,
 				description:
-					'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
+					'Comma separated list of the properties which decides which rows in the database should be updated. Normally that would be "id".',
 			},
 			{
 				displayName: 'Columns',
@@ -182,6 +186,57 @@ export class CrateDb implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for rows to update.',
 			},
+
+			// ----------------------------------
+			//         insert,update
+			// ----------------------------------
+			{
+				displayName: 'Return Fields',
+				name: 'returnFields',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['insert', 'update'],
+					},
+				},
+				default: '*',
+				description: 'Comma separated list of the fields that the operation will return',
+			},
+			// ----------------------------------
+			//         additional fields
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Mode',
+						name: 'mode',
+						type: 'options',
+						options: [
+							{
+								name: 'Independently',
+								value: 'independently',
+								description: 'Execute each query independently',
+							},
+							{
+								name: 'Multiple queries',
+								value: 'multiple',
+								description: '<b>Default</b>. Sends multiple queries at once to database.',
+							},
+						],
+						default: 'multiple',
+						description: [
+							'The way queries should be sent to database.',
+							'Can be used in conjunction with <b>Continue on Fail</b>.',
+							'See the docs for more examples',
+						].join('<br>'),
+					},
+				],
+			},
 		],
 	};
 
@@ -206,7 +261,7 @@ export class CrateDb implements INodeType {
 
 		const db = pgp(config);
 
-		let returnItems = [];
+		let returnItems: INodeExecutionData[] = [];
 
 		const items = this.getInputData();
 		const operation = this.getNodeParameter('operation', 0) as string;
@@ -216,66 +271,68 @@ export class CrateDb implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items);
+			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
-			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
+			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
 			// ----------------------------------
 			//         insert
 			// ----------------------------------
 
-			const [insertData, insertItems] = await pgInsert(this.getNodeParameter, pgp, db, items);
+			const insertData = await pgInsert(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
-			// Add the id to the data
 			for (let i = 0; i < insertData.length; i++) {
 				returnItems.push({
-					json: {
-						...insertData[i],
-						...insertItems[i],
-					},
+					json: insertData[i],
 				});
 			}
 		} else if (operation === 'update') {
 			// ----------------------------------
 			//         update
 			// ----------------------------------
-			const tableName = this.getNodeParameter('table', 0) as string;
-			const updateKey = this.getNodeParameter('updateKey', 0) as string;
 
-			const queries : string[] = [];
-			const updatedKeys : string[] = [];
-			let updateKeyValue : string | number;
-			let columns : string[] = [];
+			const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject;
+			const mode = additionalFields.mode ?? 'multiple' as string;
 
-			items.map(item => {
-				const setOperations : string[] = [];
-				columns = Object.keys(item.json);
-				columns.map((col : string) => {
-					if (col !== updateKey) {
-						if (typeof item.json[col] === 'string') {
-							setOperations.push(`${col} = \'${item.json[col]}\'`);
-						} else {
-							setOperations.push(`${col} = ${item.json[col]}`);
-						}
+			if(mode === 'independently') {
+				const updateItems = await pgUpdate(this.getNodeParameter, pgp, db, items, this.continueOnFail());
+
+				returnItems = this.helpers.returnJsonArray(updateItems);
+			} else if(mode === 'multiple') {
+				// Crate db does not support multiple-update queries
+				// Therefore we cannot invoke `pgUpdate` using multiple mode
+				// so we have to call multiple updates manually here
+
+				const table = this.getNodeParameter('table', 0) as string;
+				const schema = this.getNodeParameter('schema', 0) as string;
+				const updateKeys = (this.getNodeParameter('updateKey', 0) as string).split(',').map(column => column.trim());
+				const columns = (this.getNodeParameter('columns', 0) as string).split(',').map(column => column.trim());
+				const queryColumns = columns.slice();
+
+				updateKeys.forEach(updateKey => {
+					if (!queryColumns.includes(updateKey)) {
+						columns.unshift(updateKey);
+						queryColumns.unshift('?' + updateKey);
 					}
 				});
 
-				updateKeyValue = item.json[updateKey] as string | number;
+				const cs = new pgp.helpers.ColumnSet(queryColumns, { table: { table, schema } });
 
-				if (updateKeyValue === undefined) {
-					throw new NodeOperationError(this.getNode(), 'No value found for update key!');
+				const where = ' WHERE ' + updateKeys.map(updateKey => pgp.as.name(updateKey) + ' = ${' + updateKey + '}').join(' AND ');
+				// updateKeyValue = item.json[updateKey] as string | number;
+				// if (updateKeyValue === undefined) {
+				// 	throw new NodeOperationError(this.getNode(), 'No value found for update key!');
+				// }
+
+				const returning = generateReturning(pgp, this.getNodeParameter('returnFields', 0) as string);
+				const queries:string[] = [];
+				for (let i = 0; i < items.length; i++) {
+					const itemCopy = getItemCopy(items[i], columns);
+					queries.push(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning);
 				}
-
-				updatedKeys.push(updateKeyValue as string);
-
-				const query = `UPDATE "${tableName}" SET ${setOperations.join(',')} WHERE ${updateKey} = ${updateKeyValue};`;
-				queries.push(query);
-			});
-
-
-			await db.any(pgp.helpers.concat(queries));
-
-			returnItems = this.helpers.returnJsonArray(getItemCopy(items, columns) as IDataObject[]);
+				const updateItems = await db.multi(pgp.helpers.concat(queries));
+				returnItems = this.helpers.returnJsonArray(getItemsCopy(items, columns) as IDataObject[]);
+			}
 		} else {
 			await pgp.end();
 			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index df1f10cbbc..30cf358579 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -3,29 +3,50 @@ import pgPromise = require('pg-promise');
 import pg = require('pg-promise/typescript/pg-subset');
 
 /**
- * Returns of copy of the items which only contains the json data and
+ * Returns of a shallow copy of the items which only contains the json data and
  * of that only the define properties
  *
  * @param {INodeExecutionData[]} items The items to copy
  * @param {string[]} properties The properties it should include
  * @returns
  */
-export function getItemCopy(items: INodeExecutionData[], properties: string[]): IDataObject[] {
-	// Prepare the data to insert and copy it to be returned
+export function getItemsCopy(items: INodeExecutionData[], properties: string[]): IDataObject[] {
 	let newItem: IDataObject;
 	return items.map(item => {
 		newItem = {};
 		for (const property of properties) {
-			if (item.json[property] === undefined) {
-				newItem[property] = null;
-			} else {
-				newItem[property] = JSON.parse(JSON.stringify(item.json[property]));
-			}
+			newItem[property] = item.json[property];
 		}
 		return newItem;
 	});
 }
 
+/**
+ * Returns of a shallow copy of the item which only contains the json data and
+ * of that only the define properties
+ *
+ * @param {INodeExecutionData} item The item to copy
+ * @param {string[]} properties The properties it should include
+ * @returns
+ */
+export function getItemCopy(item: INodeExecutionData, properties: string[]): IDataObject {
+	const newItem: IDataObject = {};
+	for (const property of properties) {
+		newItem[property] = item.json[property];
+	}
+	return newItem;
+}
+
+/**
+ * Returns a returning clause from a comma separated string
+ * @param {pgPromise.IMain<{}, pg.IClient>} pgp The pgPromise instance
+ * @param string returning The comma separated string
+ * @returns string
+ */
+export function generateReturning(pgp: pgPromise.IMain<{}, pg.IClient>, returning: string): string {
+	return ' RETURNING ' + returning.split(',').map(returnedField => pgp.as.name(returnedField.trim())).join(', ');
+}
+
 /**
  * Executes the given SQL query on the database.
  *
@@ -33,20 +54,53 @@ export function getItemCopy(items: INodeExecutionData[], properties: string[]):
  * @param {pgPromise.IMain<{}, pg.IClient>} pgp The pgPromise instance
  * @param {pgPromise.IDatabase<{}, pg.IClient>} db The pgPromise database connection
  * @param {input[]} input The Node's input data
- * @returns Promise<Array<object>>
+ * @returns Promise<Array<IDataObject>>
  */
-export function pgQuery(
+export async function pgQuery(
 	getNodeParam: Function,
 	pgp: pgPromise.IMain<{}, pg.IClient>,
 	db: pgPromise.IDatabase<{}, pg.IClient>,
 	input: INodeExecutionData[],
-): Promise<object[]> {
-	const queries: string[] = [];
-	for (let i = 0; i < input.length; i++) {
-		queries.push(getNodeParam('query', i) as string);
+	continueOnFail: boolean,
+	overrideMode?: string,
+): Promise<IDataObject[]> {
+	const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
+	const mode = overrideMode ? overrideMode : (additionalFields.mode ?? 'multiple') as string;
+	if (mode === 'multiple') {
+		const queries: string[] = [];
+		for (let i = 0; i < input.length; i++) {
+			queries.push(getNodeParam('query', i) as string);
+		}
+		return (await db.multi(pgp.helpers.concat(queries))).flat(1);
+	} else if (mode === 'transaction') {
+		return db.tx(async t => {
+			const result: IDataObject[] = [];
+			for (let i = 0; i < input.length; i++) {
+				try {
+					Array.prototype.push.apply(result, await t.any(getNodeParam('query', i) as string));
+				} catch (err) {
+					if (continueOnFail === false) throw err;
+					result.push({ ...input[i].json, code: err.code, message: err.message });
+					return result;
+				}
+			}
+			return result;
+		});
+	} else if (mode === 'independently') {
+		return db.task(async t => {
+			const result: IDataObject[] = [];
+			for (let i = 0; i < input.length; i++) {
+				try {
+					Array.prototype.push.apply(result, await t.any(getNodeParam('query', i) as string));
+				} catch (err) {
+					if (continueOnFail === false) throw err;
+					result.push({ ...input[i].json, code: err.code, message: err.message });
+				}
+			}
+			return result;
+		});
 	}
-
-	return db.any(pgp.helpers.concat(queries));
+	throw new Error('multiple, independently or transaction are valid options');
 }
 
 /**
@@ -63,33 +117,63 @@ export async function pgInsert(
 	pgp: pgPromise.IMain<{}, pg.IClient>,
 	db: pgPromise.IDatabase<{}, pg.IClient>,
 	items: INodeExecutionData[],
-): Promise<IDataObject[][]> {
+	continueOnFail: boolean,
+	overrideMode?: string,
+): Promise<IDataObject[]> {
 	const table = getNodeParam('table', 0) as string;
 	const schema = getNodeParam('schema', 0) as string;
-	let returnFields = (getNodeParam('returnFields', 0) as string).split(',') as string[];
 	const columnString = getNodeParam('columns', 0) as string;
 	const columns = columnString.split(',')
 		.map(column => column.trim().split(':'))
 		.map(([name, cast]) => ({ name, cast }));
-
-	const te = new pgp.helpers.TableName({ table, schema });
-
-	// Prepare the data to insert and copy it to be returned
 	const columnNames = columns.map(column => column.name);
-	const insertItems = getItemCopy(items, columnNames);
 
-	const columnSet = new pgp.helpers.ColumnSet(columns);
+	const cs = new pgp.helpers.ColumnSet(columns, { table: { table, schema } });
 
-	// Generate the multi-row insert query and return the id of new row
-	returnFields = returnFields.map(value => value.trim()).filter(value => !!value);
-	const query =
-		pgp.helpers.insert(insertItems, columnSet, te) +
-		(returnFields.length ? ` RETURNING ${returnFields.join(',')}` : '');
+	const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
+	const mode = overrideMode ? overrideMode : (additionalFields.mode ?? 'multiple') as string;
 
-	// Executing the query to insert the data
-	const insertData = await db.manyOrNone(query);
+	const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string);
+	if (mode === 'multiple') {
+		const query = pgp.helpers.insert(getItemsCopy(items, columnNames), cs) + returning;
+		return db.any(query);
+	} else if (mode === 'transaction') {
+		return db.tx(async t => {
+			const result: IDataObject[] = [];
+			for (let i = 0; i < items.length; i++) {
+				const itemCopy = getItemCopy(items[i], columnNames);
+				try {
+					result.push(await t.one(pgp.helpers.insert(itemCopy, cs) + returning));
+				} catch (err) {
+					if (continueOnFail === false) throw err;
+					result.push({ ...itemCopy, code: err.code, message: err.message });
+					return result;
+				}
+			}
+			return result;
+		});
+	} else if (mode === 'independently') {
+		return db.task(async t => {
+			const result: IDataObject[] = [];
+			for (let i = 0; i < items.length; i++) {
+				const itemCopy = getItemCopy(items[i], columnNames);
+				try {
+					const insertResult = await t.oneOrNone(pgp.helpers.insert(itemCopy, cs) + returning);
+					if (insertResult !== null) {
+						result.push(insertResult);
+					}
+				} catch (err) {
+					if (continueOnFail === false) {
+						throw err;
+					}
+					result.push({ ...itemCopy, code: err.code, message: err.message });
+				}
+			}
+			return result;
+		});
+	}
 
-	return [insertData, insertItems];
+	throw new Error('multiple, independently or transaction are valid options');
 }
 
 /**
@@ -106,45 +190,80 @@ export async function pgUpdate(
 	pgp: pgPromise.IMain<{}, pg.IClient>,
 	db: pgPromise.IDatabase<{}, pg.IClient>,
 	items: INodeExecutionData[],
+	continueOnFail = false,
 ): Promise<IDataObject[]> {
 	const table = getNodeParam('table', 0) as string;
 	const schema = getNodeParam('schema', 0) as string;
 	const updateKey = getNodeParam('updateKey', 0) as string;
 	const columnString = getNodeParam('columns', 0) as string;
-
-	const [updateColumnName, updateColumnCast] = updateKey.split(':');
-	const updateColumn = {
-		name: updateColumnName,
-		cast: updateColumnCast,
-	};
-
 	const columns = columnString.split(',')
 		.map(column => column.trim().split(':'))
 		.map(([name, cast]) => ({ name, cast }));
 
-	const te = new pgp.helpers.TableName({ table, schema });
+	const updateKeys = updateKey.split(',').map(key => {
+		const [name, cast] = key.trim().split(':');
+		const updateColumn = { name, cast };
+		const targetCol = columns.find((column) => column.name === name);
+		if (!targetCol) {
+			columns.unshift(updateColumn);
+		}
+		else if (!targetCol.cast) {
+			targetCol.cast = updateColumn.cast || targetCol.cast;
+		}
+		return updateColumn;
+	});
 
-	// Make sure that the updateKey does also get queried
-	const targetCol = columns.find((column) => column.name === updateColumn.name);
-	if (!targetCol) {
-		columns.unshift(updateColumn);
-	}
-	else if (!targetCol.cast) {
-		targetCol.cast = updateColumn.cast || targetCol.cast;
-	}
+	const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
+	const mode = additionalFields.mode ?? 'multiple' as string;
+
+	const cs = new pgp.helpers.ColumnSet(columns, { table: { table, schema } });
 
 	// Prepare the data to update and copy it to be returned
 	const columnNames = columns.map(column => column.name);
-	const updateItems = getItemCopy(items, columnNames);
+	const updateItems = getItemsCopy(items, columnNames);
 
-	const columnSet = new pgp.helpers.ColumnSet(columns);
-
-	// Generate the multi-row update query
-	const query =
-		pgp.helpers.update(updateItems, columnSet, te) + ' WHERE v.' + updateColumn.name + ' = t.' + updateColumn.name;
-
-	// Executing the query to update the data
-	await db.none(query);
-
-	return updateItems;
+	const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string);
+	if (mode === 'multiple') {
+		const query =
+			pgp.helpers.update(updateItems, cs)
+			+ ' WHERE ' + updateKeys.map(updateKey => {
+				const key = pgp.as.name(updateKey.name);
+				return 'v.' + key + ' = t.' + key;
+			}).join(' AND ')
+			+ returning;
+		return await db.any(query);
+	} else {
+		const where = ' WHERE ' + updateKeys.map(updateKey => pgp.as.name(updateKey.name) + ' = ${' + updateKey.name + '}').join(' AND ');
+		if (mode === 'transaction') {
+			return db.tx(async t => {
+				const result: IDataObject[] = [];
+				for (let i = 0; i < items.length; i++) {
+					const itemCopy = getItemCopy(items[i], columnNames);
+					try {
+						Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning));
+					} catch (err) {
+						if (continueOnFail === false) throw err;
+						result.push({ ...itemCopy, code: err.code, message: err.message });
+						return result;
+					}
+				}
+				return result;
+			});
+		} else if (mode === 'independently') {
+			return db.task(async t => {
+				const result: IDataObject[] = [];
+				for (let i = 0; i < items.length; i++) {
+					const itemCopy = getItemCopy(items[i], columnNames);
+					try {
+						Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning));
+					} catch (err) {
+						if (continueOnFail === false) throw err;
+						result.push({ ...itemCopy, code: err.code, message: err.message });
+					}
+				}
+				return result;
+			});
+		}
+	}
+	throw new Error('multiple, independently or transaction are valid options');
 }
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 9b62d57db5..ff30f77ecf 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -121,18 +121,6 @@ export class Postgres implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for the new rows.<br>You can use type casting with colons (:) like id:int.',
 			},
-			{
-				displayName: 'Return Fields',
-				name: 'returnFields',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['insert'],
-					},
-				},
-				default: '*',
-				description: 'Comma separated list of the fields that the operation will return',
-			},
 
 			// ----------------------------------
 			//         update
@@ -147,7 +135,7 @@ export class Postgres implements INodeType {
 					},
 				},
 				default: 'public',
-				required: true,
+				required: false,
 				description: 'Name of the schema the table belongs to',
 			},
 			{
@@ -174,8 +162,7 @@ export class Postgres implements INodeType {
 				},
 				default: 'id',
 				required: true,
-				description:
-					'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
+				description: 'Comma separated list of the properties which decides which rows in the database should be updated. Normally that would be "id".',
 			},
 			{
 				displayName: 'Columns',
@@ -191,6 +178,62 @@ export class Postgres implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for rows to update.<br>You can use type casting with colons (:) like id:int.',
 			},
+
+			// ----------------------------------
+			//         insert,update
+			// ----------------------------------
+			{
+				displayName: 'Return Fields',
+				name: 'returnFields',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['insert', 'update'],
+					},
+				},
+				default: '*',
+				description: 'Comma separated list of the fields that the operation will return',
+			},
+			// ----------------------------------
+			//         Additional fields
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Mode',
+						name: 'mode',
+						type: 'options',
+						options: [
+							{
+								name: 'Independently',
+								value: 'independently',
+								description: 'Execute each query independently',
+							},
+							{
+								name: 'Multiple queries',
+								value: 'multiple',
+								description: '<b>Default</b>. Sends multiple queries at once to database.',
+							},
+							{
+								name: 'Transaction',
+								value: 'transaction',
+								description: 'Executes all queries in a single transaction',
+							},
+						],
+						default: 'multiple',
+						description: [
+							'The way queries should be sent to database.',
+							'Can be used in conjunction with <b>Continue on Fail</b>.',
+							'See the docs for more examples',
+						].join('<br>'),
+					},
+				],
+			},
 		],
 	};
 
@@ -232,23 +275,19 @@ export class Postgres implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items);
+			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
-			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
+			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
 			// ----------------------------------
 			//         insert
 			// ----------------------------------
 
-			const [insertData, insertItems] = await pgInsert(this.getNodeParameter, pgp, db, items);
+			const insertData = await pgInsert(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
-			// Add the id to the data
 			for (let i = 0; i < insertData.length; i++) {
 				returnItems.push({
-					json: {
-						...insertData[i],
-						...insertItems[i],
-					},
+					json: insertData[i],
 				});
 			}
 		} else if (operation === 'update') {
@@ -256,7 +295,7 @@ export class Postgres implements INodeType {
 			//         update
 			// ----------------------------------
 
-			const updateItems = await pgUpdate(this.getNodeParameter, pgp, db, items);
+			const updateItems = await pgUpdate(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
 			returnItems = this.helpers.returnJsonArray(updateItems);
 		} else {
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index e3f8b124bc..67a1ceca41 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -9,7 +9,10 @@ import {
 
 import * as pgPromise from 'pg-promise';
 
-import { pgQuery } from '../Postgres/Postgres.node.functions';
+import {
+	pgInsert,
+	pgQuery,
+} from '../Postgres/Postgres.node.functions';
 
 export class QuestDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -81,7 +84,7 @@ export class QuestDb implements INodeType {
 			{
 				displayName: 'Schema',
 				name: 'schema',
-				type: 'string',
+				type: 'hidden', // Schema is used by pgInsert
 				displayOptions: {
 					show: {
 						operation: [
@@ -89,8 +92,7 @@ export class QuestDb implements INodeType {
 						],
 					},
 				},
-				default: 'public',
-				required: true,
+				default: '',
 				description: 'Name of the schema the table belongs to',
 			},
 			{
@@ -108,10 +110,79 @@ export class QuestDb implements INodeType {
 				required: true,
 				description: 'Name of the table in which to insert data to.',
 			},
+			{
+				displayName: 'Columns',
+				name: 'columns',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['insert'],
+					},
+				},
+				default: '',
+				placeholder: 'id,name,description',
+				description:
+					'Comma separated list of the properties which should used as columns for the new rows.',
+			},
 			{
 				displayName: 'Return Fields',
 				name: 'returnFields',
 				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['insert'],
+					},
+				},
+				default: '*',
+				description: 'Comma separated list of the fields that the operation will return',
+			},
+			// ----------------------------------
+			//         additional fields
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: [
+							'executeQuery',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Mode',
+						name: 'mode',
+						type: 'options',
+						options: [
+							{
+								name: 'Independently',
+								value: 'independently',
+								description: 'Execute each query independently',
+							},
+							{
+								name: 'Transaction',
+								value: 'transaction',
+								description: 'Executes all queries in a single transaction',
+							},
+						],
+						default: 'independently',
+						description: [
+							'The way queries should be sent to database.',
+							'Can be used in conjunction with <b>Continue on Fail</b>.',
+							'See the docs for more examples',
+						].join('<br>'),
+					},
+				],
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'hidden',
+				default: {},
 				displayOptions: {
 					show: {
 						operation: [
@@ -119,8 +190,6 @@ export class QuestDb implements INodeType {
 						],
 					},
 				},
-				default: '*',
-				description: 'Comma separated list of the fields that the operation will return',
 			},
 		],
 	};
@@ -156,37 +225,30 @@ export class QuestDb implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items);
+			const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject;
+			const mode = (additionalFields.mode || 'independently') as string;
 
-			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
+			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items, this.continueOnFail(), mode);
+
+			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
 			// ----------------------------------
 			//         insert
 			// ----------------------------------
-			const tableName = this.getNodeParameter('table', 0) as string;
+
+			// Transaction and multiple won't work properly with QuestDB.
+			// So we send queries independently.
+			await pgInsert(this.getNodeParameter, pgp, db, items, this.continueOnFail(), 'independently');
+
 			const returnFields = this.getNodeParameter('returnFields', 0) as string;
+			const table = this.getNodeParameter('table', 0) as string;
 
-			const queries : string[] = [];
-			items.map(item => {
-				const columns = Object.keys(item.json);
-
-				const values : string = columns.map((col : string) => {
-					if (typeof item.json[col] === 'string') {
-						return `\'${item.json[col]}\'`;
-					} else {
-						return item.json[col];
-					}
-				}).join(',');
-
-				const query = `INSERT INTO ${tableName} (${columns.join(',')}) VALUES (${values});`;
- 				queries.push(query);
+			const insertData = await db.any('SELECT ${columns:name} from ${table:name}', {
+				columns: returnFields.split(',').map(value => value.trim()).filter(value => !!value),
+				table,
 			});
 
-			await db.any(pgp.helpers.concat(queries));
-
-			const returnedItems = await db.any(`SELECT ${returnFields} from ${tableName}`);
-
-			returnItems = this.helpers.returnJsonArray(returnedItems as IDataObject[]);
+			returnItems = this.helpers.returnJsonArray(insertData);
 		} else {
 			await pgp.end();
 			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 72bf645efe..77ad53fb6a 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -137,20 +137,6 @@ export class TimescaleDb implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for the new rows.',
 			},
-			{
-				displayName: 'Return Fields',
-				name: 'returnFields',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: [
-							'insert',
-						],
-					},
-				},
-				default: '*',
-				description: 'Comma separated list of the fields that the operation will return',
-			},
 
 			// ----------------------------------
 			//         update
@@ -217,6 +203,61 @@ export class TimescaleDb implements INodeType {
 				description:
 					'Comma separated list of the properties which should used as columns for rows to update.',
 			},
+			// ----------------------------------
+			//         insert,update
+			// ----------------------------------
+			{
+				displayName: 'Return Fields',
+				name: 'returnFields',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['insert', 'update'],
+					},
+				},
+				default: '*',
+				description: 'Comma separated list of the fields that the operation will return',
+			},
+			// ----------------------------------
+			//         additional fields
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Mode',
+						name: 'mode',
+						type: 'options',
+						options: [
+							{
+								name: 'Independently',
+								value: 'independently',
+								description: 'Execute each query independently',
+							},
+							{
+								name: 'Multiple queries',
+								value: 'multiple',
+								description: '<b>Default</b>. Sends multiple queries at once to database.',
+							},
+							{
+								name: 'Transaction',
+								value: 'transaction',
+								description: 'Executes all queries in a single transaction',
+							},
+						],
+						default: 'multiple',
+						description: [
+							'The way queries should be sent to database.',
+							'Can be used in conjunction with <b>Continue on Fail</b>.',
+							'See the docs for more examples',
+						].join('<br>'),
+					},
+				],
+			},
 		],
 	};
 
@@ -251,22 +292,20 @@ export class TimescaleDb implements INodeType {
 			//         executeQuery
 			// ----------------------------------
 
-			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items);
+			const queryResult = await pgQuery(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
-			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
+			returnItems = this.helpers.returnJsonArray(queryResult);
 		} else if (operation === 'insert') {
 			// ----------------------------------
 			//         insert
 			// ----------------------------------
 
-			const [insertData, insertItems] = await pgInsert(this.getNodeParameter, pgp, db, items);
+			const insertData = await pgInsert(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
 			// Add the id to the data
 			for (let i = 0; i < insertData.length; i++) {
 				returnItems.push({
-					json: {
-						...insertData[i],
-					},
+					json: insertData[i],
 				});
 			}
 		} else if (operation === 'update') {
@@ -274,7 +313,7 @@ export class TimescaleDb implements INodeType {
 			//         update
 			// ----------------------------------
 
-			const updateItems = await pgUpdate(this.getNodeParameter, pgp, db, items);
+			const updateItems = await pgUpdate(this.getNodeParameter, pgp, db, items, this.continueOnFail());
 
 			returnItems = this.helpers.returnJsonArray(updateItems);
 
diff --git a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js
index bc3bcbb758..dd2b37ee30 100644
--- a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js
+++ b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.js
@@ -8,12 +8,14 @@ describe('pgUpdate', () => {
 			table: 'mytable',
 			schema: 'myschema',
 			updateKey: 'id',
-			columns: 'id,name'
+			columns: 'id,name',
+			additionalFields: {},
+			returnFields: '*',
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const none = jest.fn();
-		const db = {none};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -21,10 +23,9 @@ describe('pgUpdate', () => {
 			}
 		];
 
-		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
 
-		expect(db.none).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.id = t.id`);
-		expect(results).toEqual([updateItem]);
+		expect(db.any).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`);
 	});
 
 	it('runs query to update db if updateKey is not in columns', async () => {
@@ -33,12 +34,14 @@ describe('pgUpdate', () => {
 			table: 'mytable',
 			schema: 'myschema',
 			updateKey: 'id',
-			columns: 'name'
+			columns: 'name',
+			additionalFields: {},
+			returnFields: '*',
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const none = jest.fn();
-		const db = {none};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -48,8 +51,7 @@ describe('pgUpdate', () => {
 
 		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
 
-		expect(db.none).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.id = t.id`);
-		expect(results).toEqual([updateItem]);
+		expect(db.any).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values(1234,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`);
 	});
 
 	it('runs query to update db with cast as updateKey', async () => {
@@ -58,12 +60,14 @@ describe('pgUpdate', () => {
 			table: 'mytable',
 			schema: 'myschema',
 			updateKey: 'id:uuid',
-			columns: 'name'
+			columns: 'name',
+			additionalFields: {},
+			returnFields: '*',
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const none = jest.fn();
-		const db = {none};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -71,10 +75,9 @@ describe('pgUpdate', () => {
 			}
 		];
 
-		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
 
-		expect(db.none).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.id = t.id`);
-		expect(results).toEqual([updateItem]);
+		expect(db.any).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`);
 	});
 
 	it('runs query to update db with cast in target columns', async () => {
@@ -83,12 +86,14 @@ describe('pgUpdate', () => {
 			table: 'mytable',
 			schema: 'myschema',
 			updateKey: 'id',
-			columns: 'id:uuid,name'
+			columns: 'id:uuid,name',
+			additionalFields: {},
+			returnFields: '*',
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const none = jest.fn();
-		const db = {none};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -96,10 +101,9 @@ describe('pgUpdate', () => {
 			}
 		];
 
-		const results = await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
+		await PostgresFun.pgUpdate(getNodeParam, pgp, db, items)
 
-		expect(db.none).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.id = t.id`);
-		expect(results).toEqual([updateItem]);
+		expect(db.any).toHaveBeenCalledWith(`update \"myschema\".\"mytable\" as t set \"id\"=v.\"id\",\"name\"=v.\"name\" from (values('1234'::uuid,'test')) as v(\"id\",\"name\") WHERE v.\"id\" = t.\"id\" RETURNING *`);
 	});
 });
 
@@ -113,11 +117,12 @@ describe('pgInsert', () => {
 			schema: 'myschema',
 			columns: 'id,name,age',
 			returnFields: '*',
+			additionalFields: {},
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const manyOrNone = jest.fn();
-		const db = {manyOrNone};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -125,10 +130,9 @@ describe('pgInsert', () => {
 			},
 		];
 
-		const results = await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
+		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
 
-		expect(db.manyOrNone).toHaveBeenCalledWith(`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234,'test',34) RETURNING *`);
-		expect(results).toEqual([undefined, [insertItem]]);
+		expect(db.any).toHaveBeenCalledWith(`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234,'test',34) RETURNING *`);
 	});
 
 	it('runs query to insert with type casting', async () => {
@@ -138,11 +142,12 @@ describe('pgInsert', () => {
 			schema: 'myschema',
 			columns: 'id:int,name:text,age',
 			returnFields: '*',
+			additionalFields: {},
 		};
 		const getNodeParam = (key) => nodeParams[key];
 		const pgp = pgPromise();
-		const manyOrNone = jest.fn();
-		const db = {manyOrNone};
+		const any = jest.fn();
+		const db = {any};
 
 		const items = [
 			{
@@ -150,9 +155,8 @@ describe('pgInsert', () => {
 			},
 		];
 
-		const results = await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
+		await PostgresFun.pgInsert(getNodeParam, pgp, db, items);
 
-		expect(db.manyOrNone).toHaveBeenCalledWith(`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234::int,'test'::text,34) RETURNING *`);
-		expect(results).toEqual([undefined, [insertItem]]);
+		expect(db.any).toHaveBeenCalledWith(`insert into \"myschema\".\"mytable\"(\"id\",\"name\",\"age\") values(1234::int,'test'::text,34) RETURNING *`);
 	});
 });
diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json
index b7e291996e..cbcbf98937 100644
--- a/packages/nodes-base/tsconfig.json
+++ b/packages/nodes-base/tsconfig.json
@@ -1,7 +1,8 @@
 {
 	"compilerOptions": {
 		"lib": [
-			"es2017"
+			"es2017",
+			"es2019.array"
 		],
 		"types": [
 			"node",

From 81d8a9f332c152cbe5f80e8adda83b6a9b529b1e Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 24 Apr 2021 23:14:06 +0200
Subject: [PATCH 078/231] :boom: Deprecate Activation Trigger and add two new
 replacement nodes (#1680)

* Add Workflow & n8n Trigger nodes

* Update nodes descriptions & icons

* Remove Activation Trigger node

* Update nodes descriptions & Add timestamp and workflow_id

* Added breaking change notice and types to events

* :zap: Minor improvements

Co-authored-by: dali <servfrdali@yahoo.fr>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/cli/BREAKING-CHANGES.md              | 16 ++++
 .../nodes/ActivationTrigger.node.ts           | 73 -----------------
 packages/nodes-base/nodes/N8nTrigger.node.ts  | 71 ++++++++++++++++
 .../nodes-base/nodes/WorkflowTrigger.node.ts  | 81 +++++++++++++++++++
 packages/nodes-base/nodes/n8nTrigger.svg      | 24 ++++++
 packages/nodes-base/package.json              |  3 +-
 6 files changed, 194 insertions(+), 74 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/ActivationTrigger.node.ts
 create mode 100644 packages/nodes-base/nodes/N8nTrigger.node.ts
 create mode 100644 packages/nodes-base/nodes/WorkflowTrigger.node.ts
 create mode 100644 packages/nodes-base/nodes/n8nTrigger.svg

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 5435714e8e..55be53d7c7 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -5,6 +5,21 @@ This list shows all the versions which include breaking changes and how to upgra
 ## 0.117.0
 
 ### What changed?
+Removed the "Activation Trigger" node. This node was replaced by two other nodes.
+
+The "Activation Trigger" node was added on version 0.113.0 but was not fully compliant to UX, so we decided to refactor and change it ASAP so it affects the least possible users.
+
+The new nodes are "n8n Trigger" and "Workflow Trigger". Behavior-wise, the nodes do the same, we just split the functionality to make it more intuitive to users.
+
+### When is action necessary?
+
+If you use the "Activation Trigger" in any of your workflows, please replace it by the new nodes.
+
+### How to upgrade:
+
+Remove the previous node and add the new ones according to your workflows.
+
+----------------------------
 
 Changed the behavior for nodes that use Postgres Wire Protocol: Postgres, QuestDB, CrateDB and TimescaleDB.
 
@@ -22,6 +37,7 @@ By default, all `insert` operations will have `Return fields: *` as the default,
 
 Previously, the node would return all information it received, without taking into account what actually happened in the database.
 
+
 ## 0.113.0
 
 ### What changed?
diff --git a/packages/nodes-base/nodes/ActivationTrigger.node.ts b/packages/nodes-base/nodes/ActivationTrigger.node.ts
deleted file mode 100644
index 83c656ade1..0000000000
--- a/packages/nodes-base/nodes/ActivationTrigger.node.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { ITriggerFunctions } from 'n8n-core';
-import {
-	INodeType,
-	INodeTypeDescription,
-	ITriggerResponse,
-} from 'n8n-workflow';
-
-export class ActivationTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Activation Trigger',
-		name: 'activationTrigger',
-		icon: 'fa:play-circle',
-		group: ['trigger'],
-		version: 1,
-		description: 'Executes whenever the workflow becomes active.',
-		defaults: {
-			name: 'Activation Trigger',
-			color: '#00e000',
-		},
-		inputs: [],
-		outputs: ['main'],
-		properties: [
-			{
-				displayName: 'Events',
-				name: 'events',
-				type: 'multiOptions',
-				required: true,
-				default: [],
-				description: 'Specifies under which conditions an execution should happen:<br />' +
-					'- <b>Activation</b>: Workflow gets activated<br />' +
-					'- <b>Update</b>: Workflow gets saved while active<br>' +
-					'- <b>Start</b>: n8n starts or restarts',
-				options: [
-					{
-						name: 'Activation',
-						value: 'activate',
-						description: 'Run when workflow gets activated',
-					},
-					{
-						name: 'Start',
-						value: 'init',
-						description: 'Run when n8n starts or restarts',
-					},
-					{
-						name: 'Update',
-						value: 'update',
-						description: 'Run when workflow gets saved while it is active',
-					},
-				],
-			},
-		],
-	};
-
-
-	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
-		const events = this.getNodeParameter('events', []) as string[];
-
-		const activationMode = this.getActivationMode();
-
-		if (events.includes(activationMode)) {
-			this.emit([this.helpers.returnJsonArray([{ activation: activationMode }])]);
-		}
-
-		const self = this;
-		async function manualTriggerFunction() {
-			self.emit([self.helpers.returnJsonArray([{ activation: 'manual' }])]);
-		}
-
-		return {
-			manualTriggerFunction,
-		};
-	}
-}
diff --git a/packages/nodes-base/nodes/N8nTrigger.node.ts b/packages/nodes-base/nodes/N8nTrigger.node.ts
new file mode 100644
index 0000000000..245f65601e
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrigger.node.ts
@@ -0,0 +1,71 @@
+import { ITriggerFunctions } from 'n8n-core';
+import {
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
+
+type eventType = 'Instance started' | undefined;
+
+export class N8nTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'n8n Trigger',
+		name: 'n8nTrigger',
+		icon: 'file:n8nTrigger.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Handle events from your n8n instance',
+		defaults: {
+			name: 'n8n Trigger',
+			color: '#ff6d5a',
+		},
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'multiOptions',
+				required: true,
+				default: [],
+				description: 'Specifies under which conditions an execution should happen:<br />' +
+					'- <b>Instance started</b>: Triggers when this n8n instance is started or re-started',
+				options: [
+					{
+						name: 'Instance started',
+						value: 'init',
+						description: 'Triggers when this n8n instance is started or re-started',
+					},
+				],
+			},
+		],
+	};
+
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+		const events = this.getNodeParameter('events', []) as string[];
+
+		const activationMode = this.getActivationMode();
+
+		if (events.includes(activationMode)) {
+			let event: eventType;
+			if (activationMode === 'init') {
+				event = 'Instance started';
+			}
+			this.emit([
+				this.helpers.returnJsonArray([
+					{ event, timestamp: (new Date()).toISOString(), workflow_id: this.getWorkflow().id },
+				]),
+			]);
+		}
+
+		const self = this;
+		async function manualTriggerFunction() {
+			self.emit([self.helpers.returnJsonArray([{ event: 'Manual execution', timestamp: (new Date()).toISOString(), workflow_id: self.getWorkflow().id }])]);
+		}
+
+		return {
+			manualTriggerFunction,
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/WorkflowTrigger.node.ts b/packages/nodes-base/nodes/WorkflowTrigger.node.ts
new file mode 100644
index 0000000000..dfd7f2190b
--- /dev/null
+++ b/packages/nodes-base/nodes/WorkflowTrigger.node.ts
@@ -0,0 +1,81 @@
+import { ITriggerFunctions } from 'n8n-core';
+import {
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
+
+type eventType = 'Workflow activated' | 'Workflow updated' | undefined;
+type activationType = 'activate' | 'update';
+
+export class WorkflowTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Workflow Trigger',
+		name: 'workflowTrigger',
+		icon: 'fa:network-wired',
+		group: ['trigger'],
+		version: 1,
+		description: 'Triggers based on various lifecycle events, like when a workflow is activated',
+		defaults: {
+			name: 'Workflow Trigger',
+			color: '#ff6d5a',
+		},
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'multiOptions',
+				required: true,
+				default: [],
+				description: 'Specifies under which conditions an execution should happen:<br />' +
+					'- <b>Active Workflow Updated</b>: Triggers when this workflow is updated<br />' +
+					'- <b>Workflow Activated</b>: Triggers when this workflow is activated',
+				options: [
+					{
+						name: 'Active Workflow Updated',
+						value: 'update',
+						description: 'Triggers when this workflow is updated',
+					},
+					{
+						name: 'Workflow Activated',
+						value: 'activate',
+						description: 'Triggers when this workflow is activated',
+					},
+				],
+			},
+		],
+	};
+
+
+	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
+		const events = this.getNodeParameter('events', []) as activationType[];
+
+		const activationMode = this.getActivationMode() as activationType;
+
+		if (events.includes(activationMode)) {
+			let event: eventType;
+			if (activationMode === 'activate') {
+				event = 'Workflow activated';
+			}
+			if (activationMode === 'update') {
+				event = 'Workflow updated';
+			}
+			this.emit([
+				this.helpers.returnJsonArray([
+					{ event, timestamp: (new Date()).toISOString(), workflow_id: this.getWorkflow().id },
+				]),
+			]);
+		}
+
+		const self = this;
+		async function manualTriggerFunction() {
+			self.emit([self.helpers.returnJsonArray([{ event: 'Manual execution', timestamp: (new Date()).toISOString(), workflow_id: self.getWorkflow().id }])]);
+		}
+
+		return {
+			manualTriggerFunction,
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/n8nTrigger.svg b/packages/nodes-base/nodes/n8nTrigger.svg
new file mode 100644
index 0000000000..5cc4cbc1f3
--- /dev/null
+++ b/packages/nodes-base/nodes/n8nTrigger.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="5 5 55 55" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;fill:#FF6D5A;}
+	.st1{fill:#FF6D5A;}
+</style>
+<path class="st0" d="M50.41,30.55v-1c0-0.55-0.45-1-1-1h-17.5v-2.5h4.5c1.1,0,2-0.9,2-2v-8c0-1.1-0.9-2-2-2h-12c-1.1,0-2,0.9-2,2v8
+	c0,1.1,0.9,2,2,2h4.5v2.5h-17.5c-0.55,0-1,0.45-1,1v1c0,0.55,0.45,1,1,1h6.5v2.5h-3.5c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2h10
+	c1.1,0,2-0.9,2-2v-8c0-1.1-0.9-2-2-2h-3.5v-2.5h19v2.5h-3.5c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2v-8
+	c0-1.1-0.9-2-2-2h-3.5v-2.5h6.5C49.96,31.55,50.41,31.1,50.41,30.55z M26.41,22.05v-4h8v4H26.41z M22.41,42.05h-6v-4h6V42.05z
+	 M44.41,42.05h-6v-4h6V42.05z"/>
+<path class="st1" d="M50.28,17.26c-2.39,0-4.4,1.64-4.97,3.86h-7.15c-2.8,0-5.08,2.28-5.08,5.08c0,1.4-1.14,2.54-2.54,2.54h-1.02
+	c-0.57-2.22-2.58-3.86-4.97-3.86c-2.39,0-4.4,1.64-4.97,3.86h-4.08c-0.57-2.22-2.58-3.86-4.97-3.86c-2.83,0-5.13,2.3-5.13,5.13
+	s2.3,5.13,5.13,5.13c2.39,0,4.4-1.64,4.97-3.86h4.08c0.57,2.22,2.58,3.86,4.97,3.86c2.37,0,4.37-1.62,4.95-3.81h1.03
+	c1.4,0,2.54,1.14,2.54,2.54c0,2.8,2.28,5.09,5.08,5.09h1.66c0.57,2.22,2.58,3.86,4.97,3.86c2.83,0,5.13-2.3,5.13-5.13
+	c0-2.83-2.3-5.13-5.13-5.13c-2.39,0-4.4,1.64-4.97,3.86h-1.66c-1.4,0-2.54-1.14-2.54-2.54c0-1.53-0.68-2.9-1.76-3.84
+	c1.07-0.93,1.76-2.31,1.76-3.84c0-1.4,1.14-2.54,2.54-2.54h7.15c0.57,2.22,2.58,3.86,4.97,3.86c2.83,0,5.13-2.3,5.13-5.13
+	S53.11,17.26,50.28,17.26z M10.54,32.61c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59s2.59,1.16,2.59,2.59
+	C13.13,31.45,11.97,32.61,10.54,32.61z M24.56,32.61c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59
+	c1.43,0,2.59,1.16,2.59,2.59C27.15,31.45,25.98,32.61,24.56,32.61z M44.8,35.11c1.43,0,2.59,1.16,2.59,2.59
+	c0,1.43-1.16,2.59-2.59,2.59c-1.43,0-2.59-1.16-2.59-2.59C42.21,36.27,43.37,35.11,44.8,35.11z M50.28,24.98
+	c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59c1.43,0,2.59,1.16,2.59,2.59C52.87,23.82,51.71,24.98,50.28,24.98z"/>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index c2dcda32b5..54bb70c5f4 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -271,7 +271,6 @@
       "dist/credentials/ZulipApi.credentials.js"
     ],
     "nodes": [
-      "dist/nodes/ActivationTrigger.node.js",
       "dist/nodes/ActiveCampaign/ActiveCampaign.node.js",
       "dist/nodes/ActiveCampaign/ActiveCampaignTrigger.node.js",
       "dist/nodes/AgileCrm/AgileCrm.node.js",
@@ -442,6 +441,7 @@
       "dist/nodes/MoveBinaryData.node.js",
       "dist/nodes/Msg91/Msg91.node.js",
       "dist/nodes/MySql/MySql.node.js",
+      "dist/nodes/N8nTrigger.node.js",
       "dist/nodes/Nasa/Nasa.node.js",
       "dist/nodes/NextCloud/NextCloud.node.js",
       "dist/nodes/NoOp.node.js",
@@ -539,6 +539,7 @@
       "dist/nodes/Webhook.node.js",
       "dist/nodes/Wekan/Wekan.node.js",
       "dist/nodes/Wordpress/Wordpress.node.js",
+      "dist/nodes/WorkflowTrigger.node.js",
       "dist/nodes/WooCommerce/WooCommerce.node.js",
       "dist/nodes/WooCommerce/WooCommerceTrigger.node.js",
       "dist/nodes/WriteBinaryFile.node.js",

From 3d7a2348df692b64c4cac999e8126332d41b2533 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 21:39:21 +0000
Subject: [PATCH 079/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.114.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 54bb70c5f4..6056f40f71 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.113.1",
+  "version": "0.114.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From a6a19862f2abe1c23da89d481b56be567161d723 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 21:40:22 +0000
Subject: [PATCH 080/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.87.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index a13b4f0b25..1295acde1b 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 91aa4252016631228ccac26cca2a1d083fab00df Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 21:41:32 +0000
Subject: [PATCH 081/231] :arrow_up: Set n8n-editor-ui@0.87.0 and
 n8n-nodes-base@0.114.0 on n8n

---
 packages/cli/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index a93df5d13f..29133bdad0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -104,8 +104,8 @@
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
     "n8n-core": "~0.68.0",
-    "n8n-editor-ui": "~0.86.0",
-    "n8n-nodes-base": "~0.113.0",
+    "n8n-editor-ui": "~0.87.0",
+    "n8n-nodes-base": "~0.114.0",
     "n8n-workflow": "~0.56.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 7f0f8deb6d76ad99fd5160c6a93b529f5c359a06 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 24 Apr 2021 21:41:33 +0000
Subject: [PATCH 082/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.117.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 29133bdad0..daa98944e7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.116.1",
+  "version": "0.117.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From b6d45e30efe05c2c0178bdd330acb74558c35def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 30 Apr 2021 20:37:46 +0200
Subject: [PATCH 083/231] :zap: Add self-hosted support to ERPNext (#1679)

---
 .../credentials/ERPNextApi.credentials.ts     | 40 ++++++++++++++++++-
 .../nodes/ERPNext/GenericFunctions.ts         | 27 ++++++++++---
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/credentials/ERPNextApi.credentials.ts b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
index d94210600e..1ad997f74c 100644
--- a/packages/nodes-base/credentials/ERPNextApi.credentials.ts
+++ b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
@@ -20,13 +20,51 @@ export class ERPNextApi implements ICredentialType {
 			type: 'string' as NodePropertyTypes,
 			default: '',
 		},
+		{
+			displayName: 'Environment',
+			name: 'environment',
+			type: 'options' as NodePropertyTypes,
+			default: 'cloudHosted',
+			options: [
+				{
+					name: 'Cloud-hosted',
+					value: 'cloudHosted',
+				},
+				{
+					name: 'Self-hosted',
+					value: 'selfHosted',
+				},
+			],
+		},
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
 			type: 'string' as NodePropertyTypes,
 			default: '',
 			placeholder: 'n8n',
-			description: 'ERPNext subdomain. For instance, entering n8n will make the url look like: https://n8n.erpnext.com/.',
+			description: 'Subdomain of cloud-hosted ERPNext instance. For example, "n8n" is the subdomain in: <code>https://n8n.erpnext.com</code>',
+			displayOptions: {
+				show: {
+					environment: [
+						'cloudHosted',
+					],
+				},
+			},
+		},
+		{
+			displayName: 'Domain',
+			name: 'domain',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			placeholder: 'https://www.mydomain.com',
+			description: 'Fully qualified domain name of self-hosted ERPNext instance.',
+			displayOptions: {
+				show: {
+					environment: [
+						'selfHosted',
+					],
+				},
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
index 08de44e8e0..4a85c0064a 100644
--- a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
@@ -24,8 +24,8 @@ export async function erpNextApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ) {
-
-	const credentials = this.getCredentials('erpNextApi');
+	const credentials = this.getCredentials('erpNextApi') as ERPNextApiCredentials;
+	const baseUrl = getBaseUrl(credentials);
 
 	if (credentials === undefined) {
 		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
@@ -40,7 +40,7 @@ export async function erpNextApiRequest(
 		method,
 		body,
 		qs: query,
-		uri: uri || `https://${credentials.subdomain}.erpnext.com${resource}`,
+		uri: uri || `${baseUrl}${resource}`,
 		json: true,
 	};
 
@@ -56,13 +56,12 @@ export async function erpNextApiRequest(
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-
 		if (error.statusCode === 403) {
-			throw new NodeApiError(this.getNode(), { message: `DocType unavailable.` });
+			throw new NodeApiError(this.getNode(), { message: 'DocType unavailable.' });
 		}
 
 		if (error.statusCode === 307) {
-			throw new NodeApiError(this.getNode(), { message:`Please ensure the subdomain is correct.` });
+			throw new NodeApiError(this.getNode(), { message: 'Please ensure the subdomain is correct.' });
 		}
 
 		throw new NodeApiError(this.getNode(), error);
@@ -95,3 +94,19 @@ export async function erpNextApiRequestAllItems(
 
 	return returnData;
 }
+
+/**
+ * Return the base API URL based on the user's environment.
+ */
+const getBaseUrl = ({ environment, domain, subdomain }: ERPNextApiCredentials) =>
+	environment === 'cloudHosted'
+		? `https://${subdomain}.erpnext.com`
+		: domain;
+
+type ERPNextApiCredentials = {
+	apiKey: string;
+	apiSecret: string;
+	environment: 'cloudHosted' | 'selfHosted';
+	subdomain?: string;
+	domain?: string;
+};

From 901551ae9905d20444c29726249543908761453e Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 15:19:59 -0400
Subject: [PATCH 084/231] :zap: Add delete folder operation to FTP Node (#1704)

* :zap: Add delete folder operation to FTP Node

* :zap: Minor improvement

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/nodes-base/nodes/Ftp.node.ts | 56 +++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Ftp.node.ts b/packages/nodes-base/nodes/Ftp.node.ts
index 12835376e0..ef254b055d 100644
--- a/packages/nodes-base/nodes/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp.node.ts
@@ -102,7 +102,7 @@ export class Ftp implements INodeType {
 					{
 						name: 'Delete',
 						value: 'delete',
-						description: 'Delete a file.',
+						description: 'Delete a file/folder.',
 					},
 					{
 						name: 'Download',
@@ -148,6 +148,46 @@ export class Ftp implements INodeType {
 				required: true,
 			},
 
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				displayOptions: {
+					show: {
+						operation: [
+							'delete',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Folder',
+						name: 'folder',
+						type: 'boolean',
+						default: false,
+						description: 'When set to true, folders can be deleted.',
+						required: true,
+					},
+					{
+						displayName: 'Recursive',
+						displayOptions: {
+							show: {
+								folder: [
+									true,
+								],
+							},
+						},
+						name: 'recursive',
+						type: 'boolean',
+						default: false,
+						description: 'If true, remove all files and directories in target directory.',
+						required: true,
+					},
+				],
+			},
+
 			// ----------------------------------
 			//         download
 			// ----------------------------------
@@ -401,8 +441,13 @@ export class Ftp implements INodeType {
 
 				if (operation === 'delete') {
 					const path = this.getNodeParameter('path', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
 
-					responseData = await sftp!.delete(path);
+					if (options.folder === true) {
+						responseData = await sftp!.rmdir(path, !!options.recursive);
+					} else {
+						responseData = await sftp!.delete(path);
+					}
 
 					returnItems.push({ json: { success: true } });
 				}
@@ -488,8 +533,13 @@ export class Ftp implements INodeType {
 
 				if (operation === 'delete') {
 					const path = this.getNodeParameter('path', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
 
-					responseData = await ftp!.delete(path);
+					if (options.folder === true) {
+						responseData = await ftp!.rmdir(path, !!options.recursive);
+					} else {
+						responseData = await ftp!.delete(path);
+					}
 
 					returnItems.push({ json: { success: true } });
 				}

From 144bf3ea00bb0d8531ad964fc3ca63d296a88677 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 15:22:46 -0400
Subject: [PATCH 085/231] :zap: Add svg logos to Facebook nodes (#1713)

---
 .../nodes/Facebook/FacebookGraphApi.node.ts     |   2 +-
 .../nodes/Facebook/FacebookTrigger.node.ts      |   2 +-
 packages/nodes-base/nodes/Facebook/facebook.png | Bin 2413 -> 0 bytes
 packages/nodes-base/nodes/Facebook/facebook.svg |  16 ++++++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/Facebook/facebook.png
 create mode 100644 packages/nodes-base/nodes/Facebook/facebook.svg

diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 0beabbb9b6..0e73c19863 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -20,7 +20,7 @@ export class FacebookGraphApi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Facebook Graph API',
 		name: 'facebookGraphApi',
-		icon: 'file:facebook.png',
+		icon: 'file:facebook.svg',
 		group: ['transform'],
 		version: 1,
 		description: 'Interacts with Facebook using the Graph API',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index d532bfc1a9..b462d83a10 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -29,7 +29,7 @@ export class FacebookTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Facebook Trigger',
 		name: 'facebookTrigger',
-		icon: 'file:facebook.png',
+		icon: 'file:facebook.svg',
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["appId"] +"/"+ $parameter["object"]}}',
diff --git a/packages/nodes-base/nodes/Facebook/facebook.png b/packages/nodes-base/nodes/Facebook/facebook.png
deleted file mode 100644
index 85e6670eeba4930e5b4a9ab96fdf727f4ccb038e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2413
zcmb7_c|4SB8^`b2%vdrrl%;GF*@{Hj8M}Csr7UfjlBG^BV^^3g89JQ?LzL_~)Nv#!
zidUf{ojS?B^~NMeMqb8PW*9T?GgAHW{`FqZ=kwgx=lNXs^|`;l=en+2FeDfUIA;eZ
z2LOWsa1eTcfB~-A$A$y~;Nk+b0RR|)f=K}c<iVf^z_tU_h7W)<Y{z%s1E#qd0|$T_
z0+5?A$DvhdP-fxo%@t7s`;oB({yo~f1o7P`3bzSnfw5a~Xk=(aaA=r{fvz4fwsCSn
z3bRAD;qTgTaea!{hH0P<Iel3){|m<^QP2kP7(fK(2pAr~@h}7)CU^mqp;Mq>8@90x
z00bNfLje&qMpR533TVdx7y|l+K#CyIB1nu#1Pl%kc%&2owNH8{PQ=<>e=CWsicV6=
zve{PZVemlhw4O|Bc(-l#{$vc}h}Et$vIpkr5oK<6btx?MqlN)Fk!}7xspWEEA2sZa
z&OY>vs>p4>ve4@geR;ysE3jTvOn$qjmbS5p=|LxFZ=YkwgMvfO#l*&4Orxe}T+O_Z
zmw)qC$(>&-tM1;bee}4Y@yXNYFaGFw+4<_vcYXZ>gG0k3<DVw~p87n^WG^l)uW-1l
zLP|*8uaMAtgHs5BME#(IB!NSm2si=-N5PRuDh$#Hfs-O2RrXm+qx5#_yKl7;F;FGh
zY$JQ@PjXYsDz$wegFb!W$b9!M|5iIjI7>G9jA59%{n2cVvK~l0xeX2@2*kk=Lh<wx
z!UUWR6!JtwMnwymE~lhk`N~Dl$^D8}Ua<*R_ppAGudV$XVedD@j}x1a3*RY6fh`b2
zqeamoVxkyPad9yTtUL}YDT!5*k(H8HQ&Hcgs-n76Q^!P4Q`>O&PE~z7eM2(~D=RB?
zJ%@kTTRNK%tt<pk5}3HSICcwG5r<Q>&{Ea1_`gjs0wfR{^5LQ4nz=`CuQP~JF&t`o
z6kO3xpJ^?)o>zQAVvNpgTiK$c-$RYBTKTK3Xp~l7G^XvszBOz7)Z}oreB;a$!&*mC
z1*-3s{HXXQw>i3o7&WfFzjKM?SH@&=qk~^}Ee2M_+_pGL^V+tmWj{iW3}!3(cn23Y
z$hzwE|Lo{no)^Sz`Q39>Rl@@jLeG)E51kAH{eKt=9*~-0v~?FhE4MQINZQ{fYj>?h
z8yk-@qX#rGE3v0uy7U(gnmwM_8_-VBoqsRie=@u53V{^dbf78BMK0-HaL+$6M!L@j
zdRWH)elTk`$7&f+-Qm)qeTNn@M){?2LcbF@AFO&(ua`9&Q5I97J+0}{fBr(JYuui)
zEdI5SQMZW<yyV!%X`n77!rp!26^FHaRKt>Tr{xkaAi1R76Njk1&Zf?Db-s~EuN%^z
zrm+&u%dT&0dAim!!$eb0R(1JtpP;FO9ZeF5*_IL1`HgH)TSM7MmiOzVsS9TjidK(t
z_?|e|@~3_UN~aYvYaH^=%#>#KDveBv%C^~uP4HBm?1p<oNF0Zo6lvQ0@@bywB=4~N
z#c0TpwpmJZ8M&ZKY@_=g>x%Jzt+FNn-6mH9Tnj0iLW&UKQR+$S+r!sghizxBDbuG-
zSCuB6-=S+V78H~3$ZK+yHP$K;B@acG)t9#>4y`B9aonO;=8uj{4yAMRX~RL<lT%(>
ziwIXF(cT)25xoExvQk3ToeJfG%wOy;X)xRdS%bCQ>#x_$DkpxEqUm5sY{k6gXpGWN
zu;-?-*-<o(9QWA=Rn|F`K64Lk->22AwcKAd#uw>JmUpW7m3C^90sytY0Zuqw;X;GP
z003}tXao}WS-X?SNm->2TIaiQ43>(Xm79Oq<;;@W=kLb9RSJ<%W2f+&Pio>x&)ZnH
z`nTx%lh~KVTt3-1-J>Cw%JZYlyE8xE=Q~_3KIGuz!JyF~kqT6aTmfiHt_X~G<!y)I
zMRv?p)`gnA$(8Nc;Tz<%syxrMvWpXd^gm5W$K3S`r+6WS&(5x<Clc9wN)cNCh$lFd
z4+f*u8+ToqP^RLkW&!9L;48CldUvHf&iAp-!KsnAbNq&(*qDN8-WcB@qk4aW$N9vo
z5w@A8i+=3l)dlI8;{HPdpp&(lU81!##v5ZjgQ$LVChodh>IJ9Uudt|@)XdLmIl*ZK
zX`g?}PN)zHh8NCB1c1R&(B%N#g`zNkC+x#Pim8z2vyw_5bhk2C|09^Nm~lBK{-zg}
z3GsO+m`T-LMa>EyT$XG0T0UdWnz1ukk4cNHr6>!wn5m6AeUL%5B(%LBT^ghvB6Amc
zU2{{Rm8ez*XTwX&Pmy576`q=6t<OEt3EO=ouSfvkTqbYc(#IGrgu%ds1&>QQsUH3M
zKefD?p@}{pE7n*#nUOI0K4EWz`4>uFQg6HhXH+i84He&+%aT|)AC!CxXBBTeRr#`V
zfznWD`Fpe&KmH;`V=b<iQI~s)^!8w*MVBi(A-_aU<gfQp9OLT(VC=W=l(gx;zE=gV
z1Q&?I8hA;^Br1*l(HY8-$RP}S`%#H8X~-M`yO3ABfG%CzFI!QQ+~T3YxwODnjPpXp
z8WwMrp)V=yZD0yO3gxJK8W#0}ymZXzp_JrAdrK4NNaNaZE(XLrS>M|&04Qny6p=S%
z<#{VSE^D`j?#ur5W@6-*fim&A!!4Y(M!9$er)oumaRE3Z0Lo4>q9DB}h#yXxD4)L9
zcdh~lrAU@~kv{J3;fQ6Z@V$8gpv8cS>rE`B-{xlV9=mn>aA(Wc#g4)fn=~g*acNkt
zP8^;OD83=dz{4M-=`SUsamKeJz-94bEU&q`&yL+^8_IQD@wVKlMjnpMwT_yczjSUz
zVj4TXGB#cpU7VF@L76;l^s|MOXYz8hEc4Tzi-U_f3mVt3W5gz-4w)Tanj7wkXRP3!
H35Nd*gH!z`

diff --git a/packages/nodes-base/nodes/Facebook/facebook.svg b/packages/nodes-base/nodes/Facebook/facebook.svg
new file mode 100644
index 0000000000..14969a7085
--- /dev/null
+++ b/packages/nodes-base/nodes/Facebook/facebook.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1877F2;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M59.5,30C59.5,13.71,46.29,0.5,30,0.5S0.5,13.71,0.5,30c0,14.72,10.79,26.93,24.89,29.14V38.53H17.9V30h7.49
+		v-6.5c0-7.39,4.4-11.48,11.14-11.48c3.23,0,6.6,0.58,6.6,0.58v7.26h-3.72c-3.66,0-4.81,2.27-4.81,4.61V30h8.18l-1.31,8.53h-6.87
+		v20.61C48.71,56.93,59.5,44.72,59.5,30z"/>
+	<path class="st1" d="M41.48,38.53L42.79,30h-8.18v-5.53c0-2.33,1.14-4.61,4.81-4.61h3.72V12.6c0,0-3.38-0.58-6.6-0.58
+		c-6.74,0-11.14,4.08-11.14,11.48V30H17.9v8.53h7.49v20.61c1.5,0.24,3.04,0.36,4.61,0.36s3.11-0.12,4.61-0.36V38.53H41.48z"/>
+</g>
+</svg>

From 029b1390ee737cd5d987aecfe7395542675a3434 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Fri, 30 Apr 2021 21:25:39 +0200
Subject: [PATCH 086/231] :bug: Fix a small bug on Xero Node (#1681)

---
 packages/nodes-base/nodes/Xero/Xero.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index 27369c647e..1f23e3620e 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -434,7 +434,6 @@ export class Xero implements INodeType {
 				}
 			}
 			if (resource === 'contact') {
-			}
 				if (operation === 'create') {
 					const organizationId = this.getNodeParameter('organizationId', i) as string;
 					const name = this.getNodeParameter('name', i) as string;
@@ -670,6 +669,7 @@ export class Xero implements INodeType {
 					responseData = await xeroApiRequest.call(this, 'POST', `/Contacts/${contactId}`, { organizationId, Contacts: [body] });
 					responseData = responseData.Contacts;
 				}
+			}
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {

From 444fe64bc1d30d4ab32b19dde544ec8842096a52 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 15:44:46 -0400
Subject: [PATCH 087/231] :zap: Handle comma separated binary properties
 (Gmail) (#1711)

---
 .../nodes/Google/Gmail/DraftDescription.ts    |  3 +-
 .../nodes/Google/Gmail/Gmail.node.ts          | 72 ++++++++++---------
 .../nodes/Google/Gmail/MessageDescription.ts  | 51 ++++++-------
 3 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
index b2fd38cd3e..ded9971f6a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/DraftDescription.ts
@@ -209,7 +209,8 @@ export const draftFields = [
 								name: 'property',
 								type: 'string',
 								default: '',
-								description: 'Name of the binary property containing the data to be added to the email as an attachment',
+								description: `Name of the binary property containing the data to be added to the email as an attachment.</br>
+								Multiples can be set separated by comma.`,
 							},
 						],
 					},
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
index 158c0de9b0..2fd4457849 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
@@ -325,28 +325,29 @@ export class Gmail implements INodeType {
 
 					if (additionalFields.attachmentsUi) {
 						const attachmentsUi = additionalFields.attachmentsUi as IDataObject;
-						let attachmentsBinary = [];
+						const attachmentsBinary = [];
 						if (!isEmpty(attachmentsUi)) {
 							if (attachmentsUi.hasOwnProperty('attachmentsBinary')
 								&& !isEmpty(attachmentsUi.attachmentsBinary)
 								&& items[i].binary) {
-								// @ts-ignore
-								attachmentsBinary = attachmentsUi.attachmentsBinary.map((value) => {
-									if (items[i].binary!.hasOwnProperty(value.property)) {
-										const aux: IAttachments = { name: '', content: '', type: '' };
-										aux.name = items[i].binary![value.property].fileName || 'unknown';
-										aux.content = items[i].binary![value.property].data;
-										aux.type = items[i].binary![value.property].mimeType;
-										return aux;
+								for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
+									for (const binaryProperty of (property as string).split(',')) {
+										if (items[i].binary![binaryProperty] !== undefined) {
+											const binaryData = items[i].binary![binaryProperty];
+											attachmentsBinary.push({
+												name: binaryData.fileName || 'unknown',
+												content: binaryData.data,
+												type: binaryData.mimeType,
+											});
+										}
 									}
-								});
+								}
 							}
 
 							qs = {
 								userId: 'me',
 								uploadType: 'media',
 							};
-
 							attachmentsList = attachmentsBinary;
 						}
 					}
@@ -408,32 +409,32 @@ export class Gmail implements INodeType {
 
 					if (additionalFields.attachmentsUi) {
 						const attachmentsUi = additionalFields.attachmentsUi as IDataObject;
-						let attachmentsBinary = [];
+						const attachmentsBinary = [];
 						if (!isEmpty(attachmentsUi)) {
 							if (attachmentsUi.hasOwnProperty('attachmentsBinary')
 								&& !isEmpty(attachmentsUi.attachmentsBinary)
 								&& items[i].binary) {
-								// @ts-ignore
-								attachmentsBinary = attachmentsUi.attachmentsBinary.map((value) => {
-									if (items[i].binary!.hasOwnProperty(value.property)) {
-										const aux: IAttachments = { name: '', content: '', type: '' };
-										aux.name = items[i].binary![value.property].fileName || 'unknown';
-										aux.content = items[i].binary![value.property].data;
-										aux.type = items[i].binary![value.property].mimeType;
-										return aux;
+								for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
+									for (const binaryProperty of (property as string).split(',')) {
+										if (items[i].binary![binaryProperty] !== undefined) {
+											const binaryData = items[i].binary![binaryProperty];
+											attachmentsBinary.push({
+												name: binaryData.fileName || 'unknown',
+												content: binaryData.data,
+												type: binaryData.mimeType,
+											});
+										}
 									}
-								});
+								}
 							}
 
 							qs = {
 								userId: 'me',
 								uploadType: 'media',
 							};
-
 							attachmentsList = attachmentsBinary;
 						}
 					}
-
 					// if no recipient is defined then grab the one who sent the email
 					if (toStr === '') {
 						endpoint = `/gmail/v1/users/me/messages/${id}`;
@@ -500,7 +501,7 @@ export class Gmail implements INodeType {
 						const dataPropertyNameDownload = additionalFields.dataPropertyAttachmentsPrefixName as string || 'attachment_';
 
 						nodeExecutionData = await parseRawEmail.call(this, responseData, dataPropertyNameDownload);
-					} else  {
+					} else {
 						nodeExecutionData = {
 							json: responseData,
 						};
@@ -628,28 +629,29 @@ export class Gmail implements INodeType {
 
 					if (additionalFields.attachmentsUi) {
 						const attachmentsUi = additionalFields.attachmentsUi as IDataObject;
-						let attachmentsBinary = [];
+						const attachmentsBinary = [];
 						if (!isEmpty(attachmentsUi)) {
 							if (attachmentsUi.hasOwnProperty('attachmentsBinary')
 								&& !isEmpty(attachmentsUi.attachmentsBinary)
 								&& items[i].binary) {
-								// @ts-ignore
-								attachmentsBinary = attachmentsUi.attachmentsBinary.map((value) => {
-									if (items[i].binary!.hasOwnProperty(value.property)) {
-										const aux: IAttachments = { name: '', content: '', type: '' };
-										aux.name = items[i].binary![value.property].fileName || 'unknown';
-										aux.content = items[i].binary![value.property].data;
-										aux.type = items[i].binary![value.property].mimeType;
-										return aux;
+								for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
+									for (const binaryProperty of (property as string).split(',')) {
+										if (items[i].binary![binaryProperty] !== undefined) {
+											const binaryData = items[i].binary![binaryProperty];
+											attachmentsBinary.push({
+												name: binaryData.fileName || 'unknown',
+												content: binaryData.data,
+												type: binaryData.mimeType,
+											});
+										}
 									}
-								});
+								}
 							}
 
 							qs = {
 								userId: 'me',
 								uploadType: 'media',
 							};
-
 							attachmentsList = attachmentsBinary;
 						}
 					}
diff --git a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
index 581a13cb3d..a860580951 100644
--- a/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/MessageDescription.ts
@@ -226,30 +226,6 @@ export const messageFields = [
 		},
 		default: {},
 		options: [
-			{
-				displayName: 'CC Email',
-				name: 'ccList',
-				type: 'string',
-				description: 'The email addresses of the copy recipients.',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add CC Email',
-				},
-				placeholder: 'info@example.com',
-				default: [],
-			},
-			{
-				displayName: 'BCC Email',
-				name: 'bccList',
-				type: 'string',
-				description: 'The email addresses of the blind copy recipients.',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add BCC Email',
-				},
-				placeholder: 'info@example.com',
-				default: [],
-			},
 			{
 				displayName: 'Attachments',
 				name: 'attachmentsUi',
@@ -268,7 +244,8 @@ export const messageFields = [
 								name: 'property',
 								type: 'string',
 								default: '',
-								description: 'Name of the binary properties which contain data which should be added to email as attachment',
+								description: `Name of the binary property containing the data to be added to the email as an attachment.</br>
+								Multiples can be set separated by comma.`,
 							},
 						],
 					},
@@ -276,6 +253,30 @@ export const messageFields = [
 				default: '',
 				description: 'Array of supported attachments to add to the message.',
 			},
+			{
+				displayName: 'BCC Email',
+				name: 'bccList',
+				type: 'string',
+				description: 'The email addresses of the blind copy recipients.',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add BCC Email',
+				},
+				placeholder: 'info@example.com',
+				default: [],
+			},
+			{
+				displayName: 'CC Email',
+				name: 'ccList',
+				type: 'string',
+				description: 'The email addresses of the copy recipients.',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add CC Email',
+				},
+				placeholder: 'info@example.com',
+				default: [],
+			},
 		],
 	},
 	{

From c9d0b17291c75730e2b8e5b8e813ec364af53725 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Fri, 30 Apr 2021 21:58:23 +0200
Subject: [PATCH 088/231] :bug: Fix Post operations on Orbit Node (#1699)

---
 packages/nodes-base/nodes/Orbit/Orbit.node.ts      | 12 +++++++-----
 packages/nodes-base/nodes/Orbit/PostDescription.ts |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 42ec460492..ad0402c293 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -413,22 +413,24 @@ export class Orbit implements INodeType {
 					const url = this.getNodeParameter('url', i) as string;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const body: IDataObject = {
+						type: "post",
 						url,
 					};
 					if (additionalFields.publishedAt) {
-						body.published_at = additionalFields.publishedAt as string;
+						body.occurred_at = additionalFields.publishedAt as string;
 					}
 
-					responseData = await orbitApiRequest.call(this, 'POST', `/${workspaceId}/members/${memberId}/posts`, body);
+					responseData = await orbitApiRequest.call(this, 'POST', `/${workspaceId}/members/${memberId}/activities/`, body);
 					responseData = responseData.data;
 				}
 				if (operation === 'getAll') {
 					const workspaceId = this.getNodeParameter('workspaceId', i) as string;
 					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
 					const filters = this.getNodeParameter('filters', i) as IDataObject;
-					let endpoint = `/${workspaceId}/posts`;
+					let endpoint = `/${workspaceId}/activities`;
+					qs.type = 'content';
 					if (filters.memberId) {
-						endpoint = `/${workspaceId}/members/${filters.memberId}/posts`;
+						endpoint = `/${workspaceId}/members/${filters.memberId}/activities`;
 					}
 					if (returnAll === true) {
 						responseData = await orbitApiRequestAllItems.call(this, 'data', 'GET', endpoint, {}, qs);
@@ -443,7 +445,7 @@ export class Orbit implements INodeType {
 					const memberId = this.getNodeParameter('memberId', i) as string;
 					const postId = this.getNodeParameter('postId', i) as string;
 
-					responseData = await orbitApiRequest.call(this, 'DELETE', `/${workspaceId}/members/${memberId}/posts/${postId}`);
+					responseData = await orbitApiRequest.call(this, 'DELETE', `/${workspaceId}/members/${memberId}/activities/${postId}`);
 					responseData = { success: true };
 				}
 			}
diff --git a/packages/nodes-base/nodes/Orbit/PostDescription.ts b/packages/nodes-base/nodes/Orbit/PostDescription.ts
index 7cb798163a..f54a0be6c9 100644
--- a/packages/nodes-base/nodes/Orbit/PostDescription.ts
+++ b/packages/nodes-base/nodes/Orbit/PostDescription.ts
@@ -114,7 +114,7 @@ export const postFields = [
 		default: {},
 		options: [
 			{
-				displayName: 'Published At',
+				displayName: 'Occurred At',
 				name: 'publishedAt',
 				type: 'dateTime',
 				default: '',

From bf93a122ed8b12274020d9f7967369ff37d4019d Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 16:29:10 -0400
Subject: [PATCH 089/231] :zap: Add file name when downloading files (Google
 Drive) (#1710)

---
 .../nodes/Google/Drive/GoogleDrive.node.ts    | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 220aee7598..7deb795b68 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -274,6 +274,32 @@ export class GoogleDrive implements INodeType {
 				},
 				description: 'Name of the binary property to which to<br />write the data of the read file.',
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: [
+							'download',
+						],
+						resource: [
+							'file',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'File Name',
+						name: 'fileName',
+						type: 'string',
+						default: '',
+						description: 'File name. Ex: data.pdf',
+					},
+				],
+			},
 
 
 			// ----------------------------------
@@ -2011,6 +2037,7 @@ export class GoogleDrive implements INodeType {
 					// ----------------------------------
 
 					const fileId = this.getNodeParameter('fileId', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
 
 					const requestOptions = {
 						resolveWithFullResponse: true,
@@ -2021,10 +2048,15 @@ export class GoogleDrive implements INodeType {
 					const response = await googleApiRequest.call(this, 'GET', `/drive/v3/files/${fileId}`, {}, { alt: 'media' }, undefined, requestOptions);
 
 					let mimeType: string | undefined;
+					let fileName: string | undefined = undefined;
 					if (response.headers['content-type']) {
 						mimeType = response.headers['content-type'];
 					}
 
+					if (options.fileName) {
+						fileName = options.fileName as string;
+					}
+
 					const newItem: INodeExecutionData = {
 						json: items[i].json,
 						binary: {},
@@ -2043,7 +2075,7 @@ export class GoogleDrive implements INodeType {
 
 					const data = Buffer.from(response.body as string);
 
-					items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(data as unknown as Buffer, undefined, mimeType);
+					items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(data as unknown as Buffer, fileName, mimeType);
 
 				} else if (operation === 'list') {
 					// ----------------------------------

From 5d9280a7ad020b7da92b32fb6dd97527689da170 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 15:34:53 -0500
Subject: [PATCH 090/231] :shirt: Fix lint issue

---
 packages/nodes-base/nodes/Orbit/Orbit.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index ad0402c293..6059c0cfc4 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -413,7 +413,7 @@ export class Orbit implements INodeType {
 					const url = this.getNodeParameter('url', i) as string;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const body: IDataObject = {
-						type: "post",
+						type: 'post',
 						url,
 					};
 					if (additionalFields.publishedAt) {

From 7c418aafe7d5ee4a3e4721b201888f2be782b82b Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 16:35:42 -0400
Subject: [PATCH 091/231] :bug: Fix issue when looking up values on Google
 Sheets (#1708)

---
 packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index 80e7c6831d..2aa2541f23 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -415,6 +415,12 @@ export class GoogleSheet {
 				for (let i = 0; i < keys.length; i++) {
 					inputData[rowIndex][i] = '';
 				}
+			} else if (inputData[rowIndex].length < keys.length) {
+				for (let i = 0; i < keys.length; i++) {
+					if (inputData[rowIndex][i] === undefined) {
+						inputData[rowIndex].push('');
+					}
+				}
 			}
 		}
 		// Loop over all the lookup values and try to find a row to return

From efd40ea7a67d4a4bb38194a828024b2546d357e1 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 16:38:51 -0400
Subject: [PATCH 092/231] :bug: Fix issue of Redis never returning (#1716)

Fixes #1709. When the node returned an error the reject method was not called. Hence, the process kept running forever.
---
 packages/nodes-base/nodes/Redis/Redis.node.ts | 121 +++++++++---------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index ab01f3a0b3..ecf623ed51 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -451,77 +451,80 @@ export class Redis implements INodeType {
 			});
 
 			client.on('ready', async (err: Error | null) => {
+				try {
+					if (operation === 'info') {
+						const clientInfo = util.promisify(client.info).bind(client);
+						const result = await clientInfo();
 
-				if (operation === 'info') {
-					const clientInfo = util.promisify(client.info).bind(client);
-					const result = await clientInfo();
+						resolve(this.prepareOutputData([{ json: convertInfoToObject(result as unknown as string) }]));
+						client.quit();
 
-					resolve(this.prepareOutputData([{ json: convertInfoToObject(result as unknown as string) }]));
-					client.quit();
+					} else if (['delete', 'get', 'keys', 'set'].includes(operation)) {
+						const items = this.getInputData();
+						const returnItems: INodeExecutionData[] = [];
 
-				} else if (['delete', 'get', 'keys', 'set'].includes(operation)) {
-					const items = this.getInputData();
-					const returnItems: INodeExecutionData[] = [];
+						let item: INodeExecutionData;
+						for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+							item = { json: {} };
 
-					let item: INodeExecutionData;
-					for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-						item = { json: {} };
+							if (operation === 'delete') {
+								const keyDelete = this.getNodeParameter('key', itemIndex) as string;
 
-						if (operation === 'delete') {
-							const keyDelete = this.getNodeParameter('key', itemIndex) as string;
+								const clientDel = util.promisify(client.del).bind(client);
+								// @ts-ignore
+								await clientDel(keyDelete);
+								returnItems.push(items[itemIndex]);
+							} else if (operation === 'get') {
+								const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
+								const keyGet = this.getNodeParameter('key', itemIndex) as string;
+								const keyType = this.getNodeParameter('keyType', itemIndex) as string;
 
-							const clientDel = util.promisify(client.del).bind(client);
-							// @ts-ignore
-							await clientDel(keyDelete);
-							returnItems.push(items[itemIndex]);
-						} else if (operation === 'get') {
-							const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
-							const keyGet = this.getNodeParameter('key', itemIndex) as string;
-							const keyType = this.getNodeParameter('keyType', itemIndex) as string;
+								const value = await getValue(client, keyGet, keyType) || null;
 
-							const value = await getValue(client, keyGet, keyType) || null;
+								const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
 
-							const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
+								if (options.dotNotation === false) {
+									item.json[propertyName] = value;
+								} else {
+									set(item.json, propertyName, value);
+								}
 
-							if (options.dotNotation === false) {
-								item.json[propertyName] = value;
-							} else {
-								set(item.json, propertyName, value);
+								returnItems.push(item);
+							} else if (operation === 'keys') {
+								const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
+
+								const clientKeys = util.promisify(client.keys).bind(client);
+								const keys = await clientKeys(keyPattern);
+
+								const promises: {
+									[key: string]: GenericValue;
+								} = {};
+
+								for (const keyName of keys) {
+									promises[keyName] = await getValue(client, keyName);
+								}
+
+								for (const keyName of keys) {
+									item.json[keyName] = await promises[keyName];
+								}
+								returnItems.push(item);
+							} else if (operation === 'set') {
+								const keySet = this.getNodeParameter('key', itemIndex) as string;
+								const value = this.getNodeParameter('value', itemIndex) as string;
+								const keyType = this.getNodeParameter('keyType', itemIndex) as string;
+								const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
+								const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
+
+								await setValue(client, keySet, value, expire, ttl, keyType);
+								returnItems.push(items[itemIndex]);
 							}
-
-							returnItems.push(item);
-						} else if (operation === 'keys') {
-							const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
-
-							const clientKeys = util.promisify(client.keys).bind(client);
-							const keys = await clientKeys(keyPattern);
-
-							const promises: {
-								[key: string]: GenericValue;
-							} = {};
-
-							for (const keyName of keys) {
-								promises[keyName] = await getValue(client, keyName);
-							}
-
-							for (const keyName of keys) {
-								item.json[keyName] = await promises[keyName];
-							}
-							returnItems.push(item);
-						} else if (operation === 'set') {
-							const keySet = this.getNodeParameter('key', itemIndex) as string;
-							const value = this.getNodeParameter('value', itemIndex) as string;
-							const keyType = this.getNodeParameter('keyType', itemIndex) as string;
-							const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
-							const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
-
-							await setValue(client, keySet, value, expire, ttl, keyType);
-							returnItems.push(items[itemIndex]);
 						}
-					}
 
-					client.quit();
-					resolve(this.prepareOutputData(returnItems));
+						client.quit();
+						resolve(this.prepareOutputData(returnItems));
+					}
+				} catch (error) {
+					reject(error);
 				}
 			});
 		});

From 4cf80552247043b58292baf66da3a4128362c746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 30 Apr 2021 23:00:28 +0200
Subject: [PATCH 093/231] :sparkles: Add Kitemaker node (#1676)

* :zap: Add Kitemaker node

* :zap: Require status ID for workItem:create

* :pencil2: Reword button text

* :zap: Add credentials file

* :zap: Implement pagination

* :zap: Improvements

* :zap: Remove not needed parameter

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/KitemakerApi.credentials.ts   |  18 +
 .../nodes/Kitemaker/GenericFunctions.ts       |  85 ++++
 .../nodes/Kitemaker/Kitemaker.node.ts         | 321 +++++++++++++++
 .../descriptions/OrganizationDescription.ts   |  27 ++
 .../descriptions/SpaceDescription.ts          |  71 ++++
 .../Kitemaker/descriptions/UserDescription.ts |  71 ++++
 .../descriptions/WorkItemDescription.ts       | 372 ++++++++++++++++++
 .../nodes/Kitemaker/descriptions/index.ts     |   4 +
 .../nodes-base/nodes/Kitemaker/kitemaker.svg  |  18 +
 .../nodes-base/nodes/Kitemaker/mutations.ts   |  69 ++++
 .../nodes-base/nodes/Kitemaker/queries.ts     | 199 ++++++++++
 packages/nodes-base/package.json              |   2 +
 12 files changed, 1257 insertions(+)
 create mode 100644 packages/nodes-base/credentials/KitemakerApi.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/kitemaker.svg
 create mode 100644 packages/nodes-base/nodes/Kitemaker/mutations.ts
 create mode 100644 packages/nodes-base/nodes/Kitemaker/queries.ts

diff --git a/packages/nodes-base/credentials/KitemakerApi.credentials.ts b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
new file mode 100644
index 0000000000..2f372e0d31
--- /dev/null
+++ b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class KitemakerApi implements ICredentialType {
+	name = 'kitemakerApi';
+	displayName = 'Kitemaker API';
+	documentationUrl = 'kitemaker';
+	properties = [
+		{
+			displayName: 'Personal Access Token',
+			name: 'personalAccessToken',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
new file mode 100644
index 0000000000..6b623a6a5f
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
@@ -0,0 +1,85 @@
+import {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	IHookFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+export async function kitemakerRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
+	body: IDataObject = {},
+) {
+	const { personalAccessToken } = this.getCredentials('kitemakerApi') as { personalAccessToken: string };
+
+	const options = {
+		headers: {
+			Authorization: `Bearer ${personalAccessToken}`,
+		},
+		method: 'POST',
+		body,
+		uri: 'https://toil.kitemaker.co/developers/graphql',
+		json: true,
+	};
+
+	const responseData = await this.helpers.request!.call(this, options);
+
+	if (responseData.errors) {
+		throw new NodeApiError(this.getNode(), responseData);
+	}
+
+	return responseData;
+}
+
+export async function kitemakerRequestAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	body: { query: string; variables: { [key: string]: string } },
+) {
+	const resource = this.getNodeParameter('resource', 0) as 'space' | 'user' | 'workItem';
+	const [group, items] = getGroupAndItems(resource);
+
+	const returnAll = this.getNodeParameter('returnAll', 0, false) as boolean;
+	const limit = this.getNodeParameter('limit', 0, 0) as number;
+
+	const returnData: IDataObject[] = [];
+	let responseData;
+
+	do {
+		responseData = await kitemakerRequest.call(this, body);
+		body.variables.cursor = responseData.data[group].cursor;
+		returnData.push(...responseData.data[group][items]);
+
+		if (!returnAll && returnData.length > limit) {
+			return returnData.slice(0, limit);
+		}
+
+	} while (responseData.data[group].hasMore);
+
+	return returnData;
+}
+
+function getGroupAndItems(resource: 'space' | 'user' | 'workItem') {
+	const map: { [key: string]: { [key: string]: string } } = {
+		space: { group: 'organization', items: 'spaces' },
+		user: { group: 'organization', items: 'users' },
+		workItem: { group: 'workItems', items: 'workItems' },
+	};
+
+	return [
+		map[resource]['group'],
+		map[resource]['items'],
+	];
+}
+
+export function createLoadOptions(
+	resources: Array<{ name?: string; username?: string; title?: string; id: string }>,
+): Array<{ name: string; value: string }> {
+	return resources.map(option => {
+		if (option.username) return ({ name: option.username, value: option.id });
+		if (option.title) return ({ name: option.title, value: option.id });
+		return ({ name: option.name ?? 'Unnamed', value: option.id });
+	});
+}
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
new file mode 100644
index 0000000000..650049be61
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -0,0 +1,321 @@
+import {
+	IExecuteFunctions
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription
+} from 'n8n-workflow';
+
+import {
+	organizationOperations,
+	spaceFields,
+	spaceOperations,
+	userFields,
+	userOperations,
+	workItemFields,
+	workItemOperations,
+} from './descriptions';
+
+import {
+	createLoadOptions,
+	kitemakerRequest,
+	kitemakerRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	getAllSpaces,
+	getAllUsers,
+	getAllWorkItems,
+	getLabels,
+	getOrganization,
+	getSpaces,
+	getStatuses,
+	getUsers,
+	getWorkItem,
+	getWorkItems,
+} from './queries';
+
+import {
+	createWorkItem,
+	editWorkItem,
+} from './mutations';
+
+export class Kitemaker implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Kitemaker',
+		name: 'kitemaker',
+		icon: 'file:kitemaker.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
+		description: 'Consume the Kitemaker GraphQL API',
+		defaults: {
+			name: 'Kitemaker',
+			color: '#662482',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'kitemakerApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Organization',
+						value: 'organization',
+					},
+					{
+						name: 'Space',
+						value: 'space',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+					{
+						name: 'Work Item',
+						value: 'workItem',
+					},
+				],
+				default: 'workItem',
+				required: true,
+				description: 'Resource to operate on.',
+			},
+			...organizationOperations,
+			...spaceOperations,
+			...spaceFields,
+			...userOperations,
+			...userFields,
+			...workItemOperations,
+			...workItemFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getLabels(this: ILoadOptionsFunctions) {
+				const responseData = await kitemakerRequest.call(this, { query: getLabels });
+				const { data: { organization: { spaces } } } = responseData;
+
+				return createLoadOptions(spaces[0].labels);
+			},
+
+			async getSpaces(this: ILoadOptionsFunctions) {
+				const responseData = await kitemakerRequest.call(this, { query: getSpaces });
+				const { data: { organization: { spaces } } } = responseData;
+
+				return createLoadOptions(spaces);
+			},
+
+			async getStatuses(this: ILoadOptionsFunctions) {
+				const responseData = await kitemakerRequest.call(this, { query: getStatuses });
+				const { data: { organization: { spaces } } } = responseData;
+
+				return createLoadOptions(spaces[0].statuses);
+			},
+
+			async getUsers(this: ILoadOptionsFunctions) {
+				const responseData = await kitemakerRequest.call(this, { query: getUsers });
+				const { data: { organization: { users } } } = responseData;
+
+				return createLoadOptions(users);
+			},
+
+			async getWorkItems(this: ILoadOptionsFunctions) {
+				const spaceId = this.getNodeParameter('spaceId', 0) as string;
+
+				const responseData = await kitemakerRequest.call(this, {
+					query: getWorkItems,
+					variables: { spaceId },
+				});
+
+				const { data: { workItems: { workItems } } } = responseData;
+
+				return createLoadOptions(workItems);
+			},
+
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		let responseData;
+		const returnData: IDataObject[] = [];
+
+		// https://github.com/kitemakerhq/docs/blob/main/kitemaker.graphql
+
+		for (let i = 0; i < items.length; i++) {
+
+			if (resource === 'organization') {
+
+				// *********************************************************************
+				//                           organization
+				// *********************************************************************
+
+				if (operation === 'get') {
+
+					// ----------------------------------
+					//         organization: get
+					// ----------------------------------
+
+					responseData = await kitemakerRequest.call(this, {
+						query: getOrganization,
+					});
+
+					returnData.push(responseData.data.organization);
+
+				}
+
+			} else if (resource === 'space') {
+
+				// *********************************************************************
+				//                             space
+				// *********************************************************************
+
+				if (operation === 'getAll') {
+
+					// ----------------------------------
+					//          space: getAll
+					// ----------------------------------
+
+					const allItems = await kitemakerRequestAllItems.call(this, {
+						query: getAllSpaces,
+						variables: {},
+					});
+
+					returnData.push(...allItems);
+
+				}
+
+			} else if (resource === 'user') {
+
+				// *********************************************************************
+				//                             user
+				// *********************************************************************
+
+				if (operation === 'getAll') {
+
+					// ----------------------------------
+					//          user: getAll
+					// ----------------------------------
+
+					const allItems = await kitemakerRequestAllItems.call(this, {
+						query: getAllUsers,
+						variables: {},
+					});
+
+					returnData.push(...allItems);
+
+				}
+
+			} else if (resource === 'workItem') {
+
+				// *********************************************************************
+				//                             workItem
+				// *********************************************************************
+
+				if (operation === 'create') {
+
+					// ----------------------------------
+					//         workItem: create
+					// ----------------------------------
+
+					const input = {
+						title: this.getNodeParameter('title', i) as string,
+						statusId: this.getNodeParameter('statusId', i) as string[],
+					};
+
+					if (!input.statusId.length) {
+						throw new Error('Please enter a status to set for the work item to create.');
+					}
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					if (Object.keys(additionalFields).length) {
+						Object.assign(input, additionalFields);
+					}
+
+					responseData = await kitemakerRequest.call(this, {
+						query: createWorkItem,
+						variables: { input },
+					});
+
+					returnData.push(responseData.data.createWorkItem.workItem);
+
+				} else if (operation === 'get') {
+
+					// ----------------------------------
+					//         workItem: get
+					// ----------------------------------
+
+					const workItemId = this.getNodeParameter('workItemId', i) as string;
+
+					responseData = await kitemakerRequest.call(this, {
+						query: getWorkItem,
+						variables: { workItemId },
+					});
+
+					returnData.push(responseData.data.workItem);
+
+				} else if (operation === 'getAll') {
+
+					// ----------------------------------
+					//         workItem: getAll
+					// ----------------------------------
+
+					const allItems = await kitemakerRequestAllItems.call(this, {
+						query: getAllWorkItems,
+						variables: {
+							spaceId: this.getNodeParameter('spaceId', i) as string,
+						},
+					});
+
+					returnData.push(...allItems);
+
+				} else if (operation === 'update') {
+
+					// ----------------------------------
+					//         workItem: update
+					// ----------------------------------
+
+					const input = {
+						id: this.getNodeParameter('workItemId', i),
+					};
+
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					if (!Object.keys(updateFields).length) {
+						throw new Error('Please enter at least one field to update for the work item.');
+					}
+
+					Object.assign(input, updateFields);
+
+					responseData = await kitemakerRequest.call(this, {
+						query: editWorkItem,
+						variables: { input },
+					});
+
+					returnData.push(responseData.data.editWorkItem.workItem);
+
+				}
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
new file mode 100644
index 0000000000..ee478b044f
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
@@ -0,0 +1,27 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const organizationOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform.',
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data on the logged-in user\'s organization.',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'organization',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
new file mode 100644
index 0000000000..0c48ab3c67
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
@@ -0,0 +1,71 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const spaceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'getAll',
+		description: 'Operation to perform.',
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Retrieve data on all the spaces in the<br>logged-in user\'s organization.',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'space',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const spaceFields = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Return all results.',
+		displayOptions: {
+			show: {
+				resource: [
+					'space',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 5,
+		description: 'The number of results to return.',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'space',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
new file mode 100644
index 0000000000..aca2711242
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
@@ -0,0 +1,71 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'getAll',
+		description: 'Operation to perform.',
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Retrieve data on all the users in the<br>logged-in user\'s organization.',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const userFields = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Return all results.',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 5,
+		description: 'The number of results to return.',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
new file mode 100644
index 0000000000..637b279fde
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
@@ -0,0 +1,372 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const workItemOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform.',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const workItemFields = [
+	// ----------------------------------
+	//         workItem: create
+	// ----------------------------------
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'Title of the work item to create.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Status ID',
+		name: 'statusId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getStatuses',
+		},
+		default: [],
+		required: true,
+		description: 'ID of the status to set on the item to create.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				description: 'Description of the item to create. Markdown supported.',
+			},
+			{
+				displayName: 'Effort',
+				name: 'effort',
+				type: 'options',
+				default: 'SMALL',
+				description: 'Effort to set for the item to create.',
+				options: [
+					{
+						name: 'Small',
+						value: 'SMALL',
+					},
+					{
+						name: 'Medium',
+						value: 'MEDIUM',
+					},
+					{
+						name: 'Large',
+						value: 'LARGE',
+					},
+				],
+			},
+			{
+				displayName: 'Impact',
+				name: 'impact',
+				type: 'options',
+				default: 'SMALL',
+				description: 'Impact to set for the item to create.',
+				options: [
+					{
+						name: 'Small',
+						value: 'SMALL',
+					},
+					{
+						name: 'Medium',
+						value: 'MEDIUM',
+					},
+					{
+						name: 'Large',
+						value: 'LARGE',
+					},
+				],
+			},
+			{
+				displayName: 'Label IDs',
+				name: 'labelIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getLabels',
+				},
+				default: [],
+				description: 'ID of the label to set on the item to create.',
+			},
+			{
+				displayName: 'Member IDs',
+				name: 'memberIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: [],
+				description: 'ID of the user to assign to the item to create.',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         workItem: get
+	// ----------------------------------
+	{
+		displayName: 'Work Item ID',
+		name: 'workItemId',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'ID of the work item to retrieve.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//         workItem: getAll
+	// ----------------------------------
+	{
+		displayName: 'Space ID',
+		name: 'spaceId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getSpaces',
+		},
+		default: [],
+		required: true,
+		description: 'ID of the space to retrieve the work items from.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Return all results.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 5,
+		description: 'The number of results to return.',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//         workItem: update
+	// ----------------------------------
+	{
+		displayName: 'Work Item ID',
+		name: 'workItemId',
+		type: 'string',
+		default: '',
+		required: true,
+		description: 'ID of the work item to update.',
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'workItem',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				description: 'Description of the item to update. Markdown supported.',
+			},
+			{
+				displayName: 'Effort',
+				name: 'effort',
+				type: 'options',
+				default: 'SMALL',
+				description: 'Effort to set for the item to update.',
+				options: [
+					{
+						name: 'Small',
+						value: 'SMALL',
+					},
+					{
+						name: 'Medium',
+						value: 'MEDIUM',
+					},
+					{
+						name: 'Large',
+						value: 'LARGE',
+					},
+				],
+			},
+			{
+				displayName: 'Impact',
+				name: 'impact',
+				type: 'options',
+				default: 'SMALL',
+				description: 'Impact to set for the item to update.',
+				options: [
+					{
+						name: 'Small',
+						value: 'SMALL',
+					},
+					{
+						name: 'Medium',
+						value: 'MEDIUM',
+					},
+					{
+						name: 'Large',
+						value: 'LARGE',
+					},
+				],
+			},
+			{
+				displayName: 'Status ID',
+				name: 'statusId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getStatuses',
+				},
+				default: [],
+				description: 'ID of the status to set on the item to update.',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'Title to set for the work item to update.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
new file mode 100644
index 0000000000..1e2d9a6b8e
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
@@ -0,0 +1,4 @@
+export * from './OrganizationDescription';
+export * from './SpaceDescription';
+export * from './UserDescription';
+export * from './WorkItemDescription';
diff --git a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
new file mode 100644
index 0000000000..b6053c44a2
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="170.000000pt" height="170.000000pt" viewBox="-30 -25 220.000000 220.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,170.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path fill="#662482" d="M1065 1445 c-302 -140 -560 -254 -572 -254 -17 -1 -61 50 -200 229
+-178 229 -206 256 -242 233 -14 -9 -16 -89 -19 -793 -1 -570 1 -786 9 -796 35
+-43 33 -46 852 774 558 558 787 794 787 809 0 26 -25 53 -48 52 -9 0 -264
+-115 -567 -254z"/>
+<path fill="#e61b73" d="M694 448 c-133 -134 -244 -251 -247 -260 -3 -9 2 -26 11 -38 16 -18
+67 -26 599 -85 320 -35 589 -62 597 -59 19 7 29 38 21 62 -3 9 -159 152 -346
+317 -241 212 -348 301 -367 303 -23 2 -59 -30 -268 -240z"/>
+</g>
+</svg>
diff --git a/packages/nodes-base/nodes/Kitemaker/mutations.ts b/packages/nodes-base/nodes/Kitemaker/mutations.ts
new file mode 100644
index 0000000000..be23cb45ab
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/mutations.ts
@@ -0,0 +1,69 @@
+// ----------------------------------
+//           mutations
+// ----------------------------------
+
+export const createWorkItem = `
+	mutation($input: CreateWorkItemInput!) {
+		createWorkItem(input: $input) {
+			workItem {
+				id
+				number
+				title
+				description
+				status {
+					id
+					name
+				}
+				members {
+					id
+					username
+				}
+				watchers {
+					id
+					username
+				}
+				labels {
+					id
+					name
+				}
+				effort
+				impact
+				updatedAt
+				createdAt
+			}
+		}
+	}
+`;
+
+export const editWorkItem = `
+	mutation ($input: EditWorkItemInput!) {
+		editWorkItem(input: $input) {
+			workItem {
+				id
+				number
+				title
+				description
+				status {
+					id
+					name
+				}
+				members {
+					id
+					username
+				}
+				watchers {
+					id
+					username
+				}
+				labels {
+					id
+					name
+				}
+				effort
+				impact
+				updatedAt
+				createdAt
+			}
+		}
+	}
+`;
diff --git a/packages/nodes-base/nodes/Kitemaker/queries.ts b/packages/nodes-base/nodes/Kitemaker/queries.ts
new file mode 100644
index 0000000000..74f584a7c7
--- /dev/null
+++ b/packages/nodes-base/nodes/Kitemaker/queries.ts
@@ -0,0 +1,199 @@
+// ----------------------------------
+//             queries
+// ----------------------------------
+
+export const getAllSpaces = `
+	query {
+		organization {
+			spaces {
+				id
+				name
+				labels {
+					id
+					name
+					color
+				}
+				statuses {
+					id
+					name
+					type
+					default
+				}
+			}
+		}
+	}
+`;
+
+export const getAllUsers = `
+	query {
+		organization {
+			users {
+				id
+				username
+			}
+		}
+	}
+`;
+
+export const getLabels = `
+	query {
+		organization {
+			spaces {
+				labels {
+					id
+					name
+					color
+				}
+			}
+		}
+	}
+`;
+
+export const getOrganization = `
+	query {
+		organization {
+			id
+			name
+		}
+	}
+`;
+
+export const getSpaces = `
+	query {
+		organization {
+			spaces {
+				id
+				name
+				labels {
+					id
+					name
+					color
+				}
+				statuses {
+					id
+					name
+					type
+					default
+				}
+			}
+		}
+	}
+`;
+
+export const getStatuses = `
+	query {
+		organization {
+			spaces {
+				statuses {
+					id
+					name
+					type
+					default
+				}
+			}
+		}
+	}
+`;
+
+export const getUsers = `
+	query {
+		organization {
+			users {
+				id
+				username
+			}
+		}
+	}
+`;
+
+export const getWorkItems = `
+	query($spaceId: ID!) {
+		workItems(spaceId: $spaceId) {
+			workItems {
+				id
+				title
+			}
+		}
+	}
+`;
+
+export const getWorkItem = `
+	query($workItemId: ID!) {
+		workItem(id: $workItemId) {
+			id
+			number
+			title
+			description
+			status {
+				id
+				name
+			}
+			sort
+			members {
+				id
+				username
+			}
+			watchers {
+				id
+				username
+			}
+			labels {
+				id
+				name
+			}
+			comments {
+				id
+				actor {
+					__typename
+				}
+				body
+				threadId
+				updatedAt
+				createdAt
+			}
+			effort
+			impact
+			updatedAt
+			createdAt
+		}
+	}
+`;
+
+export const getAllWorkItems = `
+	query($spaceId: ID!, $cursor: String) {
+		workItems(spaceId: $spaceId, cursor: $cursor) {
+			hasMore,
+			cursor,
+			workItems {
+				id
+				title
+				description
+				labels {
+					id
+				}
+				comments {
+					id
+					body
+					actor {
+						... on User {
+							id
+							username
+						}
+						... on IntegrationUser {
+							id
+							externalName
+						}
+						... on Integration {
+							id
+							type
+						}
+						... on Application {
+							id
+							name
+						}
+					}
+				}
+			}
+		}
+	}
+`;
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 6056f40f71..963d6c5912 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -133,6 +133,7 @@
       "dist/credentials/JotFormApi.credentials.js",
       "dist/credentials/Kafka.credentials.js",
       "dist/credentials/KeapOAuth2Api.credentials.js",
+      "dist/credentials/KitemakerApi.credentials.js",
       "dist/credentials/LemlistApi.credentials.js",
       "dist/credentials/LineNotifyOAuth2Api.credentials.js",
       "dist/credentials/LingvaNexApi.credentials.js",
@@ -406,6 +407,7 @@
       "dist/nodes/Kafka/KafkaTrigger.node.js",
       "dist/nodes/Keap/Keap.node.js",
       "dist/nodes/Keap/KeapTrigger.node.js",
+      "dist/nodes/Kitemaker/Kitemaker.node.js",
       "dist/nodes/Lemlist/Lemlist.node.js",
       "dist/nodes/Lemlist/LemlistTrigger.node.js",
       "dist/nodes/Line/Line.node.js",

From fc54f7c82b671c540480ab4baf0c0280e4e565f1 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 1 May 2021 00:35:34 +0200
Subject: [PATCH 094/231] :sparkles: Add query parameters for CrateDB,
 PostgresDB, TimescaleDB and QuestDB (Parametrized Queries) (#1577)

* Adding support to ParameterizedQuery on Postgres Node

* Created another parameter to toggle on replacement so it's clear to users what is happening.

* Fixed lint issues

* :zap: Formatting

* Improvements to questDB node so it is more consistent

* Fixed lint issues

* Fixed typing issue

* :zap: Apply suggestions BHesseldieck

Co-authored-by: Ben Hesseldieck <1849459+BHesseldieck@users.noreply.github.com>

* Standardized output for postgres and postgres-like nodes

This changes the behavior of CrateDB, Postgres, QuestDB and TimescaleDB
nodes.

The Execute Query operation used to execute multiple queries but return
the result from only one of the queries.

This change causes the node output to containt results from all queries
that ran, making the behavior more consistent across all n8n.

* Fixing lint issues

* :zap: Minor improvements

* :zap: Fix breaking changes files

Co-authored-by: Gustavo Arjones <gustavo.arjones@ank.app>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
Co-authored-by: Jan <janober@users.noreply.github.com>
Co-authored-by: Ben Hesseldieck <1849459+BHesseldieck@users.noreply.github.com>
---
 packages/cli/BREAKING-CHANGES.md              | 10 +++++
 .../nodes-base/nodes/CrateDb/CrateDb.node.ts  | 19 +++++++++-
 .../nodes/Postgres/Postgres.node.functions.ts | 37 +++++++++++++------
 .../nodes/Postgres/Postgres.node.ts           | 19 +++++++++-
 .../nodes-base/nodes/QuestDb/QuestDb.node.ts  | 21 +++++++++--
 .../nodes/TimescaleDb/TimescaleDb.node.ts     | 24 +++++++++---
 6 files changed, 105 insertions(+), 25 deletions(-)

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 55be53d7c7..428e8317c1 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,15 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.118.0
+
+### What changed?
+In the Postgres, CrateDB, QuestDB and TimescaleDB nodes the `Execute Query` operation returns the result from all queries executed instead of just one of the results.
+
+### When is action necessary?
+
+If you use any of the above mentioned nodes with the `Execute Query` operation and the result is relevant to you, you are encouraged to revisit your logic. The node output may now contain more information than before. This change was made so that the behavior is more consistent across n8n where input with multiple rows should yield results acccording all input data instead of only one. Please note: n8n was already running multiple queries based on input. Only the output was changed.
+
 ## 0.117.0
 
 ### What changed?
@@ -50,6 +59,7 @@ If you are using a Dropbox APP with permission type, "App Folder".
 ### How to upgrade:
 
 Open your Dropbox node's credentials and set the "APP Access Type" parameter to "App Folder".
+>>>>>>> master
 
 ## 0.111.0
 
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index da74abdd6c..4dc1130b52 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -80,9 +80,9 @@ export class CrateDb implements INodeType {
 					},
 				},
 				default: '',
-				placeholder: 'SELECT id, name FROM product WHERE id < 40',
+				placeholder: 'SELECT id, name FROM product WHERE quantity > $1 AND price <= $2',
 				required: true,
-				description: 'The SQL query to execute.',
+				description: 'The SQL query to execute. You can use n8n expressions or $1 and $2 in conjunction with query parameters.',
 			},
 
 			// ----------------------------------
@@ -235,6 +235,21 @@ export class CrateDb implements INodeType {
 							'See the docs for more examples',
 						].join('<br>'),
 					},
+					{
+						displayName: 'Query Parameters',
+						name: 'queryParams',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'executeQuery',
+								],
+							},
+						},
+						default: '',
+						placeholder: 'quantity,price',
+						description: 'Comma separated list of properties which should be used as query parameters.',
+					},
 				],
 			},
 		],
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index 30cf358579..1ba9440de3 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -60,27 +60,40 @@ export async function pgQuery(
 	getNodeParam: Function,
 	pgp: pgPromise.IMain<{}, pg.IClient>,
 	db: pgPromise.IDatabase<{}, pg.IClient>,
-	input: INodeExecutionData[],
+	items: INodeExecutionData[],
 	continueOnFail: boolean,
 	overrideMode?: string,
 ): Promise<IDataObject[]> {
 	const additionalFields = getNodeParam('additionalFields', 0) as IDataObject;
+
+	let valuesArray = [] as string[][];
+	if (additionalFields.queryParams) {
+		const propertiesString = additionalFields.queryParams as string;
+		const properties = propertiesString.split(',').map(column => column.trim());
+		const paramsItems = getItemsCopy(items, properties);
+		valuesArray = paramsItems.map((row) => properties.map(col => row[col])) as string[][];
+	}
+
+	const allQueries = [] as Array<{query: string, values?: string[]}>;
+	for (let i = 0; i < items.length; i++) {
+		const query = getNodeParam('query', i) as string;
+		const values = valuesArray[i];
+		const queryFormat = { query, values };
+		allQueries.push(queryFormat);
+	}
+
 	const mode = overrideMode ? overrideMode : (additionalFields.mode ?? 'multiple') as string;
 	if (mode === 'multiple') {
-		const queries: string[] = [];
-		for (let i = 0; i < input.length; i++) {
-			queries.push(getNodeParam('query', i) as string);
-		}
-		return (await db.multi(pgp.helpers.concat(queries))).flat(1);
+		return (await db.multi(pgp.helpers.concat(allQueries))).flat(1);
 	} else if (mode === 'transaction') {
 		return db.tx(async t => {
 			const result: IDataObject[] = [];
-			for (let i = 0; i < input.length; i++) {
+			for (let i = 0; i < allQueries.length; i++) {
 				try {
-					Array.prototype.push.apply(result, await t.any(getNodeParam('query', i) as string));
+					Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values));
 				} catch (err) {
 					if (continueOnFail === false) throw err;
-					result.push({ ...input[i].json, code: err.code, message: err.message });
+					result.push({ ...items[i].json, code: err.code, message: err.message });
 					return result;
 				}
 			}
@@ -89,12 +102,12 @@ export async function pgQuery(
 	} else if (mode === 'independently') {
 		return db.task(async t => {
 			const result: IDataObject[] = [];
-			for (let i = 0; i < input.length; i++) {
+			for (let i = 0; i < allQueries.length; i++) {
 				try {
-					Array.prototype.push.apply(result, await t.any(getNodeParam('query', i) as string));
+					Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values));
 				} catch (err) {
 					if (continueOnFail === false) throw err;
-					result.push({ ...input[i].json, code: err.code, message: err.message });
+					result.push({ ...items[i].json, code: err.code, message: err.message });
 				}
 			}
 			return result;
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index ff30f77ecf..c549bfab14 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -73,9 +73,9 @@ export class Postgres implements INodeType {
 					},
 				},
 				default: '',
-				placeholder: 'SELECT id, name FROM product WHERE id < 40',
+				placeholder: 'SELECT id, name FROM product WHERE quantity > $1 AND price <= $2',
 				required: true,
-				description: 'The SQL query to execute.',
+				description: 'The SQL query to execute. You can use n8n expressions or $1 and $2 in conjunction with query parameters.',
 			},
 
 			// ----------------------------------
@@ -232,6 +232,21 @@ export class Postgres implements INodeType {
 							'See the docs for more examples',
 						].join('<br>'),
 					},
+					{
+						displayName: 'Query Parameters',
+						name: 'queryParams',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'executeQuery',
+								],
+							},
+						},
+						default: '',
+						placeholder: 'quantity,price',
+						description: 'Comma separated list of properties which should be used as query parameters.',
+					},
 				],
 			},
 		],
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 67a1ceca41..03e26d41ed 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -73,9 +73,9 @@ export class QuestDb implements INodeType {
 					},
 				},
 				default: '',
-				placeholder: 'SELECT id, name FROM product WHERE id < 40',
+				placeholder: 'SELECT id, name FROM product WHERE quantity > $1 AND price <= $2',
 				required: true,
-				description: 'The SQL query to execute.',
+				description: 'The SQL query to execute. You can use n8n expressions or $1 and $2 in conjunction with query parameters.',
 			},
 
 			// ----------------------------------
@@ -176,6 +176,21 @@ export class QuestDb implements INodeType {
 							'See the docs for more examples',
 						].join('<br>'),
 					},
+					{
+						displayName: 'Query Parameters',
+						name: 'queryParams',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'executeQuery',
+								],
+							},
+						},
+						default: '',
+						placeholder: 'quantity,price',
+						description: 'Comma separated list of properties which should be used as query parameters.',
+					},
 				],
 			},
 			{
@@ -215,7 +230,7 @@ export class QuestDb implements INodeType {
 
 		const db = pgp(config);
 
-		let returnItems = [];
+		let returnItems: INodeExecutionData[] = [];
 
 		const items = this.getInputData();
 		const operation = this.getNodeParameter('operation', 0) as string;
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 77ad53fb6a..32e7590d47 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -11,7 +11,6 @@ import {
 } from 'n8n-workflow';
 
 import {
-	getItemCopy,
 	pgInsert,
 	pgQuery,
 	pgUpdate,
@@ -77,15 +76,13 @@ export class TimescaleDb implements INodeType {
 				},
 				displayOptions: {
 					show: {
-						operation: [
-							'executeQuery',
-						],
+						operation: ['executeQuery'],
 					},
 				},
 				default: '',
-				placeholder: 'SELECT id, name FROM product WHERE id < 40',
+				placeholder: 'SELECT id, name FROM product WHERE quantity > $1 AND price <= $2',
 				required: true,
-				description: 'The SQL query to execute.',
+				description: 'The SQL query to execute. You can use n8n expressions or $1 and $2 in conjunction with query parameters.',
 			},
 
 			// ----------------------------------
@@ -256,6 +253,21 @@ export class TimescaleDb implements INodeType {
 							'See the docs for more examples',
 						].join('<br>'),
 					},
+					{
+						displayName: 'Query Parameters',
+						name: 'queryParams',
+						type: 'string',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'executeQuery',
+								],
+							},
+						},
+						default: '',
+						placeholder: 'quantity,price',
+						description: 'Comma separated list of properties which should be used as query parameters.',
+					},
 				],
 			},
 		],

From f79bc633c032f2fe40846316b737beb64d48c71d Mon Sep 17 00:00:00 2001
From: Jan <janober@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:44:12 -0500
Subject: [PATCH 095/231] :sparkles: Extend Twist Node (#1721)

* Add get/getAll:messageConversation to Twist node

* Add delete:messageConversation to Twist node

* Add update:messageConversation to Twist node

* Add archive/unarchive/delete:channel to Twist node

* Add add/update/get/getAll/remove:Thread to Twist node

* Add add/update/get/getAll/remove:Comment to Twist node

* Lint fixes

* Fix operations's descriptions

* Enhance Twist node code

* Reorder attributes alphabetically

* Fix typos

* Fix the ouput of get:Comment operation

* Fix getAll:Comment & getAll:Thread operations outputs

* :bug: Add missing scopes and remove not needed parameters

Co-authored-by: dali <servfrdali@yahoo.fr>
---
 .../credentials/TwistOAuth2Api.credentials.ts |   2 +
 .../nodes/Twist/ChannelDescription.ts         |  44 +-
 .../nodes/Twist/CommentDescription.ts         | 561 +++++++++++++++++
 .../Twist/MessageConversationDescription.ts   | 315 +++++++++-
 .../nodes/Twist/ThreadDescription.ts          | 567 ++++++++++++++++++
 packages/nodes-base/nodes/Twist/Twist.node.ts | 482 ++++++++++++++-
 6 files changed, 1946 insertions(+), 25 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Twist/CommentDescription.ts
 create mode 100644 packages/nodes-base/nodes/Twist/ThreadDescription.ts

diff --git a/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
index 850a53dabc..3c6b820791 100644
--- a/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
@@ -6,7 +6,9 @@ import {
 const scopes = [
 	'attachments:write',
 	'channels:remove',
+	'comments:remove',
 	'messages:remove',
+	'threads:remove',
 	'workspaces:read',
 ];
 
diff --git a/packages/nodes-base/nodes/Twist/ChannelDescription.ts b/packages/nodes-base/nodes/Twist/ChannelDescription.ts
index 6412125330..fd0e33a3eb 100644
--- a/packages/nodes-base/nodes/Twist/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Twist/ChannelDescription.ts
@@ -15,11 +15,21 @@ export const channelOperations = [
 			},
 		},
 		options: [
+			{
+				name: 'Archive',
+				value: 'archive',
+				description: 'Archive a channel',
+			},
 			{
 				name: 'Create',
 				value: 'create',
 				description: 'Initiates a public or private channel-based conversation',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a channel',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -30,6 +40,11 @@ export const channelOperations = [
 				value: 'getAll',
 				description: 'Get all channels',
 			},
+			{
+				name: 'Unarchive',
+				value: 'unarchive',
+				description: 'Unarchive a channel',
+			},
 			{
 				name: 'Update',
 				value: 'update',
@@ -64,7 +79,7 @@ export const channelFields = [
 			},
 		},
 		required: true,
-		description: 'The id of the workspace.',
+		description: 'The ID of the workspace.',
 	},
 	{
 		displayName: 'Name',
@@ -156,28 +171,28 @@ export const channelFields = [
 					},
 				],
 				default: 0,
-				description: 'The color of the channel',
+				description: 'The color of the channel.',
 			},
 			{
 				displayName: 'Description',
 				name: 'description',
 				type: 'string',
 				default: '',
-				description: 'The description of the channel',
+				description: 'The description of the channel.',
 			},
 			{
 				displayName: 'Public',
 				name: 'public',
 				type: 'boolean',
 				default: false,
-				description: 'If enabled, the channel will be marked as public',
+				description: 'If enabled, the channel will be marked as public.',
 			},
 			{
 				displayName: 'Temp ID',
 				name: 'temp_id',
 				type: 'number',
 				default: -1,
-				description: 'The temporary id of the channel. It needs to be a negative number.',
+				description: 'The temporary ID of the channel. It needs to be a negative number.',
 			},
 			{
 				displayName: 'User IDs',
@@ -194,8 +209,9 @@ export const channelFields = [
 			},
 		],
 	},
+
 	/* -------------------------------------------------------------------------- */
-	/*                                  channel:get                               */
+	/*                                  channel:get/archive/unarchive/delete      */
 	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Channel ID',
@@ -205,7 +221,10 @@ export const channelFields = [
 		displayOptions: {
 			show: {
 				operation: [
+					'archive',
+					'delete',
 					'get',
+					'unarchive',
 				],
 				resource: [
 					'channel',
@@ -213,8 +232,9 @@ export const channelFields = [
 			},
 		},
 		required: true,
-		description: 'The ID of the channel',
+		description: 'The ID of the channel.',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                 channel:getAll                             */
 	/* -------------------------------------------------------------------------- */
@@ -302,7 +322,7 @@ export const channelFields = [
 				name: 'archived',
 				type: 'boolean',
 				default: false,
-				description: 'If enabled, only archived conversations are returned',
+				description: 'If enabled, only archived conversations are returned.',
 			},
 		],
 	},
@@ -400,28 +420,28 @@ export const channelFields = [
 					},
 				],
 				default: 0,
-				description: 'The color of the channel',
+				description: 'The color of the channel.',
 			},
 			{
 				displayName: 'Description',
 				name: 'description',
 				type: 'string',
 				default: '',
-				description: 'The description of the channel',
+				description: 'The description of the channel.',
 			},
 			{
 				displayName: 'Name',
 				name: 'name',
 				type: 'string',
 				default: '',
-				description: 'The name of the channel',
+				description: 'The name of the channel.',
 			},
 			{
 				displayName: 'Public',
 				name: 'public',
 				type: 'boolean',
 				default: false,
-				description: 'If enabled, the channel will be marked as public',
+				description: 'If enabled, the channel will be marked as public.',
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Twist/CommentDescription.ts b/packages/nodes-base/nodes/Twist/CommentDescription.ts
new file mode 100644
index 0000000000..0aa0500d1a
--- /dev/null
+++ b/packages/nodes-base/nodes/Twist/CommentDescription.ts
@@ -0,0 +1,561 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const commentOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new comment to a thread',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a comment',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get information about a comment',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all comments',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a comment',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const commentFields = [
+	/*-------------------------------------------------------------------------- */
+	/*                                comment:create                             */
+	/* ------------------------------------------------------------------------- */
+	{
+		displayName: 'Thread ID',
+		name: 'threadId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'comment',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the thread.',
+	},
+	{
+		displayName: 'Content',
+		name: 'content',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'comment',
+				],
+			},
+		},
+		required: true,
+		description: 'The content of the comment.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Actions',
+				name: 'actionsUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Action',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Action',
+						name: 'actionValues',
+						values: [
+							{
+								displayName: 'Action',
+								name: 'action',
+								type: 'options',
+								description: 'The action of the button.',
+								options: [
+									{
+										name: 'Open URL',
+										value: 'open_url',
+									},
+									{
+										name: 'Prefill Message',
+										value: 'prefill_message',
+									},
+									{
+										name: 'Send Reply',
+										value: 'send_reply',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Button Text',
+								name: 'button_text',
+								type: 'string',
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'send_reply',
+											'prefill_message',
+										],
+									},
+								},
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
+								options: [
+									{
+										name: 'Action',
+										value: 'action',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'URL',
+								name: 'url',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'open_url',
+										],
+									},
+								},
+								description: 'URL to redirect.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Attachments',
+				name: 'binaryProperties',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the property that holds the binary data. Multiple can be defined separated by comma.',
+			},
+			{
+				displayName: 'Direct Mentions',
+				name: 'direct_mentions',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that are directly mentioned.',
+			},
+			{
+				displayName: 'Mark thread position',
+				name: 'mark_thread_position',
+				type: 'boolean',
+				default: true,
+				description: 'By default, the position of the thread is marked.',
+			},
+			{
+				displayName: 'Recipients',
+				name: 'recipients',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that will attached to the comment.',
+			},
+			{
+				displayName: 'Temporary ID',
+				name: 'temp_id',
+				type: 'number',
+				default: 0,
+				description: 'The temporary ID of the comment.',
+			},
+			{
+				displayName: 'Send as integration',
+				name: 'send_as_integration',
+				type: 'boolean',
+				default: false,
+				description: 'Displays the integration as the comment creator.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  comment:get/delete                        */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Comment ID',
+		name: 'commentId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+					'delete',
+				],
+				resource: [
+					'comment',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the comment.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 comment:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Thread ID',
+		name: 'threadId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'comment',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the channel.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'As IDs',
+				name: 'as_ids',
+				type: 'boolean',
+				default: false,
+				description: 'If enabled, only the ids of the comments are returned.',
+			},
+			{
+				displayName: 'Ending Object Index',
+				name: 'to_obj_index',
+				type: 'number',
+				default: 50,
+				description: 'Limit comments ending at the specified object index.',
+			},
+			{
+				displayName: 'Newer Than',
+				name: 'newer_than_ts',
+				type: 'dateTime',
+				default: '',
+				description: 'Limits comments to those newer when the specified Unix time.',
+			},
+			{
+				displayName: 'Older Than',
+				name: 'older_than_ts',
+				type: 'dateTime',
+				default: '',
+				description: 'Limits comments to those older than the specified Unix time.',
+			},
+			{
+				displayName: 'Order By',
+				name: 'order_by',
+				type: 'options',
+				options: [
+					{
+						name: 'ASC',
+						value: 'ASC',
+					},
+					{
+						name: 'DESC',
+						value: 'DESC',
+					},
+				],
+				default: 'ASC',
+				description: 'The order of the comments returned - one of DESC or ASC.',
+			},
+			{
+				displayName: 'Starting Object Index',
+				name: 'from_obj_index',
+				type: 'number',
+				default: 0,
+				description: 'Limit comments starting at the specified object index.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  comment:update                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Comment ID',
+		name: 'commentId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'comment',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the comment.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'comment',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Actions',
+				name: 'actionsUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Action',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Action',
+						name: 'actionValues',
+						values: [
+							{
+								displayName: 'Action',
+								name: 'action',
+								type: 'options',
+								description: 'The action of the button.',
+								options: [
+									{
+										name: 'Open URL',
+										value: 'open_url',
+									},
+									{
+										name: 'Prefill Message',
+										value: 'prefill_message',
+									},
+									{
+										name: 'Send Reply',
+										value: 'send_reply',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Button Text',
+								name: 'button_text',
+								type: 'string',
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'send_reply',
+											'prefill_message',
+										],
+									},
+								},
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
+								options: [
+									{
+										name: 'Action',
+										value: 'action',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'URL',
+								name: 'url',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'open_url',
+										],
+									},
+								},
+								description: 'URL to redirect.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Attachments',
+				name: 'binaryProperties',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the property that holds the binary data. Multiple can be defined separated by comma.',
+			},
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content of the comment.',
+			},
+			{
+				displayName: 'Direct Mentions',
+				name: 'direct_mentions',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that are directly mentioned.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts b/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
index d81f1254dc..c08201339e 100644
--- a/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
+++ b/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
@@ -20,6 +20,26 @@ export const messageConversationOperations = [
 				value: 'create',
 				description: 'Create a message in a conversation',
 			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a message in a conversation',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a message in a conversation',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all messages in a conversation',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a message in a conversation',
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -91,7 +111,7 @@ export const messageConversationFields = [
 				],
 			},
 		},
-		description: `The content of the new message. Mentions can be used as [Name](twist-mention://user_id) for users or [Group name](twist-group-mention://group_id) for groups.`,
+		description: 'The content of the new message. Mentions can be used as <code>[Name](twist-mention://user_id)</code> for users or <code>[Group name](twist-group-mention://group_id)</code> for groups.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -108,7 +128,7 @@ export const messageConversationFields = [
 			},
 		},
 		default: {},
-		description: 'Other options to set',
+		description: 'Other options to set.',
 		placeholder: 'Add options',
 		options: [
 			{
@@ -128,7 +148,7 @@ export const messageConversationFields = [
 								displayName: 'Action',
 								name: 'action',
 								type: 'options',
-								description: 'The action of the button',
+								description: 'The action of the button.',
 								options: [
 									{
 										name: 'Open URL',
@@ -171,7 +191,7 @@ export const messageConversationFields = [
 								displayName: 'Type',
 								name: 'type',
 								type: 'options',
-								description: 'The type of the button, for now just action is available.',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
 								options: [
 									{
 										name: 'Action',
@@ -191,7 +211,7 @@ export const messageConversationFields = [
 										],
 									},
 								},
-								description: 'URL to redirect',
+								description: 'URL to redirect.',
 								default: '',
 							},
 						],
@@ -213,7 +233,7 @@ export const messageConversationFields = [
 					loadOptionsMethod: 'getUsers',
 				},
 				default: [],
-				description: `The users that are directly mentioned`,
+				description: 'The users that are directly mentioned.',
 			},
 			// {
 			// 	displayName: 'Direct Group Mentions ',
@@ -223,8 +243,289 @@ export const messageConversationFields = [
 			// 		loadOptionsMethod: 'getGroups',
 			// 	},
 			// 	default: [],
-			// 	description: `The groups that are directly mentioned`,
+			// 	description: 'The groups that are directly mentioned.',
 			// },
 		],
 	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                messageConversation:getAll                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Workspace ID',
+		name: 'workspaceId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getWorkspaces',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the workspace.',
+	},
+	{
+		displayName: 'Conversation ID',
+		name: 'conversationId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getConversations',
+			loadOptionsDependsOn: [
+				'workspaceId',
+			],
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the conversation.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		default: {},
+		description: 'Other options to set.',
+		options: [
+			{
+				displayName: 'Ending Object Index',
+				name: 'to_obj_index',
+				type: 'number',
+				default: 50,
+				description: 'Limit messages ending at the specified object index.',
+			},
+			{
+				displayName: 'Limit',
+				name: 'limit',
+				type: 'number',
+				default: 50,
+				description: 'Limits the number of messages returned.',
+			},
+			{
+				displayName: 'Order By',
+				name: 'order_by',
+				type: 'options',
+				default: 'ASC',
+				description: 'The order of the conversations returned - one of DESC or ASC.',
+				options: [
+					{
+						name: 'ASC',
+						value: 'ASC',
+					},
+					{
+						name: 'DESC',
+						value: 'DESC',
+					},
+				],
+			},
+			{
+				displayName: 'Starting Object Index',
+				name: 'from_obj_index',
+				type: 'number',
+				default: 0,
+				description: 'Limit messages starting at the specified object index.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                messageConversation:get/delete/update       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Message ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+					'get',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the conversation message.',
+	},
+	
+	/* -------------------------------------------------------------------------- */
+	/*                                messageConversation:update                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Conversation Message ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the conversation message.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'messageConversation',
+				],
+			},
+		},
+		default: {},
+		description: 'Other options to set.',
+		options: [
+			{
+				displayName: 'Actions',
+				name: 'actionsUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Action',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Action',
+						name: 'actionValues',
+						values: [
+							{
+								displayName: 'Action',
+								name: 'action',
+								type: 'options',
+								description: 'The action of the button.',
+								options: [
+									{
+										name: 'Open URL',
+										value: 'open_url',
+									},
+									{
+										name: 'Prefill Message',
+										value: 'prefill_message',
+									},
+									{
+										name: 'Send Reply',
+										value: 'send_reply',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Button Text',
+								name: 'button_text',
+								type: 'string',
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'send_reply',
+											'prefill_message',
+										],
+									},
+								},
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
+								options: [
+									{
+										name: 'Action',
+										value: 'action',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'URL',
+								name: 'url',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'open_url',
+										],
+									},
+								},
+								description: 'URL to redirect.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Attachments',
+				name: 'binaryProperties',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the property that holds the binary data. Multiple can be defined separated by comma.',
+			},
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content of the new message. Mentions can be used as <code>[Name](twist-mention://user_id)</code> for users or <code>[Group name](twist-group-mention://group_id)</code> for groups.',
+			},
+			{
+				displayName: 'Direct Mentions',
+				name: 'direct_mentions',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: [],
+				description: 'The users that are directly mentioned.',
+			},
+		],
+	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Twist/ThreadDescription.ts b/packages/nodes-base/nodes/Twist/ThreadDescription.ts
new file mode 100644
index 0000000000..4ce8f48a47
--- /dev/null
+++ b/packages/nodes-base/nodes/Twist/ThreadDescription.ts
@@ -0,0 +1,567 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const threadOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new thread in a channel',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a thread',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get information about a thread',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all threads',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a thread',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const threadFields = [
+	/*-------------------------------------------------------------------------- */
+	/*                                thread:create                              */
+	/* ------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the channel.',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The title of the new thread (1 < length < 300).',
+	},
+	{
+		displayName: 'Content',
+		name: 'content',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The content of the thread.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Actions',
+				name: 'actionsUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Action',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Action',
+						name: 'actionValues',
+						values: [
+							{
+								displayName: 'Action',
+								name: 'action',
+								type: 'options',
+								description: 'The action of the button.',
+								options: [
+									{
+										name: 'Open URL',
+										value: 'open_url',
+									},
+									{
+										name: 'Prefill Message',
+										value: 'prefill_message',
+									},
+									{
+										name: 'Send Reply',
+										value: 'send_reply',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Button Text',
+								name: 'button_text',
+								type: 'string',
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'send_reply',
+											'prefill_message',
+										],
+									},
+								},
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
+								options: [
+									{
+										name: 'Action',
+										value: 'action',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'URL',
+								name: 'url',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'open_url',
+										],
+									},
+								},
+								description: 'URL to redirect.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Attachments',
+				name: 'binaryProperties',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the property that holds the binary data. Multiple can be defined separated by comma.',
+			},
+			{
+				displayName: 'Direct Mentions',
+				name: 'direct_mentions',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that are directly mentioned.',
+			},
+			{
+				displayName: 'Recipients',
+				name: 'recipients',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that will attached to the thread.',
+			},
+			{
+				displayName: 'Send as integration',
+				name: 'send_as_integration',
+				type: 'boolean',
+				default: false,
+				description: 'Displays the integration as the thread creator.',
+			},
+			{
+				displayName: 'Temporary ID',
+				name: 'temp_id',
+				type: 'number',
+				default: 0,
+				description: 'The temporary ID of the thread.',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                  thread:get/delete                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Thread ID',
+		name: 'threadId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+					'delete',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the thread.',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 thread:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel ID',
+		name: 'channelId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the channel.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'As IDs',
+				name: 'as_ids',
+				type: 'boolean',
+				default: false,
+				description: 'If enabled, only the IDs of the threads are returned.',
+			},
+			{
+				displayName: 'Filter By',
+				name: 'filter_by',
+				type: 'options',
+				options: [
+					{
+						name: 'Attached to me',
+						value: 'attached_to_me',
+					},
+					{
+						name: 'Everyone',
+						value: 'everyone',
+					},
+					{
+						name: 'Starred',
+						value: 'is_starred',
+					},
+				],
+				default: '',
+				description: 'A filter can be one of <code>attached_to_me</code>, <code>everyone</code> and <code>is_starred</code>.',
+			},
+			{
+				displayName: 'Newer Than',
+				name: 'newer_than_ts',
+				type: 'dateTime',
+				default: '',
+				description: 'Limits threads to those newer when the specified Unix time.',
+			},
+			{
+				displayName: 'Older Than',
+				name: 'older_than_ts',
+				type: 'dateTime',
+				default: '',
+				description: 'Limits threads to those older than the specified Unix time.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  thread:update                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Thread ID',
+		name: 'threadId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'thread',
+				],
+			},
+		},
+		required: true,
+		description: 'The ID of the thread.',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'thread',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Actions',
+				name: 'actionsUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Action',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Action',
+						name: 'actionValues',
+						values: [
+							{
+								displayName: 'Action',
+								name: 'action',
+								type: 'options',
+								description: 'The action of the button.',
+								options: [
+									{
+										name: 'Open URL',
+										value: 'open_url',
+									},
+									{
+										name: 'Prefill Message',
+										value: 'prefill_message',
+									},
+									{
+										name: 'Send Reply',
+										value: 'send_reply',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'Button Text',
+								name: 'button_text',
+								type: 'string',
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Message',
+								name: 'message',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'send_reply',
+											'prefill_message',
+										],
+									},
+								},
+								description: 'The text for the action button.',
+								default: '',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The type of the button. (Currently only <code>action</code> is available).',
+								options: [
+									{
+										name: 'Action',
+										value: 'action',
+									},
+								],
+								default: '',
+							},
+							{
+								displayName: 'URL',
+								name: 'url',
+								type: 'string',
+								displayOptions: {
+									show: {
+										action: [
+											'open_url',
+										],
+									},
+								},
+								description: 'URL to redirect.',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Attachments',
+				name: 'binaryProperties',
+				type: 'string',
+				default: 'data',
+				description: 'Name of the property that holds the binary data. Multiple can be defined separated by comma.',
+			},
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content of the thread.',
+			},
+			{
+				displayName: 'Direct Mentions',
+				name: 'direct_mentions',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'workspaceId',
+					],
+				},
+				default: [],
+				description: 'The users that are directly mentioned.',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'The title of the thread (1 < length < 300).',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index d2fe9f18dd..3d9c70092c 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -29,7 +29,16 @@ import {
 	messageConversationOperations,
 } from './MessageConversationDescription';
 
+import {
+	threadFields,
+	threadOperations
+} from './ThreadDescription';
+import {
+	commentFields,
+	commentOperations
+} from './CommentDescription';
 import uuid = require('uuid');
+import * as moment from 'moment';
 
 export class Twist implements INodeType {
 	description: INodeTypeDescription = {
@@ -62,18 +71,30 @@ export class Twist implements INodeType {
 						name: 'Channel',
 						value: 'channel',
 					},
+					{
+						name: 'Comment',
+						value: 'comment',
+					},
 					{
 						name: 'Message Conversation',
 						value: 'messageConversation',
 					},
+					{
+						name: 'Thread',
+						value: 'thread',
+					},
 				],
 				default: 'messageConversation',
 				description: 'The resource to operate on.',
 			},
 			...channelOperations,
 			...channelFields,
+			...commentOperations,
+			...commentFields,
 			...messageConversationOperations,
 			...messageConversationFields,
+			...threadOperations,
+			...threadFields,
 		],
 	};
 
@@ -169,10 +190,15 @@ export class Twist implements INodeType {
 
 					responseData = await twistApiRequest.call(this, 'POST', '/channels/add', body);
 				}
+				//https://developer.twist.com/v3/#remove-channel
+				if (operation === 'delete') {
+					qs.id = this.getNodeParameter('channelId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/channels/remove', {}, qs);
+				}
 				//https://developer.twist.com/v3/#get-channel
 				if (operation === 'get') {
-					const channelId = this.getNodeParameter('channelId', i) as string;
-					qs.id = channelId;
+					qs.id = this.getNodeParameter('channelId', i) as string;
 
 					responseData = await twistApiRequest.call(this, 'GET', '/channels/getone', {}, qs);
 				}
@@ -202,6 +228,190 @@ export class Twist implements INodeType {
 
 					responseData = await twistApiRequest.call(this, 'POST', '/channels/update', body);
 				}
+				//https://developer.twist.com/v3/#archive-channel
+				if (operation === 'archive') {
+					qs.id = this.getNodeParameter('channelId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/channels/archive', {}, qs);
+				}
+				//https://developer.twist.com/v3/#unarchive-channel
+				if (operation === 'unarchive') {
+					qs.id = this.getNodeParameter('channelId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/channels/unarchive', {}, qs);
+				}
+			}
+			if (resource === 'comment') {
+				//https://developer.twist.com/v3/#add-comment
+				if (operation === 'create') {
+					const threadId = this.getNodeParameter('threadId', i) as string;
+					const content = this.getNodeParameter('content', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const body: IDataObject = {
+						thread_id: threadId,
+						content,
+					};
+					Object.assign(body, additionalFields);
+
+					if (body.actionsUi) {
+						const actions = (body.actionsUi as IDataObject).actionValues as IDataObject[];
+
+						if (actions) {
+							body.actions = actions;
+							delete body.actionsUi;
+						}
+					}
+
+					if (body.binaryProperties) {
+						const binaryProperties = (body.binaryProperties as string).split(',') as string[];
+
+						const attachments: IDataObject[] = [];
+
+						for (const binaryProperty of binaryProperties) {
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryProperty] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+							}
+
+							attachments.push(await twistApiRequest.call(
+								this,
+								'POST',
+								'/attachments/upload',
+								{},
+								{},
+								{
+									formData: {
+										file_name: {
+											value: Buffer.from(binaryData.data, BINARY_ENCODING),
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+										attachment_id: uuid(),
+									},
+								},
+							));
+						}
+
+						body.attachments = attachments;
+					}
+
+					if (body.direct_mentions) {
+						const directMentions: string[] = [];
+						for (const directMention of body.direct_mentions as number[]) {
+							directMentions.push(`[name](twist-mention://${directMention})`);
+						}
+						body.content = `${directMentions.join(' ')} ${body.content}`;
+					}
+
+					responseData = await twistApiRequest.call(this, 'POST', '/comments/add', body);
+				}
+				//https://developer.twist.com/v3/#remove-comment
+				if (operation === 'delete') {
+					qs.id = this.getNodeParameter('commentId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/comments/remove', {}, qs);
+				}
+				//https://developer.twist.com/v3/#get-comment
+				if (operation === 'get') {
+					qs.id = this.getNodeParameter('commentId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'GET', '/comments/getone', {}, qs);
+					responseData = responseData?.comment;
+				}
+				//https://developer.twist.com/v3/#get-all-comments
+				if (operation === 'getAll') {
+					const threadId = this.getNodeParameter('threadId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const filters = this.getNodeParameter('filters', i) as IDataObject;
+					qs.thread_id = threadId;
+
+					Object.assign(qs, filters);
+					if (!returnAll) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+					if (qs.older_than_ts) {
+						qs.older_than_ts = moment(qs.older_than_ts as string).unix();
+					}
+					if (qs.newer_than_ts) {
+						qs.newer_than_ts = moment(qs.newer_than_ts as string).unix();
+					}
+
+					responseData = await twistApiRequest.call(this, 'GET', '/comments/get', {}, qs);
+					if (qs.as_ids) {
+						responseData = (responseData as Array<number>).map(id => ({ ID: id }));
+					}
+				}
+				//https://developer.twist.com/v3/#update-comment
+				if (operation === 'update') {
+					const commentId = this.getNodeParameter('commentId', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body: IDataObject = {
+						id: commentId,
+					};
+					Object.assign(body, updateFields);
+
+					if (body.actionsUi) {
+						const actions = (body.actionsUi as IDataObject).actionValues as IDataObject[];
+
+						if (actions) {
+							body.actions = actions;
+							delete body.actionsUi;
+						}
+					}
+
+					if (body.binaryProperties) {
+						const binaryProperties = (body.binaryProperties as string).split(',') as string[];
+
+						const attachments: IDataObject[] = [];
+
+						for (const binaryProperty of binaryProperties) {
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryProperty] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+							}
+
+							attachments.push(await twistApiRequest.call(
+								this,
+								'POST',
+								'/attachments/upload',
+								{},
+								{},
+								{
+									formData: {
+										file_name: {
+											value: Buffer.from(binaryData.data, BINARY_ENCODING),
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+										attachment_id: uuid(),
+									},
+								},
+							));
+						}
+
+						body.attachments = attachments;
+					}
+
+					if (body.direct_mentions) {
+						const directMentions: string[] = [];
+						for (const directMention of body.direct_mentions as number[]) {
+							directMentions.push(`[name](twist-mention://${directMention})`);
+						}
+						body.content = `${directMentions.join(' ')} ${body.content}`;
+					}
+
+					responseData = await twistApiRequest.call(this, 'POST', '/comments/update', body);
+				}
 			}
 			if (resource === 'messageConversation') {
 				//https://developer.twist.com/v3/#add-message-to-conversation
@@ -244,7 +454,7 @@ export class Twist implements INodeType {
 							attachments.push(await twistApiRequest.call(
 								this,
 								'POST',
-								`/attachments/upload`,
+								'/attachments/upload',
 								{},
 								{},
 								{
@@ -265,11 +475,11 @@ export class Twist implements INodeType {
 					}
 
 					if (body.direct_mentions) {
-						const direcMentions: string[] = [];
+						const directMentions: string[] = [];
 						for (const directMention of body.direct_mentions as number[]) {
-							direcMentions.push(`[name](twist-mention://${directMention})`);
+							directMentions.push(`[name](twist-mention://${directMention})`);
 						}
-						body.content = `${direcMentions.join(' ')} ${body.content}`;
+						body.content = `${directMentions.join(' ')} ${body.content}`;
 					}
 
 					// if (body.direct_group_mentions) {
@@ -282,6 +492,266 @@ export class Twist implements INodeType {
 
 					responseData = await twistApiRequest.call(this, 'POST', '/conversation_messages/add', body);
 				}
+				//https://developer.twist.com/v3/#get-message
+				if (operation === 'get') {
+					qs.id = this.getNodeParameter('id', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'GET', '/conversation_messages/getone', {}, qs);
+				}
+				//https://developer.twist.com/v3/#get-all-messages
+				if (operation === 'getAll') {
+					const conversationId = this.getNodeParameter('conversationId', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					qs.conversation_id = conversationId;
+					Object.assign(qs, additionalFields);
+
+					responseData = await twistApiRequest.call(this, 'GET', '/conversation_messages/get', {}, qs);
+				}
+				//https://developer.twist.com/v3/#remove-message-from-conversation
+				if (operation === 'delete') {
+					qs.id = this.getNodeParameter('id', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/conversation_messages/remove', {}, qs);
+				}
+				//https://developer.twist.com/v3/#update-message-in-conversation
+				if (operation === 'update') {
+					const id = this.getNodeParameter('id', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body: IDataObject = {
+						id,
+					};
+					Object.assign(body, updateFields);
+
+					if (body.actionsUi) {
+						const actions = (body.actionsUi as IDataObject).actionValues as IDataObject[];
+
+						if (actions) {
+							body.actions = actions;
+							delete body.actionsUi;
+						}
+					}
+
+					if (body.binaryProperties) {
+						const binaryProperties = (body.binaryProperties as string).split(',') as string[];
+
+						const attachments: IDataObject[] = [];
+
+						for (const binaryProperty of binaryProperties) {
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryProperty] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+							}
+
+							attachments.push(await twistApiRequest.call(
+								this,
+								'POST',
+								'/attachments/upload',
+								{},
+								{},
+								{
+									formData: {
+										file_name: {
+											value: Buffer.from(binaryData.data, BINARY_ENCODING),
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+										attachment_id: uuid(),
+									},
+								},
+							));
+						}
+
+						body.attachments = attachments;
+					}
+
+					if (body.direct_mentions) {
+						const directMentions: string[] = [];
+						for (const directMention of body.direct_mentions as number[]) {
+							directMentions.push(`[name](twist-mention://${directMention})`);
+						}
+						body.content = `${directMentions.join(' ')} ${body.content}`;
+					}
+
+					responseData = await twistApiRequest.call(this, 'POST', '/conversation_messages/update', body);
+				}
+			}
+			if (resource === 'thread') {
+				//https://developer.twist.com/v3/#add-thread
+				if (operation === 'create') {
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					const title = this.getNodeParameter('title', i) as string;
+					const content = this.getNodeParameter('content', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const body: IDataObject = {
+						channel_id: channelId,
+						content,
+						title,
+					};
+					Object.assign(body, additionalFields);
+
+					if (body.actionsUi) {
+						const actions = (body.actionsUi as IDataObject).actionValues as IDataObject[];
+
+						if (actions) {
+							body.actions = actions;
+							delete body.actionsUi;
+						}
+					}
+
+					if (body.binaryProperties) {
+						const binaryProperties = (body.binaryProperties as string).split(',') as string[];
+
+						const attachments: IDataObject[] = [];
+
+						for (const binaryProperty of binaryProperties) {
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryProperty] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+							}
+
+							attachments.push(await twistApiRequest.call(
+								this,
+								'POST',
+								'/attachments/upload',
+								{},
+								{},
+								{
+									formData: {
+										file_name: {
+											value: Buffer.from(binaryData.data, BINARY_ENCODING),
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+										attachment_id: uuid(),
+									},
+								},
+							));
+						}
+
+						body.attachments = attachments;
+					}
+
+					if (body.direct_mentions) {
+						const directMentions: string[] = [];
+						for (const directMention of body.direct_mentions as number[]) {
+							directMentions.push(`[name](twist-mention://${directMention})`);
+						}
+						body.content = `${directMentions.join(' ')} ${body.content}`;
+					}
+
+					responseData = await twistApiRequest.call(this, 'POST', '/threads/add', body);
+				}
+				//https://developer.twist.com/v3/#remove-thread
+				if (operation === 'delete') {
+					qs.id = this.getNodeParameter('threadId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'POST', '/threads/remove', {}, qs);
+				}
+				//https://developer.twist.com/v3/#get-thread
+				if (operation === 'get') {
+					qs.id = this.getNodeParameter('threadId', i) as string;
+
+					responseData = await twistApiRequest.call(this, 'GET', '/threads/getone', {}, qs);
+				}
+				//https://developer.twist.com/v3/#get-all-threads
+				if (operation === 'getAll') {
+					const channelId = this.getNodeParameter('channelId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const filters = this.getNodeParameter('filters', i) as IDataObject;
+					qs.channel_id = channelId;
+
+					Object.assign(qs, filters);
+					if (!returnAll) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+					if (qs.older_than_ts) {
+						qs.older_than_ts = moment(qs.older_than_ts as string).unix();
+					}
+					if (qs.newer_than_ts) {
+						qs.newer_than_ts = moment(qs.newer_than_ts as string).unix();
+					}
+
+					responseData = await twistApiRequest.call(this, 'GET', '/threads/get', {}, qs);
+					if (qs.as_ids) {
+						responseData = (responseData as Array<number>).map(id => ({ ID: id }));
+					}
+				}
+				//https://developer.twist.com/v3/#update-thread
+				if (operation === 'update') {
+					const threadId = this.getNodeParameter('threadId', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const body: IDataObject = {
+						id: threadId,
+					};
+					Object.assign(body, updateFields);
+
+					if (body.actionsUi) {
+						const actions = (body.actionsUi as IDataObject).actionValues as IDataObject[];
+
+						if (actions) {
+							body.actions = actions;
+							delete body.actionsUi;
+						}
+					}
+
+					if (body.binaryProperties) {
+						const binaryProperties = (body.binaryProperties as string).split(',') as string[];
+
+						const attachments: IDataObject[] = [];
+
+						for (const binaryProperty of binaryProperties) {
+
+							const item = items[i].binary as IBinaryKeyData;
+
+							const binaryData = item[binaryProperty] as IBinaryData;
+
+							if (binaryData === undefined) {
+								throw new Error(`No binary data property "${binaryProperty}" does not exists on item!`);
+							}
+
+							attachments.push(await twistApiRequest.call(
+								this,
+								'POST',
+								'/attachments/upload',
+								{},
+								{},
+								{
+									formData: {
+										file_name: {
+											value: Buffer.from(binaryData.data, BINARY_ENCODING),
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+										attachment_id: uuid(),
+									},
+								},
+							));
+						}
+
+						body.attachments = attachments;
+					}
+
+					if (body.direct_mentions) {
+						const directMentions: string[] = [];
+						for (const directMention of body.direct_mentions as number[]) {
+							directMentions.push(`[name](twist-mention://${directMention})`);
+						}
+						body.content = `${directMentions.join(' ')} ${body.content}`;
+					}
+
+					responseData = await twistApiRequest.call(this, 'POST', '/threads/update', body);
+				}
 			}
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);

From 0dd760f67dde3f98d07466e3bf8e0cf72ba40b2d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 20:07:08 -0500
Subject: [PATCH 096/231] :shirt: Fix lint issue

---
 packages/nodes-base/nodes/Twist/Twist.node.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 3d9c70092c..93ad3ae0b7 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -343,7 +343,7 @@ export class Twist implements INodeType {
 
 					responseData = await twistApiRequest.call(this, 'GET', '/comments/get', {}, qs);
 					if (qs.as_ids) {
-						responseData = (responseData as Array<number>).map(id => ({ ID: id }));
+						responseData = (responseData as number[]).map(id => ({ ID: id }));
 					}
 				}
 				//https://developer.twist.com/v3/#update-comment
@@ -683,7 +683,7 @@ export class Twist implements INodeType {
 
 					responseData = await twistApiRequest.call(this, 'GET', '/threads/get', {}, qs);
 					if (qs.as_ids) {
-						responseData = (responseData as Array<number>).map(id => ({ ID: id }));
+						responseData = (responseData as number[]).map(id => ({ ID: id }));
 					}
 				}
 				//https://developer.twist.com/v3/#update-thread

From 6c773d7a862b910e6bd503b74fc45491c03ca73e Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 30 Apr 2021 21:23:25 -0400
Subject: [PATCH 097/231] :sparkles: Add MQTT & Trigger Node (#1705)

* :sparkles: MQTT-Node

* :zap: Small fix

* :zap: Error when the publish method faile

* :zap: Improvements

* :zap: Improvements

* :zap: Add Send Input Data parameter

* :zap: Minor improvements

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/Mqtt.credentials.ts           |  18 +-
 packages/nodes-base/nodes/MQTT/Mqtt.node.json |  21 +++
 packages/nodes-base/nodes/MQTT/Mqtt.node.ts   | 171 ++++++++++++++++++
 .../nodes-base/nodes/MQTT/MqttTrigger.node.ts |  49 +++--
 packages/nodes-base/nodes/MQTT/mqtt.png       | Bin 2310 -> 0 bytes
 packages/nodes-base/nodes/MQTT/mqtt.svg       |  21 +++
 packages/nodes-base/package.json              |   1 +
 7 files changed, 259 insertions(+), 22 deletions(-)
 create mode 100644 packages/nodes-base/nodes/MQTT/Mqtt.node.json
 create mode 100644 packages/nodes-base/nodes/MQTT/Mqtt.node.ts
 delete mode 100644 packages/nodes-base/nodes/MQTT/mqtt.png
 create mode 100644 packages/nodes-base/nodes/MQTT/mqtt.svg

diff --git a/packages/nodes-base/credentials/Mqtt.credentials.ts b/packages/nodes-base/credentials/Mqtt.credentials.ts
index 05d4b0ec5c..a474e0501b 100644
--- a/packages/nodes-base/credentials/Mqtt.credentials.ts
+++ b/packages/nodes-base/credentials/Mqtt.credentials.ts
@@ -3,15 +3,11 @@ import {
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
-
 export class Mqtt implements ICredentialType {
 	name = 'mqtt';
 	displayName = 'MQTT';
 	documentationUrl = 'mqtt';
 	properties = [
-		// The credentials to get from user and save encrypted.
-		// Properties can be defined exactly in the same way
-		// as node properties.
 		{
 			displayName: 'Protocol',
 			name: 'protocol',
@@ -55,5 +51,19 @@ export class Mqtt implements ICredentialType {
 			},
 			default: '',
 		},
+		{
+			displayName: 'Clean Session',
+			name: 'clean',
+			type: 'boolean' as NodePropertyTypes,
+			default: true,
+			description: `Set to false to receive QoS 1 and 2 messages while offline.`,
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			description: 'Client ID. If left empty, one is autogenrated for you',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.json b/packages/nodes-base/nodes/MQTT/Mqtt.node.json
new file mode 100644
index 0000000000..595ac2b74b
--- /dev/null
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.mqtt",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Communication",
+		"Development"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/mqtt"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mqtt/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
new file mode 100644
index 0000000000..fc71fe6221
--- /dev/null
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
@@ -0,0 +1,171 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import * as mqtt from 'mqtt';
+
+import {
+	IClientOptions,
+} from 'mqtt';
+
+export class Mqtt implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'MQTT',
+		name: 'mqtt',
+		icon: 'file:mqtt.svg',
+		group: ['input'],
+		version: 1,
+		description: 'Push messages to MQTT',
+		defaults: {
+			name: 'MQTT',
+			color: '#9b27af',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'mqtt',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Topic',
+				name: 'topic',
+				type: 'string',
+				required: true,
+				default: '',
+				description: `The topic to publish to`,
+			},
+			{
+				displayName: 'Send Input Data',
+				name: 'sendInputData',
+				type: 'boolean',
+				default: true,
+				description: 'Send the the data the node receives as JSON.',
+			},
+			{
+				displayName: 'Message',
+				name: 'message',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						sendInputData: [
+							false,
+						],
+					},
+				},
+				default: '',
+				description: 'The message to publish',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'QoS',
+						name: 'qos',
+						type: 'options',
+						options: [
+							{
+								name: 'Received at Most Once',
+								value: 0,
+							},
+							{
+								name: 'Received at Least Once',
+								value: 1,
+							},
+							{
+								name: 'Exactly Once',
+								value: 2,
+							},
+						],
+						default: 0,
+						description: 'QoS subscription level',
+					},
+					{
+						displayName: 'Retain',
+						name: 'retain',
+						type: 'boolean',
+						default: false,
+						description: `Normally if a publisher publishes a message to a topic, and no one is subscribed to<br>
+						that topic the message is simply discarded by the broker. However the publisher can tell the broker<br>
+						to keep the last message on that topic by setting the retain flag to true.`,
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = (items.length as unknown) as number;
+		const credentials = this.getCredentials('mqtt') as IDataObject;
+
+		const protocol = credentials.protocol as string || 'mqtt';
+		const host = credentials.host as string;
+		const brokerUrl = `${protocol}://${host}`;
+		const port = credentials.port as number || 1883;
+		const clientId = credentials.clientId as string || `mqttjs_${Math.random().toString(16).substr(2, 8)}`;
+		const clean = credentials.clean as boolean;
+
+		const clientOptions: IClientOptions = {
+			port,
+			clean,
+			clientId,
+		};
+
+		if (credentials.username && credentials.password) {
+			clientOptions.username = credentials.username as string;
+			clientOptions.password = credentials.password as string;
+		}
+
+		const client = mqtt.connect(brokerUrl, clientOptions);
+		const sendInputData = this.getNodeParameter('sendInputData', 0) as boolean;
+
+		// tslint:disable-next-line: no-any
+		const data = await new Promise((resolve, reject): any => {
+			client.on('connect', () => {
+				for (let i = 0; i < length; i++) {
+
+					let message;
+					const topic = (this.getNodeParameter('topic', i) as string);
+					const options = (this.getNodeParameter('options', i) as IDataObject);
+
+					try {
+						if (sendInputData === true) {
+							message = JSON.stringify(items[i].json);
+						} else {
+							message = this.getNodeParameter('message', i) as string;
+						}
+						client.publish(topic, message, options);
+					} catch (e) {
+						reject(e);
+					}
+				}
+				//wait for the in-flight messages to be acked.
+				//needed for messages with QoS 1 & 2
+				client.end(false, {}, () => {
+					resolve([items]);
+				});
+
+				client.on('error', (e: string | undefined) => {
+					reject(e);
+				});
+			});
+		});
+
+		return data as INodeExecutionData[][];
+	}
+}
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
index c99078e919..94bbda8c18 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
@@ -13,14 +13,14 @@ import {
 import * as mqtt from 'mqtt';
 
 import {
-	IClientOptions,
+	IClientOptions, ISubscriptionMap,
 } from 'mqtt';
 
 export class MqttTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'MQTT Trigger',
 		name: 'mqttTrigger',
-		icon: 'file:mqtt.png',
+		icon: 'file:mqtt.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Listens to MQTT events',
@@ -43,7 +43,9 @@ export class MqttTrigger implements INodeType {
 				type: 'string',
 				default: '',
 				description: `Topics to subscribe to, multiple can be defined with comma.<br/>
-				wildcard characters are supported (+ - for single level and # - for multi level)`,
+				wildcard characters are supported (+ - for single level and # - for multi level)<br>
+				By default all subscription used QoS=0. To set a different QoS, write the QoS desired<br>
+				after the topic preceded by a colom. For Example: topicA:1,topicB:2`,
 			},
 			{
 				displayName: 'Options',
@@ -52,6 +54,13 @@ export class MqttTrigger implements INodeType {
 				placeholder: 'Add Option',
 				default: {},
 				options: [
+					{
+						displayName: 'JSON Parse Body',
+						name: 'jsonParseBody',
+						type: 'boolean',
+						default: false,
+						description: 'Try to parse the message to an object.',
+					},
 					{
 						displayName: 'Only Message',
 						name: 'onlyMessage',
@@ -59,13 +68,6 @@ export class MqttTrigger implements INodeType {
 						default: false,
 						description: 'Returns only the message property.',
 					},
-					{
-						displayName: 'JSON Parse Message',
-						name: 'jsonParseMessage',
-						type: 'boolean',
-						default: false,
-						description: 'Try to parse the message to an object.',
-					},
 				],
 			},
 		],
@@ -81,6 +83,13 @@ export class MqttTrigger implements INodeType {
 
 		const topics = (this.getNodeParameter('topics') as string).split(',');
 
+		const topicsQoS: IDataObject = {};
+
+		for (const data of topics) {
+			const [topic, qos] = data.split(':');
+			topicsQoS[topic] = (qos) ? { qos: parseInt(qos, 10) } : { qos: 0 };
+		}
+
 		const options = this.getNodeParameter('options') as IDataObject;
 
 		if (!topics) {
@@ -91,9 +100,13 @@ export class MqttTrigger implements INodeType {
 		const host = credentials.host as string;
 		const brokerUrl = `${protocol}://${host}`;
 		const port = credentials.port as number || 1883;
+		const clientId = credentials.clientId as string || `mqttjs_${Math.random().toString(16).substr(2, 8)}`;
+		const clean = credentials.clean as boolean;
 
 		const clientOptions: IClientOptions = {
 			port,
+			clean,
+			clientId,
 		};
 
 		if (credentials.username && credentials.password) {
@@ -108,20 +121,19 @@ export class MqttTrigger implements INodeType {
 		async function manualTriggerFunction() {
 			await new Promise((resolve, reject) => {
 				client.on('connect', () => {
-					client.subscribe(topics, (err, granted) => {
+					client.subscribe(topicsQoS as ISubscriptionMap, (err, granted) => {
 						if (err) {
 							reject(err);
 						}
 						client.on('message', (topic: string, message: Buffer | string) => { // tslint:disable-line:no-any
-
 							let result: IDataObject = {};
 
 							message = message.toString() as string;
 
-							if (options.jsonParseMessage) {
+							if (options.jsonParseBody) {
 								try {
 									message = JSON.parse(message.toString());
-								} catch (error) { }
+								} catch (err) { }
 							}
 
 							result.message = message;
@@ -129,10 +141,9 @@ export class MqttTrigger implements INodeType {
 
 							if (options.onlyMessage) {
 								//@ts-ignore
-								result = message;
+								result = [message as string];
 							}
-
-							self.emit([self.helpers.returnJsonArray([result])]);
+							self.emit([self.helpers.returnJsonArray(result)]);
 							resolve(true);
 						});
 					});
@@ -144,7 +155,9 @@ export class MqttTrigger implements INodeType {
 			});
 		}
 
-		manualTriggerFunction();
+		if (this.getMode() === 'trigger') {
+			manualTriggerFunction();
+		}
 
 		async function closeFunction() {
 			client.end();
diff --git a/packages/nodes-base/nodes/MQTT/mqtt.png b/packages/nodes-base/nodes/MQTT/mqtt.png
deleted file mode 100644
index 12c5f24952b3cc910c95bbd7809f443be26385cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2310
zcmV+h3HkPkP)<h;3K|Lk000e1NJLTq002Ay002A)0ssI2wVqBT000QhNkl<Zc-rmS
z3rrMe9suxp?vn)ziU<OV3RI~Nv?2mUB?uw{wLz;K+Dp^3m+IZcOX}I?qNbO--qo}B
z(qL-P`UtfZQG6_|p3*7;ZUsSs7QAXv0p+!<usb`CZ|*-kEH1FNWnHvwm`ygb-#3rn
zeDk00`_Incq9|fNwFw_VkDy1;Pk(ZbMuK?lgN9q@T6i;u<M<Oc0g2Mk!HfK+zc!g5
zi64R%k$|7bEN;ATkJge;Ufk#AdW3+u(HTb;5(F6fF`TsY)tveZf2>q_E1s6v?#7r7
z%bcyxM!zw0Kvh39%mcJA^YbP{8>J$jqFA1Ii=c~CW)-B$ut%UV5y!+MOV72}c9F`b
zk4CJh3L~=h%fN|ak4B3aDp*$BcHQ{nKqGZHm32CWz$nM^p9}iv(&F~o5%dUp1U-Tt
zL64wE&<<#x6$D0r8G<Hg^}{uJD=%0P%#aF#Qc2~o9o{MkRsn~ki@-<~MJWi!B?nHh
z6h$D;Nfl1ul$wO}-xW0CkuF#}B_j}un+<JuK5wNpl<e>h^_-YG9#X<PCHGs(I^d9a
zGw&PeGbuGdJ5JSpy{qBa?e1nXL6JVwyh4)3!NJQrkh#FJnz)WyV?eC0z@pwNyjRS2
z^R)+VN)`cEhm%7?^A>(WazOI#XsBv!Xg{=2uT^Vt5@$Nu<h}DJr;La4(w$Y8wpFWX
z^}Nl~BG*6r@Ko?z(W|B3oNS6*9~Qf9mXlL2BEznls5hP)T*V9g?(lpCMj?*SOdUEp
zC}CVmZVbW@ff2b2^B>$~)TD-16RXRYD77@KUb3U&+?LDFEf3H5Z~>3_&whKU<yzac
zmnKDRn88}v{c}&zO4=h_#hKZ$5k3pIMwyzsi+)!^kT?WJcT>-(kWrkO4~p`Qesfk^
zz482}a#BMfR%oth#R-byDeY7`>y%6A2lu*lV?9d$b+!1N%W8#YYQ~hsJEJ-pP2NGC
zfIj<H`73ABf@1?Ny!+*aKUXMqO18(Ebt*L|#=rPahO7Un2X~L9J1}<Ks-sIfZW(i<
zjzKuV8G}d=1;knSu;hv92NpJ6X+4y1lGf2s4wni<i)h71P1R)ST|(bD+vq*X6E3*j
zb3cZLS(U#eFwVbv|5uT}oOW^hm6E?zt*?7o>!UfaxbS{$JE^9vMkadW%ojG#ffe(!
z&Wsx6#WQHke6JOGNu7;d`{D{oKufo)(jEm1nw%K4EH}RSYU@YIdI@d6vx0Efg{#&S
zrIQ#rWOV(ho2_3PV>Zq@m{Qn&qiaL`FK+$!?%nd1xVPq9e6OPH-_;wwTCLP5a$^dN
zcTE&cTD!R!uY@iB%ltd#EqQ5rg(pq1bl`lyw7hsnH0%zd4q7@iF=*)^G}K}&rU_T9
zEy{2O-FT__(~TEjE6X(GT)SP?vV33S(Y0sC&-0u6>j*%XzF)QB>(wfqa$o$h&Rboi
zf@B`Bv)4^a*cSEe#ioy!f2Q=Jp~ION6Zm4@qRvL+zPJ;B#^eu%4Hx=eP5YkM{MQYc
zv<KbYWF9-i=lziV$=hQiGN+XMz4H9l%dcO_93AR?VqI}v!T*#xg{7TI&54hAIrQp>
zb!XlzS9vLTM(~dwv+{6qXQOFf+;Kp|)E6F85(5XI<&yv%yvJ0<8of*Cwua7}*@xpc
z&5nQjd04Fe^v%3<{mP@s;mblwc2u5w`|^S<bK?Fm8y5R0y{M<v>_5wQ)yXB4g33!f
z-CWs9t7$+7MEkBd3^8rmA6H29503$8Y22}$1RGkpMnA-u4o>u6vS)tBt*#H|ee%o%
z&tH|TfW`8&&(sxsvm!q!G-*QFKdXx0F{pLQmB*9)rjKDQtg*4%XNngLXkX@BKflGG
z^pyVe0rdEov6*>`O)cGfZM{do@JI?u+4I8vn)X8pfF|L9WR76PY%M($G>pl9&yS9O
zZ`S>q4mkBZkJ5K7&;@uL$vVTBm_^&>hNXrWc2!sGt)mnqsidMeP7h6+pwQ7OodO!G
z<gb;6o!8~wO<;wwGe)QUBev~^@zlC6pqb_Hu#K-m&^*6I+oM_xtwq1N1Os?)OoN4&
zVtQz3_$_eAV(wuH7EZBrzRc2SOu}{v95Dz62tq*+N|Jz95kzP+T1gQE=@aht;(-M1
zX!Y66rPT);AZf7)M4l0WN~tNizw6zpC?ZZoRs_f9D2Ahg++*lyxe#Gi(ZY(Xv^h~q
z9Qw8^?^*hmn@zM8ia5vcp8ncNNr6=d8%SV~w(y0IE%~sYeaz8q+Yat1#%x)hi)gum
z5g8tVo3IyP_BjzF`U*wDUM!`DoS;zAy<&_Qus}bwLwTS0vC(!nXLo<M*ePhJVt1fz
z)mF#$9%iwd(2j1YFCAVnX3IUaZa~X!#PB#T|Mxn4V%sndHvyD8&=1|5be}P7Vpu>9
zk8J%i(mgk}k{j*^c^t!??(gx%m_4T5hqhgZJhF2A-EI_1BLs_U!YOy69o?91XmG1o
zM#C^pyBRIJIVnyAw~Mjfm>veSEZ`6?NY|w_xl4@MyS!|Ds{7G)H-~Ux@OA03xUb9m
zLFj_i;<lP0|1AdFfjet{klQu!Lv$FGUG#lu_&Wa57cE!XU3mC8*!?(Ssh_q8>Y4P~
z!Zay0eB^UPDYHZ+JF2SQy`g-DcHuE|pIiRfcWGi$p7LG2Tkqn%4QE>sQZ%D=^6!0@
zZb|^-qo3G9K8~TLJ5BmmFR|5_LZyJj(j~VbU_Ab?_2467{hz`2mOF55U6HL2))Wv6
zV{QbSws%2bU|?UW?F5Ywg1QIh2e-eyU45wDRKbuOg$@0wKCHpRjS3QN7<_Q8(_eVs
z7qlHEdPXXzXN3k&2=dVA287nYw-BVpMySiwW$Nj&Sj{kxx%4i=<GjBh<-9nqR%<*p
zUS6JFz#R~%1JQD0!wkbP9LK@WC;#dV002tUv`VGIoL#}r->i{eRd~8@3dsPcox#uO
g9i|`o^piyYA3KLr@}Cs({r~^~07*qoM6N<$f^m3?c>n+a

diff --git a/packages/nodes-base/nodes/MQTT/mqtt.svg b/packages/nodes-base/nodes/MQTT/mqtt.svg
new file mode 100644
index 0000000000..3e202aa2ce
--- /dev/null
+++ b/packages/nodes-base/nodes/MQTT/mqtt.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 320 320" overflow="visible" xml:space="preserve">
+<g id="black_bg" display="none">
+</g>
+<g id="logos">
+	<g>
+		<path fill="#FFFFFF" d="M7.1,133.9v46.7c73.8,0.1,134,59.3,135,132.4h45.5C186.5,214.6,106.1,134.8,7.1,133.9z"/>
+		<path fill="#FFFFFF" d="M7.1,37.3v46.7c127.4,0.1,231.1,102.5,232.1,228.9h45.5C283.7,161.4,159.7,38.3,7.1,37.3z"/>
+		<path fill="#FFFFFF" d="M312.9,193.5V97.6c-11.8-16.1-25.9-33.4-40.4-47.8c-16-15.9-34.1-30.1-52.3-42.7H119
+			C207.3,38.9,278.1,107.2,312.9,193.5z"/>
+		<path fill="#660066" d="M7.1,180.6v117.1c0,8.4,6.8,15.3,15.3,15.3H142C141,239.8,80.9,180.7,7.1,180.6z"/>
+		<path fill="#660066" d="M7.1,84.1v49.8c99,0.9,179.4,80.7,180.4,179.1h51.7C238.2,186.6,134.5,84.2,7.1,84.1z"/>
+		<path fill="#660066" d="M312.9,297.6V193.5C278.1,107.2,207.3,38.9,119,7.1H22.4c-8.4,0-15.3,6.8-15.3,15.3v15
+			c152.6,0.9,276.6,124,277.6,275.6h13C306.1,312.9,312.9,306.1,312.9,297.6z"/>
+		<path fill="#660066" d="M272.6,49.8c14.5,14.4,28.6,31.7,40.4,47.8V22.4c0-8.4-6.8-15.3-15.3-15.3h-77.3
+			C238.4,19.7,256.6,33.9,272.6,49.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 963d6c5912..516fa72e4e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -439,6 +439,7 @@
       "dist/nodes/Mocean/Mocean.node.js",
       "dist/nodes/MondayCom/MondayCom.node.js",
       "dist/nodes/MongoDb/MongoDb.node.js",
+      "dist/nodes/MQTT/Mqtt.node.js",
       "dist/nodes/MQTT/MqttTrigger.node.js",
       "dist/nodes/MoveBinaryData.node.js",
       "dist/nodes/Msg91/Msg91.node.js",

From f2ec7ec6aca69dc1ce4ea41029198bdb51fe553a Mon Sep 17 00:00:00 2001
From: Harshil Agrawal <ghagrawal17@gmail.com>
Date: Sat, 1 May 2021 03:28:07 +0200
Subject: [PATCH 098/231] :zap: Add and update codex files (#1719)

---
 .../nodes/Dropbox/Dropbox.node.json           |  7 +++++++
 .../Eventbrite/EventbriteTrigger.node.json    |  7 +++++++
 .../Google/BigQuery/GoogleBigQuery.node.json  | 21 +++++++++++++++++++
 .../Google/Calendar/GoogleCalendar.node.json  |  5 +++++
 .../nodes/Google/Drive/GoogleDrive.node.json  |  5 +++++
 .../nodes/Google/Gmail/Gmail.node.json        |  5 +++++
 .../nodes/Google/Sheet/GoogleSheets.node.json |  5 +++++
 .../nodes/Hubspot/Hubspot.node.json           |  5 +++++
 .../nodes/Mailcheck/Mailcheck.node.json       |  8 ++++++-
 .../OneDrive/MicrosoftOneDrive.node.json      |  7 +++++++
 .../nodes-base/nodes/N8nTrigger.node.json     | 15 +++++++++++++
 .../nodes-base/nodes/Trello/Trello.node.json  |  5 +++++
 .../nodes/Trello/TrelloTrigger.node.json      |  7 +++++++
 .../nodes/WorkflowTrigger.node.json           | 15 +++++++++++++
 .../nodes/Zendesk/Zendesk.node.json           |  7 +++++++
 15 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json
 create mode 100644 packages/nodes-base/nodes/N8nTrigger.node.json
 create mode 100644 packages/nodes-base/nodes/WorkflowTrigger.node.json

diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.json b/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
index c4251d30f0..5ae88a50c4 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.dropbox/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
 		]
 	}
 }
\ 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 1442bbd2f3..626eec3c78 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.eventbriteTrigger/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
 		]
 	}
 }
\ 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
new file mode 100644
index 0000000000..920fe82e79
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.json
@@ -0,0 +1,21 @@
+{
+	"node": "n8n-nodes-base.googleBigQuery",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Data & Storage",
+		"Development"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/google"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.googleBigQuery/"
+			}
+		]
+	}
+}
\ 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 0113380aea..ed4457d823 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -27,6 +27,11 @@
 				"icon": "🎫",
 				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
 			},
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "5 workflow automations for Mattermost that we love at n8n",
 				"icon": "🤖",
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
index 99b6331324..be55a73881 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.json
@@ -17,6 +17,11 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "Why this Product Manager loves workflow automation with n8n",
 				"icon": "🧠",
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index 9d3f7e8ce7..57b61b714a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -27,6 +27,11 @@
 				"icon": "🎫",
 				"url": "https://n8n.io/blog/supercharging-your-conference-registration-process-with-n8n/"
 			},
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "Using Automation to Boost Productivity in the Workplace",
 				"icon": "💪",
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
index 355c2a2f15..649f5f4955 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.json
@@ -48,6 +48,11 @@
 				"icon": "📈",
 				"url": "https://n8n.io/blog/migrating-community-metrics-to-orbit-using-n8n/"
 			},
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "How Honest Burgers Use Automation to Save $100k per year",
 				"icon": "🍔",
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
index b0ebe88f6f..e2ac50d601 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.json
@@ -17,6 +17,11 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "Benefits of automation and n8n: An interview with HubSpot's Hugh Durkin",
 				"icon": "🎖",
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
index b205ef1b28..663ce32994 100644
--- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.json
@@ -3,13 +3,19 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
-		"Utility"
+		"Utility",
+		"Marketing & Content"
 	],
 	"resources": {
 		"credentialDocumentation": [
 			{
 				"url": "https://docs.n8n.io/credentials/mailcheck"
 			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.mailcheck/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
index ce00669547..3e90220118 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftOneDrive/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/N8nTrigger.node.json b/packages/nodes-base/nodes/N8nTrigger.node.json
new file mode 100644
index 0000000000..396dd11d3f
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrigger.node.json
@@ -0,0 +1,15 @@
+{
+	"node": "n8n-nodes-base.n8nTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Core Nodes"
+	],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.n8nTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.json b/packages/nodes-base/nodes/Trello/Trello.node.json
index 522237dd3a..82b6ca627e 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.json
+++ b/packages/nodes-base/nodes/Trello/Trello.node.json
@@ -17,6 +17,11 @@
 			}
 		],
 		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			},
 			{
 				"label": "How a digital strategist uses n8n for online marketing",
 				"icon": "💻",
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
index 614372268b..8c9c974224 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.trelloTrigger/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/WorkflowTrigger.node.json b/packages/nodes-base/nodes/WorkflowTrigger.node.json
new file mode 100644
index 0000000000..3b937f2106
--- /dev/null
+++ b/packages/nodes-base/nodes/WorkflowTrigger.node.json
@@ -0,0 +1,15 @@
+{
+	"node": "n8n-nodes-base.WorkflowTrigger",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Core Nodes"
+	],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.WorkflowTrigger/"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.json b/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
index 194fc5d275..87307add31 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.json
@@ -15,6 +15,13 @@
 			{
 				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.zendesk/"
 			}
+		],
+		"generic": [
+			{
+				"label": "Hey founders! Your business doesn't need you to operate",
+				"icon": " 🖥️",
+				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
+			}
 		]
 	}
 }
\ No newline at end of file

From 0cc3aea629b9dc225d76763d86d0ad49d11d3932 Mon Sep 17 00:00:00 2001
From: lublak <44057030+lublak@users.noreply.github.com>
Date: Sat, 1 May 2021 03:29:44 +0200
Subject: [PATCH 099/231] :heavy_plus_sign: Add xml2js dependency to
 n8n-workflow (#1717)

---
 packages/workflow/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 7f53397619..53885db2d0 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -37,7 +37,8 @@
   },
   "dependencies": {
     "lodash.get": "^4.4.2",
-    "riot-tmpl": "^3.0.8"
+    "riot-tmpl": "^3.0.8",
+    "xml2js": "^0.4.23"
   },
   "jest": {
     "transform": {

From ab1c8037de65bce85703f292fdd5a10dbcb88f3d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 20:42:32 -0500
Subject: [PATCH 100/231] :zap: Unify some dependency versions

---
 packages/cli/package.json        | 2 +-
 packages/node-dev/package.json   | 2 +-
 packages/nodes-base/package.json | 2 +-
 packages/workflow/package.json   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index daa98944e7..8dd4e347ab 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -64,7 +64,7 @@
     "@types/jest": "^26.0.13",
     "@types/localtunnel": "^1.9.0",
     "@types/lodash.get": "^4.4.6",
-    "@types/node": "14.0.27",
+    "@types/node": "^14.14.40",
     "@types/open": "^6.1.0",
     "@types/parseurl": "^1.3.1",
     "@types/request-promise-native": "~1.0.15",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 55fa3b59b1..64c637beb4 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -47,7 +47,7 @@
     "@oclif/dev-cli": "^1.22.2",
     "@types/copyfiles": "^2.1.1",
     "@types/inquirer": "^6.5.0",
-    "@types/tmp": "^0.1.0",
+    "@types/tmp": "^0.2.0",
     "@types/vorpal": "^1.11.0",
     "tslint": "^6.1.2"
   },
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 516fa72e4e..4986fdb5dd 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -639,7 +639,7 @@
     "uuid": "^3.4.0",
     "vm2": "^3.6.10",
     "xlsx": "^0.16.7",
-    "xml2js": "^0.4.22"
+    "xml2js": "^0.4.23"
   },
   "jest": {
     "transform": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 53885db2d0..4a6e11004f 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -30,6 +30,7 @@
     "@types/jest": "^26.0.13",
     "@types/lodash.get": "^4.4.6",
     "@types/node": "^14.14.40",
+    "@types/xml2js": "^0.4.3",
     "jest": "^26.4.2",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",

From 9a7de7d07709ee196f92e092fac0e381225800af Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 21:12:11 -0500
Subject: [PATCH 101/231] :bug: Fix bug with activating some trigger nodes
 #1715

---
 .../nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts   | 2 +-
 packages/nodes-base/nodes/Github/GithubTrigger.node.ts        | 4 ++--
 packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index 8fe8eb9718..fffbe576c8 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -180,7 +180,7 @@ export class GetResponseTrigger implements INodeType {
 						}
 					}
 				} catch (error) {
-					if (error.message.includes('[404]')) {
+					if (error.httpCode === '404') {
 						return false;
 					}
 				}
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 98388c45d1..64a5b6faf0 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -353,7 +353,7 @@ export class GithubTrigger implements INodeType {
 				try {
 					await githubApiRequest.call(this, 'GET', endpoint, {});
 				} catch (error) {
-					if (error.message.includes('[404]:')) {
+					if (error.httpCode === '404') {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;
@@ -399,7 +399,7 @@ export class GithubTrigger implements INodeType {
 				try {
 					responseData = await githubApiRequest.call(this, 'POST', endpoint, body);
 				} catch (error) {
-					if (error.message.includes('[422]:')) {
+					if (error.httpCode === '422') {
 						// Webhook exists already
 
 						// Get the data of the already registered webhook
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 7a8828b93e..9098d987b7 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -179,7 +179,7 @@ export class GitlabTrigger implements INodeType {
 				try {
 					await gitlabApiRequest.call(this, 'GET', endpoint, {});
 				} catch (error) {
-					if (error.message.includes('[404]:')) {
+					if (error.httpCode === '404') {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;

From b7a074abd7e57a936962f39658471ad23a4f7cf0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 21:14:07 -0500
Subject: [PATCH 102/231] :zap: Fix breaking changes files

---
 packages/cli/BREAKING-CHANGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 428e8317c1..1132496ee4 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -59,7 +59,6 @@ If you are using a Dropbox APP with permission type, "App Folder".
 ### How to upgrade:
 
 Open your Dropbox node's credentials and set the "APP Access Type" parameter to "App Folder".
->>>>>>> master
 
 ## 0.111.0
 

From c83c05456db008a47d3b3d1b7af89eabeb0c380b Mon Sep 17 00:00:00 2001
From: lublak <44057030+lublak@users.noreply.github.com>
Date: Sat, 1 May 2021 04:22:15 +0200
Subject: [PATCH 103/231] :zap: Use native fs promise where possible (#1684)

---
 packages/cli/src/GenericHelpers.ts               |  9 +++------
 packages/cli/src/LoadNodesAndCredentials.ts      | 16 +++++-----------
 packages/node-dev/src/Build.ts                   |  6 +++++-
 .../nodes-base/nodes/ExecuteWorkflow.node.ts     |  7 ++-----
 packages/nodes-base/nodes/ReadBinaryFile.node.ts |  7 ++-----
 .../nodes-base/nodes/ReadBinaryFiles.node.ts     |  7 ++-----
 .../nodes-base/nodes/WriteBinaryFile.node.ts     |  7 ++-----
 7 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 74e9578fec..8dba633baa 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -3,14 +3,11 @@ import * as express from 'express';
 import { join as pathJoin } from 'path';
 import {
 	readFile as fsReadFile,
-} from 'fs';
-import { promisify } from 'util';
+} from 'fs/promises';
 import { IDataObject } from 'n8n-workflow';
 
 import { IPackageVersions } from './';
 
-const fsReadFileAsync = promisify(fsReadFile);
-
 let versionCache: IPackageVersions | undefined;
 
 
@@ -72,7 +69,7 @@ export async function getVersions(): Promise<IPackageVersions> {
 		return versionCache;
 	}
 
-	const packageFile = await fsReadFileAsync(pathJoin(__dirname, '../../package.json'), 'utf8') as string;
+	const packageFile = await fsReadFile(pathJoin(__dirname, '../../package.json'), 'utf8') as string;
 	const packageData = JSON.parse(packageFile);
 
 	versionCache = {
@@ -122,7 +119,7 @@ export async function getConfigValue(configKey: string): Promise<string | boolea
 
 	let data;
 	try {
-		data = await fsReadFileAsync(fileEnvironmentVariable, 'utf8') as string;
+		data = await fsReadFile(fileEnvironmentVariable, 'utf8') as string;
 	} catch (error) {
 		if (error.code === 'ENOENT') {
 			throw new Error(`The file "${fileEnvironmentVariable}" could not be found.`);
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 5399b24932..a69c6be33f 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -14,15 +14,9 @@ import {
 	readdir as fsReaddir,
 	readFile as fsReadFile,
 	stat as fsStat,
- } from 'fs';
+ } from 'fs/promises';
 import * as glob from 'glob-promise';
 import * as path from 'path';
-import { promisify } from 'util';
-
-const fsAccessAsync = promisify(fsAccess);
-const fsReaddirAsync = promisify(fsReaddir);
-const fsReadFileAsync = promisify(fsReadFile);
-const fsStatAsync = promisify(fsStat);
 
 
 class LoadNodesAndCredentialsClass {
@@ -49,7 +43,7 @@ class LoadNodesAndCredentialsClass {
 		];
 		for (const checkPath of checkPaths) {
 			try {
-				await fsAccessAsync(checkPath);
+				await fsAccess(checkPath);
 				// Folder exists, so use it.
 				this.nodeModulesPath = path.dirname(checkPath);
 				break;
@@ -102,13 +96,13 @@ class LoadNodesAndCredentialsClass {
 		const getN8nNodePackagesRecursive = async (relativePath: string): Promise<string[]> => {
 			const results: string[] = [];
 			const nodeModulesPath = `${this.nodeModulesPath}/${relativePath}`;
-			for (const file of await fsReaddirAsync(nodeModulesPath)) {
+			for (const file of await fsReaddir(nodeModulesPath)) {
 				const isN8nNodesPackage = file.indexOf('n8n-nodes-') === 0;
 				const isNpmScopedPackage = file.indexOf('@') === 0;
 				if (!isN8nNodesPackage && !isNpmScopedPackage) {
 					continue;
 				}
-				if (!(await fsStatAsync(nodeModulesPath)).isDirectory()) {
+				if (!(await fsStat(nodeModulesPath)).isDirectory()) {
 					continue;
 				}
 				if (isN8nNodesPackage) { results.push(`${relativePath}${file}`); }
@@ -234,7 +228,7 @@ class LoadNodesAndCredentialsClass {
 		const packagePath = path.join(this.nodeModulesPath, packageName);
 
 		// Read the data from the package.json file to see if any n8n data is defiend
-		const packageFileString = await fsReadFileAsync(path.join(packagePath, 'package.json'), 'utf8');
+		const packageFileString = await fsReadFile(path.join(packagePath, 'package.json'), 'utf8');
 		const packageFile = JSON.parse(packageFileString);
 		if (!packageFile.hasOwnProperty('n8n')) {
 			return;
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index ce2f16a263..4b470a6ff1 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -1,9 +1,13 @@
 import { ChildProcess, spawn } from 'child_process';
 const copyfiles = require('copyfiles');
+
 import {
 	readFile as fsReadFile,
+} from 'fs/promises';
+import {
 	write as fsWrite,
 } from 'fs';
+
 import { join } from 'path';
 import { file } from 'tmp-promise';
 import { promisify } from 'util';
@@ -32,7 +36,7 @@ export async function createCustomTsconfig () {
 	const tsconfigPath = join(__dirname, '../../src/tsconfig-build.json');
 
 	// Read the tsconfi file
-	const tsConfigString = await fsReadFileAsync(tsconfigPath, { encoding: 'utf8'}) as string;
+	const tsConfigString = await fsReadFile(tsconfigPath, { encoding: 'utf8'}) as string;
 	const tsConfig = JSON.parse(tsConfigString);
 
 	// Set absolute include paths
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
index e4883cd4e8..7ca01e8327 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow.node.ts
@@ -1,9 +1,6 @@
 import {
 	readFile as fsReadFile,
-} from 'fs';
-import { promisify } from 'util';
-
-const fsReadFileAsync = promisify(fsReadFile);
+} from 'fs/promises';
 
 import { IExecuteFunctions } from 'n8n-core';
 import {
@@ -162,7 +159,7 @@ export class ExecuteWorkflow implements INodeType {
 
 			let workflowJson;
 			try {
-				workflowJson = await fsReadFileAsync(workflowPath, { encoding: 'utf8' }) as string;
+				workflowJson = await fsReadFile(workflowPath, { encoding: 'utf8' }) as string;
 			} catch (error) {
 				if (error.code === 'ENOENT') {
 					throw new NodeOperationError(this.getNode(), `The file "${workflowPath}" could not be found.`);
diff --git a/packages/nodes-base/nodes/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
index 6b595d3b10..fe5a3d8bce 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile.node.ts
@@ -8,10 +8,7 @@ import {
 
 import {
 	readFile as fsReadFile,
-} from 'fs';
-import { promisify } from 'util';
-
-const fsReadFileAsync = promisify(fsReadFile);
+} from 'fs/promises';
 
 
 export class ReadBinaryFile implements INodeType {
@@ -64,7 +61,7 @@ export class ReadBinaryFile implements INodeType {
 
 			let data;
 			try {
-				data = await fsReadFileAsync(filePath) as Buffer;
+				data = await fsReadFile(filePath) as Buffer;
 			} catch (error) {
 				if (error.code === 'ENOENT') {
 					throw new NodeOperationError(this.getNode(), `The file "${filePath}" could not be found.`);
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
index 7a42764f35..509402bb21 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles.node.ts
@@ -9,10 +9,7 @@ import * as path from 'path';
 
 import {
 	readFile as fsReadFile,
-} from 'fs';
-import { promisify } from 'util';
-
-const fsReadFileAsync = promisify(fsReadFile);
+} from 'fs/promises';
 
 
 export class ReadBinaryFiles implements INodeType {
@@ -61,7 +58,7 @@ export class ReadBinaryFiles implements INodeType {
 		let item: INodeExecutionData;
 		let data: Buffer;
 		for (const filePath of files) {
-			data = await fsReadFileAsync(filePath) as Buffer;
+			data = await fsReadFile(filePath) as Buffer;
 
 			item = {
 				binary: {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
index 6c6f9a83ad..5796110119 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile.node.ts
@@ -13,10 +13,7 @@ import {
 
 import {
 	writeFile as fsWriteFile,
-} from 'fs';
-import { promisify } from 'util';
-
-const fsWriteFileAsync = promisify(fsWriteFile);
+} from 'fs/promises';
 
 
 export class WriteBinaryFile implements INodeType {
@@ -80,7 +77,7 @@ export class WriteBinaryFile implements INodeType {
 			}
 
 			// Write the file to disk
-			await fsWriteFileAsync(fileName, Buffer.from(item.binary[dataPropertyName].data, BINARY_ENCODING), 'binary');
+			await fsWriteFile(fileName, Buffer.from(item.binary[dataPropertyName].data, BINARY_ENCODING), 'binary');
 
 			const newItem: INodeExecutionData = {
 				json: {},

From d239ba5cff855218751f68cf5a607b5ba560219a Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 1 May 2021 05:23:51 +0300
Subject: [PATCH 104/231] :arrow_up: Set mqtt@4.2.6 on n8n-nodes-base

Snyk has created this PR to upgrade mqtt from 4.2.1 to 4.2.6.

See this package in npm:
https://www.npmjs.com/package/mqtt

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4986fdb5dd..539010cbb8 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -620,7 +620,7 @@
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
     "mongodb": "3.6.3",
-    "mqtt": "4.2.1",
+    "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
     "n8n-core": "~0.68.0",

From eab7b0a10a47b231caaabd9640d1ea57f610c943 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 1 May 2021 05:25:18 +0300
Subject: [PATCH 105/231] :arrow_up: Set tslib@0.114.1 on n8n

Snyk has created this PR to upgrade tslib from 1.13.0 to 1.14.1.

See this package in npm:
https://www.npmjs.com/package/tslib

See this project in Snyk:
https://app.snyk.io/org/janober/project/fc678bbc-0ac7-4659-9458-8f7f360e2566?utm_source=github&utm_medium=upgrade-pr
---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8dd4e347ab..7eba64834e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -114,7 +114,7 @@
     "request-promise-native": "^1.0.7",
     "sqlite3": "^5.0.1",
     "sse-channel": "^3.1.1",
-    "tslib": "1.13.0",
+    "tslib": "1.14.1",
     "typeorm": "^0.2.30"
   },
   "jest": {

From 03639b0e3ac46b1e787d4f5b784222e235a1fc29 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 1 May 2021 05:26:52 +0300
Subject: [PATCH 106/231] :arrow_up: Set mongodb@3.6.5 on n8n-nodes-base

Snyk has created this PR to upgrade mongodb from 3.6.3 to 3.6.5.

See this package in npm:
https://www.npmjs.com/package/mongodb

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr

Co-authored-by: Jan <janober@users.noreply.github.com>
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 539010cbb8..38d615717d 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -619,7 +619,7 @@
     "mailparser": "^3.2.0",
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
-    "mongodb": "3.6.3",
+    "mongodb": "3.6.5",
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",

From 35cae02a36eb4e31765c1f76c6827de3fa955b64 Mon Sep 17 00:00:00 2001
From: Colton Anglin <colton01@icloud.com>
Date: Fri, 30 Apr 2021 21:48:40 -0500
Subject: [PATCH 107/231] :zap: Add option to use Field IDs on Quickbase Node
 (#1651)

* QuickBase: Use FieldIDs instead of names

* Fix name change

* Delete tmp-209473KO4eyCT5LSi

* Fix name change

* Change default to false
---
 .../nodes/QuickBase/GenericFunctions.ts       |  4 +-
 .../nodes/QuickBase/QuickBase.node.ts         | 70 +++++++++++------
 .../nodes/QuickBase/RecordDescription.ts      | 77 ++++++-------------
 3 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index 255d3d6d85..89ad286456 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -41,8 +41,10 @@ export async function quickbaseApiRequest(this: IExecuteFunctions | ILoadOptions
 			body,
 			qs,
 			uri: `https://api.quickbase.com/v1${resource}`,
-			json: true,
+			json: true
 		};
+
+
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index a3de7a4683..02a17e8a04 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -230,8 +230,8 @@ export class QuickBase implements INodeType {
 			if (operation === 'create') {
 				const tableId = this.getNodeParameter('tableId', 0) as string;
 
-				const { fieldsLabelKey, fieldsIdKey } = await getFieldsObject.call(this, tableId);
-
+				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
+				
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
 				const data: IDataObject[] = [];
@@ -244,10 +244,16 @@ export class QuickBase implements INodeType {
 					const columns = this.getNodeParameter('columns', i) as string;
 
 					const columnList = columns.split(',').map(column => column.trim());
-
-					for (const key of Object.keys(items[i].json)) {
-						if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
-							record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+					if (useFieldIDs) {
+						for (const key of Object.keys(items[i].json)) {
+							record[key] = { value: items[i].json[key] };
+						}
+					} else {
+						const { fieldsLabelKey } = await getFieldsObject.call(this, tableId);
+						for (const key of Object.keys(items[i].json)) {
+							if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
+								record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+							}
 						}
 					}
 
@@ -259,8 +265,9 @@ export class QuickBase implements INodeType {
 					to: tableId,
 				};
 
-				// If not fields are set return at least the record id
-				body.fieldsToReturn = [fieldsLabelKey['Record ID#']];
+				// If no fields are set return at least the record id
+				// 3 == Default Quickbase RecordID #
+				body.fieldsToReturn = [3];
 
 				if (options.fields) {
 					body.fieldsToReturn = options.fields as string[];
@@ -275,7 +282,7 @@ export class QuickBase implements INodeType {
 					for (const record of records) {
 						const data: IDataObject = {};
 						for (const [key, value] of Object.entries(record)) {
-							data[fieldsIdKey[key]] = (value as IDataObject).value;
+							data[key] = (value as IDataObject).value;
 						}
 						responseData.push(data);
 					}
@@ -365,6 +372,8 @@ export class QuickBase implements INodeType {
 
 				const { fieldsLabelKey, fieldsIdKey } = await getFieldsObject.call(this, tableId);
 
+				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
+
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
 				const updateKey = this.getNodeParameter('updateKey', 0) as string;
@@ -380,9 +389,16 @@ export class QuickBase implements INodeType {
 
 					const columnList = columns.split(',').map(column => column.trim());
 
-					for (const key of Object.keys(items[i].json)) {
-						if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
-							record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+					if (useFieldIDs) {
+						for (const key of Object.keys(items[i].json)) {
+							record[key] = { value: items[i].json[key] };
+						}
+					} else {
+						const { fieldsLabelKey } = await getFieldsObject.call(this, tableId);
+						for (const key of Object.keys(items[i].json)) {
+							if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
+								record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+							}
 						}
 					}
 
@@ -390,8 +406,6 @@ export class QuickBase implements INodeType {
 						throw new NodeOperationError(this.getNode(), `The update key ${updateKey} could not be found in the input`);
 					}
 
-					record[fieldsLabelKey['Record ID#']] = { value: items[i].json[updateKey] };
-
 					data.push(record);
 				}
 
@@ -400,8 +414,9 @@ export class QuickBase implements INodeType {
 					to: tableId,
 				};
 
-				// If not fields are set return at least the record id
-				body.fieldsToReturn = [fieldsLabelKey['Record ID#']];
+				// If no fields are set return at least the record id
+				// 3 == Default Quickbase RecordID #
+				//body.fieldsToReturn = [fieldsLabelKey['Record ID#']];
 
 				if (options.fields) {
 					body.fieldsToReturn = options.fields as string[];
@@ -432,7 +447,8 @@ export class QuickBase implements INodeType {
 			if (operation === 'upsert') {
 				const tableId = this.getNodeParameter('tableId', 0) as string;
 
-				const { fieldsLabelKey, fieldsIdKey } = await getFieldsObject.call(this, tableId);
+				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
+
 
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
@@ -451,9 +467,16 @@ export class QuickBase implements INodeType {
 
 					const columnList = columns.split(',').map(column => column.trim());
 
-					for (const key of Object.keys(items[i].json)) {
-						if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
-							record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+					if (useFieldIDs) {
+						for (const key of Object.keys(items[i].json)) {
+							record[key] = { value: items[i].json[key] };
+						}
+					} else {
+						const { fieldsLabelKey } = await getFieldsObject.call(this, tableId);
+						for (const key of Object.keys(items[i].json)) {
+							if (fieldsLabelKey.hasOwnProperty(key) && columnList.includes(key)) {
+								record[fieldsLabelKey[key].toString()] = { value: items[i].json[key] };
+							}
 						}
 					}
 
@@ -472,8 +495,9 @@ export class QuickBase implements INodeType {
 					mergeFieldId,
 				};
 
-				// If not fields are set return at least the record id
-				body.fieldsToReturn = [fieldsLabelKey['Record ID#']];
+				// If no fields are set return at least the record id
+				// 3 == Default Quickbase RecordID #
+				body.fieldsToReturn = [3];
 
 				if (options.fields) {
 					body.fieldsToReturn = options.fields as string[];
@@ -488,7 +512,7 @@ export class QuickBase implements INodeType {
 					for (const record of records) {
 						const data: IDataObject = {};
 						for (const [key, value] of Object.entries(record)) {
-							data[fieldsIdKey[key]] = (value as IDataObject).value;
+							data[key] = (value as IDataObject).value;
 						}
 						responseData.push(data);
 					}
diff --git a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
index 73614d9297..276b8c73fb 100644
--- a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
+++ b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
@@ -69,7 +69,7 @@ export const recordFields = [
 		description: 'The table identifier',
 	},
 	{
-		displayName: 'Columns',
+		displayName: 'Insert Fields',
 		name: 'columns',
 		type: 'string',
 		displayOptions: {
@@ -84,11 +84,30 @@ export const recordFields = [
 		},
 		default: '',
 		required: true,
-		placeholder: 'id,name,description',
+		placeholder: 'Select Fields...',
 		description: 'Comma separated list of the properties which should used as columns for the new rows.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Use Field IDs',
+		name: 'useFieldIDs',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'record',
+				],
+				operation: [
+					'create',
+					'upsert',
+					'update'
+				],
+			},
+		},
+		default: false,
+		description: 'Use Field IDs instead of Field Names in Insert Fields.',
+	},
+	{
+		displayName: 'Simplified Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -122,7 +141,7 @@ export const recordFields = [
 		},
 		options: [
 			{
-				displayName: 'Fields',
+				displayName: 'Return Fields',
 				name: 'fields',
 				type: 'multiOptions',
 				typeOptions: {
@@ -133,7 +152,7 @@ export const recordFields = [
 				},
 				default: [],
 				description: `Specify an array of field ids that will return data for any updates or added record. Record ID (FID 3) is always returned if any field ID is requested.`,
-			},
+			}
 		],
 	},
 	/* -------------------------------------------------------------------------- */
@@ -255,54 +274,6 @@ export const recordFields = [
 			},
 		},
 		options: [
-			// {
-			// 	displayName: 'Group By',
-			// 	name: 'groupByUi',
-			// 	placeholder: 'Add Group By',
-			// 	type: 'fixedCollection',
-			// 	typeOptions: {
-			// 		multipleValues: true,
-			// 	},
-			// 	default: {},
-			// 	options: [
-			// 		{
-			// 			name: 'groupByValues',
-			// 			displayName: 'Group By',
-			// 			values: [
-			// 				{
-			// 					displayName: 'Field ID',
-			// 					name: 'fieldId',
-			// 					type: 'options',
-			// 					typeOptions: {
-			// 						loadOptionsMethod: 'getTableFields',
-			// 					},
-			// 					default: '',
-			// 					description: 'The unique identifier of a field in a table.',
-			// 				},
-			// 				{
-			// 					displayName: 'Grouping',
-			// 					name: 'grouping',
-			// 					type: 'options',
-			// 					options: [
-			// 						{
-			// 							name: 'ASC',
-			// 							value: 'ASC',
-			// 						},
-			// 						{
-			// 							name: 'DESC',
-			// 							value: 'DESC',
-			// 						},
-			// 						{
-			// 							name: 'Equal Values',
-			// 							value: 'equal-values',
-			// 						},
-			// 					],
-			// 					default: 'ASC',
-			// 				},
-			// 			],
-			// 		},
-			// 	],
-			// },
 			{
 				displayName: 'Select',
 				name: 'select',

From 0b69310bedc5979550696aae6ac5881aea7b1206 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 30 Apr 2021 21:49:15 -0500
Subject: [PATCH 108/231] :zap: Minor improvements to Quickbase Node

---
 .../nodes/QuickBase/GenericFunctions.ts       |  2 +-
 .../nodes/QuickBase/QuickBase.node.ts         | 13 ++----
 .../nodes/QuickBase/RecordDescription.ts      | 44 ++++++++++---------
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index 89ad286456..d1393ddbfc 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -41,7 +41,7 @@ export async function quickbaseApiRequest(this: IExecuteFunctions | ILoadOptions
 			body,
 			qs,
 			uri: `https://api.quickbase.com/v1${resource}`,
-			json: true
+			json: true,
 		};
 
 
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index 02a17e8a04..b26128c22d 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -230,8 +230,6 @@ export class QuickBase implements INodeType {
 			if (operation === 'create') {
 				const tableId = this.getNodeParameter('tableId', 0) as string;
 
-				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
-				
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
 				const data: IDataObject[] = [];
@@ -244,7 +242,7 @@ export class QuickBase implements INodeType {
 					const columns = this.getNodeParameter('columns', i) as string;
 
 					const columnList = columns.split(',').map(column => column.trim());
-					if (useFieldIDs) {
+					if (options.useFieldIDs === true) {
 						for (const key of Object.keys(items[i].json)) {
 							record[key] = { value: items[i].json[key] };
 						}
@@ -372,8 +370,6 @@ export class QuickBase implements INodeType {
 
 				const { fieldsLabelKey, fieldsIdKey } = await getFieldsObject.call(this, tableId);
 
-				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
-
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
 				const updateKey = this.getNodeParameter('updateKey', 0) as string;
@@ -389,7 +385,7 @@ export class QuickBase implements INodeType {
 
 					const columnList = columns.split(',').map(column => column.trim());
 
-					if (useFieldIDs) {
+					if (options.useFieldIDs === true) {
 						for (const key of Object.keys(items[i].json)) {
 							record[key] = { value: items[i].json[key] };
 						}
@@ -447,9 +443,6 @@ export class QuickBase implements INodeType {
 			if (operation === 'upsert') {
 				const tableId = this.getNodeParameter('tableId', 0) as string;
 
-				const useFieldIDs = this.getNodeParameter('useFieldIDs', 0) as boolean;
-
-
 				const simple = this.getNodeParameter('simple', 0) as boolean;
 
 				const updateKey = this.getNodeParameter('updateKey', 0) as string;
@@ -467,7 +460,7 @@ export class QuickBase implements INodeType {
 
 					const columnList = columns.split(',').map(column => column.trim());
 
-					if (useFieldIDs) {
+					if (options.useFieldIDs === true) {
 						for (const key of Object.keys(items[i].json)) {
 							record[key] = { value: items[i].json[key] };
 						}
diff --git a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
index 276b8c73fb..7b572fe837 100644
--- a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
+++ b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
@@ -69,7 +69,7 @@ export const recordFields = [
 		description: 'The table identifier',
 	},
 	{
-		displayName: 'Insert Fields',
+		displayName: 'Columns',
 		name: 'columns',
 		type: 'string',
 		displayOptions: {
@@ -87,25 +87,6 @@ export const recordFields = [
 		placeholder: 'Select Fields...',
 		description: 'Comma separated list of the properties which should used as columns for the new rows.',
 	},
-	{
-		displayName: 'Use Field IDs',
-		name: 'useFieldIDs',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: [
-					'record',
-				],
-				operation: [
-					'create',
-					'upsert',
-					'update'
-				],
-			},
-		},
-		default: false,
-		description: 'Use Field IDs instead of Field Names in Insert Fields.',
-	},
 	{
 		displayName: 'Simplified Response',
 		name: 'simple',
@@ -152,7 +133,14 @@ export const recordFields = [
 				},
 				default: [],
 				description: `Specify an array of field ids that will return data for any updates or added record. Record ID (FID 3) is always returned if any field ID is requested.`,
-			}
+			},
+			{
+				displayName: 'Use Field IDs',
+				name: 'useFieldIDs',
+				type: 'boolean',
+				default: false,
+				description: 'Use Field IDs instead of Field Names in Columns.',
+			},
 		],
 	},
 	/* -------------------------------------------------------------------------- */
@@ -443,6 +431,13 @@ export const recordFields = [
 				default: [],
 				description: `Specify an array of field ids that will return data for any updates or added record. Record ID (FID 3) is always returned if any field ID is requested.`,
 			},
+			{
+				displayName: 'Use Field IDs',
+				name: 'useFieldIDs',
+				type: 'boolean',
+				default: false,
+				description: 'Use Field IDs instead of Field Names in Columns.',
+			},
 			// {
 			// 	displayName: 'Merge Field ID',
 			// 	name: 'mergeFieldId',
@@ -583,6 +578,13 @@ export const recordFields = [
 				default: [],
 				description: `Specify an array of field ids that will return data for any updates or added record. Record ID (FID 3) is always returned if any field ID is requested.`,
 			},
+			{
+				displayName: 'Use Field IDs',
+				name: 'useFieldIDs',
+				type: 'boolean',
+				default: false,
+				description: 'Use Field IDs instead of Field Names in Columns.',
+			},
 		],
 	},
 ] as INodeProperties[];

From c972f3dd50a184f47c6a8030f6b2e641487c795b Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sun, 2 May 2021 05:43:01 +0200
Subject: [PATCH 109/231] :sparkles: Added logging to n8n (#1381)

* Added logging to n8n

This commit adds logging to n8n using the Winston library.

For now, this commit only allows logging to console (default behavior)
or file (need to pass in config via environment variables).

Other logging methods can be further implemented using hooks. These were
skipped for now as it would require adding more dependencies.

Logging level is notice by default, meaning no additional messages would
be displayed at the moment. Logging level can be set to info or debug as
well to enrich the generated logs.

The ILogger interface was added to the workflow project as it would make
it available for all other projects but the implementation was done on
the cli project.

* Lint fixes and logging level naming. Also fixed the way we use the logger as it was not working previously

* Improvements to logging framework

Using appropriate single quotes
Improving the way the logger is declared

* Improved naming for Log Types

* Removed logger global variable, replacing it by a proxy

* Add logging to CLI commands

* Remove unused GenericHelpers

* Changed back some messages to console instead of logger and added npm
shortcuts for worker and webhook

* Fix typos

* Adding basic file rotation to logs as suggested by @mutdmour

* Fixed linting issues

* Correcting comment to correctly reflect space usage

* Added settings for log files rotation

* Correcting config type from String to Number

* Changed default file settings to number

To reflect previous changes to the type

* Changed the way log messages are added to be called statically. Also minor naming improvements

* Applying latest corrections sent by @ivov

* :zap: Some logging improvements

* Saving logs to a folder inside n8n home instead of root

* Fixed broken tests and linting

* Changed some log messages to improve formatting

* Adding quotes to names  on log messages

* Added execution and session IDs to logs. Also removed unnecessary line breaks

* :zap: Added file caller to log messages (#1657)

This is done using callsites library which already existed
in the project as another library's dependency. So in fact
it does not add any new dependency.

* Adding logs to help debug Salesforce node

* :zap: Add function name to logs and add more logs

* :zap: Improve some error messages

* :zap: Improve some more log messages

* :zap: Rename logging env variables to match others

Co-authored-by: dali <servfrdali@yahoo.fr>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 package.json                                  |   4 +-
 packages/cli/commands/execute.ts              |  47 +++++---
 packages/cli/commands/export/credentials.ts   |  44 ++++---
 packages/cli/commands/export/workflow.ts      |  42 ++++---
 packages/cli/commands/import/credentials.ts   |  22 +++-
 packages/cli/commands/import/workflow.ts      |  22 +++-
 packages/cli/commands/start.ts                |  23 +++-
 packages/cli/commands/update/workflow.ts      |  33 +++--
 packages/cli/commands/webhook.ts              |  31 +++--
 packages/cli/commands/worker.ts               |  43 ++++---
 packages/cli/config/index.ts                  |  37 ++++++
 packages/cli/package.json                     |   1 +
 packages/cli/src/ActiveWorkflowRunner.ts      |  20 ++-
 packages/cli/src/Logger.ts                    | 114 ++++++++++++++++++
 packages/cli/src/Push.ts                      |  12 +-
 packages/cli/src/WebhookHelpers.ts            |   5 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  29 +++--
 packages/cli/src/WorkflowHelpers.ts           |  13 +-
 packages/cli/src/WorkflowRunner.ts            |   8 ++
 packages/cli/src/WorkflowRunnerProcess.ts     |  23 ++--
 packages/core/src/ActiveWorkflows.ts          |   3 +
 packages/core/src/NodeExecuteFunctions.ts     |   9 ++
 packages/core/src/WorkflowExecute.ts          |  11 +-
 packages/core/test/WorkflowExecute.test.ts    |  12 ++
 .../nodes/Salesforce/GenericFunctions.ts      |   6 +
 .../nodes/Salesforce/Salesforce.node.ts       |   6 +
 packages/workflow/src/Interfaces.ts           |  10 ++
 packages/workflow/src/LoggerProxy.ts          |  45 +++++++
 packages/workflow/src/index.ts                |   2 +
 29 files changed, 548 insertions(+), 129 deletions(-)
 create mode 100644 packages/cli/src/Logger.ts
 create mode 100644 packages/workflow/src/LoggerProxy.ts

diff --git a/package.json b/package.json
index 866d256baf..44145dbb5e 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
     "start:windows": "cd packages/cli/bin && n8n",
     "test": "lerna run test",
     "tslint": "lerna exec npm run tslint",
-    "watch": "lerna run --parallel watch"
+    "watch": "lerna run --parallel watch",
+    "webhook": "./packages/cli/bin/n8n webhook",
+    "worker": "./packages/cli/bin/n8n worker"
   },
   "devDependencies": {
     "lerna": "^3.13.1",
diff --git a/packages/cli/commands/execute.ts b/packages/cli/commands/execute.ts
index 864748f8cb..9eafd28c9e 100644
--- a/packages/cli/commands/execute.ts
+++ b/packages/cli/commands/execute.ts
@@ -13,7 +13,6 @@ import {
 	CredentialTypes,
 	Db,
 	ExternalHooks,
-	GenericHelpers,
 	IWorkflowBase,
 	IWorkflowExecutionDataProcess,
 	LoadNodesAndCredentials,
@@ -23,6 +22,13 @@ import {
 	WorkflowRunner,
 } from '../src';
 
+import { 
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
 
 export class Execute extends Command {
 	static description = '\nExecutes a given workflow';
@@ -44,6 +50,9 @@ export class Execute extends Command {
 
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		const { flags } = this.parse(Execute);
 
 		// Start directly with the init of the database to improve startup time
@@ -54,12 +63,12 @@ export class Execute extends Command {
 		const loadNodesAndCredentialsPromise = loadNodesAndCredentials.init();
 
 		if (!flags.id && !flags.file) {
-			GenericHelpers.logOutput(`Either option "--id" or "--file" have to be set!`);
+			console.info(`Either option "--id" or "--file" have to be set!`);
 			return;
 		}
 
 		if (flags.id && flags.file) {
-			GenericHelpers.logOutput(`Either "id" or "file" can be set never both!`);
+			console.info(`Either "id" or "file" can be set never both!`);
 			return;
 		}
 
@@ -71,7 +80,7 @@ export class Execute extends Command {
 				workflowData = JSON.parse(await fs.readFile(flags.file, 'utf8'));
 			} catch (error) {
 				if (error.code === 'ENOENT') {
-					GenericHelpers.logOutput(`The file "${flags.file}" could not be found.`);
+					console.info(`The file "${flags.file}" could not be found.`);
 					return;
 				}
 
@@ -81,7 +90,7 @@ export class Execute extends Command {
 			// Do a basic check if the data in the file looks right
 			// TODO: Later check with the help of TypeScript data if it is valid or not
 			if (workflowData === undefined || workflowData.nodes === undefined || workflowData.connections === undefined) {
-				GenericHelpers.logOutput(`The file "${flags.file}" does not contain valid workflow data.`);
+				console.info(`The file "${flags.file}" does not contain valid workflow data.`);
 				return;
 			}
 			workflowId = workflowData.id!.toString();
@@ -95,8 +104,8 @@ export class Execute extends Command {
 			workflowId = flags.id;
 			workflowData = await Db.collections!.Workflow!.findOne(workflowId);
 			if (workflowData === undefined) {
-				GenericHelpers.logOutput(`The workflow with the id "${workflowId}" does not exist.`);
-				return;
+				console.info(`The workflow with the id "${workflowId}" does not exist.`);
+				process.exit(1);
 			}
 		}
 
@@ -138,7 +147,7 @@ export class Execute extends Command {
 		if (startNode === undefined) {
 			// If the workflow does not contain a start-node we can not know what
 			// should be executed and with which data to start.
-			GenericHelpers.logOutput(`The workflow does not contain a "Start" node. So it can not be executed.`);
+			console.info(`The workflow does not contain a "Start" node. So it can not be executed.`);
 			return Promise.resolve();
 		}
 
@@ -163,9 +172,10 @@ export class Execute extends Command {
 			}
 
 			if (data.data.resultData.error) {
-				this.log('Execution was NOT successfull:');
-				this.log('====================================');
-				this.log(JSON.stringify(data, null, 2));
+				console.info('Execution was NOT successful. See log message for details.');
+				logger.info('Execution error:');
+				logger.info('====================================');
+				logger.info(JSON.stringify(data, null, 2));
 
 				const { error } = data.data.resultData;
 				throw {
@@ -174,14 +184,15 @@ export class Execute extends Command {
 				};
 			}
 
-			this.log('Execution was successfull:');
-			this.log('====================================');
-			this.log(JSON.stringify(data, null, 2));
+			console.info('Execution was successful:');
+			console.info('====================================');
+			console.info(JSON.stringify(data, null, 2));
 		} catch (e) {
-			console.error('\nGOT ERROR');
-			console.log('====================================');
-			console.error(e.message);
-			console.error(e.stack);
+			console.error('Error executing workflow. See log messages for details.');
+			logger.error('\nExecution error:');
+			logger.info('====================================');
+			logger.error(e.message);
+			logger.error(e.stack);
 			this.exit(1);
 		}
 
diff --git a/packages/cli/commands/export/credentials.ts b/packages/cli/commands/export/credentials.ts
index ec12033446..de1aafe6dd 100644
--- a/packages/cli/commands/export/credentials.ts
+++ b/packages/cli/commands/export/credentials.ts
@@ -14,10 +14,17 @@ import {
 
 import {
 	Db,
-	GenericHelpers,
 	ICredentialsDecryptedDb,
 } from '../../src';
 
+import { 
+	getLogger,
+} from '../../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -59,8 +66,11 @@ export class ExportCredentialsCommand extends Command {
 	};
 
 	async run() {
-		const { flags } = this.parse(ExportCredentialsCommand);
+		const logger = getLogger();
+		LoggerProxy.init(logger);
 
+		const { flags } = this.parse(ExportCredentialsCommand);
+		
 		if (flags.backup) {
 			flags.all = true;
 			flags.pretty = true;
@@ -68,41 +78,42 @@ export class ExportCredentialsCommand extends Command {
 		}
 
 		if (!flags.all && !flags.id) {
-			GenericHelpers.logOutput(`Either option "--all" or "--id" have to be set!`);
+			console.info(`Either option "--all" or "--id" have to be set!`);
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			GenericHelpers.logOutput(`You should either use "--all" or "--id" but never both!`);
+			console.info(`You should either use "--all" or "--id" but never both!`);
 			return;
 		}
 
 		if (flags.separate) {
 			try {
 				if (!flags.output) {
-					GenericHelpers.logOutput(`You must inform an output directory via --output when using --separate`);
+					console.info(`You must inform an output directory via --output when using --separate`);
 					return;
 				}
 
 				if (fs.existsSync(flags.output)) {
 					if (!fs.lstatSync(flags.output).isDirectory()) {
-						GenericHelpers.logOutput(`The paramenter --output must be a directory`);
+						console.info(`The paramenter --output must be a directory`);
 						return;
 					}
 				} else {
 					fs.mkdirSync(flags.output, { recursive: true });
 				}
 			} catch (e) {
-				console.error('\nFILESYSTEM ERROR');
-				console.log('====================================');
-				console.error(e.message);
-				console.error(e.stack);
+				console.error('Aborting execution as a filesystem error has been encountered while creating the output directory. See log messages for details.');
+				logger.error('\nFILESYSTEM ERROR');
+				logger.info('====================================');
+				logger.error(e.message);
+				logger.error(e.stack);
 				this.exit(1);
 			}
 		} else if (flags.output) {
 			if (fs.existsSync(flags.output)) {
 				if (fs.lstatSync(flags.output).isDirectory()) {
-					GenericHelpers.logOutput(`The paramenter --output must be a writeble file`);
+					console.info(`The paramenter --output must be a writeble file`);
 					return;
 				}
 			}
@@ -143,18 +154,21 @@ export class ExportCredentialsCommand extends Command {
 					const filename = (flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) + credentials[i].id + '.json';
 					fs.writeFileSync(filename, fileContents);
 				}
-				console.log('Successfully exported', i, 'credentials.');
+				console.info(`Successfully exported ${i} credentials.`);
 			} else {
 				const fileContents = JSON.stringify(credentials, null, flags.pretty ? 2 : undefined);
 				if (flags.output) {
 					fs.writeFileSync(flags.output!, fileContents);
-					console.log('Successfully exported', credentials.length, 'credentials.');
+					console.info(`Successfully exported ${credentials.length} credentials.`);
 				} else {
-					console.log(fileContents);
+					console.info(fileContents);
 				}
 			}
+			// Force exit as process won't exit using MySQL or Postgres.
+			process.exit(0);
 		} catch (error) {
-			this.error(error.message);
+			console.error('Error exporting credentials. See log messages for details.');
+			logger.error(error.message);
 			this.exit(1);
 		}
 	}
diff --git a/packages/cli/commands/export/workflow.ts b/packages/cli/commands/export/workflow.ts
index 0cf1d712ad..9d478dbaef 100644
--- a/packages/cli/commands/export/workflow.ts
+++ b/packages/cli/commands/export/workflow.ts
@@ -9,9 +9,16 @@ import {
 
 import {
 	Db,
-	GenericHelpers,
 } from '../../src';
 
+import { 
+	getLogger,
+} from '../../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -49,6 +56,9 @@ export class ExportWorkflowsCommand extends Command {
 	};
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		const { flags } = this.parse(ExportWorkflowsCommand);
 
 		if (flags.backup) {
@@ -58,41 +68,42 @@ export class ExportWorkflowsCommand extends Command {
 		}
 
 		if (!flags.all && !flags.id) {
-			GenericHelpers.logOutput(`Either option "--all" or "--id" have to be set!`);
+			console.info(`Either option "--all" or "--id" have to be set!`);
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			GenericHelpers.logOutput(`You should either use "--all" or "--id" but never both!`);
+			console.info(`You should either use "--all" or "--id" but never both!`);
 			return;
 		}
 
 		if (flags.separate) {
 			try {
 				if (!flags.output) {
-					GenericHelpers.logOutput(`You must inform an output directory via --output when using --separate`);
+					console.info(`You must inform an output directory via --output when using --separate`);
 					return;
 				}
 
 				if (fs.existsSync(flags.output)) {
 					if (!fs.lstatSync(flags.output).isDirectory()) {
-						GenericHelpers.logOutput(`The paramenter --output must be a directory`);
+						console.info(`The paramenter --output must be a directory`);
 						return;
 					}
 				} else {
 					fs.mkdirSync(flags.output, { recursive: true });
 				}
 			} catch (e) {
-				console.error('\nFILESYSTEM ERROR');
-				console.log('====================================');
-				console.error(e.message);
-				console.error(e.stack);
+				console.error('Aborting execution as a filesystem error has been encountered while creating the output directory. See log messages for details.');
+				logger.error('\nFILESYSTEM ERROR');
+				logger.info('====================================');
+				logger.error(e.message);
+				logger.error(e.stack);
 				this.exit(1);
 			}
 		} else if (flags.output) {
 			if (fs.existsSync(flags.output)) {
 				if (fs.lstatSync(flags.output).isDirectory()) {
-					GenericHelpers.logOutput(`The paramenter --output must be a writeble file`);
+					console.info(`The paramenter --output must be a writeble file`);
 					return;
 				}
 			}
@@ -119,18 +130,21 @@ export class ExportWorkflowsCommand extends Command {
 					const filename = (flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) + workflows[i].id + '.json';
 					fs.writeFileSync(filename, fileContents);
 				}
-				console.log('Successfully exported', i, 'workflows.');
+				console.info(`Successfully exported ${i} workflows.`);
 			} else {
 				const fileContents = JSON.stringify(workflows, null, flags.pretty ? 2 : undefined);
 				if (flags.output) {
 					fs.writeFileSync(flags.output!, fileContents);
-					console.log('Successfully exported', workflows.length, workflows.length === 1 ? 'workflow.' : 'workflows.');
+					console.info(`Successfully exported ${workflows.length} ${workflows.length === 1 ? 'workflow.' : 'workflows.'}`);
 				} else {
-					console.log(fileContents);
+					console.info(fileContents);
 				}
 			}
+			// Force exit as process won't exit using MySQL or Postgres.
+			process.exit(0);
 		} catch (error) {
-			this.error(error.message);
+			console.error('Error exporting workflows. See log messages for details.');
+			logger.error(error.message);
 			this.exit(1);
 		}
 	}
diff --git a/packages/cli/commands/import/credentials.ts b/packages/cli/commands/import/credentials.ts
index ed0da4e94b..b038f33693 100644
--- a/packages/cli/commands/import/credentials.ts
+++ b/packages/cli/commands/import/credentials.ts
@@ -10,9 +10,16 @@ import {
 
 import {
 	Db,
-	GenericHelpers,
 } from '../../src';
 
+import { 
+	getLogger,
+} from '../../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
 import * as fs from 'fs';
 import * as glob from 'glob-promise';
 import * as path from 'path';
@@ -37,17 +44,20 @@ export class ImportCredentialsCommand extends Command {
 	};
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		const { flags } = this.parse(ImportCredentialsCommand);
 
 		if (!flags.input) {
-			GenericHelpers.logOutput(`An input file or directory with --input must be provided`);
+			console.info(`An input file or directory with --input must be provided`);
 			return;
 		}
 
 		if (flags.separate) {
 			if (fs.existsSync(flags.input)) {
 				if (!fs.lstatSync(flags.input).isDirectory()) {
-					GenericHelpers.logOutput(`The paramenter --input must be a directory`);
+					console.info(`The paramenter --input must be a directory`);
 					return;
 				}
 			}
@@ -89,9 +99,11 @@ export class ImportCredentialsCommand extends Command {
 					await Db.collections.Credentials!.save(fileContents[i]);
 				}
 			}
-			console.log('Successfully imported', i, 'credentials.');
+			console.info(`Successfully imported ${i} ${i === 1 ? 'credential.' : 'credentials.'}`);
+			process.exit(0);
 		} catch (error) {
-			this.error(error.message);
+			console.error('An error occurred while exporting credentials. See log messages for details.');
+			logger.error(error.message);
 			this.exit(1);
 		}
 	}
diff --git a/packages/cli/commands/import/workflow.ts b/packages/cli/commands/import/workflow.ts
index 7a0dc49e10..5b31041a44 100644
--- a/packages/cli/commands/import/workflow.ts
+++ b/packages/cli/commands/import/workflow.ts
@@ -5,9 +5,16 @@ import {
 
 import {
 	Db,
-	GenericHelpers,
 } from '../../src';
 
+import { 
+	getLogger,
+} from '../../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
 import * as fs from 'fs';
 import * as glob from 'glob-promise';
 import * as path from 'path';
@@ -32,17 +39,20 @@ export class ImportWorkflowsCommand extends Command {
 	};
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		const { flags } = this.parse(ImportWorkflowsCommand);
 
 		if (!flags.input) {
-			GenericHelpers.logOutput(`An input file or directory with --input must be provided`);
+			console.info(`An input file or directory with --input must be provided`);
 			return;
 		}
 
 		if (flags.separate) {
 			if (fs.existsSync(flags.input)) {
 				if (!fs.lstatSync(flags.input).isDirectory()) {
-					GenericHelpers.logOutput(`The paramenter --input must be a directory`);
+					console.info(`The paramenter --input must be a directory`);
 					return;
 				}
 			}
@@ -69,9 +79,11 @@ export class ImportWorkflowsCommand extends Command {
 				}
 			}
 
-			console.log('Successfully imported', i, i === 1 ? 'workflow.' : 'workflows.');
+			console.info(`Successfully imported ${i} ${i === 1 ? 'workflow.' : 'workflows.'}`);
+			process.exit(0);
 		} catch (error) {
-			this.error(error.message);
+			console.error('An error occurred while exporting workflows. See log messages for details.');
+			logger.error(error.message);
 			this.exit(1);
 		}
 	}
diff --git a/packages/cli/commands/start.ts b/packages/cli/commands/start.ts
index c01ad0ed4a..023e3e827f 100644
--- a/packages/cli/commands/start.ts
+++ b/packages/cli/commands/start.ts
@@ -25,11 +25,17 @@ import {
 } from '../src';
 import { IDataObject } from 'n8n-workflow';
 
+import { 
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
 
 let activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner | undefined;
 let processExistCode = 0;
 
-
 export class Start extends Command {
 	static description = 'Starts n8n. Makes Web-UI available and starts active workflows';
 
@@ -71,7 +77,7 @@ export class Start extends Command {
 	 * get removed.
 	 */
 	static async stopProcess() {
-		console.log(`\nStopping n8n...`);
+		getLogger().info('\nStopping n8n...');
 
 		try {
 			const externalHooks = ExternalHooks();
@@ -132,13 +138,18 @@ export class Start extends Command {
 		// Wrap that the process does not close but we can still use async
 		await (async () => {
 			try {
+				const logger = getLogger();
+				LoggerProxy.init(logger);
+				logger.info('Initializing n8n process');
+
 				// Start directly with the init of the database to improve startup time
 				const startDbInitPromise = Db.init().catch((error: Error) => {
-					console.error(`There was an error initializing DB: ${error.message}`);
+					logger.error(`There was an error initializing DB: "${error.message}"`);
 
 					processExistCode = 1;
 					// @ts-ignore
 					process.emit('SIGINT');
+					process.exit(1);
 				});
 
 				// Make sure the settings exist
@@ -184,7 +195,7 @@ export class Start extends Command {
 								cumulativeTimeout += now - lastTimer;
 								lastTimer = now;
 								if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-									console.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + '. Exiting process.');
+									logger.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + ". Exiting process.");
 									process.exit(1);
 								}
 							}
@@ -213,9 +224,9 @@ export class Start extends Command {
 
 					redis.on('error', (error) => {
 						if (error.toString().includes('ECONNREFUSED') === true) {
-							console.warn('Redis unavailable - trying to reconnect...');
+							logger.warn('Redis unavailable - trying to reconnect...');
 						} else {
-							console.warn('Error with Redis: ', error);
+							logger.warn('Error with Redis: ', error);
 						}
 					});
 				}
diff --git a/packages/cli/commands/update/workflow.ts b/packages/cli/commands/update/workflow.ts
index 06be05759d..c7d81901aa 100644
--- a/packages/cli/commands/update/workflow.ts
+++ b/packages/cli/commands/update/workflow.ts
@@ -11,6 +11,13 @@ import {
 	GenericHelpers,
 } from '../../src';
 
+import { 
+	getLogger,
+} from '../../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
 
 export class UpdateWorkflowCommand extends Command {
 	static description = '\Update workflows';
@@ -34,25 +41,28 @@ export class UpdateWorkflowCommand extends Command {
 	};
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		const { flags } = this.parse(UpdateWorkflowCommand);
 
 		if (!flags.all && !flags.id) {
-			GenericHelpers.logOutput(`Either option "--all" or "--id" have to be set!`);
+			console.info(`Either option "--all" or "--id" have to be set!`);
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			GenericHelpers.logOutput(`Either something else on top should be "--all" or "--id" can be set never both!`);
+			console.info(`Either something else on top should be "--all" or "--id" can be set never both!`);
 			return;
 		}
 
 		const updateQuery: IDataObject = {};
 		if (flags.active === undefined) {
-			GenericHelpers.logOutput(`No update flag like "--active=true" has been set!`);
+			console.info(`No update flag like "--active=true" has been set!`);
 			return;
 		} else {
 			if (!['false', 'true'].includes(flags.active)) {
-				GenericHelpers.logOutput(`Valid values for flag "--active" are only "false" or "true"!`);
+				console.info(`Valid values for flag "--active" are only "false" or "true"!`);
 				return;
 			}
 			updateQuery.active = flags.active === 'true';
@@ -63,20 +73,21 @@ export class UpdateWorkflowCommand extends Command {
 
 			const findQuery: IDataObject = {};
 			if (flags.id) {
-				console.log(`Deactivating workflow with ID: ${flags.id}`);
+				console.info(`Deactivating workflow with ID: ${flags.id}`);
 				findQuery.id = flags.id;
 			} else {
-				console.log('Deactivating all workflows');
+				console.info('Deactivating all workflows');
 				findQuery.active = true;
 			}
 
 			await Db.collections.Workflow!.update(findQuery, updateQuery);
-			console.log('Done');
+			console.info('Done');
 		} catch (e) {
-			console.error('\nGOT ERROR');
-			console.log('====================================');
-			console.error(e.message);
-			console.error(e.stack);
+			console.error('Error updating database. See log messages for details.');
+			logger.error('\nGOT ERROR');
+			logger.info('====================================');
+			logger.error(e.message);
+			logger.error(e.stack);
 			this.exit(1);
 		}
 
diff --git a/packages/cli/commands/webhook.ts b/packages/cli/commands/webhook.ts
index 68c5876543..da09857380 100644
--- a/packages/cli/commands/webhook.ts
+++ b/packages/cli/commands/webhook.ts
@@ -20,6 +20,13 @@ import {
 } from '../src';
 import { IDataObject } from 'n8n-workflow';
 
+import { 
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
 
 let activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner | undefined;
 let processExistCode = 0;
@@ -42,7 +49,7 @@ export class Webhook extends Command {
 	 * get removed.
 	 */
 	static async stopProcess() {
-		console.log(`\nStopping n8n...`);
+		LoggerProxy.info(`\nStopping n8n...`);
 
 		try {
 			const externalHooks = ExternalHooks();
@@ -72,7 +79,7 @@ export class Webhook extends Command {
 			let count = 0;
 			while (executingWorkflows.length !== 0) {
 				if (count++ % 4 === 0) {
-					console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
+					LoggerProxy.info(`Waiting for ${executingWorkflows.length} active executions to finish...`);
 				}
 				await new Promise((resolve) => {
 					setTimeout(resolve, 500);
@@ -81,7 +88,7 @@ export class Webhook extends Command {
 			}
 
 		} catch (error) {
-			console.error('There was an error shutting down n8n.', error);
+			LoggerProxy.error('There was an error shutting down n8n.', error);
 		}
 
 		process.exit(processExistCode);
@@ -89,6 +96,9 @@ export class Webhook extends Command {
 
 
 	async run() {
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
 		// Make sure that n8n shuts down gracefully if possible
 		process.on('SIGTERM', Webhook.stopProcess);
 		process.on('SIGINT', Webhook.stopProcess);
@@ -116,11 +126,12 @@ export class Webhook extends Command {
 			try {
 				// Start directly with the init of the database to improve startup time
 				const startDbInitPromise = Db.init().catch(error => {
-					console.error(`There was an error initializing DB: ${error.message}`);
+					logger.error(`There was an error initializing DB: "${error.message}"`);
 
 					processExistCode = 1;
 					// @ts-ignore
 					process.emit('SIGINT');
+					process.exit(1);
 				});
 
 				// Make sure the settings exist
@@ -166,7 +177,7 @@ export class Webhook extends Command {
 								cumulativeTimeout += now - lastTimer;
 								lastTimer = now;
 								if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-									console.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + '. Exiting process.');
+									logger.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + ". Exiting process.");
 									process.exit(1);
 								}
 							}
@@ -195,9 +206,9 @@ export class Webhook extends Command {
 
 					redis.on('error', (error) => {
 						if (error.toString().includes('ECONNREFUSED') === true) {
-							console.warn('Redis unavailable - trying to reconnect...');
+							logger.warn('Redis unavailable - trying to reconnect...');
 						} else {
-							console.warn('Error with Redis: ', error);
+							logger.warn('Error with Redis: ', error);
 						}
 					});
 				}
@@ -209,14 +220,16 @@ export class Webhook extends Command {
 				await activeWorkflowRunner.initWebhooks();
 
 				const editorUrl = GenericHelpers.getBaseUrl();
-				this.log('Webhook listener waiting for requests.');
+				console.info('Webhook listener waiting for requests.');
 
 			} catch (error) {
-				this.error(`There was an error: ${error.message}`);
+				console.error('Exiting due to error. See log message for details.');
+				logger.error(`Webhook process cannot continue. "${error.message}"`);
 
 				processExistCode = 1;
 				// @ts-ignore
 				process.emit('SIGINT');
+				process.exit(1);
 			}
 		})();
 	}
diff --git a/packages/cli/commands/worker.ts b/packages/cli/commands/worker.ts
index d7af9ac794..56da5d9c98 100644
--- a/packages/cli/commands/worker.ts
+++ b/packages/cli/commands/worker.ts
@@ -37,6 +37,14 @@ import {
 	WorkflowExecuteAdditionalData,
 } from '../src';
 
+import { 
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
 import * as config from '../config';
 import * as Bull from 'bull';
 import * as Queue from '../src/Queue';
@@ -71,7 +79,7 @@ export class Worker extends Command {
 	 * get removed.
 	 */
 	static async stopProcess() {
-		console.log(`\nStopping n8n...`);
+		LoggerProxy.info(`Stopping n8n...`);
 
 		// Stop accepting new jobs
 		Worker.jobQueue.pause(true);
@@ -95,7 +103,7 @@ export class Worker extends Command {
 			while (Object.keys(Worker.runningJobs).length !== 0) {
 				if (count++ % 4 === 0) {
 					const waitLeft = Math.ceil((stopTime - new Date().getTime()) / 1000);
-					console.log(`Waiting for ${Object.keys(Worker.runningJobs).length} active executions to finish... (wait ${waitLeft} more seconds)`);
+					LoggerProxy.info(`Waiting for ${Object.keys(Worker.runningJobs).length} active executions to finish... (wait ${waitLeft} more seconds)`);
 				}
 				await new Promise((resolve) => {
 					setTimeout(resolve, 500);
@@ -103,7 +111,7 @@ export class Worker extends Command {
 			}
 
 		} catch (error) {
-			console.error('There was an error shutting down n8n.', error);
+			LoggerProxy.error('There was an error shutting down n8n.', error);
 		}
 
 		process.exit(Worker.processExistCode);
@@ -113,7 +121,7 @@ export class Worker extends Command {
 		const jobData = job.data as IBullJobData;
 		const executionDb = await Db.collections.Execution!.findOne(jobData.executionId) as IExecutionFlattedDb;
 		const currentExecutionDb = ResponseHelper.unflattenExecutionData(executionDb) as IExecutionResponse;
-		console.log(`Start job: ${job.id} (Workflow ID: ${currentExecutionDb.workflowData.id} | Execution: ${jobData.executionId})`);
+		LoggerProxy.info(`Start job: ${job.id} (Workflow ID: ${currentExecutionDb.workflowData.id} | Execution: ${jobData.executionId})`);
 
 		let staticData = currentExecutionDb.workflowData!.staticData;
 		if (jobData.loadStaticData === true) {
@@ -170,7 +178,10 @@ export class Worker extends Command {
 	}
 
 	async run() {
-		console.log('Starting n8n worker...');
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
+		console.info('Starting n8n worker...');
 
 		// Make sure that n8n shuts down gracefully if possible
 		process.on('SIGTERM', Worker.stopProcess);
@@ -183,11 +194,12 @@ export class Worker extends Command {
 
 				// Start directly with the init of the database to improve startup time
 				const startDbInitPromise = Db.init().catch(error => {
-					console.error(`There was an error initializing DB: ${error.message}`);
+					logger.error(`There was an error initializing DB: "${error.message}"`);
 
 					Worker.processExistCode = 1;
 					// @ts-ignore
 					process.emit('SIGINT');
+					process.exit(1);
 				});
 
 				// Make sure the settings exist
@@ -221,10 +233,10 @@ export class Worker extends Command {
 
 				const versions = await GenericHelpers.getVersions();
 
-				console.log('\nn8n worker is now ready');
-				console.log(` * Version: ${versions.cli}`);
-				console.log(` * Concurrency: ${flags.concurrency}`);
-				console.log('');
+				console.info('\nn8n worker is now ready');
+				console.info(` * Version: ${versions.cli}`);
+				console.info(` * Concurrency: ${flags.concurrency}`);
+				console.info('');
 
 				Worker.jobQueue.on('global:progress', (jobId, progress) => {
 					// Progress of a job got updated which does get used
@@ -252,27 +264,28 @@ export class Worker extends Command {
 							cumulativeTimeout += now - lastTimer;
 							lastTimer = now;
 							if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-								console.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + '. Exiting process.');
+								logger.error('Unable to connect to Redis after ' + redisConnectionTimeoutLimit + ". Exiting process.");
 								process.exit(1);
 							}
 						}
-						console.warn('Redis unavailable - trying to reconnect...');
+						logger.warn('Redis unavailable - trying to reconnect...');
 					} else if (error.toString().includes('Error initializing Lua scripts') === true) {
 						// This is a non-recoverable error
 						// Happens when worker starts and Redis is unavailable
 						// Even if Redis comes back online, worker will be zombie
-						console.error('Error initializing worker.');
+						logger.error('Error initializing worker.');
 						process.exit(2);
 					} else {
-						console.error('Error from queue: ', error);
+						logger.error('Error from queue: ', error);
 					}
 				});
 			} catch (error) {
-				this.error(`There was an error: ${error.message}`);
+				logger.error(`Worker process cannot continue. "${error.message}"`);
 
 				Worker.processExistCode = 1;
 				// @ts-ignore
 				process.emit('SIGINT');
+				process.exit(1);
 			}
 		})();
 
diff --git a/packages/cli/config/index.ts b/packages/cli/config/index.ts
index 9b2c6ea614..c8d97684d9 100644
--- a/packages/cli/config/index.ts
+++ b/packages/cli/config/index.ts
@@ -1,5 +1,7 @@
 import * as convict from 'convict';
 import * as dotenv from 'dotenv';
+import * as path from 'path';
+import * as core from 'n8n-core';
 
 dotenv.config();
 
@@ -572,6 +574,41 @@ const config = convict({
 		},
 	},
 
+	logs: {
+		level: {
+			doc: 'Log output level. Options are error, warn, info, verbose and debug.',
+			format: String,
+			default: 'info',
+			env: 'N8N_LOG_LEVEL',
+		},
+		output: {
+			doc: 'Where to output logs. Options are: console, file. Multiple can be separated by comma (",")',
+			format: String,
+			default: 'console',
+			env: 'N8N_LOG_OUTPUT',
+		},
+		file: {
+			fileCountMax: {
+				doc: 'Maximum number of files to keep.',
+				format: Number,
+				default: 100,
+				env: 'N8N_LOG_FILE_COUNT_MAX',
+			},
+			fileSizeMax: {
+				doc: 'Maximum size for each log file in MB.',
+				format: Number,
+				default: 16,
+				env: 'N8N_LOG_FILE_SIZE_MAX',
+			},
+			location: {
+				doc: 'Log file location; only used if log output is set to file.',
+				format: String,
+				default: path.join(core.UserSettings.getUserN8nFolderPath(), 'logs/n8n.log'),
+				env: 'N8N_LOG_FILE_LOCATION',
+			},
+		},
+	},
+
 });
 
 // Overwrite default configuration with settings which got defined in
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7eba64834e..0c269ea504 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -87,6 +87,7 @@
     "body-parser": "^1.18.3",
     "body-parser-xml": "^1.1.0",
     "bull": "^3.19.0",
+    "callsites": "^3.1.0",
     "client-oauth2": "^4.2.5",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 07cd0a8b82..9f9b9f3580 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -35,6 +35,9 @@ import {
 } from 'n8n-workflow';
 
 import * as express from 'express';
+import { 
+	LoggerProxy as Logger,
+} from 'n8n-workflow';
 
 export class ActiveWorkflowRunner {
 	private activeWorkflows: ActiveWorkflows | null = null;
@@ -43,7 +46,6 @@ export class ActiveWorkflowRunner {
 		[key: string]: IActivationError;
 	} = {};
 
-
 	async init() {
 
 		// Get the active workflows from database
@@ -59,20 +61,24 @@ export class ActiveWorkflowRunner {
 		this.activeWorkflows = new ActiveWorkflows();
 
 		if (workflowsData.length !== 0) {
-			console.log('\n ================================');
-			console.log('   Start Active Workflows:');
-			console.log(' ================================');
+			console.info(' ================================');
+			console.info('   Start Active Workflows:');
+			console.info(' ================================');
 
 			for (const workflowData of workflowsData) {
 				console.log(`   - ${workflowData.name}`);
+				Logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {workflowName: workflowData.name, workflowId: workflowData.id});
 				try {
 					await this.add(workflowData.id.toString(), 'init', workflowData);
+					Logger.verbose(`Successfully started workflow "${workflowData.name}"`, {workflowName: workflowData.name, workflowId: workflowData.id});
 					console.log(`     => Started`);
 				} catch (error) {
 					console.log(`     => ERROR: Workflow could not be activated:`);
 					console.log(`               ${error.message}`);
+					Logger.error(`Unable to initialize workflow "${workflowData.name}" (startup)`, {workflowName: workflowData.name, workflowId: workflowData.id});
 				}
 			}
+			Logger.verbose('Finished initializing active workflows (startup)');
 		}
 	}
 
@@ -88,6 +94,7 @@ export class ActiveWorkflowRunner {
 	 */
 	async removeAll(): Promise<void> {
 		const activeWorkflowId: string[] = [];
+		Logger.verbose('Call to remove all active workflows received (removeAll)');
 
 		if (this.activeWorkflows !== null) {
 			// TODO: This should be renamed!
@@ -117,6 +124,7 @@ export class ActiveWorkflowRunner {
 	 * @memberof ActiveWorkflowRunner
 	 */
 	async executeWebhook(httpMethod: WebhookHttpMethod, path: string, req: express.Request, res: express.Response): Promise<IResponseCallbackData> {
+		Logger.debug(`Received webhoook "${httpMethod}" for path "${path}"`);
 		if (this.activeWorkflows === null) {
 			throw new ResponseHelper.ResponseError('The "activeWorkflows" instance did not get initialized yet.', 404, 404);
 		}
@@ -437,6 +445,7 @@ export class ActiveWorkflowRunner {
 		return ((workflow: Workflow, node: INode) => {
 			const returnFunctions = NodeExecuteFunctions.getExecutePollFunctions(workflow, node, additionalData, mode, activation);
 			returnFunctions.__emit = (data: INodeExecutionData[][]): void => {
+				Logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
 				this.runWorkflow(workflowData, node, data, additionalData, mode);
 			};
 			return returnFunctions;
@@ -458,6 +467,7 @@ export class ActiveWorkflowRunner {
 		return ((workflow: Workflow, node: INode) => {
 			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(workflow, node, additionalData, mode, activation);
 			returnFunctions.emit = (data: INodeExecutionData[][]): void => {
+				Logger.debug(`Received trigger for workflow "${workflow.name}"`);
 				WorkflowHelpers.saveStaticData(workflow);
 				this.runWorkflow(workflowData, node, data, additionalData, mode).catch((err) => console.error(err));
 			};
@@ -492,6 +502,7 @@ export class ActiveWorkflowRunner {
 
 			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(['n8n-nodes-base.start']);
 			if (canBeActivated === false) {
+				Logger.error(`Unable to activate workflow "${workflowData.name}"`);
 				throw new Error(`The workflow can not be activated because it does not contain any nodes which could start the workflow. Only workflows which have trigger or webhook nodes can be activated.`);
 			}
 
@@ -507,6 +518,7 @@ export class ActiveWorkflowRunner {
 			if (workflowInstance.getTriggerNodes().length !== 0
 				|| workflowInstance.getPollNodes().length !== 0) {
 					await this.activeWorkflows.add(workflowId, workflowInstance, additionalData, mode, activation, getTriggerFunctions, getPollFunctions);
+				Logger.info(`Successfully activated workflow "${workflowData.name}"`);
 			}
 
 			if (this.activationErrors[workflowId] !== undefined) {
diff --git a/packages/cli/src/Logger.ts b/packages/cli/src/Logger.ts
new file mode 100644
index 0000000000..3bbc61e6a9
--- /dev/null
+++ b/packages/cli/src/Logger.ts
@@ -0,0 +1,114 @@
+import config = require('../config');
+import * as winston from 'winston';
+
+import {
+	IDataObject,
+	ILogger,
+	LogTypes,
+} from 'n8n-workflow';
+
+import * as callsites from 'callsites';
+import { basename } from 'path';
+
+class Logger implements ILogger {
+	private logger: winston.Logger;
+
+	constructor() {
+		const level = config.get('logs.level');
+		const output = (config.get('logs.output') as string).split(',').map(output => output.trim());
+
+		this.logger = winston.createLogger({
+			level,
+		});
+
+		if (output.includes('console')) {
+			let format: winston.Logform.Format;
+			if (['debug', 'verbose'].includes(level)) {
+				format = winston.format.combine(
+					winston.format.metadata(),
+					winston.format.timestamp(),
+					winston.format.colorize({ all: true }),
+					winston.format.printf(({ level, message, timestamp, metadata }) => {
+						return `${timestamp} | ${level.padEnd(18)} | ${message}` + (Object.keys(metadata).length ? ` ${JSON.stringify(metadata)}` : '');
+					}) as winston.Logform.Format
+				);
+			} else {
+				format = winston.format.printf(({ message }) => message) as winston.Logform.Format;
+			}
+
+			this.logger.add(
+				new winston.transports.Console({
+					format,
+				})
+			);
+		}
+
+		if (output.includes('file')) {
+			const fileLogFormat = winston.format.combine(
+				winston.format.timestamp(),
+				winston.format.metadata(),
+				winston.format.json()
+			);
+			this.logger.add(
+				new winston.transports.File({
+					filename: config.get('logs.file.location'),
+					format: fileLogFormat,
+					maxsize: config.get('logs.file.fileSizeMax') as number * 1048576, // config * 1mb
+					maxFiles: config.get('logs.file.fileCountMax'),
+				})
+			);
+		}
+	}
+
+	log(type: LogTypes, message: string, meta: object = {}) {
+		const callsite = callsites();
+		// We are using the third array element as the structure is as follows:
+		// [0]: this file
+		// [1]: Should be LoggerProxy
+		// [2]: Should point to the caller.
+		// Note: getting line number is useless because at this point
+		// We are in runtime, so it means we are looking at compiled js files
+		const logDetails = {} as IDataObject;
+		if (callsite[2] !== undefined) {
+			logDetails.file = basename(callsite[2].getFileName() || '');
+			const functionName = callsite[2].getFunctionName();
+			if (functionName) {
+				logDetails.function = functionName;
+			}
+		}
+		this.logger.log(type, message, {...meta, ...logDetails});
+	}
+
+	// Convenience methods below
+
+	debug(message: string, meta: object = {}) {
+		this.log('debug', message, meta);
+	}
+
+	info(message: string, meta: object = {}) {
+		this.log('info', message, meta);
+	}
+
+	error(message: string, meta: object = {}) {
+		this.log('error', message, meta);
+	}
+
+	verbose(message: string, meta: object = {}) {
+		this.log('verbose', message, meta);
+	}
+
+	warn(message: string, meta: object = {}) {
+		this.log('warn', message, meta);
+	}
+
+}
+
+let activeLoggerInstance: Logger | undefined;
+
+export function getLogger() {
+	if (activeLoggerInstance === undefined) {
+		activeLoggerInstance = new Logger();
+	}
+
+	return activeLoggerInstance;
+}
diff --git a/packages/cli/src/Push.ts b/packages/cli/src/Push.ts
index 94172ac35b..78a20fde57 100644
--- a/packages/cli/src/Push.ts
+++ b/packages/cli/src/Push.ts
@@ -7,6 +7,10 @@ import {
 	IPushDataType,
 } from '.';
 
+import {
+	LoggerProxy as Logger,
+} from 'n8n-workflow';
+
 export class Push {
 	private channel: sseChannel;
 	private connections: {
@@ -24,6 +28,7 @@ export class Push {
 
 		this.channel.on('disconnect', (channel: string, res: express.Response) => {
 			if (res.req !== undefined) {
+				Logger.debug(`Remove editor-UI session`, { sessionId: res.req.query.sessionId });
 				delete this.connections[res.req.query.sessionId as string];
 			}
 		});
@@ -39,6 +44,8 @@ export class Push {
 	 * @memberof Push
 	 */
 	add(sessionId: string, req: express.Request, res: express.Response) {
+		Logger.debug(`Add editor-UI session`, { sessionId });
+
 		if (this.connections[sessionId] !== undefined) {
 			// Make sure to remove existing connection with the same session
 			// id if one exists already
@@ -64,11 +71,12 @@ export class Push {
 
 	send(type: IPushDataType, data: any, sessionId?: string) { // tslint:disable-line:no-any
 		if (sessionId !== undefined && this.connections[sessionId] === undefined) {
-			// TODO: Log that properly!
-			console.error(`The session "${sessionId}" is not registred.`);
+			Logger.error(`The session "${sessionId}" is not registred.`, { sessionId });
 			return;
 		}
 
+		Logger.debug(`Send data of type "${type}" to editor-UI`, { dataType: type, sessionId });
+
 		const sendData: IPushData = {
 			type,
 			data,
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index 8913777329..f0d5f63818 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -30,13 +30,14 @@ import {
 	IWebhookData,
 	IWebhookResponseData,
 	IWorkflowExecuteAdditionalData,
+	LoggerProxy as Logger,
 	NodeHelpers,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 
-const activeExecutions = ActiveExecutions.getInstance();
 
+const activeExecutions = ActiveExecutions.getInstance();
 
 /**
  * Returns all the webhooks which should be created for the give workflow
@@ -286,6 +287,8 @@ export function getWorkflowWebhooksBasic(workflow: Workflow): IWebhookData[] {
 		const workflowRunner = new WorkflowRunner();
 		const executionId = await workflowRunner.run(runData, true, !didSendResponse);
 
+		Logger.verbose(`Started execution of workflow "${workflow.name}" from webhook with execution ID ${executionId}`, { executionId });
+
 		// Get a promise which resolves when the workflow did execute and send then response
 		const executePromise = activeExecutions.getPostExecutePromise(executionId) as Promise<IExecutionDb | undefined>;
 		executePromise.then((data) => {
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 8e0793385a..dd7e8a6533 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -37,6 +37,7 @@ import {
 	IWorkflowExecuteAdditionalData,
 	IWorkflowExecuteHooks,
 	IWorkflowHooksOptionalParameters,
+	LoggerProxy as Logger,
 	Workflow,
 	WorkflowExecuteMode,
 	WorkflowHooks,
@@ -44,11 +45,10 @@ import {
 
 import * as config from '../config';
 
-import { LessThanOrEqual } from "typeorm";
+import { LessThanOrEqual } from 'typeorm';
 
 const ERROR_TRIGGER_TYPE = config.get('nodes.errorTriggerType') as string;
 
-
 /**
  * Checks if there was an error and if errorWorkflow or a trigger is defined. If so it collects
  * all the data and executes it
@@ -85,9 +85,11 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
 		// Run the error workflow
 		// To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
 		if (workflowData.settings !== undefined && workflowData.settings.errorWorkflow && !(mode === 'error' && workflowData.id && workflowData.settings.errorWorkflow.toString() === workflowData.id.toString())) {
+			Logger.verbose(`Start external error workflow`, { executionId: this.executionId, errorWorkflowId: workflowData.settings.errorWorkflow.toString(), workflowId: this.workflowData.id });
 			// If a specific error workflow is set run only that one
 			WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData);
 		} else if (mode !== 'error' && workflowData.id !== undefined && workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)) {
+			Logger.verbose(`Start internal error workflow`, { executionId: this.executionId, workflowId: this.workflowData.id });
 			// If the workflow contains
 			WorkflowHelpers.executeErrorWorkflow(workflowData.id.toString(), workflowErrorData);
 		}
@@ -102,6 +104,8 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
 let throttling = false;
 function pruneExecutionData(): void {
 	if (!throttling) {
+		Logger.verbose('Pruning execution data from database');
+
 		throttling = true;
 		const timeout = config.get('executions.pruneDataTimeout') as number; // in seconds
 		const maxAge = config.get('executions.pruneDataMaxAge') as number; // in h
@@ -133,6 +137,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				if (this.sessionId === undefined) {
 					return;
 				}
+				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, { executionId: this.executionId, sessionId: this.sessionId, workflowId: this.workflowData.id });
 
 				const pushInstance = Push.getInstance();
 				pushInstance.send('nodeExecuteBefore', {
@@ -147,6 +152,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				if (this.sessionId === undefined) {
 					return;
 				}
+				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, { executionId: this.executionId, sessionId: this.sessionId, workflowId: this.workflowData.id });
 
 				const pushInstance = Push.getInstance();
 				pushInstance.send('nodeExecuteAfter', {
@@ -158,6 +164,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 		],
 		workflowExecuteBefore: [
 			async function (this: WorkflowHooks): Promise<void> {
+				Logger.debug(`Executing hook (hookFunctionsPush)`, { executionId: this.executionId, sessionId: this.sessionId, workflowId: this.workflowData.id });
 				// Push data to session which started the workflow
 				if (this.sessionId === undefined) {
 					return;
@@ -168,13 +175,14 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					mode: this.mode,
 					startedAt: new Date(),
 					retryOf: this.retryOf,
-					workflowId: this.workflowData.id as string,
+					workflowId: this.workflowData.id, sessionId: this.sessionId as string,
 					workflowName: this.workflowData.name,
 				}, this.sessionId);
 			},
 		],
 		workflowExecuteAfter: [
 			async function (this: WorkflowHooks, fullRunData: IRun, newStaticData: IDataObject): Promise<void> {
+				Logger.debug(`Executing hook (hookFunctionsPush)`, { executionId: this.executionId, sessionId: this.sessionId, workflowId: this.workflowData.id });
 				// Push data to session which started the workflow
 				if (this.sessionId === undefined) {
 					return;
@@ -195,6 +203,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				};
 
 				// Push data to editor-ui once workflow finished
+				Logger.debug(`Save execution progress to database for execution ID ${this.executionId} `, { executionId: this.executionId, workflowId: this.workflowData.id });
 				// TODO: Look at this again
 				const sendData: IPushDataExecutionFinished = {
 					executionId: this.executionId,
@@ -232,6 +241,8 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 				}
 
 				try {
+					Logger.debug(`Save execution progress to database for execution ID ${this.executionId} `, { executionId: this.executionId, nodeName });
+
 					const execution = await Db.collections.Execution!.findOne(this.executionId);
 
 					if (execution === undefined) {
@@ -286,7 +297,7 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 					// For busy machines, we may get "Database is locked" errors.
 
 					// We do this to prevent crashes and executions ending in `unknown` state.
-					console.log(`Failed saving execution progress to database for execution ID ${this.executionId}`, err);
+					Logger.error(`Failed saving execution progress to database for execution ID ${this.executionId} (hookFunctionsPreExecute, nodeExecuteAfter)`, { ...err, executionId: this.executionId, sessionId: this.sessionId, workflowId: this.workflowData.id });
 				}
 
 			},
@@ -307,6 +318,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 		workflowExecuteBefore: [],
 		workflowExecuteAfter: [
 			async function (this: WorkflowHooks, fullRunData: IRun, newStaticData: IDataObject): Promise<void> {
+				Logger.debug(`Executing hook (hookFunctionsSave)`, { executionId: this.executionId, workflowId: this.workflowData.id });
 
 				// Prune old execution data
 				if (config.get('executions.pruneData')) {
@@ -321,8 +333,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						try {
 							await WorkflowHelpers.saveStaticDataById(this.workflowData.id as string, newStaticData);
 						} catch (e) {
-							// TODO: Add proper logging!
-							console.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: ${e.message}`);
+							Logger.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`, { executionId: this.executionId, workflowId: this.workflowData.id });
 						}
 					}
 
@@ -375,6 +386,9 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						fullExecutionData.workflowId = this.workflowData.id.toString();
 					}
 
+					// Leave log message before flatten as that operation increased memory usage a lot and the chance of a crash is highest here
+					Logger.debug(`Save execution data to database for execution ID ${this.executionId}`, { executionId: this.executionId, workflowId: this.workflowData.id });
+
 					const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
 
 					// Save the Execution in DB
@@ -420,8 +434,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						try {
 							await WorkflowHelpers.saveStaticDataById(this.workflowData.id as string, newStaticData);
 						} catch (e) {
-							// TODO: Add proper logging!
-							console.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: ${e.message}`);
+							Logger.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`, { sessionId: this.sessionId, workflowId: this.workflowData.id });
 						}
 					}
 
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index 7071c1b715..76c264d643 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -18,8 +18,8 @@ import {
 	IRunExecutionData,
 	ITaskData,
 	IWorkflowCredentials,
-	Workflow,
-} from 'n8n-workflow';
+	LoggerProxy as Logger,
+	Workflow,} from 'n8n-workflow';
 
 import * as config from '../config';
 
@@ -86,7 +86,7 @@ export async function executeErrorWorkflow(workflowId: string, workflowErrorData
 
 		if (workflowData === undefined) {
 			// The error workflow could not be found
-			console.error(`ERROR: Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find error workflow "${workflowId}"`);
+			Logger.error(`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find error workflow "${workflowId}"`, { workflowId });
 			return;
 		}
 
@@ -105,7 +105,7 @@ export async function executeErrorWorkflow(workflowId: string, workflowErrorData
 		}
 
 		if (workflowStartNode === undefined) {
-			console.error(`ERROR: Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find "${ERROR_TRIGGER_TYPE}" in workflow "${workflowId}"`);
+			Logger.error(`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find "${ERROR_TRIGGER_TYPE}" in workflow "${workflowId}"`);
 			return;
 		}
 
@@ -153,7 +153,7 @@ export async function executeErrorWorkflow(workflowId: string, workflowErrorData
 		const workflowRunner = new WorkflowRunner();
 		await workflowRunner.run(runData);
 	} catch (error) {
-		console.error(`ERROR: Calling Error Workflow for "${workflowErrorData.workflow.id}": ${error.message}`);
+		Logger.error(`Calling Error Workflow for "${workflowErrorData.workflow.id}": "${error.message}"`, { workflowId: workflowErrorData.workflow.id });
 	}
 }
 
@@ -315,8 +315,7 @@ export async function saveStaticData(workflow: Workflow): Promise <void> {
 				await saveStaticDataById(workflow.id!, workflow.staticData);
 				workflow.staticData.__dataChanged = false;
 			} catch (e) {
-				// TODO: Add proper logging!
-				console.error(`There was a problem saving the workflow with id "${workflow.id}" to save changed staticData: ${e.message}`);
+				Logger.error(`There was a problem saving the workflow with id "${workflow.id}" to save changed staticData: "${e.message}"`, { workflowId: workflow.id });
 			}
 		}
 	}
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 7ded8d81b3..1cf4e43b35 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -29,6 +29,7 @@ import {
 import {
 	ExecutionError,
 	IRun,
+	LoggerProxy as Logger,
 	Workflow,
 	WorkflowExecuteMode,
 	WorkflowHooks,
@@ -177,20 +178,24 @@ export class WorkflowRunner {
 
 		// Register the active execution
 		const executionId = await this.activeExecutions.add(data, undefined);
+		Logger.verbose(`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`, {executionId});
 
 		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId, true);
 
 		let workflowExecution: PCancelable<IRun>;
 		if (data.executionData !== undefined) {
+			Logger.debug(`Execution ID ${executionId} had Execution data. Running with payload.`, {executionId});
 			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode, data.executionData);
 			workflowExecution = workflowExecute.processRunExecutionData(workflow);
 		} else if (data.runData === undefined || data.startNodes === undefined || data.startNodes.length === 0 || data.destinationNode === undefined) {
+			Logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {executionId});
 			// Execute all nodes
 
 			// Can execute without webhook so go on
 			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
 			workflowExecution = workflowExecute.run(workflow, undefined, data.destinationNode);
 		} else {
+			Logger.debug(`Execution ID ${executionId} is a partial execution.`, {executionId});
 			// Execute only the nodes between start and destination nodes
 			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
 			workflowExecution = workflowExecute.runPartialWorkflow(workflow, data.runData, data.startNodes, data.destinationNode);
@@ -450,6 +455,7 @@ export class WorkflowRunner {
 
 		// Listen to data from the subprocess
 		subprocess.on('message', async (message: IProcessMessage) => {
+			Logger.debug(`Received child process message of type ${message.type} for execution ID ${executionId}.`, {executionId});
 			if (message.type === 'start') {
 				// Now that the execution actually started set the timeout again so that does not time out to early.
 				startedAt = new Date();
@@ -491,11 +497,13 @@ export class WorkflowRunner {
 		// Also get informed when the processes does exit especially when it did crash or timed out
 		subprocess.on('exit', async (code, signal) => {
 			if (signal === 'SIGTERM'){
+				Logger.debug(`Subprocess for execution ID ${executionId} timed out.`, {executionId});
 				// Execution timed out and its process has been terminated
 				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
 
 				this.processError(timeoutError, startedAt, data.executionMode, executionId);
 			} else if (code !== 0) {
+				Logger.debug(`Subprocess for execution ID ${executionId} finished with error code ${code}.`, {executionId});
 				// Process did exit with error code, so something went wrong.
 				const executionError = new WorkflowOperationError('Workflow execution process did crash for an unknown reason!');
 
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index f3c381fb7d..14ae4a1abf 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -20,23 +20,29 @@ import {
 	ExecutionError,
 	IDataObject,
 	IExecuteWorkflowInfo,
+	ILogger,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeData,
 	IRun,
-	IRunExecutionData,
 	ITaskData,
 	IWorkflowExecuteAdditionalData,
 	IWorkflowExecuteHooks,
+	LoggerProxy,
 	Workflow,
 	WorkflowHooks,
 	WorkflowOperationError,
 } from 'n8n-workflow';
 
+import {
+	getLogger,
+} from '../src/Logger';
+
 import * as config from '../config';
 
 export class WorkflowRunnerProcess {
 	data: IWorkflowExecutionDataProcessWithExecution | undefined;
+	logger: ILogger;
 	startedAt = new Date();
 	workflow: Workflow | undefined;
 	workflowExecute: WorkflowExecute | undefined;
@@ -57,7 +63,13 @@ export class WorkflowRunnerProcess {
 		process.on('SIGTERM', WorkflowRunnerProcess.stopProcess);
 		process.on('SIGINT', WorkflowRunnerProcess.stopProcess);
 
+		const logger = this.logger = getLogger();
+		LoggerProxy.init(logger);
+
 		this.data = inputData;
+
+		logger.verbose('Initializing n8n sub-process', { pid: process.pid, workflowId: this.data.workflowData.id });
+
 		let className: string;
 		let tempNode: INodeType;
 		let filePath: string;
@@ -152,6 +164,8 @@ export class WorkflowRunnerProcess {
 				throw e;
 			}
 
+			await sendToParentProcess('finishExecution', { executionId, result });
+
 			const returnData = WorkflowHelpers.getDataLastExecutedNodeData(result);
 			return returnData!.data!.main;
 		};
@@ -187,12 +201,7 @@ export class WorkflowRunnerProcess {
 				parameters,
 			});
 		} catch (error) {
-			// TODO: Add proper logging
-			console.error(`There was a problem sending hook: "${hook}"`);
-			console.error('Parameters:');
-			console.error(parameters);
-			console.error('Error:');
-			console.error(error);
+			this.logger.error(`There was a problem sending hook: "${hook}"`, { parameters, error});
 		}
 	}
 
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 320e9fa73f..7b2342b1c6 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -7,6 +7,7 @@ import {
 	IPollResponse,
 	ITriggerResponse,
 	IWorkflowExecuteAdditionalData,
+	LoggerProxy as Logger,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
@@ -17,6 +18,7 @@ import {
 	IWorkflowData,
 } from './';
 
+
 export class ActiveWorkflows {
 	private workflowData: {
 		[key: string]: IWorkflowData;
@@ -163,6 +165,7 @@ export class ActiveWorkflows {
 
 		// The trigger function to execute when the cron-time got reached
 		const executeTrigger = async () => {
+			Logger.info(`Polling trigger initiated for workflow "${workflow.name}"`, {workflowName: workflow.name, workflowId: workflow.id});
 			const pollResponse = await workflow.runPoll(node, pollFunctions);
 
 			if (pollResponse !== null) {
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index e77e1a3d94..aeeb39c810 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -51,6 +51,9 @@ import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
 import { fromBuffer } from 'file-type';
 import { lookup } from 'mime-types';
+import {
+	LoggerProxy as Logger,
+} from 'n8n-workflow';
 
 const requestPromiseWithDefaults = requestPromise.defaults({
 	timeout: 300000, // 5 minutes
@@ -188,8 +191,12 @@ export function requestOAuth2(this: IAllExecuteFunctions, credentialsType: strin
 					};
 				}
 
+				Logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`);
+
 				const newToken = await token.refresh(tokenRefreshOptions);
 
+				Logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
+
 				credentials.oauthTokenData = newToken.data;
 
 				// Find the name of the credentials
@@ -201,6 +208,8 @@ export function requestOAuth2(this: IAllExecuteFunctions, credentialsType: strin
 				// Save the refreshed token
 				await additionalData.credentialsHelper.updateCredentials(name, credentialsType, credentials);
 
+				Logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been saved to database successfully.`);
+
 				// Make the request again with the new token
 				const newRequestOptions = newToken.sign(requestOptions as clientOAuth2.RequestObject);
 
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 40fe227d33..8d474a458f 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -15,6 +15,7 @@ import {
 	ITaskDataConnections,
 	IWaitingForExecution,
 	IWorkflowExecuteAdditionalData,
+	LoggerProxy as Logger,
 	Workflow,
 	WorkflowExecuteMode,
 	WorkflowOperationError,
@@ -482,6 +483,8 @@ export class WorkflowExecute {
 	 * @memberof WorkflowExecute
 	 */
 	processRunExecutionData(workflow: Workflow): PCancelable<IRun> {
+		Logger.verbose('Workflow execution started', { workflowId: workflow.id });
+
 		const startedAt = new Date();
 
 		const workflowIssues = workflow.checkReadyForExecution();
@@ -502,7 +505,6 @@ export class WorkflowExecute {
 			this.runExecutionData.startData = {};
 		}
 
-
 		let currentExecutionTry = '';
 		let lastExecutionTry = '';
 
@@ -564,6 +566,7 @@ export class WorkflowExecute {
 					executionData = this.runExecutionData.executionData!.nodeExecutionStack.shift() as IExecuteData;
 					executionNode = executionData.node;
 
+					Logger.debug(`Start processing node "${executionNode.name}"`, { node: executionNode.name, workflowId: workflow.id });
 					await this.executeHook('nodeExecuteBefore', [executionNode.name]);
 
 					// Get the index of the current run
@@ -661,7 +664,9 @@ export class WorkflowExecute {
 								}
 							}
 
+							Logger.debug(`Running node "${executionNode.name}" started`, { node: executionNode.name, workflowId: workflow.id });
 							nodeSuccessData = await workflow.runNode(executionData.node, executionData.data, this.runExecutionData, runIndex, this.additionalData, NodeExecuteFunctions, this.mode);
+							Logger.debug(`Running node "${executionNode.name}" finished successfully`, { node: executionNode.name, workflowId: workflow.id });
 
 							if (nodeSuccessData === undefined) {
 								// Node did not get executed
@@ -698,6 +703,8 @@ export class WorkflowExecute {
 								message: error.message,
 								stack: error.stack,
 							};
+
+							Logger.debug(`Running node "${executionNode.name}" finished with error`, { node: executionNode.name, workflowId: workflow.id });
 						}
 					}
 
@@ -829,8 +836,10 @@ export class WorkflowExecute {
 		const fullRunData = this.getFullRunData(startedAt);
 
 		if (executionError !== undefined) {
+			Logger.verbose(`Workflow execution finished with error`, { error: executionError, workflowId: workflow.id });
 			fullRunData.data.resultData.error = executionError;
 		} else {
+			Logger.verbose(`Workflow execution finished successfully`, { workflowId: workflow.id });
 			fullRunData.finished = true;
 		}
 
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index c89cc07fd8..8c7a51c0ba 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -1,8 +1,10 @@
 
 import {
 	IConnections,
+	ILogger,
 	INode,
 	IRun,
+	LoggerProxy,
 	Workflow,
 } from 'n8n-workflow';
 
@@ -1154,9 +1156,19 @@ describe('WorkflowExecute', () => {
 			},
 		];
 
+		const fakeLogger = {
+			log: () => {},
+			debug:  () => {},
+			verbose:  () => {},
+			info:  () => {},
+			warn:  () => {},
+			error:  () => {},
+		} as ILogger;
+
 
 		const executionMode = 'manual';
 		const nodeTypes = Helpers.NodeTypes();
+		LoggerProxy.init(fakeLogger);
 
 		for (const testData of tests) {
 			test(testData.description, async () => {
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 54be4408c8..49a61cc52f 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -18,6 +18,10 @@ import * as moment from 'moment-timezone';
 
 import * as jwt from 'jsonwebtoken';
 
+import {
+	LoggerProxy as Logger
+} from 'n8n-workflow';
+
 export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'oAuth2') as string;
 
@@ -29,6 +33,7 @@ export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSin
 			const response = await getAccessToken.call(this, credentials as IDataObject);
 			const { instance_url, access_token } = response;
 			const options = getOptions.call(this, method, (uri || endpoint), body, qs, instance_url as string);
+			Logger.debug(`Authentication for "Salesforce" node is using "jwt". Invoking URI ${options.uri}`);
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			//@ts-ignore
 			return await this.helpers.request(options);
@@ -38,6 +43,7 @@ export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSin
 			const credentials = this.getCredentials(credentialsType);
 			const subdomain = ((credentials!.accessTokenUrl as string).match(/https:\/\/(.+).salesforce\.com/) || [])[1];
 			const options = getOptions.call(this, method, (uri || endpoint), body, qs, `https://${subdomain}.salesforce.com`);
+			Logger.debug(`Authentication for "Salesforce" node is using "OAuth2". Invoking URI ${options.uri}`);
 			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, credentialsType, options);
 		}
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 977c25cdb1..dee9fffe5b 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -112,6 +112,10 @@ import {
 	userOperations,
 } from './UserDescription';
 
+import {
+	LoggerProxy as Logger,
+} from 'n8n-workflow';
+
 export class Salesforce implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Salesforce',
@@ -923,6 +927,8 @@ export class Salesforce implements INodeType {
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 
+		Logger.debug(`Running "Salesforce" node named "${this.getNode.name}" resource "${resource}" operation "${operation}"`);
+
 		for (let i = 0; i < items.length; i++) {
 			if (resource === 'lead') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/post-lead
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index ba78499b5a..cecdaf925a 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -764,6 +764,16 @@ export interface IWorkflowSettings {
 	[key: string]: IDataObject | string | number | boolean | undefined;
 }
 
+export type LogTypes = 'debug' | 'verbose' | 'info' | 'warn' | 'error';
+
+export interface ILogger {
+	log: (type: LogTypes, message: string, meta?: object) => void;
+	debug: (message: string, meta?: object) => void;
+	verbose: (message: string, meta?: object) => void;
+	info: (message: string, meta?: object) => void;
+	warn: (message: string, meta?: object) => void;
+	error: (message: string, meta?: object) => void;
+}
 export interface IRawErrorObject {
 	[key: string]: string | object | number | boolean | undefined | null | string[] | object[] | number[] | boolean[];
 }
diff --git a/packages/workflow/src/LoggerProxy.ts b/packages/workflow/src/LoggerProxy.ts
new file mode 100644
index 0000000000..52ddfea9f6
--- /dev/null
+++ b/packages/workflow/src/LoggerProxy.ts
@@ -0,0 +1,45 @@
+import { 
+	ILogger, 
+	LogTypes,
+} from './Interfaces';
+
+
+let logger: ILogger | undefined;
+
+export function init(loggerInstance: ILogger) {
+	logger = loggerInstance;
+}
+
+export function getInstance(): ILogger {
+	if (logger === undefined) {
+		throw new Error('LoggerProxy not initialized');
+	}
+
+	return logger;
+}
+
+export function log(type: LogTypes, message: string, meta: object = {}) {
+	getInstance().log(type, message, meta);
+}
+
+// Convenience methods below
+
+export function debug(message: string, meta: object = {}) {
+	getInstance().log('debug', message, meta);
+}
+
+export function info(message: string, meta: object = {}) {
+	getInstance().log('info', message, meta);
+}
+
+export function error(message: string, meta: object = {}) {
+	getInstance().log('error', message, meta);
+}
+
+export function verbose(message: string, meta: object = {}) {
+	getInstance().log('verbose', message, meta);
+}
+
+export function warn(message: string, meta: object = {}) {
+	getInstance().log('warn', message, meta);
+}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 1248d7da9d..74fb590ea3 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -6,9 +6,11 @@ export * from './WorkflowDataProxy';
 export * from './WorkflowErrors';
 export * from './WorkflowHooks';
 
+import * as LoggerProxy from './LoggerProxy';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
 export {
+	LoggerProxy,
 	NodeHelpers,
 	ObservableObject,
 };

From 469b92e32a7ddd721e6c2e16aa754ea612361be2 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 1 May 2021 23:50:15 -0400
Subject: [PATCH 110/231] :zap: Add continueOnFail to Google Calendar (#1722)

* :zap: Add continueOnFail to Google Calendar

* :zap: Minor improvements

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../Google/Calendar/GoogleCalendar.node.ts    | 804 +++++++++---------
 1 file changed, 409 insertions(+), 395 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 755094916b..c813f44fd9 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -180,429 +180,443 @@ export class GoogleCalendar implements INodeType {
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 		for (let i = 0; i < length; i++) {
-			if (resource === 'calendar') {
-				//https://developers.google.com/calendar/v3/reference/freebusy/query
-				if (operation === 'availability') {
-					const timezone = this.getTimezone();
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const timeMin = this.getNodeParameter('timeMin', i) as string;
-					const timeMax = this.getNodeParameter('timeMax', i) as string;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					const outputFormat = options.outputFormat || 'availability';
+			try {
+				if (resource === 'calendar') {
+					//https://developers.google.com/calendar/v3/reference/freebusy/query
+					if (operation === 'availability') {
+						const timezone = this.getTimezone();
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const timeMin = this.getNodeParameter('timeMin', i) as string;
+						const timeMax = this.getNodeParameter('timeMax', i) as string;
+						const options = this.getNodeParameter('options', i) as IDataObject;
+						const outputFormat = options.outputFormat || 'availability';
 
-					const body: IDataObject = {
-						timeMin: moment.tz(timeMin, timezone).utc().format(),
-						timeMax: moment.tz(timeMax, timezone).utc().format(),
-						items: [
-							{
-								id: calendarId,
-							},
-						],
-						timeZone: options.timezone || timezone,
-					};
-
-					responseData = await googleApiRequest.call(
-						this,
-						'POST',
-						`/calendar/v3/freeBusy`,
-						body,
-						{},
-					);
-
-					if (responseData.calendars[calendarId].errors) {
-						throw new NodeApiError(this.getNode(), responseData.calendars[calendarId]);
-					}
-
-					if (outputFormat === 'availability') {
-						responseData = {
-							available: !responseData.calendars[calendarId].busy.length,
+						const body: IDataObject = {
+							timeMin: moment.tz(timeMin, timezone).utc().format(),
+							timeMax: moment.tz(timeMax, timezone).utc().format(),
+							items: [
+								{
+									id: calendarId,
+								},
+							],
+							timeZone: options.timezone || timezone,
 						};
 
-					} else if (outputFormat === 'bookedSlots') {
-						responseData = responseData.calendars[calendarId].busy;
+						responseData = await googleApiRequest.call(
+							this,
+							'POST',
+							`/calendar/v3/freeBusy`,
+							body,
+							{},
+						);
+
+						if (responseData.calendars[calendarId].errors) {
+							throw new NodeApiError(this.getNode(), responseData.calendars[calendarId]);
+						}
+
+						if (outputFormat === 'availability') {
+							responseData = {
+								available: !responseData.calendars[calendarId].busy.length,
+							};
+
+						} else if (outputFormat === 'bookedSlots') {
+							responseData = responseData.calendars[calendarId].busy;
+						}
 					}
 				}
-			}
-			if (resource === 'event') {
-				//https://developers.google.com/calendar/v3/reference/events/insert
-				if (operation === 'create') {
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const start = this.getNodeParameter('start', i) as string;
-					const end = this.getNodeParameter('end', i) as string;
-					const useDefaultReminders = this.getNodeParameter(
-						'useDefaultReminders',
-						i,
-					) as boolean;
-					const additionalFields = this.getNodeParameter(
-						'additionalFields',
-						i,
-					) as IDataObject;
-					if (additionalFields.maxAttendees) {
-						qs.maxAttendees = additionalFields.maxAttendees as number;
-					}
-					if (additionalFields.sendNotifications) {
-						qs.sendNotifications = additionalFields.sendNotifications as boolean;
-					}
-					if (additionalFields.sendUpdates) {
-						qs.sendUpdates = additionalFields.sendUpdates as string;
-					}
-					const body: IEvent = {
-						start: {
-							dateTime: start,
-							timeZone: additionalFields.timeZone || this.getTimezone(),
-						},
-						end: {
-							dateTime: end,
-							timeZone: additionalFields.timeZone || this.getTimezone(),
-						},
-					};
-					if (additionalFields.attendees) {
-						body.attendees = [];
-						(additionalFields.attendees as string[]).forEach(attendee => {
-							body.attendees!.push.apply(body.attendees, attendee.split(',').map(a => a.trim()).map(email => ({ email })));
-						});
-					}
-					if (additionalFields.color) {
-						body.colorId = additionalFields.color as string;
-					}
-					if (additionalFields.description) {
-						body.description = additionalFields.description as string;
-					}
-					if (additionalFields.guestsCanInviteOthers) {
-						body.guestsCanInviteOthers = additionalFields.guestsCanInviteOthers as boolean;
-					}
-					if (additionalFields.guestsCanModify) {
-						body.guestsCanModify = additionalFields.guestsCanModify as boolean;
-					}
-					if (additionalFields.guestsCanSeeOtherGuests) {
-						body.guestsCanSeeOtherGuests = additionalFields.guestsCanSeeOtherGuests as boolean;
-					}
-					if (additionalFields.id) {
-						body.id = additionalFields.id as string;
-					}
-					if (additionalFields.location) {
-						body.location = additionalFields.location as string;
-					}
-					if (additionalFields.summary) {
-						body.summary = additionalFields.summary as string;
-					}
-					if (additionalFields.showMeAs) {
-						body.transparency = additionalFields.showMeAs as string;
-					}
-					if (additionalFields.visibility) {
-						body.visibility = additionalFields.visibility as string;
-					}
-					if (!useDefaultReminders) {
-						const reminders = (this.getNodeParameter(
-							'remindersUi',
+				if (resource === 'event') {
+					//https://developers.google.com/calendar/v3/reference/events/insert
+					if (operation === 'create') {
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const start = this.getNodeParameter('start', i) as string;
+						const end = this.getNodeParameter('end', i) as string;
+						const useDefaultReminders = this.getNodeParameter(
+							'useDefaultReminders',
 							i,
-						) as IDataObject).remindersValues as IDataObject[];
-						body.reminders = {
-							useDefault: false,
+						) as boolean;
+						const additionalFields = this.getNodeParameter(
+							'additionalFields',
+							i,
+						) as IDataObject;
+						if (additionalFields.maxAttendees) {
+							qs.maxAttendees = additionalFields.maxAttendees as number;
+						}
+						if (additionalFields.sendNotifications) {
+							qs.sendNotifications = additionalFields.sendNotifications as boolean;
+						}
+						if (additionalFields.sendUpdates) {
+							qs.sendUpdates = additionalFields.sendUpdates as string;
+						}
+						const body: IEvent = {
+							start: {
+								dateTime: start,
+								timeZone: additionalFields.timeZone || this.getTimezone(),
+							},
+							end: {
+								dateTime: end,
+								timeZone: additionalFields.timeZone || this.getTimezone(),
+							},
 						};
-						if (reminders) {
-							body.reminders.overrides = reminders;
+						if (additionalFields.attendees) {
+							body.attendees = [];
+							(additionalFields.attendees as string[]).forEach(attendee => {
+								body.attendees!.push.apply(body.attendees, attendee.split(',').map(a => a.trim()).map(email => ({ email })));
+							});
 						}
-					}
-					if (additionalFields.allday) {
-						body.start = {
-							date: moment(start)
-								.utc()
-								.format('YYYY-MM-DD'),
-						};
-						body.end = {
-							date: moment(end)
-								.utc()
-								.format('YYYY-MM-DD'),
-						};
-					}
-					//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
-					//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
-					body.recurrence = [];
-					if (additionalFields.rrule) {
-						body.recurrence = [`RRULE:${additionalFields.rrule}`];
-					} else {
-						if (
-							additionalFields.repeatHowManyTimes &&
-							additionalFields.repeatUntil
-						) {
-							throw new NodeOperationError(this.getNode(),
-								`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
-							);
+						if (additionalFields.color) {
+							body.colorId = additionalFields.color as string;
 						}
-						if (additionalFields.repeatFrecuency) {
-							body.recurrence?.push(
-								`FREQ=${(additionalFields.repeatFrecuency as string).toUpperCase()};`,
-							);
+						if (additionalFields.description) {
+							body.description = additionalFields.description as string;
 						}
-						if (additionalFields.repeatHowManyTimes) {
-							body.recurrence?.push(
-								`COUNT=${additionalFields.repeatHowManyTimes};`,
-							);
+						if (additionalFields.guestsCanInviteOthers) {
+							body.guestsCanInviteOthers = additionalFields.guestsCanInviteOthers as boolean;
 						}
-						if (additionalFields.repeatUntil) {
-							body.recurrence?.push(
-								`UNTIL=${moment(additionalFields.repeatUntil as string)
+						if (additionalFields.guestsCanModify) {
+							body.guestsCanModify = additionalFields.guestsCanModify as boolean;
+						}
+						if (additionalFields.guestsCanSeeOtherGuests) {
+							body.guestsCanSeeOtherGuests = additionalFields.guestsCanSeeOtherGuests as boolean;
+						}
+						if (additionalFields.id) {
+							body.id = additionalFields.id as string;
+						}
+						if (additionalFields.location) {
+							body.location = additionalFields.location as string;
+						}
+						if (additionalFields.summary) {
+							body.summary = additionalFields.summary as string;
+						}
+						if (additionalFields.showMeAs) {
+							body.transparency = additionalFields.showMeAs as string;
+						}
+						if (additionalFields.visibility) {
+							body.visibility = additionalFields.visibility as string;
+						}
+						if (!useDefaultReminders) {
+							const reminders = (this.getNodeParameter(
+								'remindersUi',
+								i,
+							) as IDataObject).remindersValues as IDataObject[];
+							body.reminders = {
+								useDefault: false,
+							};
+							if (reminders) {
+								body.reminders.overrides = reminders;
+							}
+						}
+						if (additionalFields.allday) {
+							body.start = {
+								date: moment(start)
 									.utc()
-									.format('YYYYMMDDTHHmmss')}Z`,
-							);
-						}
-						if (body.recurrence.length !== 0) {
-							body.recurrence = [`RRULE:${body.recurrence.join('')}`];
-						}
-					}
-
-					if (additionalFields.conferenceDataUi) {
-						const conferenceData = (additionalFields.conferenceDataUi as IDataObject).conferenceDataValues as IDataObject;
-						if (conferenceData) {
-
-							qs.conferenceDataVersion = 1;
-							body.conferenceData = {
-								createRequest: {
-									requestId: uuid(),
-									conferenceSolution: {
-										type: conferenceData.conferenceSolution as string,
-									},
-								},
+									.format('YYYY-MM-DD'),
+							};
+							body.end = {
+								date: moment(end)
+									.utc()
+									.format('YYYY-MM-DD'),
 							};
 						}
-					}
+						//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
+						//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
+						body.recurrence = [];
+						if (additionalFields.rrule) {
+							body.recurrence = [`RRULE:${additionalFields.rrule}`];
+						} else {
+							if (
+								additionalFields.repeatHowManyTimes &&
+								additionalFields.repeatUntil
+							) {
+								throw new NodeOperationError(this.getNode(),
+									`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
+								);
+							}
+							if (additionalFields.repeatFrecuency) {
+								body.recurrence?.push(
+									`FREQ=${(additionalFields.repeatFrecuency as string).toUpperCase()};`,
+								);
+							}
+							if (additionalFields.repeatHowManyTimes) {
+								body.recurrence?.push(
+									`COUNT=${additionalFields.repeatHowManyTimes};`,
+								);
+							}
+							if (additionalFields.repeatUntil) {
+								body.recurrence?.push(
+									`UNTIL=${moment(additionalFields.repeatUntil as string)
+										.utc()
+										.format('YYYYMMDDTHHmmss')}Z`,
+								);
+							}
+							if (body.recurrence.length !== 0) {
+								body.recurrence = [`RRULE:${body.recurrence.join('')}`];
+							}
+						}
 
-					responseData = await googleApiRequest.call(
-						this,
-						'POST',
-						`/calendar/v3/calendars/${calendarId}/events`,
-						body,
-						qs,
-					);
-				}
-				//https://developers.google.com/calendar/v3/reference/events/delete
-				if (operation === 'delete') {
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const eventId = this.getNodeParameter('eventId', i) as string;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					if (options.sendUpdates) {
-						qs.sendUpdates = options.sendUpdates as number;
-					}
-					responseData = await googleApiRequest.call(
-						this,
-						'DELETE',
-						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
-						{},
-					);
-					responseData = { success: true };
-				}
-				//https://developers.google.com/calendar/v3/reference/events/get
-				if (operation === 'get') {
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const eventId = this.getNodeParameter('eventId', i) as string;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					if (options.maxAttendees) {
-						qs.maxAttendees = options.maxAttendees as number;
-					}
-					if (options.timeZone) {
-						qs.timeZone = options.timeZone as string;
-					}
-					responseData = await googleApiRequest.call(
-						this,
-						'GET',
-						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
-						{},
-						qs,
-					);
-				}
-				//https://developers.google.com/calendar/v3/reference/events/list
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					if (options.iCalUID) {
-						qs.iCalUID = options.iCalUID as string;
-					}
-					if (options.maxAttendees) {
-						qs.maxAttendees = options.maxAttendees as number;
-					}
-					if (options.orderBy) {
-						qs.orderBy = options.orderBy as number;
-					}
-					if (options.query) {
-						qs.q = options.query as number;
-					}
-					if (options.showDeleted) {
-						qs.showDeleted = options.showDeleted as boolean;
-					}
-					if (options.showHiddenInvitations) {
-						qs.showHiddenInvitations = options.showHiddenInvitations as boolean;
-					}
-					if (options.singleEvents) {
-						qs.singleEvents = options.singleEvents as boolean;
-					}
-					if (options.timeMax) {
-						qs.timeMax = options.timeMax as string;
-					}
-					if (options.timeMin) {
-						qs.timeMin = options.timeMin as string;
-					}
-					if (options.timeZone) {
-						qs.timeZone = options.timeZone as string;
-					}
-					if (options.updatedMin) {
-						qs.updatedMin = options.updatedMin as string;
-					}
-					if (returnAll) {
-						responseData = await googleApiRequestAllItems.call(
+						if (additionalFields.conferenceDataUi) {
+							const conferenceData = (additionalFields.conferenceDataUi as IDataObject).conferenceDataValues as IDataObject;
+							if (conferenceData) {
+
+								qs.conferenceDataVersion = 1;
+								body.conferenceData = {
+									createRequest: {
+										requestId: uuid(),
+										conferenceSolution: {
+											type: conferenceData.conferenceSolution as string,
+										},
+									},
+								};
+							}
+						}
+
+						responseData = await googleApiRequest.call(
 							this,
-							'items',
-							'GET',
+							'POST',
 							`/calendar/v3/calendars/${calendarId}/events`,
-							{},
+							body,
 							qs,
 						);
-					} else {
-						qs.maxResults = this.getNodeParameter('limit', i) as number;
+					}
+					//https://developers.google.com/calendar/v3/reference/events/delete
+					if (operation === 'delete') {
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const eventId = this.getNodeParameter('eventId', i) as string;
+						const options = this.getNodeParameter('options', i) as IDataObject;
+						if (options.sendUpdates) {
+							qs.sendUpdates = options.sendUpdates as number;
+						}
+						responseData = await googleApiRequest.call(
+							this,
+							'DELETE',
+							`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
+							{},
+						);
+						responseData = { success: true };
+					}
+					//https://developers.google.com/calendar/v3/reference/events/get
+					if (operation === 'get') {
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const eventId = this.getNodeParameter('eventId', i) as string;
+						const options = this.getNodeParameter('options', i) as IDataObject;
+						if (options.maxAttendees) {
+							qs.maxAttendees = options.maxAttendees as number;
+						}
+						if (options.timeZone) {
+							qs.timeZone = options.timeZone as string;
+						}
 						responseData = await googleApiRequest.call(
 							this,
 							'GET',
-							`/calendar/v3/calendars/${calendarId}/events`,
+							`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
 							{},
 							qs,
 						);
-						responseData = responseData.items;
+					}
+					//https://developers.google.com/calendar/v3/reference/events/list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const options = this.getNodeParameter('options', i) as IDataObject;
+						if (options.iCalUID) {
+							qs.iCalUID = options.iCalUID as string;
+						}
+						if (options.maxAttendees) {
+							qs.maxAttendees = options.maxAttendees as number;
+						}
+						if (options.orderBy) {
+							qs.orderBy = options.orderBy as number;
+						}
+						if (options.query) {
+							qs.q = options.query as number;
+						}
+						if (options.showDeleted) {
+							qs.showDeleted = options.showDeleted as boolean;
+						}
+						if (options.showHiddenInvitations) {
+							qs.showHiddenInvitations = options.showHiddenInvitations as boolean;
+						}
+						if (options.singleEvents) {
+							qs.singleEvents = options.singleEvents as boolean;
+						}
+						if (options.timeMax) {
+							qs.timeMax = options.timeMax as string;
+						}
+						if (options.timeMin) {
+							qs.timeMin = options.timeMin as string;
+						}
+						if (options.timeZone) {
+							qs.timeZone = options.timeZone as string;
+						}
+						if (options.updatedMin) {
+							qs.updatedMin = options.updatedMin as string;
+						}
+						if (returnAll) {
+							responseData = await googleApiRequestAllItems.call(
+								this,
+								'items',
+								'GET',
+								`/calendar/v3/calendars/${calendarId}/events`,
+								{},
+								qs,
+							);
+						} else {
+							qs.maxResults = this.getNodeParameter('limit', i) as number;
+							responseData = await googleApiRequest.call(
+								this,
+								'GET',
+								`/calendar/v3/calendars/${calendarId}/events`,
+								{},
+								qs,
+							);
+							responseData = responseData.items;
+						}
+					}
+					//https://developers.google.com/calendar/v3/reference/events/patch
+					if (operation === 'update') {
+						const calendarId = this.getNodeParameter('calendar', i) as string;
+						const eventId = this.getNodeParameter('eventId', i) as string;
+						const useDefaultReminders = this.getNodeParameter(
+							'useDefaultReminders',
+							i,
+						) as boolean;
+						const updateFields = this.getNodeParameter(
+							'updateFields',
+							i,
+						) as IDataObject;
+						if (updateFields.maxAttendees) {
+							qs.maxAttendees = updateFields.maxAttendees as number;
+						}
+						if (updateFields.sendNotifications) {
+							qs.sendNotifications = updateFields.sendNotifications as boolean;
+						}
+						if (updateFields.sendUpdates) {
+							qs.sendUpdates = updateFields.sendUpdates as string;
+						}
+						const body: IEvent = {};
+						if (updateFields.start) {
+							body.start = {
+								dateTime: updateFields.start,
+								timeZone: updateFields.timeZone || this.getTimezone(),
+							};
+						}
+						if (updateFields.end) {
+							body.end = {
+								dateTime: updateFields.end,
+								timeZone: updateFields.timeZone || this.getTimezone(),
+							};
+						}
+						if (updateFields.attendees) {
+							body.attendees = [];
+							(updateFields.attendees as string[]).forEach(attendee => {
+								body.attendees!.push.apply(body.attendees, attendee.split(',').map(a => a.trim()).map(email => ({ email })));
+							});
+						}
+						if (updateFields.color) {
+							body.colorId = updateFields.color as string;
+						}
+						if (updateFields.description) {
+							body.description = updateFields.description as string;
+						}
+						if (updateFields.guestsCanInviteOthers) {
+							body.guestsCanInviteOthers = updateFields.guestsCanInviteOthers as boolean;
+						}
+						if (updateFields.guestsCanModify) {
+							body.guestsCanModify = updateFields.guestsCanModify as boolean;
+						}
+						if (updateFields.guestsCanSeeOtherGuests) {
+							body.guestsCanSeeOtherGuests = updateFields.guestsCanSeeOtherGuests as boolean;
+						}
+						if (updateFields.id) {
+							body.id = updateFields.id as string;
+						}
+						if (updateFields.location) {
+							body.location = updateFields.location as string;
+						}
+						if (updateFields.summary) {
+							body.summary = updateFields.summary as string;
+						}
+						if (updateFields.showMeAs) {
+							body.transparency = updateFields.showMeAs as string;
+						}
+						if (updateFields.visibility) {
+							body.visibility = updateFields.visibility as string;
+						}
+						if (!useDefaultReminders) {
+							const reminders = (this.getNodeParameter(
+								'remindersUi',
+								i,
+							) as IDataObject).remindersValues as IDataObject[];
+							body.reminders = {
+								useDefault: false,
+							};
+							if (reminders) {
+								body.reminders.overrides = reminders;
+							}
+						}
+						if (updateFields.allday && updateFields.start && updateFields.end) {
+							body.start = {
+								date: moment(updateFields.start as string)
+									.utc()
+									.format('YYYY-MM-DD'),
+							};
+							body.end = {
+								date: moment(updateFields.end as string)
+									.utc()
+									.format('YYYY-MM-DD'),
+							};
+						}
+						//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
+						//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
+						body.recurrence = [];
+						if (updateFields.rrule) {
+							body.recurrence = [`RRULE:${updateFields.rrule}`];
+						} else {
+							if (updateFields.repeatHowManyTimes && updateFields.repeatUntil) {
+								throw new NodeOperationError(this.getNode(),
+									`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
+								);
+							}
+							if (updateFields.repeatFrecuency) {
+								body.recurrence?.push(
+									`FREQ=${(updateFields.repeatFrecuency as string).toUpperCase()};`,
+								);
+							}
+							if (updateFields.repeatHowManyTimes) {
+								body.recurrence?.push(`COUNT=${updateFields.repeatHowManyTimes};`);
+							}
+							if (updateFields.repeatUntil) {
+								body.recurrence?.push(
+									`UNTIL=${moment(updateFields.repeatUntil as string)
+										.utc()
+										.format('YYYYMMDDTHHmmss')}Z`,
+								);
+							}
+							if (body.recurrence.length !== 0) {
+								body.recurrence = [`RRULE:${body.recurrence.join('')}`];
+							} else {
+								delete body.recurrence;
+							}
+						}
+						responseData = await googleApiRequest.call(
+							this,
+							'PATCH',
+							`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
+							body,
+							qs,
+						);
 					}
 				}
-				//https://developers.google.com/calendar/v3/reference/events/patch
-				if (operation === 'update') {
-					const calendarId = this.getNodeParameter('calendar', i) as string;
-					const eventId = this.getNodeParameter('eventId', i) as string;
-					const useDefaultReminders = this.getNodeParameter(
-						'useDefaultReminders',
-						i,
-					) as boolean;
-					const updateFields = this.getNodeParameter(
-						'updateFields',
-						i,
-					) as IDataObject;
-					if (updateFields.maxAttendees) {
-						qs.maxAttendees = updateFields.maxAttendees as number;
-					}
-					if (updateFields.sendNotifications) {
-						qs.sendNotifications = updateFields.sendNotifications as boolean;
-					}
-					if (updateFields.sendUpdates) {
-						qs.sendUpdates = updateFields.sendUpdates as string;
-					}
-					const body: IEvent = {};
-					if (updateFields.start) {
-						body.start = {
-							dateTime: updateFields.start,
-							timeZone: updateFields.timeZone || this.getTimezone(),
-						};
-					}
-					if (updateFields.end) {
-						body.end = {
-							dateTime: updateFields.end,
-							timeZone: updateFields.timeZone || this.getTimezone(),
-						};
-					}
-					if (updateFields.attendees) {
-						body.attendees = [];
-						(updateFields.attendees as string[]).forEach(attendee => {
-							body.attendees!.push.apply(body.attendees, attendee.split(',').map(a => a.trim()).map(email => ({ email })));
-						});
-					}
-					if (updateFields.color) {
-						body.colorId = updateFields.color as string;
-					}
-					if (updateFields.description) {
-						body.description = updateFields.description as string;
-					}
-					if (updateFields.guestsCanInviteOthers) {
-						body.guestsCanInviteOthers = updateFields.guestsCanInviteOthers as boolean;
-					}
-					if (updateFields.guestsCanModify) {
-						body.guestsCanModify = updateFields.guestsCanModify as boolean;
-					}
-					if (updateFields.guestsCanSeeOtherGuests) {
-						body.guestsCanSeeOtherGuests = updateFields.guestsCanSeeOtherGuests as boolean;
-					}
-					if (updateFields.id) {
-						body.id = updateFields.id as string;
-					}
-					if (updateFields.location) {
-						body.location = updateFields.location as string;
-					}
-					if (updateFields.summary) {
-						body.summary = updateFields.summary as string;
-					}
-					if (updateFields.showMeAs) {
-						body.transparency = updateFields.showMeAs as string;
-					}
-					if (updateFields.visibility) {
-						body.visibility = updateFields.visibility as string;
-					}
-					if (!useDefaultReminders) {
-						const reminders = (this.getNodeParameter(
-							'remindersUi',
-							i,
-						) as IDataObject).remindersValues as IDataObject[];
-						body.reminders = {
-							useDefault: false,
-						};
-						if (reminders) {
-							body.reminders.overrides = reminders;
-						}
-					}
-					if (updateFields.allday && updateFields.start && updateFields.end) {
-						body.start = {
-							date: moment(updateFields.start as string)
-								.utc()
-								.format('YYYY-MM-DD'),
-						};
-						body.end = {
-							date: moment(updateFields.end as string)
-								.utc()
-								.format('YYYY-MM-DD'),
-						};
-					}
-					//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
-					//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
-					body.recurrence = [];
-					if (updateFields.rrule) {
-						body.recurrence = [`RRULE:${updateFields.rrule}`];
-					} else {
-						if (updateFields.repeatHowManyTimes && updateFields.repeatUntil) {
-							throw new NodeOperationError(this.getNode(),
-								`You can set either 'Repeat How Many Times' or 'Repeat Until' but not both`,
-							);
-						}
-						if (updateFields.repeatFrecuency) {
-							body.recurrence?.push(
-								`FREQ=${(updateFields.repeatFrecuency as string).toUpperCase()};`,
-							);
-						}
-						if (updateFields.repeatHowManyTimes) {
-							body.recurrence?.push(`COUNT=${updateFields.repeatHowManyTimes};`);
-						}
-						if (updateFields.repeatUntil) {
-							body.recurrence?.push(
-								`UNTIL=${moment(updateFields.repeatUntil as string)
-									.utc()
-									.format('YYYYMMDDTHHmmss')}Z`,
-							);
-						}
-						if (body.recurrence.length !== 0) {
-							body.recurrence = [`RRULE:${body.recurrence.join('')}`];
-						} else {
-							delete body.recurrence;
-						}
-					}
-					responseData = await googleApiRequest.call(
-						this,
-						'PATCH',
-						`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
-						body,
-						qs,
+			} catch (error) {
+				if (this.continueOnFail() !== true) {
+					throw error;
+				} else {
+					// Return the actual reason as error
+					returnData.push(
+						{
+							error: error.message,
+						},
 					);
+					continue;
 				}
 			}
 

From ea48882291278fd22e1d13fb6e20c4e56f535105 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sun, 2 May 2021 06:53:20 +0300
Subject: [PATCH 111/231] :arrow_up: Set mongodb@3.6.6 on n8n-nodes-base

Snyk has created this PR to upgrade mongodb from 3.6.5 to 3.6.6.

See this package in npm:
https://www.npmjs.com/package/mongodb

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 38d615717d..3168299b8c 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -619,7 +619,7 @@
     "mailparser": "^3.2.0",
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
-    "mongodb": "3.6.5",
+    "mongodb": "3.6.6",
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",

From 74d8f3d1501b9edca4104ece121518c8e5a25ca3 Mon Sep 17 00:00:00 2001
From: Mika Luhta <12100880+mluhta@users.noreply.github.com>
Date: Sun, 2 May 2021 06:10:44 +0200
Subject: [PATCH 112/231] :sparkles: Add isRead property & message:move to
 Outlook (#1724)

---
 .../Microsoft/Outlook/DraftMessageSharedDescription.ts    | 7 +++++++
 .../nodes/Microsoft/Outlook/MessageDescription.ts         | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
index faa72220c8..9478096b56 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/DraftMessageSharedDescription.ts
@@ -175,6 +175,13 @@ export const draftMessageSharedFields = [
 				],
 				default: 'Low',
 			},
+			{
+				displayName: 'Is Read',
+				name: 'isRead',
+				description: 'Indicates whether the message has been read.',
+				type: 'boolean',
+				default: false,
+			},
 			{
 				displayName: 'Read Receipt Requested',
 				name: 'isReadReceiptRequested',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
index d45f1bae17..e67b6ce3ea 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MessageDescription.ts
@@ -35,6 +35,11 @@ export const messageOperations = [
 				value: 'getMime',
 				description: 'Get MIME content of a message',
 			},
+			{
+				name: 'Move',
+				value: 'move',
+				description: 'Move a message',
+			},
 			{
 				name: 'Reply',
 				value: 'reply',
@@ -75,6 +80,7 @@ export const messageFields = [
 					'get',
 					'getAttachment',
 					'getMime',
+					'move',
 					'update',
 					'reply',
 				],
@@ -615,7 +621,7 @@ export const messageFields = [
 	{
 		displayName: 'Folder ID',
 		name: 'folderId',
-		description: 'Folder ID',
+		description: 'Target Folder ID.',
 		type: 'string',
 		default: '',
 		required: true,

From 9bc62e41c1f1f5f4645e673e63a3140962e82bcb Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:56:20 +0000
Subject: [PATCH 113/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.57.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 4a6e11004f..e5247ba349 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 6980ecf2a8e8bd5f597531cf89850ab3e1ce7f51 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:56:37 +0000
Subject: [PATCH 114/231] :arrow_up: Set n8n-workflow@0.57.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 70e6874e66..00437d3e17 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.56.0",
+    "n8n-workflow": "~0.57.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",

From 56b93c3e7e65074c743b7b7422c2ff4ef6773fac Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:56:37 +0000
Subject: [PATCH 115/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.69?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 00437d3e17..69a76944f1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From e88161525c84b78de14a0ac73697be4fb643f621 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:56:52 +0000
Subject: [PATCH 116/231] :arrow_up: Set n8n-core@0.69.0 and
 n8n-workflow@0.57.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3168299b8c..1b337bce87 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -586,7 +586,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.56.0",
+    "n8n-workflow": "~0.57.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -623,7 +623,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.68.0",
+    "n8n-core": "~0.69.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",

From d992534fc4c1ad4af1cfb86f467a94ee5e541fe9 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:56:52 +0000
Subject: [PATCH 117/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.115.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 1b337bce87..dd9011245e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.114.0",
+  "version": "0.115.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From e5043676be87784a8671984a3524f771dd81dec2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:57:49 +0000
Subject: [PATCH 118/231] :arrow_up: Set n8n-workflow@0.57.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 1295acde1b..a3799ef638 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -65,7 +65,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.56.0",
+    "n8n-workflow": "~0.57.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",

From 8c2ffc5d0e5b9e06982ffaffc6fcb23f5f37dad2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:57:49 +0000
Subject: [PATCH 119/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.88.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index a3799ef638..ccf591fe6b 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.87.0",
+  "version": "0.88.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 318142a9e5ee86fe13d77bd576c942e9e51ce25f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:58:37 +0000
Subject: [PATCH 120/231] :arrow_up: Set n8n-core@0.69.0, n8n-editor-ui@0.88.0,
 n8n-nodes-base@0.115.0 and n8n-workflow@0.57.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0c269ea504..26c9893846 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -104,10 +104,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.68.0",
-    "n8n-editor-ui": "~0.87.0",
-    "n8n-nodes-base": "~0.114.0",
-    "n8n-workflow": "~0.56.0",
+    "n8n-core": "~0.69.0",
+    "n8n-editor-ui": "~0.88.0",
+    "n8n-nodes-base": "~0.115.0",
+    "n8n-workflow": "~0.57.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",

From 043cf6730c54f65aafd8744d5a0e604e4922d1d3 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 2 May 2021 13:58:37 +0000
Subject: [PATCH 121/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.118.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 26c9893846..9a1673bedc 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.117.0",
+  "version": "0.118.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 3d2eaa3aaa20e9d4d7504fbe1a7d54bde68ee5a9 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 3 May 2021 16:15:02 -0500
Subject: [PATCH 122/231] :zap: Check on startup for Node.js version 14 or
 later

---
 packages/cli/bin/n8n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 583dfa5bf4..b72c643fb3 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -24,8 +24,8 @@ if (process.argv.length === 2) {
 
 var nodeVersion = process.versions.node.split('.');
 
-if (parseInt(nodeVersion[0], 10) < 12 || parseInt(nodeVersion[0], 10) === 12 && parseInt(nodeVersion[1], 10) < 9) {
-	console.log(`\nYour Node.js version (${process.versions.node}) is too old to run n8n.\nPlease update to version 12.9 or later!\n`);
+if (parseInt(nodeVersion[0], 10) < 14) {
+	console.log(`\nYour Node.js version (${process.versions.node}) is too old to run n8n.\nPlease update to version 14 or later!\n`);
 	process.exit(0);
 }
 

From 715e41b5907de39e4ccf7084e3b6b1bdcb5928dc Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 3 May 2021 16:21:22 -0500
Subject: [PATCH 123/231] :zap: Update required Node.js version also to 14 in
 package.json of cli

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9a1673bedc..aa48f92da2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -44,7 +44,7 @@
     "workflow"
   ],
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "bin",

From 0cb96d6caa699781c396467c637359447511a67a Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 4 May 2021 18:55:39 +0300
Subject: [PATCH 124/231] =?UTF-8?q?=F0=9F=90=9B=20fix=20external=20links?=
 =?UTF-8?q?=20in=20sidemenu=20(#1720)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix admin link clickability

* fix bug when there are unsaved changes
---
 packages/editor-ui/src/Interface.ts           |  2 +-
 .../editor-ui/src/components/MainSidebar.vue  | 95 ++++++++-----------
 .../MainSidebarMenuItemsIterator.vue          | 44 +++++++++
 .../src/components/mixins/genericHelpers.ts   |  4 +-
 packages/editor-ui/src/views/NodeView.vue     |  2 +
 5 files changed, 90 insertions(+), 57 deletions(-)
 create mode 100644 packages/editor-ui/src/components/MainSidebarMenuItemsIterator.vue

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 745e0f11fb..1ac72fd90a 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -435,7 +435,7 @@ export type MenuItemPosition = 'top' | 'bottom';
 export interface IMenuItem {
 	id: string;
 	type: MenuItemType;
-	position: MenuItemPosition;
+	position?: MenuItemPosition;
 	properties: ILinkMenuItemProperties;
 }
 
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 6de1de6c98..d6c53be80e 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -21,21 +21,7 @@
 					</a>
 				</el-menu-item>
 
-				<el-menu-item
-					v-for="item in sidebarMenuTopItems"
-					:key="item.id"
-					:index="item.id"
-				>
-					<a
-						v-if="item.type === 'link'"
-						:href="item.properties.href"
-						:target="item.properties.newWindow ? '_blank' : '_self'"
-						class="primary-item"
-					>
-						<font-awesome-icon :icon="item.properties.icon" />
-						<span slot="title" class="item-title-root">{{ item.properties.title }}</span>
-					</a>
-				</el-menu-item>
+				<MenuItemsIterator :items="sidebarMenuTopItems" :root="true"/>
 
 				<el-submenu index="workflow" title="Workflow">
 					<template slot="title">
@@ -136,30 +122,8 @@
 						<span slot="title" class="item-title-root">Help</span>
 					</template>
 
-					<el-menu-item index="help-documentation">
-						<template slot="title">
-							<a href="https://docs.n8n.io" target="_blank">
-								<font-awesome-icon icon="book"/>
-								<span slot="title" class="item-title">Documentation</span>
-							</a>
-						</template>
-					</el-menu-item>
-					<el-menu-item index="help-forum">
-						<template slot="title">
-							<a href="https://community.n8n.io" target="_blank">
-								<font-awesome-icon icon="users"/>
-								<span slot="title" class="item-title">Forum</span>
-							</a>
-						</template>
-					</el-menu-item>
-					<el-menu-item index="help-examples">
-						<template slot="title">
-							<a href="https://n8n.io/workflows" target="_blank">
-								<font-awesome-icon icon="network-wired"/>
-								<span slot="title" class="item-title">Workflows</span>
-							</a>
-						</template>
-					</el-menu-item>
+					<MenuItemsIterator :items="helpMenuItems" />
+
 					<el-menu-item index="help-about">
 						<template slot="title">
 							<font-awesome-icon class="about-icon" icon="info"/>
@@ -168,21 +132,7 @@
 					</el-menu-item>
 				</el-submenu>
 
-				<el-menu-item
-					v-for="item in sidebarMenuBottomItems"
-					:key="item.id"
-					:index="item.id"
-				>
-					<a
-						v-if="item.type === 'link'"
-						:href="item.properties.href"
-						:target="item.properties.newWindow ? '_blank' : '_self'"
-						class="primary-item"
-					>
-						<font-awesome-icon :icon="item.properties.icon" />
-						<span slot="title" class="item-title-root">{{ item.properties.title }}</span>
-					</a>
-				</el-menu-item>
+				<MenuItemsIterator :items="sidebarMenuBottomItems" :root="true"/>
 
 			</el-menu>
 
@@ -192,6 +142,7 @@
 </template>
 
 <script lang="ts">
+
 import Vue from 'vue';
 import { MessageBoxInputData } from 'element-ui/types/message-box';
 
@@ -219,6 +170,40 @@ import { workflowRun } from '@/components/mixins/workflowRun';
 import { saveAs } from 'file-saver';
 
 import mixins from 'vue-typed-mixins';
+import MenuItemsIterator from './MainSidebarMenuItemsIterator.vue';
+
+const helpMenuItems: IMenuItem[] = [
+	{
+		id: 'docs',
+		type: 'link',
+		properties: {
+			href: 'https://docs.n8n.io',
+			title: 'Documentation',
+			icon: 'book',
+			newWindow: true,
+		},
+	},
+	{
+		id: 'forum',
+		type: 'link',
+		properties: {
+			href: 'https://community.n8n.io',
+			title: 'Forum',
+			icon: 'users',
+			newWindow: true,
+		},
+	},
+	{
+		id: 'examples',
+		type: 'link',
+		properties: {
+			href: 'https://n8n.io/workflows',
+			title: 'Workflows',
+			icon: 'network-wired',
+			newWindow: true,
+		},
+	},
+];
 
 export default mixins(
 	genericHelpers,
@@ -237,6 +222,7 @@ export default mixins(
 			ExecutionsList,
 			WorkflowOpen,
 			WorkflowSettings,
+			MenuItemsIterator,
 		},
 		data () {
 			return {
@@ -250,6 +236,7 @@ export default mixins(
 				stopExecutionInProgress: false,
 				workflowOpenDialogVisible: false,
 				workflowSettingsDialogVisible: false,
+				helpMenuItems,
 			};
 		},
 		computed: {
diff --git a/packages/editor-ui/src/components/MainSidebarMenuItemsIterator.vue b/packages/editor-ui/src/components/MainSidebarMenuItemsIterator.vue
new file mode 100644
index 0000000000..5fcb5d9b02
--- /dev/null
+++ b/packages/editor-ui/src/components/MainSidebarMenuItemsIterator.vue
@@ -0,0 +1,44 @@
+<template>
+	<div>
+		<el-menu-item
+			v-for="item in items"
+			:key="item.id"
+			:index="item.id"
+			@click="onClick(item)"
+		>
+			<font-awesome-icon :icon="item.properties.icon" />
+			<span slot="title" :class="{'item-title-root': root, 'item-title': !root}">{{ item.properties.title }}</span>
+		</el-menu-item>
+	</div>
+</template>
+
+<script lang="ts">
+
+import { IMenuItem } from '../Interface';
+import Vue from 'vue';
+
+export default Vue.extend({
+	name: 'MenuItemsIterator',
+	props: [
+		'items',
+		'root',
+	],
+	methods: {
+		onClick(item: IMenuItem) {
+			if (item && item.type === 'link' && item.properties) {
+				const href = item.properties.href;
+				if (!href) {
+					return;
+				}
+
+				if (item.properties.newWindow) {
+					window.open(href);
+				}
+				else {
+					window.location.assign(item.properties.href);
+				}
+			}
+		},
+	},
+});
+</script>
\ No newline at end of file
diff --git a/packages/editor-ui/src/components/mixins/genericHelpers.ts b/packages/editor-ui/src/components/mixins/genericHelpers.ts
index a51eecd547..9fadcc7a7c 100644
--- a/packages/editor-ui/src/components/mixins/genericHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/genericHelpers.ts
@@ -52,7 +52,7 @@ export const genericHelpers = mixins(showMessage).extend({
 			return true;
 		},
 
-		startLoading () {
+		startLoading (text?: string) {
 			if (this.loadingService !== null) {
 				return;
 			}
@@ -60,7 +60,7 @@ export const genericHelpers = mixins(showMessage).extend({
 			this.loadingService = this.$loading(
 				{
 					lock: true,
-					text: 'Loading',
+					text: text || 'Loading',
 					spinner: 'el-icon-loading',
 					background: 'rgba(255, 255, 255, 0.8)',
 				},
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 65852033ef..609195f324 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1453,6 +1453,8 @@ export default mixins(
 						(e || window.event).returnValue = confirmationMessage; //Gecko + IE
 						return confirmationMessage; //Gecko + Webkit, Safari, Chrome etc.
 					} else {
+						this.startLoading('Redirecting');
+
 						return;
 					}
 				});

From f324fe1dff182e8e65822ea303c3dcc98af6b657 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 5 May 2021 15:18:14 -0500
Subject: [PATCH 125/231] :bug: Fix Error-Workflows

---
 packages/cli/src/WorkflowExecuteAdditionalData.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index dd7e8a6533..e2d48b3b69 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -85,11 +85,11 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
 		// Run the error workflow
 		// To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
 		if (workflowData.settings !== undefined && workflowData.settings.errorWorkflow && !(mode === 'error' && workflowData.id && workflowData.settings.errorWorkflow.toString() === workflowData.id.toString())) {
-			Logger.verbose(`Start external error workflow`, { executionId: this.executionId, errorWorkflowId: workflowData.settings.errorWorkflow.toString(), workflowId: this.workflowData.id });
+			Logger.verbose(`Start external error workflow`, { executionId, errorWorkflowId: workflowData.settings.errorWorkflow.toString(), workflowId: workflowData.id });
 			// If a specific error workflow is set run only that one
 			WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData);
 		} else if (mode !== 'error' && workflowData.id !== undefined && workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)) {
-			Logger.verbose(`Start internal error workflow`, { executionId: this.executionId, workflowId: this.workflowData.id });
+			Logger.verbose(`Start internal error workflow`, { executionId, workflowId: workflowData.id });
 			// If the workflow contains
 			WorkflowHelpers.executeErrorWorkflow(workflowData.id.toString(), workflowErrorData);
 		}

From 2052cadce9ed28597b4b3dc13c4fbca575a5ef37 Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Thu, 6 May 2021 02:46:33 +0200
Subject: [PATCH 126/231] :sparkles: Add more frontend hooks (#1687)

* :zap: add hook for nodecreatelist mount

* :zap: add hook for nodeCreateList selectedTypeChanged

* :zap: add hook for nodeCreateList nodeFilterChanged

* :zap: add hook for nodeCreateList filteredNodeTypesComputed

* :zap: add hook for nodeView.activeNodeChanged

* :zap: add hook for credentialsEdit credentialTypeChanged

* :zap: add hook for onDocumentationUrlClick

* :zap: add hook for executionsList openDialog

* :zap: add hook for execution open

* :zap: add hook for credentialsList dialogVisibleChanged

* :zap: add hook for workflowSettings

* :zap: add hook for showMessage showError

* :zap: add hook for nodeView createNodeActiveChanged

* :zap: add hook for nodeView addNodeButton

* :zap: cleanup

* :zap: add hook for workflowRun runWorkflow

* :zap: add hook for pushConnection executionFinished

* :zap: add hook for runData.displayModeChanged

* :zap: update nodeCreateList.nodeFilterChanged hook

* :zap: update dataDisplay nodeTypeChanged hook

* :zap: update dataDisplay nodeTypeChanged hook

* :zap: update dataDisplay nodeTypeChanged hook

* :zap: update error data in hooks

* update workflowRun runError hook

* :zap: Minor improvements

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../src/components/CredentialsEdit.vue        |  6 ++-
 .../src/components/CredentialsList.vue        |  3 ++
 .../editor-ui/src/components/DataDisplay.vue  | 20 ++++++++-
 .../src/components/ExecutionsList.vue         |  4 ++
 packages/editor-ui/src/components/Node.vue    | 45 ++-----------------
 .../src/components/NodeCreateList.vue         | 18 +++++++-
 packages/editor-ui/src/components/RunData.vue |  7 ++-
 .../src/components/WorkflowSettings.vue       |  7 +++
 .../src/components/mixins/nodeHelpers.ts      | 40 +++++++++++++++++
 .../src/components/mixins/pushConnection.ts   | 20 +++++++++
 .../src/components/mixins/showMessage.ts      |  7 ++-
 .../src/components/mixins/workflowRun.ts      | 10 +++--
 packages/editor-ui/src/views/NodeView.vue     | 10 ++++-
 13 files changed, 143 insertions(+), 54 deletions(-)

diff --git a/packages/editor-ui/src/components/CredentialsEdit.vue b/packages/editor-ui/src/components/CredentialsEdit.vue
index 77a64de7bd..874a4e3451 100644
--- a/packages/editor-ui/src/components/CredentialsEdit.vue
+++ b/packages/editor-ui/src/components/CredentialsEdit.vue
@@ -50,6 +50,7 @@
 <script lang="ts">
 import Vue from 'vue';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { restApi } from '@/components/mixins/restApi';
 import { showMessage } from '@/components/mixins/showMessage';
 import CredentialsInput from '@/components/CredentialsInput.vue';
@@ -71,6 +72,7 @@ import { INodeUi } from '../Interface';
 export default mixins(
 	restApi,
 	showMessage,
+	externalHooks,
 ).extend({
 	name: 'CredentialsEdit',
 	props: [
@@ -195,7 +197,6 @@ export default mixins(
 						});
 						return;
 					}
-
 					this.credentialData = currentCredentials;
 				} else {
 					Vue.nextTick(() => {
@@ -227,6 +228,9 @@ export default mixins(
 				this.credentialType = null;
 			}
 		},
+		async credentialType (newValue, oldValue) {
+			this.$externalHooks().run('credentialsEdit.credentialTypeChanged', { newValue, oldValue, editCredentials: !!this.editCredentials, credentialType: this.credentialType, setCredentialType: this.setCredentialType });
+		},
 	},
 	methods: {
 		getCredentialProperties (name: string): INodeProperties[] {
diff --git a/packages/editor-ui/src/components/CredentialsList.vue b/packages/editor-ui/src/components/CredentialsList.vue
index 061bfa7d1e..a29af1594f 100644
--- a/packages/editor-ui/src/components/CredentialsList.vue
+++ b/packages/editor-ui/src/components/CredentialsList.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script lang="ts">
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { restApi } from '@/components/mixins/restApi';
 import { ICredentialsResponse } from '@/Interface';
 import { nodeHelpers } from '@/components/mixins/nodeHelpers';
@@ -47,6 +48,7 @@ import { genericHelpers } from '@/components/mixins/genericHelpers';
 import mixins from 'vue-typed-mixins';
 
 export default mixins(
+	externalHooks,
 	genericHelpers,
 	nodeHelpers,
 	restApi,
@@ -75,6 +77,7 @@ export default mixins(
 				this.loadCredentials();
 				this.loadCredentialTypes();
 			}
+			this.$externalHooks().run('credentialsList.dialogVisibleChanged', { dialogVisible: newValue });
 		},
 	},
 	methods: {
diff --git a/packages/editor-ui/src/components/DataDisplay.vue b/packages/editor-ui/src/components/DataDisplay.vue
index 1e3985c361..5102566efb 100644
--- a/packages/editor-ui/src/components/DataDisplay.vue
+++ b/packages/editor-ui/src/components/DataDisplay.vue
@@ -26,7 +26,7 @@
 								</svg>
 
 							<div v-if="showDocumentHelp && nodeType" class="text">
-								Need help? <a id="doc-hyperlink" v-if="showDocumentHelp && nodeType" :href="documentationUrl" target="_blank">Open {{nodeType.displayName}} documentation</a>
+								Need help? <a id="doc-hyperlink" v-if="showDocumentHelp && nodeType" :href="documentationUrl" target="_blank" @click="onDocumentationUrlClick">Open {{nodeType.displayName}} documentation</a>
 							</div>
 					</div>
 				</transition>
@@ -49,10 +49,16 @@ import {
 	IUpdateInformation,
 } from '../Interface';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
+import { nodeHelpers } from '@/components/mixins/nodeHelpers';
+import { workflowHelpers } from '@/components/mixins/workflowHelpers';
+
 import NodeSettings from '@/components/NodeSettings.vue';
 import RunData from '@/components/RunData.vue';
 
-export default Vue.extend({
+import mixins from 'vue-typed-mixins';
+
+export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
 	name: 'DataDisplay',
 	components: {
 		NodeSettings,
@@ -88,6 +94,13 @@ export default Vue.extend({
 			return null;
 		},
 	},
+	watch: {
+		node (node, oldNode) {
+			if(node && !oldNode) {
+				this.$externalHooks().run('dataDisplay.nodeTypeChanged', { nodeSubtitle: this.getNodeSubtitle(node, this.nodeType, this.getWorkflow()) });
+			}
+		},
+	},
 	methods: {
 		valueChanged (parameterData: IUpdateInformation) {
 			this.$emit('valueChanged', parameterData);
@@ -102,6 +115,9 @@ export default Vue.extend({
 				this.$store.commit('setActiveNode', null);
 			}
 		},
+		onDocumentationUrlClick () {
+			this.$externalHooks().run('dataDisplay.onDocumentationUrlClick', { nodeType: this.nodeType, documentationUrl: this.documentationUrl });
+		},
 	},
 });
 
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index 1c0dfd80e3..d576c6898b 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -158,6 +158,7 @@ import Vue from 'vue';
 import ExecutionTime from '@/components/ExecutionTime.vue';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { restApi } from '@/components/mixins/restApi';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { showMessage } from '@/components/mixins/showMessage';
@@ -182,6 +183,7 @@ import {
 import mixins from 'vue-typed-mixins';
 
 export default mixins(
+	externalHooks,
 	genericHelpers,
 	restApi,
 	showMessage,
@@ -558,6 +560,8 @@ export default mixins(
 			await this.loadWorkflows();
 			await this.refreshData();
 			this.handleAutoRefreshToggle();
+
+			this.$externalHooks().run('executionsList.openDialog');
 		},
 		async retryExecution (execution: IExecutionShortResponse, loadWorkflow?: boolean) {
 			this.isDataLoading = true;
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 4d8eb6e5ff..335c19e6f4 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -47,14 +47,11 @@
 
 import Vue from 'vue';
 import { nodeBase } from '@/components/mixins/nodeBase';
+import { nodeHelpers } from '@/components/mixins/nodeHelpers';
 import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 
 import {
-	INode,
-	INodeIssueObjectProperty,
-	INodePropertyOptions,
 	INodeTypeDescription,
-	ITaskData,
 	NodeHelpers,
 } from 'n8n-workflow';
 
@@ -62,7 +59,7 @@ import NodeIcon from '@/components/NodeIcon.vue';
 
 import mixins from 'vue-typed-mixins';
 
-export default mixins(nodeBase, workflowHelpers).extend({
+export default mixins(nodeBase, nodeHelpers, workflowHelpers).extend({
 	name: 'Node',
 	components: {
 		NodeIcon,
@@ -133,41 +130,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 			}
 		},
 		nodeSubtitle (): string | undefined {
-			if (this.data.notesInFlow) {
-				return this.data.notes;
-			}
-
-			if (this.nodeType !== null && this.nodeType.subtitle !== undefined) {
-				return this.workflow.expression.getSimpleParameterValue(this.data as INode, this.nodeType.subtitle, 'internal') as string | undefined;
-			}
-
-			if (this.data.parameters.operation !== undefined) {
-				const operation = this.data.parameters.operation as string;
-				if (this.nodeType === null) {
-					return operation;
-				}
-
-				const operationData = this.nodeType.properties.find((property) => {
-					return property.name === 'operation';
-				});
-				if (operationData === undefined) {
-					return operation;
-				}
-
-				if (operationData.options === undefined) {
-					return operation;
-				}
-
-				const optionData = operationData.options.find((option) => {
-					return (option as INodePropertyOptions).value === this.data.parameters.operation;
-				});
-				if (optionData === undefined) {
-					return operation;
-				}
-
-				return optionData.name;
-			}
-			return undefined;
+			return this.getNodeSubtitle(this.data, this.nodeType, this.workflow);
 		},
 		workflowRunning (): boolean {
 			return this.$store.getters.isActionActive('workflowRunning');
@@ -186,7 +149,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 			this.disableNodes([this.data]);
 		},
 		executeNode () {
-			this.$emit('runWorkflow', this.data.name);
+			this.$emit('runWorkflow', this.data.name, 'Node.executeNode');
 		},
 		deleteNode () {
 			Vue.nextTick(() => {
diff --git a/packages/editor-ui/src/components/NodeCreateList.vue b/packages/editor-ui/src/components/NodeCreateList.vue
index 3d318c2c8d..a00b3ff2d9 100644
--- a/packages/editor-ui/src/components/NodeCreateList.vue
+++ b/packages/editor-ui/src/components/NodeCreateList.vue
@@ -24,10 +24,13 @@
 <script lang="ts">
 
 import Vue from 'vue';
+import { externalHooks } from "@/components/mixins/externalHooks";
 import { INodeTypeDescription } from 'n8n-workflow';
 import NodeCreateItem from '@/components/NodeCreateItem.vue';
 
-export default Vue.extend({
+import mixins from "vue-typed-mixins";
+
+export default mixins(externalHooks).extend({
 	name: 'NodeCreateList',
 	components: {
 		NodeCreateItem,
@@ -70,13 +73,18 @@ export default Vue.extend({
 				return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
 			});
 
+			this.$externalHooks().run('nodeCreateList.filteredNodeTypesComputed', { nodeFilter: this.nodeFilter, result: returnData, selectedType: this.selectedType });
 			return returnData;
 		},
 	},
 	watch: {
-		nodeFilter (newVal, oldVal) {
+		nodeFilter (newValue, oldValue) {
 			// Reset the index whenver the filter-value changes
 			this.activeNodeTypeIndex = 0;
+			this.$externalHooks().run('nodeCreateList.nodeFilterChanged', { oldValue, newValue, selectedType: this.selectedType, filteredNodes: this.filteredNodeTypes });
+		},
+		selectedType (newValue, oldValue) {
+			this.$externalHooks().run('nodeCreateList.selectedTypeChanged', { oldValue, newValue });
 		},
 	},
 	methods: {
@@ -105,6 +113,12 @@ export default Vue.extend({
 			this.$emit('nodeTypeSelected', nodeTypeName);
 		},
 	},
+	async mounted() {
+		this.$externalHooks().run('nodeCreateList.mounted');
+	},
+	async destroyed() {
+		this.$externalHooks().run('nodeCreateList.destroyed');
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index b64029e69b..da72d6ed1b 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -5,7 +5,7 @@
 		<el-button
 			v-if="node && !isReadOnly"
 			:disabled="workflowRunning"
-			@click.stop="runWorkflow(node.name)"
+			@click.stop="runWorkflow(node.name, 'RunData.ExecuteNodeButton')"
 			class="execute-node-button"
 			:title="`Executes this ${node.name} node after executing any previous nodes that have not yet returned data`"
 		>
@@ -228,6 +228,7 @@ import BinaryDataDisplay from '@/components/BinaryDataDisplay.vue';
 import NodeErrorView from '@/components/Error/NodeViewError.vue';
 
 import { copyPaste } from '@/components/mixins/copyPaste';
+import { externalHooks } from "@/components/mixins/externalHooks";
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { nodeHelpers } from '@/components/mixins/nodeHelpers';
 import { workflowRun } from '@/components/mixins/workflowRun';
@@ -239,6 +240,7 @@ const deselectedPlaceholder = '_!^&*';
 
 export default mixins(
 	copyPaste,
+	externalHooks,
 	genericHelpers,
 	nodeHelpers,
 	workflowRun,
@@ -617,8 +619,9 @@ export default mixins(
 			jsonData () {
 				this.refreshDataSize();
 			},
-			displayMode () {
+			displayMode (newValue, oldValue) {
 				this.closeBinaryDataDisplay();
+				this.$externalHooks().run('runData.displayModeChanged', { newValue, oldValue });
 			},
 			maxRunIndex () {
 				this.runIndex = Math.min(this.runIndex, this.maxRunIndex);
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index ad1d7fd7e9..53ffc57fd0 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -167,6 +167,7 @@
 <script lang="ts">
 import Vue from 'vue';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { restApi } from '@/components/mixins/restApi';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { showMessage } from '@/components/mixins/showMessage';
@@ -180,6 +181,7 @@ import {
 import mixins from 'vue-typed-mixins';
 
 export default mixins(
+	externalHooks,
 	genericHelpers,
 	restApi,
 	showMessage,
@@ -225,6 +227,7 @@ export default mixins(
 			if (newValue) {
 				this.openDialog();
 			}
+			this.$externalHooks().run('workflowSettings.dialogVisibleChanged', { dialogVisible: newValue });
 		},
 	},
 	methods: {
@@ -456,6 +459,8 @@ export default mixins(
 				}
 			}
 
+			const oldSettings = JSON.parse(JSON.stringify(this.$store.getters.workflowSettings));
+
 			this.$store.commit('setWorkflowSettings', localWorkflowSettings);
 
 			this.isLoading = false;
@@ -467,6 +472,8 @@ export default mixins(
 			});
 
 			this.closeDialog();
+			
+			this.$externalHooks().run('workflowSettings.saveSettings', { oldSettings });
 		},
 		toggleTimeout() {
 			this.workflowSettings.executionTimeout = this.workflowSettings.executionTimeout === -1 ? 0 : -1;
diff --git a/packages/editor-ui/src/components/mixins/nodeHelpers.ts b/packages/editor-ui/src/components/mixins/nodeHelpers.ts
index 8577044946..7b70062145 100644
--- a/packages/editor-ui/src/components/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/nodeHelpers.ts
@@ -13,6 +13,8 @@ import {
 	IRunData,
 	IRunExecutionData,
 	ITaskDataConnections,
+	INode,
+	INodePropertyOptions,
 } from 'n8n-workflow';
 
 import {
@@ -321,5 +323,43 @@ export const nodeHelpers = mixins(
 					this.updateNodeCredentialIssues(node);
 				}
 			},
+			// @ts-ignore
+			getNodeSubtitle (data, nodeType, workflow): string | undefined {
+				if (data.notesInFlow) {
+					return data.notes;
+				}
+	
+				if (nodeType !== null && nodeType.subtitle !== undefined) {
+					return workflow.expression.getSimpleParameterValue(data as INode, nodeType.subtitle, 'internal') as string | undefined;
+				}
+	
+				if (data.parameters.operation !== undefined) {
+					const operation = data.parameters.operation as string;
+					if (nodeType === null) {
+						return operation;
+					}
+	
+					const operationData:INodeProperties = nodeType.properties.find((property: INodeProperties) => {
+						return property.name === 'operation';
+					});
+					if (operationData === undefined) {
+						return operation;
+					}
+	
+					if (operationData.options === undefined) {
+						return operation;
+					}
+	
+					const optionData = operationData.options.find((option) => {
+						return (option as INodePropertyOptions).value === data.parameters.operation;
+					});
+					if (optionData === undefined) {
+						return operation;
+					}
+	
+					return optionData.name;
+				}
+				return undefined;
+			},
 		},
 	});
diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
index 5cb47ef44a..5c23dd6cda 100644
--- a/packages/editor-ui/src/components/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -8,6 +8,7 @@ import {
 	IPushDataTestWebhook,
 } from '../../Interface';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { nodeHelpers } from '@/components/mixins/nodeHelpers';
 import { showMessage } from '@/components/mixins/showMessage';
 import { titleChange } from '@/components/mixins/titleChange';
@@ -15,6 +16,7 @@ import { titleChange } from '@/components/mixins/titleChange';
 import mixins from 'vue-typed-mixins';
 
 export const pushConnection = mixins(
+	externalHooks,
 	nodeHelpers,
 	showMessage,
 	titleChange,
@@ -202,6 +204,7 @@ export const pushConnection = mixins(
 
 					const runDataExecuted = pushData.data;
 
+					let runDataExecutedErrorMessage;
 					// @ts-ignore
 					const workflow = this.getWorkflow();
 					if (runDataExecuted.finished !== true) {
@@ -221,6 +224,9 @@ export const pushConnection = mixins(
 								: runDataExecuted.data.resultData.error.message;
 							errorMessage = `There was a problem executing the workflow:<br /><strong>"${receivedError}"</strong>`;
 						}
+
+						runDataExecutedErrorMessage = errorMessage;
+
 						this.$titleSet(workflow.name, 'ERROR');
 						this.$showMessage({
 							title: 'Problem executing workflow',
@@ -249,6 +255,20 @@ export const pushConnection = mixins(
 					// Set the node execution issues on all the nodes which produced an error so that
 					// it can be displayed in the node-view
 					this.updateNodesExecutionIssues();
+
+					let itemsCount = 0;
+					if(runDataExecuted.data.resultData.lastNodeExecuted && !runDataExecutedErrorMessage) {
+						itemsCount = runDataExecuted.data.resultData.runData[runDataExecuted.data.resultData.lastNodeExecuted][0].data!.main[0]!.length;
+					}
+
+					this.$externalHooks().run('pushConnection.executionFinished', {
+						itemsCount,
+						nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
+						errorMessage: runDataExecutedErrorMessage,
+						runDataExecutedStartData: runDataExecuted.data.startData,
+						resultDataError: runDataExecuted.data.resultData.error,
+					});
+
 				} else if (receivedData.type === 'executionStarted') {
 					const pushData = receivedData.data as IPushDataExecutionStarted;
 
diff --git a/packages/editor-ui/src/components/mixins/showMessage.ts b/packages/editor-ui/src/components/mixins/showMessage.ts
index c9314ce948..f7d9c21b2e 100644
--- a/packages/editor-ui/src/components/mixins/showMessage.ts
+++ b/packages/editor-ui/src/components/mixins/showMessage.ts
@@ -2,9 +2,13 @@ import Vue from 'vue';
 
 import { Notification } from 'element-ui';
 import { ElNotificationOptions } from 'element-ui/types/notification';
+import mixins from 'vue-typed-mixins';
+
+import { externalHooks } from '@/components/mixins/externalHooks';
+
 
 // export const showMessage = {
-export const showMessage = Vue.extend({
+export const showMessage = mixins(externalHooks).extend({
 	methods: {
 		$showMessage (messageData: ElNotificationOptions) {
 			messageData.dangerouslyUseHTMLString = true;
@@ -21,6 +25,7 @@ export const showMessage = Vue.extend({
 				type: 'error',
 				duration: 0,
 			});
+			this.$externalHooks().run('showMessage.showError', { title, message, errorMessage: error.message });
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/mixins/workflowRun.ts b/packages/editor-ui/src/components/mixins/workflowRun.ts
index 72c535afb1..0e9cf0b3d1 100644
--- a/packages/editor-ui/src/components/mixins/workflowRun.ts
+++ b/packages/editor-ui/src/components/mixins/workflowRun.ts
@@ -53,7 +53,7 @@ export const workflowRun = mixins(
 
 			return response;
 		},
-		async runWorkflow (nodeName: string): Promise<IExecutionPushResponse | undefined> {
+		async runWorkflow (nodeName: string, source?: string): Promise<IExecutionPushResponse | undefined> {
 			if (this.$store.getters.isActionActive('workflowRunning') === true) {
 				return;
 			}
@@ -84,7 +84,7 @@ export const workflowRun = mixins(
 							duration: 0,
 						});
 						this.$titleSet(workflow.name as string, 'ERROR');
-						this.$externalHooks().run('workflow.runError', { errorMessages });
+						this.$externalHooks().run('workflowRun.runError', { errorMessages, nodeName });
 						return;
 					}
 				}
@@ -172,7 +172,11 @@ export const workflowRun = mixins(
 				};
 				this.$store.commit('setWorkflowExecutionData', executionData);
 
-				 return await this.runWorkflowApi(startRunData);
+				 const runWorkflowApiResponse = await this.runWorkflowApi(startRunData);
+
+				 this.$externalHooks().run('workflowRun.runWorkflow', { nodeName, source });
+
+				 return runWorkflowApiResponse;
 			} catch (error) {
 				this.$titleSet(workflow.name as string, 'ERROR');
 				this.$showError(error, 'Problem running workflow', 'There was a problem running the workflow:');
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 609195f324..38fbda2f3b 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -198,7 +198,7 @@ export default mixins(
 				this.createNodeActive = false;
 			},
 			nodes: {
-				async handler (val, oldVal) {
+				async handler (value, oldValue) {
 					// Load a workflow
 					let workflowId = null as string | null;
 					if (this.$route && this.$route.params.name) {
@@ -208,7 +208,7 @@ export default mixins(
 				deep: true,
 			},
 			connections: {
-				async handler (val, oldVal) {
+				async handler (value, oldValue) {
 					// Load a workflow
 					let workflowId = null as string | null;
 					if (this.$route && this.$route.params.name) {
@@ -332,6 +332,7 @@ export default mixins(
 			},
 			openNodeCreator () {
 				this.createNodeActive = true;
+				this.$externalHooks().run('nodeView.createNodeActiveChanged', { source: 'add_node_button' });
 			},
 			async openExecution (executionId: string) {
 				this.resetWorkspace();
@@ -354,6 +355,8 @@ export default mixins(
 				this.$store.commit('setWorkflowExecutionData', data);
 
 				await this.addNodes(JSON.parse(JSON.stringify(data.workflowData.nodes)), JSON.parse(JSON.stringify(data.workflowData.connections)));
+
+				this.$externalHooks().run('execution.open', { workflowId: data.workflowData.id, workflowName: data.workflowData.name, executionId });
 			},
 			async openWorkflow (workflowId: string) {
 				this.resetWorkspace();
@@ -1052,6 +1055,8 @@ export default mixins(
 
 				this.$store.commit('setStateDirty', true);
 
+				this.$externalHooks().run('nodeView.addNodeButton', { nodeTypeName });
+
 				// Automatically deselect all nodes and select the current one and also active
 				// current node
 				this.deselectAllNodes();
@@ -1174,6 +1179,7 @@ export default mixins(
 
 					// Display the node-creator
 					this.createNodeActive = true;
+					this.$externalHooks().run('nodeView.createNodeActiveChanged', { source: 'node_connection_drop' });
 				});
 
 				this.instance.bind('connection', (info: OnConnectionBindInfo) => {

From 0de62eae30275ec5a7155213a11571f0eadc7c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 6 May 2021 19:33:24 +0200
Subject: [PATCH 127/231] :fire: Remove Node 12 CI tests (#1748)

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4beac42b36..9b95d10d44 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x]
 
     steps:
     - uses: actions/checkout@v1

From 6ad797f9e590fe4a92b3b3082d6981e1b6876b53 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 11:05:13 -0500
Subject: [PATCH 128/231] :zap: Fix version of cheerio to fix build #1754

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index dd9011245e..ba36f2b47d 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -599,7 +599,7 @@
     "aws4": "^1.8.0",
     "basic-auth": "^2.0.1",
     "change-case": "^4.1.1",
-    "cheerio": "^1.0.0-rc.3",
+    "cheerio": "1.0.0-rc.8",
     "cron": "^1.7.2",
     "eventsource": "^1.0.7",
     "fflate": "^0.4.8",

From 29842e2f5f46f485fa7c5069a89bbbeb1439761f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 18:27:33 -0500
Subject: [PATCH 129/231] :zap: Fix version of cheerio to fix build #1754

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ba36f2b47d..14ec528fc6 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -599,7 +599,7 @@
     "aws4": "^1.8.0",
     "basic-auth": "^2.0.1",
     "change-case": "^4.1.1",
-    "cheerio": "1.0.0-rc.8",
+    "cheerio": "1.0.0-rc.6",
     "cron": "^1.7.2",
     "eventsource": "^1.0.7",
     "fflate": "^0.4.8",

From fc3ebf1a4c7de360924d65c76666e3f000157fb4 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 8 May 2021 01:33:14 +0200
Subject: [PATCH 130/231] :zap: Adds increment operation to Redis (#1745)

---
 packages/nodes-base/nodes/Redis/Redis.node.ts | 74 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index ecf623ed51..012486462e 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -54,6 +54,11 @@ export class Redis implements INodeType {
 						value: 'info',
 						description: 'Returns generic information about the Redis instance.',
 					},
+					{
+						name: 'Increment',
+						value: 'incr',
+						description: 'Atomically increments a key by 1. Creates the key if it does not exist.',
+					},
 					{
 						name: 'Keys',
 						value: 'keys',
@@ -186,6 +191,60 @@ export class Redis implements INodeType {
 				],
 			},
 
+
+			// ----------------------------------
+			//         incr
+			// ----------------------------------
+			{
+				displayName: 'Key',
+				name: 'key',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'incr',
+						],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'Name of the key to increment.',
+			},
+			{
+				displayName: 'Expire',
+				name: 'expire',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						operation: [
+							'incr',
+						],
+					},
+				},
+				default: false,
+				description: 'Set a timeout on key?',
+			},
+			{
+				displayName: 'TTL',
+				name: 'ttl',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+				},
+				displayOptions: {
+					show: {
+						operation: [
+							'incr',
+						],
+						expire: [
+							true,
+						],
+					},
+				},
+				default: 60,
+				description: 'Number of seconds before key expiration.',
+			},
+
 			// ----------------------------------
 			//         keys
 			// ----------------------------------
@@ -459,7 +518,7 @@ export class Redis implements INodeType {
 						resolve(this.prepareOutputData([{ json: convertInfoToObject(result as unknown as string) }]));
 						client.quit();
 
-					} else if (['delete', 'get', 'keys', 'set'].includes(operation)) {
+					} else if (['delete', 'get', 'keys', 'set', 'incr'].includes(operation)) {
 						const items = this.getInputData();
 						const returnItems: INodeExecutionData[] = [];
 
@@ -517,6 +576,19 @@ export class Redis implements INodeType {
 
 								await setValue(client, keySet, value, expire, ttl, keyType);
 								returnItems.push(items[itemIndex]);
+							} else if (operation === 'incr') {
+
+								const keyIncr = this.getNodeParameter('key', itemIndex) as string;
+								const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
+								const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
+								const clientIncr = util.promisify(client.incr).bind(client);
+								// @ts-ignore
+								const incrementVal = await clientIncr(keyIncr);
+								if (expire === true && ttl > 0) {
+									const clientExpire = util.promisify(client.expire).bind(client);
+									await clientExpire(keyIncr, ttl);
+								}
+								returnItems.push({json: {[keyIncr]: incrementVal}});
 							}
 						}
 

From f6fdf6b5e1ca43b8be48fa588e61fe06e975b68a Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 7 May 2021 19:46:50 -0400
Subject: [PATCH 131/231] :sparkles: Add Reply To parameter to Mailjet node
 (#1732)

* :zap: Add Reply To parameter

* :zap: Add svg logo
---
 .../nodes/Mailjet/EmailDescription.ts         |  37 ++--
 .../nodes/Mailjet/GenericFunctions.ts         |  37 +++-
 .../nodes-base/nodes/Mailjet/Mailjet.node.ts  | 169 +++++++++---------
 .../nodes/Mailjet/MailjetTrigger.node.ts      |   2 +-
 packages/nodes-base/nodes/Mailjet/mailjet.png | Bin 891 -> 0 bytes
 packages/nodes-base/nodes/Mailjet/mailjet.svg |   1 +
 6 files changed, 148 insertions(+), 98 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/Mailjet/mailjet.png
 create mode 100644 packages/nodes-base/nodes/Mailjet/mailjet.svg

diff --git a/packages/nodes-base/nodes/Mailjet/EmailDescription.ts b/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
index 7039757192..56f8982dcb 100644
--- a/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Mailjet/EmailDescription.ts
@@ -31,9 +31,9 @@ export const emailOperations = [
 
 export const emailFields = [
 
-/* -------------------------------------------------------------------------- */
-/*                                email:send                                  */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                email:send                                  */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'From Email',
 		name: 'fromEmail',
@@ -162,11 +162,18 @@ export const emailFields = [
 				type: 'number',
 				default: 2,
 			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				type: 'string',
+				description: 'The reply-to email address. Multiple ones can be separated by comma.',
+				default: '',
+			},
 			{
 				displayName: 'Template Language',
 				name: 'templateLanguage',
 				type: 'boolean',
-				default: true,
+				default: false,
 			},
 			{
 				displayName: 'Track Clicks',
@@ -258,9 +265,9 @@ export const emailFields = [
 			},
 		],
 	},
-/* -------------------------------------------------------------------------- */
-/*                                email:sendTemplate                          */
-/* -------------------------------------------------------------------------- */
+	/* -------------------------------------------------------------------------- */
+	/*                                email:sendTemplate                          */
+	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'From Email',
 		name: 'fromEmail',
@@ -301,7 +308,10 @@ export const emailFields = [
 	{
 		displayName: 'Template ID',
 		name: 'templateId',
-		type: 'string',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTemplates',
+		},
 		required: true,
 		default: '',
 		displayOptions: {
@@ -336,7 +346,7 @@ export const emailFields = [
 				displayName: 'Bcc Email',
 				name: 'bccEmail',
 				type: 'string',
-				description: 'Bcc Recipients of the email separated by ,.',
+				description: 'BCC Recipients of the email separated by ,.',
 				default: '',
 			},
 			{
@@ -358,6 +368,13 @@ export const emailFields = [
 				type: 'number',
 				default: 2,
 			},
+			{
+				displayName: 'Reply To',
+				name: 'replyTo',
+				type: 'string',
+				description: 'The reply-to email address. Multiple ones can be separated by comma.',
+				default: '',
+			},
 			{
 				displayName: 'Subject',
 				name: 'subject',
@@ -382,7 +399,7 @@ export const emailFields = [
 				displayName: 'Template Language',
 				name: 'templateLanguage',
 				type: 'boolean',
-				default: true,
+				default: false,
 			},
 		],
 	},
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index 6f101a1619..fba2c896ce 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -1,10 +1,18 @@
-import { OptionsWithUri } from 'request';
+import {
+	OptionsWithUri,
+} from 'request';
+
 import {
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import { IDataObject, IHookFunctions, NodeApiError } from 'n8n-workflow';
+
+import {
+	IDataObject,
+	IHookFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
 
 export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const emailApiCredentials = this.getCredentials('mailjetEmailApi');
@@ -16,7 +24,7 @@ export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingle
 		method,
 		qs,
 		body,
-		uri: uri ||`https://api.mailjet.com${resource}`,
+		uri: uri || `https://api.mailjet.com${resource}`,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
@@ -25,12 +33,10 @@ export async function mailjetApiRequest(this: IExecuteFunctions | IExecuteSingle
 	}
 	if (emailApiCredentials !== undefined) {
 		const base64Credentials = Buffer.from(`${emailApiCredentials.apiKey}:${emailApiCredentials.secretKey}`).toString('base64');
-		//@ts-ignore
-		options.headers['Authorization'] = `Basic ${base64Credentials}`;
+		options.headers!['Authorization'] = `Basic ${base64Credentials}`;
 	} else {
 		const smsApiCredentials = this.getCredentials('mailjetSmsApi');
-		//@ts-ignore
-		options.headers['Authorization'] = `Bearer ${smsApiCredentials.token}`;
+		options.headers!['Authorization'] = `Bearer ${smsApiCredentials!.token}`;
 	}
 	try {
 		return await this.helpers.request!(options);
@@ -57,3 +63,20 @@ export async function mailjetApiRequestAllItems(this: IExecuteFunctions | IHookF
 	);
 	return returnData;
 }
+
+export interface IMessage {
+	From?: { Email?: string, Name?: string };
+	Subject?: string;
+	To?: IDataObject[];
+	Cc?: IDataObject[];
+	Bcc?: IDataObject[];
+	Variables?: IDataObject;
+	TemplateLanguage?: boolean;
+	TemplateID?: number;
+	HTMLPart?: string;
+	TextPart?: string;
+	TrackOpens?: string;
+	ReplyTo?: IDataObject;
+	TrackClicks?: string;
+	Priority?: number;
+}
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index a30d7ada15..5e85b47848 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -1,19 +1,26 @@
 import {
 	IExecuteFunctions,
 } from 'n8n-core';
+
 import {
 	IDataObject,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+
 import {
+	IMessage,
 	mailjetApiRequest,
 } from './GenericFunctions';
+
 import {
 	emailFields,
 	emailOperations,
 } from './EmailDescription';
+
 import {
 	smsFields,
 	smsOperations,
@@ -23,7 +30,7 @@ export class Mailjet implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mailjet',
 		name: 'mailjet',
-		icon: 'file:mailjet.png',
+		icon: 'file:mailjet.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
@@ -83,6 +90,24 @@ export class Mailjet implements INodeType {
 		],
 	};
 
+	methods = {
+		loadOptions: {
+			// Get all the available custom fields to display them to user so that he can
+			// select them easily
+			async getTemplates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { Data: templates } = await mailjetApiRequest.call(this, 'GET', '/v3/REST/template');
+				for (const template of templates) {
+					returnData.push({
+						name: template.Name,
+						value: template.ID,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
@@ -103,80 +128,71 @@ export class Mailjet implements INodeType {
 					const toEmail = (this.getNodeParameter('toEmail', i) as string).split(',') as string[];
 					const variables = (this.getNodeParameter('variablesUi', i) as IDataObject).variablesValues as IDataObject[];
 
-					const body: IDataObject = {
-						Messages: [
-							{
-								From: {
-									email: fromEmail,
-								},
-								subject,
-								to: [],
-								Cc: [],
-								Bcc: [],
-								Variables: {},
-							},
-						],
-						//SandboxMode: true,
+					const body: IMessage = {
+						From: {
+							Email: fromEmail,
+						},
+						Subject: subject,
+						To: [],
+						Cc: [],
+						Bcc: [],
+						Variables: {},
 					};
+
 					for (const email of toEmail) {
-						//@ts-ignore
-						body.Messages[0].to.push({
-							email,
+						body.To?.push({
+							Email: email,
 						});
 					}
 					if (variables) {
 						for (const variable of variables) {
-							//@ts-ignore
-							body.Messages[0].Variables[variable.name] = variable.value;
+							body.Variables![variable.name as string] = variable.value;
 						}
 					}
 					if (htmlBody) {
-						//@ts-ignore
-						body.Messages[0].HTMLPart = htmlBody;
+						body.HTMLPart = htmlBody;
 					}
 					if (textBody) {
-						//@ts-ignore
-						body.Messages[0].TextPart = textBody;
+						body.TextPart = textBody;
 					}
 					if (additionalFields.bccEmail) {
 						const bccEmail = (additionalFields.bccEmail as string).split(',') as string[];
 						for (const email of bccEmail) {
-							//@ts-ignore
-							body.Messages[0].Bcc.push({
-								email,
+							body.Bcc!.push({
+								Email: email,
 							});
 						}
 					}
-					if (additionalFields.ccEmail) {
-						const ccEmail = (additionalFields.ccEmail as string).split(',') as string[];
+					if (additionalFields.ccAddresses) {
+						const ccEmail = (additionalFields.ccAddresses as string).split(',') as string[];
 						for (const email of ccEmail) {
-							//@ts-ignore
-							body.Messages[0].Cc.push({
-								email,
+							body.Cc!.push({
+								Email: email,
 							});
 						}
 					}
 					if (additionalFields.trackOpens) {
-						//@ts-ignore
-						body.Messages[0].TrackOpens = additionalFields.trackOpens as string;
+						body.TrackOpens = additionalFields.trackOpens as string;
+					}
+					if (additionalFields.replyTo) {
+						const replyTo = additionalFields.replyTo as string;
+						body['ReplyTo'] = {
+							Email: replyTo,
+						};
 					}
 					if (additionalFields.trackClicks) {
-						//@ts-ignore
-						body.Messages[0].TrackClicks = additionalFields.trackClicks as string;
+						body.TrackClicks = additionalFields.trackClicks as string;
 					}
 					if (additionalFields.fromName) {
-						//@ts-ignore
-						body.Messages[0].From.name = additionalFields.fromName as string;
+						body.From!.Name = additionalFields.fromName as string;
 					}
 					if (additionalFields.templateLanguage) {
-						//@ts-ignore
-						body.Messages[0].From.TemplateLanguage = additionalFields.templateLanguage as boolean;
+						body.TemplateLanguage = additionalFields.templateLanguage as boolean;
 					}
 					if (additionalFields.priority) {
-						//@ts-ignore
-						body.Messages[0].Priority = additionalFields.priority as number;
+						body.Priority = additionalFields.priority as number;
 					}
-					responseData = await mailjetApiRequest.call(this, 'POST', '/v3.1/send', body);
+					responseData = await mailjetApiRequest.call(this, 'POST', '/v3.1/send', { Messages: [body] });
 					responseData = responseData.Messages;
 
 				}
@@ -189,73 +205,66 @@ export class Mailjet implements INodeType {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const toEmail = (this.getNodeParameter('toEmail', i) as string).split(',') as string[];
 
-					const body: IDataObject = {
-						Messages: [
-							{
-								From: {
-									email: fromEmail,
-								},
-								Subject: subject,
-								to: [],
-								Cc: [],
-								Bcc: [],
-								Variables: {},
-								TemplateID: templateId,
-							},
-						],
-						//SandboxMode: true,
+					const body: IMessage = {
+						From: {
+							Email: fromEmail,
+						},
+						Subject: subject,
+						To: [],
+						Cc: [],
+						Bcc: [],
+						Variables: {},
+						TemplateID: templateId,
 					};
+
 					for (const email of toEmail) {
-						//@ts-ignore
-						body.Messages[0].to.push({
-							email,
+						body.To!.push({
+							Email: email,
 						});
 					}
 					if (variables) {
 						for (const variable of variables) {
-							//@ts-ignore
-							body.Messages[0].Variables[variable.name] = variable.value;
+							body.Variables![variable.name as string] = variable.value;
 						}
 					}
 					if (additionalFields.bccEmail) {
 						const bccEmail = (additionalFields.bccEmail as string).split(',') as string[];
 						for (const email of bccEmail) {
-							//@ts-ignore
-							body.Messages[0].Bcc.push({
-								email,
+							body.Bcc!.push({
+								Email: email,
 							});
 						}
 					}
 					if (additionalFields.ccEmail) {
 						const ccEmail = (additionalFields.ccEmail as string).split(',') as string[];
 						for (const email of ccEmail) {
-							//@ts-ignore
-							body.Messages[0].Cc.push({
-								email,
+							body.Cc!.push({
+								Email: email,
 							});
 						}
 					}
+					if (additionalFields.replyTo) {
+						const replyTo = additionalFields.replyTo as string;
+						body['ReplyTo'] = {
+							Email: replyTo,
+						};
+					}
 					if (additionalFields.trackOpens) {
-						//@ts-ignore
-						body.Messages[0].TrackOpens = additionalFields.trackOpens as string;
+						body.TrackOpens = additionalFields.trackOpens as string;
 					}
 					if (additionalFields.trackClicks) {
-						//@ts-ignore
-						body.Messages[0].TrackClicks = additionalFields.trackClicks as string;
+						body.TrackClicks = additionalFields.trackClicks as string;
 					}
 					if (additionalFields.fromName) {
-						//@ts-ignore
-						body.Messages[0].From.name = additionalFields.fromName as string;
+						body.From!.Name = additionalFields.fromName as string;
 					}
 					if (additionalFields.templateLanguage) {
-						//@ts-ignore
-						body.Messages[0].From.TemplateLanguage = additionalFields.templateLanguage as boolean;
+						body.TemplateLanguage = additionalFields.templateLanguage as boolean;
 					}
 					if (additionalFields.priority) {
-						//@ts-ignore
-						body.Messages[0].Priority = additionalFields.priority as number;
+						body.Priority = additionalFields.priority as number;
 					}
-					responseData = await mailjetApiRequest.call(this, 'POST', '/v3.1/send', body);
+					responseData = await mailjetApiRequest.call(this, 'POST', '/v3.1/send', { Messages: [body] });
 					responseData = responseData.Messages;
 				}
 			}
diff --git a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
index f25b39b0b7..8e71b0833a 100644
--- a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
@@ -18,7 +18,7 @@ export class MailjetTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mailjet Trigger',
 		name: 'mailjetTrigger',
-		icon: 'file:mailjet.png',
+		icon: 'file:mailjet.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Mailjet events via webhooks',
diff --git a/packages/nodes-base/nodes/Mailjet/mailjet.png b/packages/nodes-base/nodes/Mailjet/mailjet.png
deleted file mode 100644
index 88c3f71cc9f2648b7d0283efa61d030b6ba2d6fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq001%o001xu0{{R3WGUH*0002(P)t-s|NsC0
z|Nj2@_Wtzi|NsC0{{8u*Ir*YC`K3eosYv;xK>3^i`JVv!ngIBi0RR2_{pi{GqBQxY
zJpcFd|MTnp?c@2TNB;Tt{ou>~^zQn;i}|TV`KLemqdWPb0Qi>x{p8d9+QIzSy!yO@
z`LAF3sZ;r<PWh`$`KLqqqdxecI{BqB`JN&9p$_<z0RQ{={_y7g;m-Tgv-{7m`_HTU
z&87RvqWj04`nGxbraAebD*2-!`Jx&5o)!J--Td9g{M5Mn#+m!YmHNSw`nrAkwQ~Bf
zYWcHh`JgZPo(A}n0Q<|Q`L1R8tyTD&5NIqq761SM1awkPQ}_4x_h5}Z6aWAMIY~r8
zR7l6|)yHz%Fcbw)CjlvtC?v%qTHWg1wtDZ~<^Mk?prOf|WHgeTMJ5a16}dQk4;KsG
zq0i>-i~I|sD9T?=QDkl;PWt{acmjEq81q9RyKK$Or-%YF$c4q+-0{FT8Rj>u_CwmW
zjo*fzBL*_M1Q&F5KOvm6iMNe*GSBWG>w^6zrid5cB3@b7v50Qf2%&Tw+hu!mf9gb#
z2;fs=;=$>2tg9bM2<d6DaCJ;6O%8JFMbkH3$2Q~~=Z7p=tlwfoPld!|F-_Bo#bUV5
z8b^}rnBvoRy0i4ZOA;(+7MPa+qYDwMQbLQ_rfDO^@!RWUvTdKPQZ8plxh|J0V-H&s
zO6$4hgKHq=Y1Z3Slbm*Jxc$?h%%SG#qJh1r&f2^@-y`%m%|!D_T91!Li>Khrl7Mk@
ztj0LWN9R+~l$~z(!-UbQ_BKdn%>ewG0_bt^+V!2F7{9k0Gcq2OL<v>4d6obO7!ku2
zyHG+#aZM}5<Jy3{J%~yr00Jh{*LjK!6P{KIi)bYhZ$>0IPf*0-mX7s=8d3!)#ptMe
z58&)#j)m2b75WI)>U1S*x<pK-hh!3X!q%snE|OUaheRwD4^!JyO&5uQT8&_eiY;D%
znl2Cp8Qb@Y6~YOwLQPl5OQXE6lvy2WI!{2DsY<2HQ&ATVah8CH<ZIr0qYpJ*Cp}&{
zzWM;J5d)<gDX8fNq9B{qT2Rv!B29J$HQhoK<ie?ModV!?qWoWfu`lvT@)L$aRB%gz
Rr6d3V002ovPDHLkV1mb9)x7`!

diff --git a/packages/nodes-base/nodes/Mailjet/mailjet.svg b/packages/nodes-base/nodes/Mailjet/mailjet.svg
new file mode 100644
index 0000000000..0d9badd5ca
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailjet/mailjet.svg
@@ -0,0 +1 @@
+<svg height="2500" viewBox=".5 90 402.6 222.2" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="m129.1 195.5-7 46.5-48 70.2 16.2-8.9 263.7-145.2 49.1-27zm-1.7-12.3 206.8-47-13.4-1.8-54.3-7.6-115.2-15.9-150.8-20.9 55.3 40.6 69.5 51.1z" fill="#fead0c"/></svg>
\ No newline at end of file

From 31dd9591097d46adc99728de8c40ab8fb5f2df3d Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 7 May 2021 19:54:40 -0400
Subject: [PATCH 132/231] :bug: Select base url depending on the datacenter
 (#1744)

---
 .../credentials/ZohoOAuth2Api.credentials.ts        |  2 +-
 packages/nodes-base/nodes/Zoho/GenericFunctions.ts  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
index 53372b603b..d9fedc56fe 100644
--- a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
@@ -53,7 +53,7 @@ export class ZohoOAuth2Api implements ICredentialType {
 				},
 				{
 					name: 'CN - https://accounts.zoho.com.cn/oauth/v2/token',
-					value: ' https://accounts.zoho.com.cn/oauth/v2/token',
+					value: 'https://accounts.zoho.com.cn/oauth/v2/token',
 				},
 			],
 			default: 'https://accounts.zoho.com/oauth/v2/token',
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index d21c84a9a3..d5e07a3877 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,4 +1,7 @@
-import { OptionsWithUri } from 'request';
+import { 
+	OptionsWithUri,
+} from 'request';
+
 import {
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
@@ -9,6 +12,8 @@ import {
 } from 'n8n-workflow';
 
 export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+	const { oauthTokenData: { api_domain } } = this.getCredentials('zohoOAuth2Api') as { [key: string]: IDataObject };
+
 	const options: OptionsWithUri = {
 		headers: {
 			'Content-Type': 'application/json',
@@ -20,7 +25,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 			],
 		},
 		qs,
-		uri: uri || `https://www.zohoapis.com/crm/v2${resource}`,
+		uri: uri || `${api_domain}/crm/v2${resource}`,
 		json: true,
 	};
 	try {
@@ -31,7 +36,7 @@ export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFun
 	}
 }
 
-export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 
 	const returnData: IDataObject[] = [];
 
@@ -51,4 +56,4 @@ export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOpti
 	);
 
 	return returnData;
-}
+}
\ No newline at end of file

From d90acdf86366781122ba82370a55750b79af11bb Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 8 May 2021 02:06:26 +0200
Subject: [PATCH 133/231] :zap: Implement timeout for subworkflows (#1751)

---
 packages/cli/src/WorkflowExecuteAdditionalData.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index e2d48b3b69..809a8439f8 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -619,7 +619,16 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 	// This one already contains changes to talk to parent process
 	// and get executionID from `activeExecutions` running on main process
 	additionalDataIntegrated.executeWorkflow = additionalData.executeWorkflow;
-	additionalDataIntegrated.executionTimeoutTimestamp = additionalData.executionTimeoutTimestamp;
+
+	let subworkflowTimeout = additionalData.executionTimeoutTimestamp;
+	if (workflowData.settings?.executionTimeout !== undefined && workflowData.settings.executionTimeout > 0) {
+		// We might have received a max timeout timestamp from the parent workflow
+		// If we did, then we get the minimum time between the two timeouts
+		// If no timeout was given from the parent, then we use our timeout.
+		subworkflowTimeout = Math.min(additionalData.executionTimeoutTimestamp || Number.MAX_SAFE_INTEGER, Date.now() + (workflowData.settings.executionTimeout as number * 1000));
+	}
+	
+	additionalDataIntegrated.executionTimeoutTimestamp = subworkflowTimeout;
 
 
 	// Execute the workflow

From cdbb3acd2d4221a8c8beabb815d5a7c761f9f226 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 8 May 2021 02:37:45 +0200
Subject: [PATCH 134/231] :bug: Remove webhooks deregistration from webhook
 process (#1753)

---
 packages/cli/commands/webhook.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/cli/commands/webhook.ts b/packages/cli/commands/webhook.ts
index da09857380..e1acc94874 100644
--- a/packages/cli/commands/webhook.ts
+++ b/packages/cli/commands/webhook.ts
@@ -61,17 +61,6 @@ export class Webhook extends Command {
 				process.exit(processExistCode);
 			}, 30000);
 
-			const removePromises = [];
-			if (activeWorkflowRunner !== undefined) {
-				removePromises.push(activeWorkflowRunner.removeAll());
-			}
-
-			// Remove all test webhooks
-			const testWebhooks = TestWebhooks.getInstance();
-			removePromises.push(testWebhooks.removeAll());
-
-			await Promise.all(removePromises);
-
 			// Wait for active workflow executions to finish
 			const activeExecutionsInstance = ActiveExecutions.getInstance();
 			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();

From 90d69246d9d34df5b1890e858fdc6707c99ce1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 8 May 2021 04:59:32 +0200
Subject: [PATCH 135/231] :bug: Fix null value parsing in Google FIrestore
 (#1749)

---
 .../nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index cb58d5c496..8200a95064 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -112,9 +112,9 @@ export function documentToJson(fields: IDataObject): IDataObject {
 	for (const f of Object.keys(fields)) {
 		const key = f, value = fields[f],
 			isDocumentType = ['stringValue', 'booleanValue', 'doubleValue',
-				'integerValue', 'timestampValue', 'mapValue', 'arrayValue'].find(t => t === key);
+				'integerValue', 'timestampValue', 'mapValue', 'arrayValue', 'nullValue'].find(t => t === key);
 		if (isDocumentType) {
-			const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue']
+			const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue', 'nullValue']
 				.find(t => t === key);
 			if (item) {
 				return value as IDataObject;

From 5809b1e098eb0fb4da35bc29b477b2321831e003 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 22:06:31 -0500
Subject: [PATCH 136/231] :zap: Optimize svgs

---
 packages/nodes-base/nodes/Asana/asana.svg     |  2 +-
 .../nodes-base/nodes/Facebook/facebook.svg    | 17 +------------
 .../nodes-base/nodes/Kitemaker/kitemaker.svg  | 19 +-------------
 packages/nodes-base/nodes/MQTT/mqtt.svg       | 22 +---------------
 .../nodes-base/nodes/Mailcheck/mailcheck.svg  |  2 +-
 packages/nodes-base/nodes/Mailjet/mailjet.svg |  2 +-
 .../nodes/TimescaleDb/timescale.svg           |  2 +-
 packages/nodes-base/nodes/n8nTrigger.svg      | 25 +------------------
 8 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/packages/nodes-base/nodes/Asana/asana.svg b/packages/nodes-base/nodes/Asana/asana.svg
index 4a585afdff..2d5de3183d 100644
--- a/packages/nodes-base/nodes/Asana/asana.svg
+++ b/packages/nodes-base/nodes/Asana/asana.svg
@@ -1 +1 @@
-<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><defs><radialGradient cx="50%" cy="55%" fx="50%" fy="55%" r="72.507%" gradientTransform="matrix(.92404 0 0 1 .038 0)" id="a"><stop stop-color="#FFB900" offset="0%"/><stop stop-color="#F95D8F" offset="60%"/><stop stop-color="#F95353" offset="99.91%"/></radialGradient></defs><path d="M45.594 28.5c-6.994.003-12.664 5.673-12.667 12.667.003 6.995 5.673 12.664 12.667 12.668 6.995-.004 12.664-5.673 12.667-12.668-.003-6.994-5.672-12.664-12.667-12.667zm-32.927.001C5.673 28.505.003 34.174 0 41.17c.003 6.994 5.673 12.664 12.667 12.667 6.995-.003 12.664-5.673 12.668-12.667-.004-6.995-5.673-12.664-12.668-12.668zM41.79 12.667c-.002 6.995-5.671 12.665-12.666 12.67-6.995-.004-12.664-5.674-12.667-12.67C16.46 5.673 22.13.003 29.123 0c6.994.004 12.663 5.673 12.666 12.667z" transform="translate(.732 2.732)" fill="url(#a)" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><defs><radialGradient cx="50%" cy="55%" fx="50%" fy="55%" r="72.507%" gradientTransform="matrix(.92404 0 0 1 .038 0)" id="a"><stop stop-color="#FFB900" offset="0%"/><stop stop-color="#F95D8F" offset="60%"/><stop stop-color="#F95353" offset="99.91%"/></radialGradient></defs><path d="M45.594 28.5c-6.994.003-12.664 5.673-12.667 12.667.003 6.995 5.673 12.664 12.667 12.668 6.995-.004 12.664-5.673 12.667-12.668-.003-6.994-5.672-12.664-12.667-12.667zm-32.927.001C5.673 28.505.003 34.174 0 41.17c.003 6.994 5.673 12.664 12.667 12.667 6.995-.003 12.664-5.673 12.668-12.667-.004-6.995-5.673-12.664-12.668-12.668zM41.79 12.667c-.002 6.995-5.671 12.665-12.666 12.67-6.995-.004-12.664-5.674-12.667-12.67C16.46 5.673 22.13.003 29.123 0c6.994.004 12.663 5.673 12.666 12.667z" transform="translate(.732 2.732)" fill="url(#a)" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Facebook/facebook.svg b/packages/nodes-base/nodes/Facebook/facebook.svg
index 14969a7085..14021e35e4 100644
--- a/packages/nodes-base/nodes/Facebook/facebook.svg
+++ b/packages/nodes-base/nodes/Facebook/facebook.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1877F2;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M59.5,30C59.5,13.71,46.29,0.5,30,0.5S0.5,13.71,0.5,30c0,14.72,10.79,26.93,24.89,29.14V38.53H17.9V30h7.49
-		v-6.5c0-7.39,4.4-11.48,11.14-11.48c3.23,0,6.6,0.58,6.6,0.58v7.26h-3.72c-3.66,0-4.81,2.27-4.81,4.61V30h8.18l-1.31,8.53h-6.87
-		v20.61C48.71,56.93,59.5,44.72,59.5,30z"/>
-	<path class="st1" d="M41.48,38.53L42.79,30h-8.18v-5.53c0-2.33,1.14-4.61,4.81-4.61h3.72V12.6c0,0-3.38-0.58-6.6-0.58
-		c-6.74,0-11.14,4.08-11.14,11.48V30H17.9v8.53h7.49v20.61c1.5,0.24,3.04,0.36,4.61,0.36s3.11-0.12,4.61-0.36V38.53H41.48z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><path d="M59.5 30C59.5 13.71 46.29.5 30 .5S.5 13.71.5 30c0 14.72 10.79 26.93 24.89 29.14V38.53H17.9V30h7.49v-6.5c0-7.39 4.4-11.48 11.14-11.48 3.23 0 6.6.58 6.6.58v7.26h-3.72c-3.66 0-4.81 2.27-4.81 4.61V30h8.18l-1.31 8.53H34.6v20.61C48.71 56.93 59.5 44.72 59.5 30z" fill="#1877f2"/><path d="M41.48 38.53L42.79 30h-8.18v-5.53c0-2.33 1.14-4.61 4.81-4.61h3.72V12.6s-3.38-.58-6.6-.58c-6.74 0-11.14 4.08-11.14 11.48V30h-7.5v8.53h7.49v20.61c1.5.24 3.04.36 4.61.36s3.11-.12 4.61-.36V38.53h6.87z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
index b6053c44a2..1e26da9261 100644
--- a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
+++ b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
@@ -1,18 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="170.000000pt" height="170.000000pt" viewBox="-30 -25 220.000000 220.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,170.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path fill="#662482" d="M1065 1445 c-302 -140 -560 -254 -572 -254 -17 -1 -61 50 -200 229
--178 229 -206 256 -242 233 -14 -9 -16 -89 -19 -793 -1 -570 1 -786 9 -796 35
--43 33 -46 852 774 558 558 787 794 787 809 0 26 -25 53 -48 52 -9 0 -264
--115 -567 -254z"/>
-<path fill="#e61b73" d="M694 448 c-133 -134 -244 -251 -247 -260 -3 -9 2 -26 11 -38 16 -18
-67 -26 599 -85 320 -35 589 -62 597 -59 19 7 29 38 21 62 -3 9 -159 152 -346
-317 -241 212 -348 301 -367 303 -23 2 -59 -30 -268 -240z"/>
-</g>
-</svg>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="226.667" height="226.667" viewBox="-30 -25 220 220"><path fill="#662482" d="M106.5 25.5c-30.2 14-56 25.4-57.2 25.4-1.7.1-6.1-5-20-22.9C11.5 5.1 8.7 2.4 5.1 4.7c-1.4.9-1.6 8.9-1.9 79.3-.1 57 .1 78.6.9 79.6 3.5 4.3 3.3 4.6 85.2-77.4C145.1 30.4 168 6.8 168 5.3c0-2.6-2.5-5.3-4.8-5.2-.9 0-26.4 11.5-56.7 25.4z"/><path fill="#e61b73" d="M69.4 125.2c-13.3 13.4-24.4 25.1-24.7 26-.3.9.2 2.6 1.1 3.8 1.6 1.8 6.7 2.6 59.9 8.5 32 3.5 58.9 6.2 59.7 5.9 1.9-.7 2.9-3.8 2.1-6.2-.3-.9-15.9-15.2-34.6-31.7-24.1-21.2-34.8-30.1-36.7-30.3-2.3-.2-5.9 3-26.8 24z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MQTT/mqtt.svg b/packages/nodes-base/nodes/MQTT/mqtt.svg
index 3e202aa2ce..bd11e032ae 100644
--- a/packages/nodes-base/nodes/MQTT/mqtt.svg
+++ b/packages/nodes-base/nodes/MQTT/mqtt.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 320 320" overflow="visible" xml:space="preserve">
-<g id="black_bg" display="none">
-</g>
-<g id="logos">
-	<g>
-		<path fill="#FFFFFF" d="M7.1,133.9v46.7c73.8,0.1,134,59.3,135,132.4h45.5C186.5,214.6,106.1,134.8,7.1,133.9z"/>
-		<path fill="#FFFFFF" d="M7.1,37.3v46.7c127.4,0.1,231.1,102.5,232.1,228.9h45.5C283.7,161.4,159.7,38.3,7.1,37.3z"/>
-		<path fill="#FFFFFF" d="M312.9,193.5V97.6c-11.8-16.1-25.9-33.4-40.4-47.8c-16-15.9-34.1-30.1-52.3-42.7H119
-			C207.3,38.9,278.1,107.2,312.9,193.5z"/>
-		<path fill="#660066" d="M7.1,180.6v117.1c0,8.4,6.8,15.3,15.3,15.3H142C141,239.8,80.9,180.7,7.1,180.6z"/>
-		<path fill="#660066" d="M7.1,84.1v49.8c99,0.9,179.4,80.7,180.4,179.1h51.7C238.2,186.6,134.5,84.2,7.1,84.1z"/>
-		<path fill="#660066" d="M312.9,297.6V193.5C278.1,107.2,207.3,38.9,119,7.1H22.4c-8.4,0-15.3,6.8-15.3,15.3v15
-			c152.6,0.9,276.6,124,277.6,275.6h13C306.1,312.9,312.9,306.1,312.9,297.6z"/>
-		<path fill="#660066" d="M272.6,49.8c14.5,14.4,28.6,31.7,40.4,47.8V22.4c0-8.4-6.8-15.3-15.3-15.3h-77.3
-			C238.4,19.7,256.6,33.9,272.6,49.8z"/>
-	</g>
-</g>
-</svg>
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 320" overflow="visible"><path fill="#FFF" d="M7.1 133.9v46.7c73.8.1 134 59.3 135 132.4h45.5c-1.1-98.4-81.5-178.2-180.5-179.1z"/><path fill="#FFF" d="M7.1 37.3V84c127.4.1 231.1 102.5 232.1 228.9h45.5c-1-151.5-125-274.6-277.6-275.6z"/><path fill="#FFF" d="M312.9 193.5V97.6c-11.8-16.1-25.9-33.4-40.4-47.8-16-15.9-34.1-30.1-52.3-42.7H119c88.3 31.8 159.1 100.1 193.9 186.4z"/><path fill="#606" d="M7.1 180.6v117.1c0 8.4 6.8 15.3 15.3 15.3H142c-1-73.2-61.1-132.3-134.9-132.4zM7.1 84.1v49.8c99 .9 179.4 80.7 180.4 179.1h51.7C238.2 186.6 134.5 84.2 7.1 84.1z"/><path fill="#606" d="M312.9 297.6V193.5C278.1 107.2 207.3 38.9 119 7.1H22.4C14 7.1 7.1 13.9 7.1 22.4v15c152.6.9 276.6 124 277.6 275.6h13c8.4-.1 15.2-6.9 15.2-15.4zM272.6 49.8c14.5 14.4 28.6 31.7 40.4 47.8V22.4c0-8.4-6.8-15.3-15.3-15.3h-77.3c18 12.6 36.2 26.8 52.2 42.7z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailcheck/mailcheck.svg b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
index 9e9829db7e..4a2a11d88d 100644
--- a/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
+++ b/packages/nodes-base/nodes/Mailcheck/mailcheck.svg
@@ -1 +1 @@
-<svg width="60" height="60" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="60" height="60" rx="8" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="m9.524 25 1.175-7.483L13.753 25h1.41l3.217-7.483L19.555 25h3.524l-2.314-13H17.26l-2.71 6.931L11.818 12H8.313L6 25h3.524zm20.025-4.828 1.59-4.327 1.59 4.327h-3.18zM34.483 25h3.777l-5.187-13h-3.868L24.02 25h3.777l.813-2.259h5.06L34.483 25zm5.331-13v13h3.542V12h-3.542zm6.397 0v13H54v-2.862h-4.247V12H46.21zM13.968 37.539a7.359 7.359 0 0 0-1.265-.41 5.792 5.792 0 0 0-1.22-.129c-.727 0-1.423.135-2.086.406a5.447 5.447 0 0 0-2.947 2.86A5.312 5.312 0 0 0 6 42.473c0 .802.152 1.543.456 2.22a5.683 5.683 0 0 0 1.21 1.755A5.416 5.416 0 0 0 11.47 48a5.4 5.4 0 0 0 1.063-.105 8.472 8.472 0 0 0 1.16-.323l.276-.097v-3.206c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 0 1-2.59-1.74 2.997 2.997 0 0 1-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.89-.602.344-.147.72-.221 1.126-.221.92 0 1.693.381 2.32 1.147v-3.231zm4.419-.249H15.68v10.42h2.707v-4.298h3.908v4.298H25V37.29h-2.706v4.022h-3.908V37.29zm14.72 0h-5.924v10.42h5.924v-2.294H29.89v-1.797h3.038v-2.294H29.89v-1.74h3.217V37.29zm9.445.249a7.41 7.41 0 0 0-1.262-.41A5.857 5.857 0 0 0 40.067 37c-.727 0-1.423.135-2.085.406-.663.271-1.246.65-1.749 1.133a5.446 5.446 0 0 0-1.201 1.728 5.341 5.341 0 0 0-.447 2.203c0 .801.151 1.542.455 2.219a5.684 5.684 0 0 0 1.21 1.755 5.42 5.42 0 0 0 4.866 1.448c.36-.069.746-.177 1.16-.323l.276-.097V44.27c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 0 1-2.59-1.74 2.997 2.997 0 0 1-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.889-.602.345-.147.72-.221 1.127-.221.92 0 1.693.381 2.32 1.147v-3.231h.002zm4.42-.249h-2.707v10.42h2.706V43.19l3.522 4.519H54l-4.516-5.486 4.13-4.934h-3.342l-3.3 4.298V37.29zM54 29.5H6v3h48v-3z" fill="#fff"/><defs><linearGradient id="a" x1="0" y1="-1" x2="60" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#4849C2"/><stop offset="1" stop-color="#2327A5"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg width="60" height="60" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="60" height="60" rx="8" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M9.524 25l1.175-7.483L13.753 25h1.41l3.217-7.483L19.555 25h3.524l-2.314-13H17.26l-2.71 6.931L11.818 12H8.313L6 25h3.524zm20.025-4.828l1.59-4.327 1.59 4.327h-3.18zM34.483 25h3.777l-5.187-13h-3.868L24.02 25h3.777l.813-2.259h5.06L34.483 25zm5.331-13v13h3.542V12h-3.542zm6.397 0v13H54v-2.862h-4.247V12H46.21zM13.968 37.539a7.359 7.359 0 00-1.265-.41 5.792 5.792 0 00-1.22-.129c-.727 0-1.423.135-2.086.406a5.447 5.447 0 00-2.947 2.86A5.312 5.312 0 006 42.473c0 .802.152 1.543.456 2.22a5.683 5.683 0 001.21 1.755A5.416 5.416 0 0011.47 48a5.4 5.4 0 001.063-.105 8.472 8.472 0 001.16-.323l.276-.097v-3.206c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 01-2.59-1.74 2.997 2.997 0 01-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.89-.602.344-.147.72-.221 1.126-.221.92 0 1.693.381 2.32 1.147v-3.231zm4.419-.249H15.68v10.42h2.707v-4.298h3.908v4.298H25V37.29h-2.706v4.022h-3.908V37.29zm14.72 0h-5.924v10.42h5.924v-2.294H29.89v-1.797h3.038v-2.294H29.89v-1.74h3.217V37.29zm9.445.249a7.41 7.41 0 00-1.262-.41A5.857 5.857 0 0040.067 37c-.727 0-1.423.135-2.085.406a5.514 5.514 0 00-1.749 1.133 5.446 5.446 0 00-1.201 1.728 5.341 5.341 0 00-.447 2.203c0 .801.151 1.542.455 2.219a5.684 5.684 0 001.21 1.755 5.42 5.42 0 004.866 1.448c.36-.069.746-.177 1.16-.323l.276-.097V44.27c-.69.738-1.469 1.105-2.333 1.105a2.769 2.769 0 01-2.59-1.74 2.997 2.997 0 01-.216-1.148c0-.406.072-.782.215-1.133.144-.351.337-.652.586-.907.248-.254.544-.453.889-.602.345-.147.72-.221 1.127-.221.92 0 1.693.381 2.32 1.147V37.54h.002zm4.42-.249h-2.707v10.42h2.706v-4.52l3.522 4.519H54l-4.516-5.486 4.13-4.934h-3.342l-3.3 4.298V37.29zM54 29.5H6v3h48v-3z" fill="#fff"/><defs><linearGradient id="a" x1="0" y1="-1" x2="60" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#4849C2"/><stop offset="1" stop-color="#2327A5"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mailjet/mailjet.svg b/packages/nodes-base/nodes/Mailjet/mailjet.svg
index 0d9badd5ca..21fd08581d 100644
--- a/packages/nodes-base/nodes/Mailjet/mailjet.svg
+++ b/packages/nodes-base/nodes/Mailjet/mailjet.svg
@@ -1 +1 @@
-<svg height="2500" viewBox=".5 90 402.6 222.2" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="m129.1 195.5-7 46.5-48 70.2 16.2-8.9 263.7-145.2 49.1-27zm-1.7-12.3 206.8-47-13.4-1.8-54.3-7.6-115.2-15.9-150.8-20.9 55.3 40.6 69.5 51.1z" fill="#fead0c"/></svg>
\ No newline at end of file
+<svg height="2500" viewBox="0.5 90 402.6 222.2" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="M129.1 195.5l-7 46.5-48 70.2 16.2-8.9L354 158.1l49.1-27zm-1.7-12.3l206.8-47-13.4-1.8-54.3-7.6-115.2-15.9L.5 90l55.3 40.6 69.5 51.1z" fill="#fead0c"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/TimescaleDb/timescale.svg b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
index 744a244156..0486a881b8 100644
--- a/packages/nodes-base/nodes/TimescaleDb/timescale.svg
+++ b/packages/nodes-base/nodes/TimescaleDb/timescale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="t"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#v"/><use xlink:href="#v" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#x"/><use xlink:href="#x" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#z"/><use xlink:href="#z" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#B"/><use xlink:href="#B" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#D"/><use xlink:href="#D" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#F"/><use xlink:href="#F" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#H"/><use xlink:href="#H" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#J"/><use xlink:href="#J" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#L"/><use xlink:href="#L" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#N"/><use xlink:href="#N" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#P"/><use xlink:href="#P" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" viewBox="4 4 32 32"><defs><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="a"/><path d="M20.42 0C9.14 0 0 8.95 0 20s9.14 20 20.42 20c11.28 0 20.42-8.95 20.42-20S31.7 0 20.42 0z" id="b"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="c"/><path d="M20.42 6.56c-7.56 0-13.69 6.01-13.69 13.41 0 7.41 6.13 13.41 13.69 13.41s13.69-6 13.69-13.41c0-7.4-6.13-13.41-13.69-13.41z" id="d"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="e"/><path d="M23.82 16.38c-.82 1.96-.22 4.06 1.34 4.69 1.56.63 3.5-.45 4.32-2.42.82-1.96.22-4.06-1.34-4.68-1.56-.63-3.49.45-4.32 2.41z" id="f"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="g"/><path d="M20.45 28.27c-2.16 0-3.92 1.87-3.92 4.16 0 2.3 1.76 4.17 3.92 4.17 2.17 0 3.93-1.87 3.93-4.17 0-2.29-1.76-4.16-3.93-4.16z" id="h"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="i"/><path d="M12.83 13.96c-1.56.63-2.16 2.73-1.33 4.69.82 1.96 2.75 3.04 4.31 2.42 1.56-.63 2.16-2.73 1.34-4.69-.82-1.96-2.75-3.05-4.32-2.42z" id="j"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="k"/><path d="M37.49 24.22c-1.32 5.27-5.12 9.58-10.11 11.7.05-.42.08-.89.08-1.43-.01-.54-.03-1.08-.08-1.62 4.23-2.22 7.24-6.41 7.74-11.31.24.26 2.13 2.4 2.37 2.66zm-12.15 9.54c-.32 1.27-.83 2.37-1.47 3.24-1.12.22-2.28.34-3.47.34-1.11 0-2.2-.1-3.26-.3-.65-.86-1.16-1.96-1.49-3.21 1.49.49 3.08.76 4.75.76 1.73 0 3.39-.29 4.94-.83zM3.35 24.42c1.38 5.21 5.18 9.46 10.15 11.54-.05-.43-.08-.92-.08-1.47 0-.53.03-1.06.08-1.58-4.31-2.22-7.35-6.46-7.83-11.43-.24.29-2.09 2.65-2.32 2.94zM29.76 5.49c-.28.16-2.55 1.44-2.83 1.6 2.11 1.01 3.95 2.52 5.35 4.36.33-.47 1.51-2.12 1.68-2.35-1.2-1.41-2.61-2.63-4.2-3.61zM8.74 11.16c1.38-1.72 3.14-3.12 5.16-4.09-.18-.12-1.07-.68-2.67-1.7-2.1 1.5-3.56 2.74-4.38 3.71.19.21 1.7 1.88 1.89 2.08z" id="l"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="m"/><path d="M18.34 9.52c-5.02.95-8.8 5.28-8.8 10.47 0 3.67 1.9 6.91 4.79 8.83.13-.37.26-.72.42-1.06-2.48-1.73-4.09-4.57-4.09-7.77 0-4.35 2.96-8.01 7.01-9.18.19-.5.41-.93.67-1.29z" id="n"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="o"/><path d="M17.19 13.19c.03-.33.06-.64.11-.95a8.469 8.469 0 00-4.72 4.55c.17.04.74.19.83.21a7.546 7.546 0 013.78-3.81z" id="p"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="q"/><path d="M15.33 26.62c.14-.24.29-.48.45-.7a7.46 7.46 0 01-2.9-4.75h-.85a8.294 8.294 0 003.3 5.45z" id="r"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="s"/><path d="M22.73 11.98c.06.29.11.59.15.91 2.06.68 3.72 2.2 4.57 4.14l.82-.21a8.42 8.42 0 00-5.54-4.84z" id="t"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="u"/><path d="M25.11 18.5l-.44 1.31 1.34.88 2.46-.88.45-.87-.89-.9-2.92.46z" id="v"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="w"/><path d="M15.85 18.5l.44 1.31-1.34.88-2.45-.88-.45-.87.88-.9 2.92.46z" id="x"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="y"/><path d="M27.97 21.17c-.05.25-.1.5-.17.75.25.2.48.39.7.58.14-.43.25-.87.32-1.33h-.85z" id="z"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="A"/><path d="M25.57 26.58c.38-.29.73-.6 1.06-.94-.27-.11-.54-.23-.82-.36-.22.21-.45.41-.69.6.16.22.31.45.45.7z" id="B"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="C"/><path d="M30.07 25.28c.69-1.4 1.08-2.96 1.08-4.61 0-5.5-4.26-10.03-9.72-10.6.27.33.51.74.71 1.21 4.49.86 7.88 4.74 7.88 9.39 0 1.25-.25 2.43-.69 3.52.33.39.58.76.74 1.09z" id="D"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="E"/><path d="M26.59 28.77c1.02-.69 1.91-1.54 2.64-2.52-.37 0-.8-.06-1.28-.18-.52.62-1.12 1.17-1.78 1.65.15.33.29.69.42 1.05z" id="F"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="G"/><path d="M20.42 9.31h-.85c-.47 5.66-.73 8.8-.78 9.43v.06c0 .15.01.3.04.45.02.16.06.32.14.48.16.41.43.72.74.87.07.05.14.11.22.16.01.01.03.02.05.02v.01c.63.34 3.8 2.04 9.5 5.11l.49-.67c-5.17-3.93-8.04-6.11-8.61-6.55-.01 0-.02 0-.02-.01-.06-.62-.37-3.74-.92-9.36z" id="H"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="I"/><path d="M24.54 29.01c-.06-.14-.34-.82-.84-2.04l-3.28 1.3-3.28-1.3c-.5 1.22-.77 1.9-.83 2.04 2.08.81 3.25 1.26 3.48 1.35a1.6 1.6 0 01-1.54 1.13h-.15c-.07.09-.64.87-.71.97a2.73 2.73 0 003.02-.91c.49.63 1.28 1.05 2.16 1.05.33 0 .65-.06.94-.17-.07-.1-.62-.86-.69-.95-.09.01-.17.01-.25.01-.74 0-1.37-.49-1.55-1.16.24-.09 1.41-.53 3.52-1.32z" id="J"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="K"/><path d="M32.43 19.97c0 4.15-2.2 7.8-5.51 9.89.14.55.26 1.13.35 1.72 4.09-2.32 6.83-6.65 6.83-11.61a13.14 13.14 0 00-2.74-8.06c-.23.25-1.03 1.14-1.14 1.27 1.39 1.92 2.21 4.26 2.21 6.79z" id="L"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="M"/><path d="M9.48 11.92a13.119 13.119 0 00-2.75 8.05c0 4.99 2.78 9.34 6.91 11.65.1-.59.21-1.17.36-1.71-3.36-2.09-5.58-5.76-5.58-9.94 0-2.52.81-4.86 2.2-6.78a68.75 68.75 0 00-1.14-1.27z" id="N"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="O"/><path d="M15.39 9.29c1.53-.69 3.23-1.08 5.03-1.08 1.79 0 3.5.39 5.03 1.08.08-.14.75-1.29.84-1.44-1.78-.82-3.77-1.29-5.87-1.29s-4.1.47-5.87 1.3c.08.14.75 1.29.84 1.43z" id="P"/></defs><use xlink:href="#a" fill="#fff"/><use xlink:href="#a" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#b" fill-opacity="0"/><use xlink:href="#b" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#c" fill="#fdb515"/><use xlink:href="#c" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#d" fill-opacity="0"/><use xlink:href="#d" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#e" fill="#fff"/><use xlink:href="#e" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#f" fill-opacity="0"/><use xlink:href="#f" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#g" fill="#fff"/><use xlink:href="#g" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#h" fill-opacity="0"/><use xlink:href="#h" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#i" fill="#fff"/><use xlink:href="#i" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#j" fill-opacity="0"/><use xlink:href="#j" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#k" fill="#333"/><use xlink:href="#k" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#l" fill-opacity="0"/><use xlink:href="#l" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#m" fill="#333"/><use xlink:href="#m" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#n" fill-opacity="0"/><use xlink:href="#n" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#o" fill="#333"/><use xlink:href="#o" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#p" fill-opacity="0"/><use xlink:href="#p" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#q" fill="#333"/><use xlink:href="#q" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#r" fill-opacity="0"/><use xlink:href="#r" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#s" fill="#333"/><use xlink:href="#s" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#t" fill-opacity="0"/><use xlink:href="#t" fill-opacity="0" stroke="#000" stroke-opacity="0"/><use xlink:href="#u" fill="#333"/><use xlink:href="#u" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#v"/><use xlink:href="#v" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#w" fill="#333"/><use xlink:href="#w" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#x"/><use xlink:href="#x" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#y" fill="#333"/><use xlink:href="#y" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#z"/><use xlink:href="#z" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#A" fill="#333"/><use xlink:href="#A" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#B"/><use xlink:href="#B" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#C" fill="#333"/><use xlink:href="#C" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#D"/><use xlink:href="#D" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#E" fill="#333"/><use xlink:href="#E" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#F"/><use xlink:href="#F" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#G" fill="#333"/><use xlink:href="#G" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#H"/><use xlink:href="#H" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#I" fill="#333"/><use xlink:href="#I" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#J"/><use xlink:href="#J" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#K" fill="#333"/><use xlink:href="#K" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#L"/><use xlink:href="#L" stroke="#000" stroke-opacity="0"/></g><use xlink:href="#M" fill="#333"/><use xlink:href="#M" fill-opacity="0" stroke="#000" stroke-opacity="0"/><g fill-opacity="0"><use xlink:href="#N"/><use xlink:href="#N" stroke="#000" stroke-opacity="0"/></g><g><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/></g><g fill-opacity="0"><use xlink:href="#P"/><use xlink:href="#P" stroke="#000" stroke-opacity="0"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/n8nTrigger.svg b/packages/nodes-base/nodes/n8nTrigger.svg
index 5cc4cbc1f3..e2e67c20fb 100644
--- a/packages/nodes-base/nodes/n8nTrigger.svg
+++ b/packages/nodes-base/nodes/n8nTrigger.svg
@@ -1,24 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="5 5 55 55" style="enable-background:new 0 0 40 40;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;fill:#FF6D5A;}
-	.st1{fill:#FF6D5A;}
-</style>
-<path class="st0" d="M50.41,30.55v-1c0-0.55-0.45-1-1-1h-17.5v-2.5h4.5c1.1,0,2-0.9,2-2v-8c0-1.1-0.9-2-2-2h-12c-1.1,0-2,0.9-2,2v8
-	c0,1.1,0.9,2,2,2h4.5v2.5h-17.5c-0.55,0-1,0.45-1,1v1c0,0.55,0.45,1,1,1h6.5v2.5h-3.5c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2h10
-	c1.1,0,2-0.9,2-2v-8c0-1.1-0.9-2-2-2h-3.5v-2.5h19v2.5h-3.5c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2v-8
-	c0-1.1-0.9-2-2-2h-3.5v-2.5h6.5C49.96,31.55,50.41,31.1,50.41,30.55z M26.41,22.05v-4h8v4H26.41z M22.41,42.05h-6v-4h6V42.05z
-	 M44.41,42.05h-6v-4h6V42.05z"/>
-<path class="st1" d="M50.28,17.26c-2.39,0-4.4,1.64-4.97,3.86h-7.15c-2.8,0-5.08,2.28-5.08,5.08c0,1.4-1.14,2.54-2.54,2.54h-1.02
-	c-0.57-2.22-2.58-3.86-4.97-3.86c-2.39,0-4.4,1.64-4.97,3.86h-4.08c-0.57-2.22-2.58-3.86-4.97-3.86c-2.83,0-5.13,2.3-5.13,5.13
-	s2.3,5.13,5.13,5.13c2.39,0,4.4-1.64,4.97-3.86h4.08c0.57,2.22,2.58,3.86,4.97,3.86c2.37,0,4.37-1.62,4.95-3.81h1.03
-	c1.4,0,2.54,1.14,2.54,2.54c0,2.8,2.28,5.09,5.08,5.09h1.66c0.57,2.22,2.58,3.86,4.97,3.86c2.83,0,5.13-2.3,5.13-5.13
-	c0-2.83-2.3-5.13-5.13-5.13c-2.39,0-4.4,1.64-4.97,3.86h-1.66c-1.4,0-2.54-1.14-2.54-2.54c0-1.53-0.68-2.9-1.76-3.84
-	c1.07-0.93,1.76-2.31,1.76-3.84c0-1.4,1.14-2.54,2.54-2.54h7.15c0.57,2.22,2.58,3.86,4.97,3.86c2.83,0,5.13-2.3,5.13-5.13
-	S53.11,17.26,50.28,17.26z M10.54,32.61c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59s2.59,1.16,2.59,2.59
-	C13.13,31.45,11.97,32.61,10.54,32.61z M24.56,32.61c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59
-	c1.43,0,2.59,1.16,2.59,2.59C27.15,31.45,25.98,32.61,24.56,32.61z M44.8,35.11c1.43,0,2.59,1.16,2.59,2.59
-	c0,1.43-1.16,2.59-2.59,2.59c-1.43,0-2.59-1.16-2.59-2.59C42.21,36.27,43.37,35.11,44.8,35.11z M50.28,24.98
-	c-1.43,0-2.59-1.16-2.59-2.59c0-1.43,1.16-2.59,2.59-2.59c1.43,0,2.59,1.16,2.59,2.59C52.87,23.82,51.71,24.98,50.28,24.98z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="5 5 55 55"><path d="M50.28 17.26c-2.39 0-4.4 1.64-4.97 3.86h-7.15c-2.8 0-5.08 2.28-5.08 5.08 0 1.4-1.14 2.54-2.54 2.54h-1.02a5.138 5.138 0 00-4.97-3.86c-2.39 0-4.4 1.64-4.97 3.86H15.5a5.138 5.138 0 00-4.97-3.86c-2.83 0-5.13 2.3-5.13 5.13s2.3 5.13 5.13 5.13c2.39 0 4.4-1.64 4.97-3.86h4.08a5.138 5.138 0 004.97 3.86 5.13 5.13 0 004.95-3.81h1.03c1.4 0 2.54 1.14 2.54 2.54 0 2.8 2.28 5.09 5.08 5.09h1.66a5.138 5.138 0 004.97 3.86c2.83 0 5.13-2.3 5.13-5.13s-2.3-5.13-5.13-5.13c-2.39 0-4.4 1.64-4.97 3.86h-1.66c-1.4 0-2.54-1.14-2.54-2.54 0-1.53-.68-2.9-1.76-3.84a5.092 5.092 0 001.76-3.84c0-1.4 1.14-2.54 2.54-2.54h7.15a5.138 5.138 0 004.97 3.86c2.83 0 5.13-2.3 5.13-5.13s-2.29-5.13-5.12-5.13zM10.54 32.61a2.59 2.59 0 11.001-5.181 2.59 2.59 0 01-.001 5.181zm14.02 0a2.59 2.59 0 112.59-2.59c0 1.43-1.17 2.59-2.59 2.59zm20.24 2.5a2.59 2.59 0 11-.001 5.181 2.59 2.59 0 01.001-5.181zm5.48-10.13a2.59 2.59 0 11.001-5.181 2.59 2.59 0 01-.001 5.181z" fill="#ff6d5a"/></svg>
\ No newline at end of file

From 71ec72493c9e3fff22d129c43bd82fe4c54f24c0 Mon Sep 17 00:00:00 2001
From: Alexander Mustafin <sashker@users.noreply.github.com>
Date: Sat, 8 May 2021 06:31:04 +0300
Subject: [PATCH 137/231] :sparkles: Add WS comprehend detect entities + Load
 more Lambda functions (#1742)

* Functions are listed recursively if the number of functions exceeds 50

* Added the DetectEntities action to the Aws Comprehend Node
---
 .../nodes-base/nodes/Aws/AwsLambda.node.ts    | 21 +++++++++
 .../Aws/Comprehend/AwsComprehend.node.ts      | 45 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index 75d5e98680..b08d28ba70 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -140,6 +140,27 @@ export class AwsLambda implements INodeType {
 						value: func.FunctionArn as string,
 					});
 				}
+
+				if (data.NextMarker) {
+					let marker: string = data.NextMarker;
+					while (true) {
+						const dataLoop = await awsApiRequestREST.call(this, 'lambda', 'GET', `/2015-03-31/functions/?MaxItems=50&Marker=${encodeURIComponent(marker)}`);
+				
+						for (const func of dataLoop.Functions!) {
+							returnData.push({
+								name: func.FunctionName as string,
+								value: func.FunctionArn as string,
+							});
+						}
+	
+						if (dataLoop.NextMarker) {
+							marker = dataLoop.NextMarker;
+						} else {
+							break;
+						}
+					}
+				}
+				
 				return returnData;
 			},
 		},
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
index 7640586d4a..179aef23d6 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
@@ -63,6 +63,11 @@ export class AwsComprehend implements INodeType {
 						value: 'detectSentiment',
 						description: 'Analyse the sentiment of the text',
 					},
+					{
+						name: 'Detect Entities',
+						value: 'detectEntities',
+						description: 'Inspects text for named entities, and returns information about them',
+					},
 				],
 				default: 'detectDominantLanguage',
 				description: 'The operation to perform.',
@@ -129,6 +134,7 @@ export class AwsComprehend implements INodeType {
 						],
 						operation: [
 							'detectSentiment',
+							'detectEntities',
 						],
 					},
 				},
@@ -168,6 +174,26 @@ export class AwsComprehend implements INodeType {
 				default: true,
 				description: 'When set to true a simplify version of the response will be used else the raw data.',
 			},
+			{
+				displayName: 'Endpoint Arn',
+				name: 'endpointArn',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				displayOptions: {
+					show: {
+						resource: [
+							'text',
+						],
+						operation: [
+							'detectEntities',
+						],
+					},
+				},
+				description: 'The Amazon Resource Name of an endpoint that is associated with a custom entity recognition model.',
+			},
 		],
 	};
 
@@ -209,6 +235,25 @@ export class AwsComprehend implements INodeType {
 					};
 					responseData = await awsApiRequestREST.call(this, 'comprehend', 'POST', '', JSON.stringify(body), { 'x-amz-target': action, 'Content-Type': 'application/x-amz-json-1.1' });
 				}
+
+				//https://docs.aws.amazon.com/comprehend/latest/dg/API_DetectEntities.html
+				if (operation === 'detectEntities') {
+					const action = 'Comprehend_20171127.DetectEntities';
+					const text = this.getNodeParameter('text', i) as string;
+					const languageCode = this.getNodeParameter('languageCode', i) as string;
+					const endpointArn = this.getNodeParameter('endpointArn', i) as string;
+
+					const body: IDataObject = {
+						Text: text,
+						LanguageCode: languageCode,
+					};
+
+					if (endpointArn && endpointArn !== '') {
+						body.EndpointArn = endpointArn;
+					}
+
+					responseData = await awsApiRequestREST.call(this, 'comprehend', 'POST', '', JSON.stringify(body), { 'x-amz-target': action, 'Content-Type': 'application/x-amz-json-1.1' });
+				}
 			}
 
 			if (Array.isArray(responseData)) {

From 1fd0fcc729c34ab9ca478638ae60a87389038d2d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 22:31:27 -0500
Subject: [PATCH 138/231] :zap: Minor improvements to AWS Comprehend

---
 .../nodes-base/nodes/Aws/AwsLambda.node.ts    |  6 +--
 .../Aws/Comprehend/AwsComprehend.node.ts      | 42 ++++++++++++-------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index b08d28ba70..d930b0b8ba 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -145,14 +145,14 @@ export class AwsLambda implements INodeType {
 					let marker: string = data.NextMarker;
 					while (true) {
 						const dataLoop = await awsApiRequestREST.call(this, 'lambda', 'GET', `/2015-03-31/functions/?MaxItems=50&Marker=${encodeURIComponent(marker)}`);
-				
+
 						for (const func of dataLoop.Functions!) {
 							returnData.push({
 								name: func.FunctionName as string,
 								value: func.FunctionArn as string,
 							});
 						}
-	
+
 						if (dataLoop.NextMarker) {
 							marker = dataLoop.NextMarker;
 						} else {
@@ -160,7 +160,7 @@ export class AwsLambda implements INodeType {
 						}
 					}
 				}
-				
+
 				return returnData;
 			},
 		},
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
index 179aef23d6..7223ddc282 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
@@ -58,16 +58,16 @@ export class AwsComprehend implements INodeType {
 						value: 'detectDominantLanguage',
 						description: 'Identify the dominant language',
 					},
-					{
-						name: 'Detect Sentiment',
-						value: 'detectSentiment',
-						description: 'Analyse the sentiment of the text',
-					},
 					{
 						name: 'Detect Entities',
 						value: 'detectEntities',
 						description: 'Inspects text for named entities, and returns information about them',
 					},
+					{
+						name: 'Detect Sentiment',
+						value: 'detectSentiment',
+						description: 'Analyse the sentiment of the text',
+					},
 				],
 				default: 'detectDominantLanguage',
 				description: 'The operation to perform.',
@@ -175,13 +175,10 @@ export class AwsComprehend implements INodeType {
 				description: 'When set to true a simplify version of the response will be used else the raw data.',
 			},
 			{
-				displayName: 'Endpoint Arn',
-				name: 'endpointArn',
-				type: 'string',
-				typeOptions: {
-					alwaysOpenEditWindow: true,
-				},
-				default: '',
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
 				displayOptions: {
 					show: {
 						resource: [
@@ -192,7 +189,19 @@ export class AwsComprehend implements INodeType {
 						],
 					},
 				},
-				description: 'The Amazon Resource Name of an endpoint that is associated with a custom entity recognition model.',
+				default: {},
+				options: [
+					{
+						displayName: 'Endpoint Arn',
+						name: 'endpointArn',
+						type: 'string',
+						typeOptions: {
+							alwaysOpenEditWindow: true,
+						},
+						default: '',
+						description: 'The Amazon Resource Name of an endpoint that is associated with a custom entity recognition model.',
+					},
+				],
 			},
 		],
 	};
@@ -241,18 +250,19 @@ export class AwsComprehend implements INodeType {
 					const action = 'Comprehend_20171127.DetectEntities';
 					const text = this.getNodeParameter('text', i) as string;
 					const languageCode = this.getNodeParameter('languageCode', i) as string;
-					const endpointArn = this.getNodeParameter('endpointArn', i) as string;
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
 					const body: IDataObject = {
 						Text: text,
 						LanguageCode: languageCode,
 					};
 
-					if (endpointArn && endpointArn !== '') {
-						body.EndpointArn = endpointArn;
+					if (additionalFields.endpointArn) {
+						body.EndpointArn = additionalFields.endpointArn;
 					}
 
 					responseData = await awsApiRequestREST.call(this, 'comprehend', 'POST', '', JSON.stringify(body), { 'x-amz-target': action, 'Content-Type': 'application/x-amz-json-1.1' });
+					responseData = responseData.Entities;
 				}
 			}
 

From ffc0c7b4d539dcfefb8992155b4140b44e227237 Mon Sep 17 00:00:00 2001
From: Harshil Agrawal <ghagrawal17@gmail.com>
Date: Sat, 8 May 2021 05:37:09 +0200
Subject: [PATCH 139/231] :zap: Add breaking change for Node.js version update
 (#1733)

* :zap: Add breaking change for Node.js version update

* :zap: Fix format of breaking-changes file

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/cli/BREAKING-CHANGES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 1132496ee4..2a762e0476 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -4,6 +4,17 @@ This list shows all the versions which include breaking changes and how to upgra
 
 ## 0.118.0
 
+### What changed?
+The minimum Node.js version required for n8n is now v14.
+
+### When is action necessary?
+If you're using n8n via npm or PM2 or if you're contributing to n8n.
+
+### How to upgrade:
+Update the Node.js version to v14 or above.
+
+----------------------------
+
 ### What changed?
 In the Postgres, CrateDB, QuestDB and TimescaleDB nodes the `Execute Query` operation returns the result from all queries executed instead of just one of the results.
 

From 43fae950e627f36b78606ba4fc15673f603cd081 Mon Sep 17 00:00:00 2001
From: fntb <67187375+fntb@users.noreply.github.com>
Date: Sat, 8 May 2021 05:50:25 +0200
Subject: [PATCH 140/231] :sparkles: Add support for files without headers to
 SpreadsheetFile node (#1738)

When false the first row of the spreadsheet file is considered a data row and each row is parsed as an array
---
 .../nodes/SpreadsheetFile.node.json           |  4 +--
 .../nodes-base/nodes/SpreadsheetFile.node.ts  | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile.node.json
index dc8a94e23f..0f004d1d7c 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.json
@@ -1,7 +1,7 @@
 {
 	"node": "n8n-nodes-base.spreadsheetFile",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
+	"nodeVersion": "1.1",
+	"codexVersion": "1.1",
 	"categories": [
 		"Data & Storage",
 		"Core Nodes"
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index bbbc136c46..22208facf0 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -27,7 +27,7 @@ import {
  * @param {IDataObject} data The object to flatten
  * @returns
  */
-function flattenObject (data: IDataObject) {
+function flattenObject(data: IDataObject) {
 	const returnData: IDataObject = {};
 	for (const key1 of Object.keys(data)) {
 		if (data[key1] !== null && (typeof data[key1]) === 'object') {
@@ -296,6 +296,20 @@ export class SpreadsheetFile implements INodeType {
 						default: 'Sheet',
 						description: 'Name of the sheet to create in the spreadsheet.',
 					},
+					{
+						displayName: 'Header Row',
+						name: 'headerRow',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'fromFile',
+								],
+							},
+						},
+						default: true,
+						description: 'Consider the first row as the header row or a data row.',
+					},
 				],
 			},
 		],
@@ -359,6 +373,9 @@ export class SpreadsheetFile implements INodeType {
 				if (options.includeEmptyCells) {
 					sheetToJsonOptions.defval = '';
 				}
+				if (!options.headerRow) {
+					sheetToJsonOptions.header = 1; // Consider the first row as a data row
+				}
 
 				const sheetJson = xlsxUtils.sheet_to_json(workbook.Sheets[sheetName], sheetToJsonOptions);
 
@@ -368,8 +385,15 @@ export class SpreadsheetFile implements INodeType {
 				}
 
 				// Add all the found data columns to the workflow data
-				for (const rowData of sheetJson) {
-					newItems.push({ json: rowData } as INodeExecutionData);
+				if (options.headerRow) {
+					for (const rowData of sheetJson) {
+						newItems.push({ json: rowData } as INodeExecutionData);
+					}
+				} else {
+					// Data was returned as an array - https://github.com/SheetJS/sheetjs#json
+					for (const rowData of sheetJson) {
+						newItems.push({ json: { row: rowData } } as INodeExecutionData);
+					}
 				}
 			}
 

From abe1ee144ab80ed810e9ee36e25ddd3bb7530b1c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 22:51:00 -0500
Subject: [PATCH 141/231] :zap: Minor fix on Spreadsheet File

---
 .../nodes/SpreadsheetFile.node.json           |  6 +--
 .../nodes-base/nodes/SpreadsheetFile.node.ts  | 40 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile.node.json
index 0f004d1d7c..ce41ae2dae 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.json
@@ -1,7 +1,7 @@
 {
 	"node": "n8n-nodes-base.spreadsheetFile",
-	"nodeVersion": "1.1",
-	"codexVersion": "1.1",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
 	"categories": [
 		"Data & Storage",
 		"Core Nodes"
@@ -20,4 +20,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index 22208facf0..e2b8350a84 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -207,6 +207,20 @@ export class SpreadsheetFile implements INodeType {
 						default: '',
 						description: 'File name to set in binary data. By default will "spreadsheet.<fileFormat>" be used.',
 					},
+					{
+						displayName: 'Header Row',
+						name: 'headerRow',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'fromFile',
+								],
+							},
+						},
+						default: true,
+						description: 'The first row of the file contains the header names.',
+					},
 					{
 						displayName: 'Include Empty Cells',
 						name: 'includeEmptyCells',
@@ -296,20 +310,6 @@ export class SpreadsheetFile implements INodeType {
 						default: 'Sheet',
 						description: 'Name of the sheet to create in the spreadsheet.',
 					},
-					{
-						displayName: 'Header Row',
-						name: 'headerRow',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': [
-									'fromFile',
-								],
-							},
-						},
-						default: true,
-						description: 'Consider the first row as the header row or a data row.',
-					},
 				],
 			},
 		],
@@ -373,7 +373,7 @@ export class SpreadsheetFile implements INodeType {
 				if (options.includeEmptyCells) {
 					sheetToJsonOptions.defval = '';
 				}
-				if (!options.headerRow) {
+				if (options.headerRow === false) {
 					sheetToJsonOptions.header = 1; // Consider the first row as a data row
 				}
 
@@ -385,15 +385,15 @@ export class SpreadsheetFile implements INodeType {
 				}
 
 				// Add all the found data columns to the workflow data
-				if (options.headerRow) {
-					for (const rowData of sheetJson) {
-						newItems.push({ json: rowData } as INodeExecutionData);
-					}
-				} else {
+				if (options.headerRow === false) {
 					// Data was returned as an array - https://github.com/SheetJS/sheetjs#json
 					for (const rowData of sheetJson) {
 						newItems.push({ json: { row: rowData } } as INodeExecutionData);
 					}
+				} else {
+					for (const rowData of sheetJson) {
+						newItems.push({ json: rowData } as INodeExecutionData);
+					}
 				}
 			}
 

From 8b11eb63327fcae7c39de46d71ab3c17180f37fc Mon Sep 17 00:00:00 2001
From: Nikita <raccoonrirush@gmail.com>
Date: Sat, 8 May 2021 12:32:00 +0800
Subject: [PATCH 142/231] :sparkles: Add collection events to Webflow Trigger
 Node (#1735)

---
 .../nodes/Webflow/WebflowTrigger.node.ts      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 94519e2328..31ef2c4a40 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -117,9 +117,57 @@ export class WebflowTrigger implements INodeType {
 						name: 'Site Publish',
 						value: 'site_publish',
 					},
+					{
+						name: 'Collection Item Created',
+						value: 'collection_item_created',
+					},
+					{
+						name: 'Collection Item Updated',
+						value: 'collection_item_changed',
+					},
+					{
+						name: 'Collection Item Deleted',
+						value: 'collection_item_deleted',
+					},
 				],
 				default: 'form_submission',
 			},
+			{
+				displayName: 'All collections',
+				name: 'allCollections',
+				type: 'boolean',
+				required: false,
+				default: true,
+				description: 'Receive events from all collections',
+			},
+			{
+				displayName: 'Collection',
+				name: 'collection',
+				type: 'options',
+				required: false,
+				default: '',
+				typeOptions: {
+					loadOptionsMethod: 'getCollections',
+					loadOptionsDependsOn: [
+						'site',
+					],
+				},
+				description: 'Collection that will trigger the events',
+				displayOptions: {
+					show: {
+						event: [
+							'collection_item_created',
+							'collection_item_changed',
+							'collection_item_deleted',
+						],
+					},
+					hide: {
+						allCollections: [
+							true,
+						],
+					},
+				},
+			},
 		],
 	};
 
@@ -140,6 +188,18 @@ export class WebflowTrigger implements INodeType {
 				}
 				return returnData;
 			},
+			async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const siteId = this.getCurrentNodeParameter('site');
+				const collections = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
+				for (const collection of collections) {
+					returnData.push({
+						name: collection.name,
+						value: collection._id,
+					});
+				}
+				return returnData;
+			},
 		},
 	};
 
@@ -165,6 +225,8 @@ export class WebflowTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const siteId = this.getNodeParameter('site') as string;
 				const event = this.getNodeParameter('event') as string;
+				const collection = this.getNodeParameter('collection') as string;
+				const allCollections = this.getNodeParameter('allCollections') as boolean;
 				const endpoint = `/sites/${siteId}/webhooks`;
 				const body: IDataObject = {
 					site_id: siteId,
@@ -172,6 +234,11 @@ export class WebflowTrigger implements INodeType {
 					url: webhookUrl,
 
 				};
+				if(event.startsWith('collection') && !allCollections) {
+					body.filter = {
+						'_cid': collection,
+					};
+				}
 				const { _id } = await webflowApiRequest.call(this, 'POST', endpoint, body);
 				webhookData.webhookId = _id;
 				return true;

From 77da5b70bc5f71322bdf00d7d4af13592e52fa9b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 7 May 2021 23:32:59 -0500
Subject: [PATCH 143/231] :zap: Improvements to Webflow Trigger Node

---
 .../nodes/Webflow/WebflowTrigger.node.ts      | 142 +++++++++---------
 1 file changed, 74 insertions(+), 68 deletions(-)

diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 31ef2c4a40..d5c08755ad 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -97,6 +97,18 @@ export class WebflowTrigger implements INodeType {
 				type: 'options',
 				required: true,
 				options: [
+					{
+						name: 'Collection Item Created',
+						value: 'collection_item_created',
+					},
+					{
+						name: 'Collection Item Deleted',
+						value: 'collection_item_deleted',
+					},
+					{
+						name: 'Collection Item Updated',
+						value: 'collection_item_changed',
+					},
 					{
 						name: 'Ecomm Inventory Changed',
 						value: 'ecomm_inventory_changed',
@@ -117,57 +129,47 @@ export class WebflowTrigger implements INodeType {
 						name: 'Site Publish',
 						value: 'site_publish',
 					},
-					{
-						name: 'Collection Item Created',
-						value: 'collection_item_created',
-					},
-					{
-						name: 'Collection Item Updated',
-						value: 'collection_item_changed',
-					},
-					{
-						name: 'Collection Item Deleted',
-						value: 'collection_item_deleted',
-					},
 				],
 				default: 'form_submission',
 			},
-			{
-				displayName: 'All collections',
-				name: 'allCollections',
-				type: 'boolean',
-				required: false,
-				default: true,
-				description: 'Receive events from all collections',
-			},
-			{
-				displayName: 'Collection',
-				name: 'collection',
-				type: 'options',
-				required: false,
-				default: '',
-				typeOptions: {
-					loadOptionsMethod: 'getCollections',
-					loadOptionsDependsOn: [
-						'site',
-					],
-				},
-				description: 'Collection that will trigger the events',
-				displayOptions: {
-					show: {
-						event: [
-							'collection_item_created',
-							'collection_item_changed',
-							'collection_item_deleted',
-						],
-					},
-					hide: {
-						allCollections: [
-							true,
-						],
-					},
-				},
-			},
+			// {
+			// 	displayName: 'All collections',
+			// 	name: 'allCollections',
+			// 	type: 'boolean',
+			// 	displayOptions: {
+			// 		show: {
+			// 			event: [
+			// 				'collection_item_created',
+			// 				'collection_item_changed',
+			// 				'collection_item_deleted',
+			// 			],
+			// 		},
+			// 	},
+			// 	required: false,
+			// 	default: true,
+			// 	description: 'Receive events from all collections',
+			// },
+			// {
+			// 	displayName: 'Collection',
+			// 	name: 'collection',
+			// 	type: 'options',
+			// 	required: false,
+			// 	default: '',
+			// 	typeOptions: {
+			// 		loadOptionsMethod: 'getCollections',
+			// 		loadOptionsDependsOn: [
+			// 			'site',
+			// 		],
+			// 	},
+			// 	description: 'Collection that will trigger the events',
+			// 	displayOptions: {
+			// 		show: {
+			// 			allCollections: [
+			// 				false,
+			// 			],
+			// 		},
+			// 	},
+			// },
 		],
 	};
 
@@ -188,18 +190,18 @@ export class WebflowTrigger implements INodeType {
 				}
 				return returnData;
 			},
-			async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const siteId = this.getCurrentNodeParameter('site');
-				const collections = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
-				for (const collection of collections) {
-					returnData.push({
-						name: collection.name,
-						value: collection._id,
-					});
-				}
-				return returnData;
-			},
+			// async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+			// 	const returnData: INodePropertyOptions[] = [];
+			// 	const siteId = this.getCurrentNodeParameter('site');
+			// 	const collections = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
+			// 	for (const collection of collections) {
+			// 		returnData.push({
+			// 			name: collection.name,
+			// 			value: collection._id,
+			// 		});
+			// 	}
+			// 	return returnData;
+			// },
 		},
 	};
 
@@ -225,8 +227,6 @@ export class WebflowTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const siteId = this.getNodeParameter('site') as string;
 				const event = this.getNodeParameter('event') as string;
-				const collection = this.getNodeParameter('collection') as string;
-				const allCollections = this.getNodeParameter('allCollections') as boolean;
 				const endpoint = `/sites/${siteId}/webhooks`;
 				const body: IDataObject = {
 					site_id: siteId,
@@ -234,11 +234,17 @@ export class WebflowTrigger implements INodeType {
 					url: webhookUrl,
 
 				};
-				if(event.startsWith('collection') && !allCollections) {
-					body.filter = {
-						'_cid': collection,
-					};
-				}
+
+				// if (event.startsWith('collection')) {
+				// 	const allCollections = this.getNodeParameter('allCollections') as boolean;
+
+				// 	if (allCollections === false) {
+				// 		body.filter = {
+				// 			'cid': this.getNodeParameter('collection') as string,
+				// 		};
+				// 	}
+				// }
+
 				const { _id } = await webflowApiRequest.call(this, 'POST', endpoint, body);
 				webhookData.webhookId = _id;
 				return true;
@@ -250,7 +256,7 @@ export class WebflowTrigger implements INodeType {
 				const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
 				try {
 					responseData = await webflowApiRequest.call(this, 'DELETE', endpoint);
-				} catch(error) {
+				} catch (error) {
 					return false;
 				}
 				if (!responseData.deleted) {

From 3a1a5fd49cc9bf7b97b90008f11c6e52713acbae Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 8 May 2021 16:26:06 -0400
Subject: [PATCH 144/231] :zap: Add pagination to resource report for Google
 Analytics (#1755)

---
 .../Google/Analytics/GenericFunctions.ts      | 51 ++++++++++------
 .../Google/Analytics/GoogleAnalytics.node.ts  | 58 +++++++++++--------
 .../Google/Analytics/ReportDescription.ts     | 41 +++++++++++++
 3 files changed, 107 insertions(+), 43 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
index 14f4905d26..7c5628483c 100644
--- a/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
@@ -27,11 +27,13 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 	};
 
 	options = Object.assign({}, options, option);
-
 	try {
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleAnalyticsOAuth2', options);
 
@@ -45,12 +47,11 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
 	const returnData: IDataObject[] = [];
 
 	let responseData;
-	body.pageSize = 100;
 
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
 		if (body.reportRequests && Array.isArray(body.reportRequests)) {
-			body.reportRequests[0].pageToken = responseData['nextPageToken'];
+			body.reportRequests[0]['pageToken'] = responseData[propertyName][0].nextPageToken;
 		} else {
 			body.pageToken = responseData['nextPageToken'];
 		}
@@ -58,28 +59,42 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
 	} while (
 		(responseData['nextPageToken'] !== undefined &&
 			responseData['nextPageToken'] !== '') ||
-		(responseData['reports'] &&
-			responseData['reports'][0].nextPageToken &&
-			responseData['reports'][0].nextPageToken !== undefined)
+		(responseData[propertyName] &&
+			responseData[propertyName][0].nextPageToken &&
+			responseData[propertyName][0].nextPageToken !== undefined)
 	);
 
 	return returnData;
 }
 
-export function simplify(responseData: any) { // tslint:disable-line:no-any
-	const { columnHeader: { dimensions }, data: { rows } } = responseData[0];
-	responseData = [];
-	for (const row of rows) {
-		const data: IDataObject = {};
-		if (dimensions) {
-			for (let i = 0; i < dimensions.length; i++) {
-				data[dimensions[i]] = row.dimensions[i];
+export function simplify(responseData: any | [any]) { // tslint:disable-line:no-any
+	const response = [];
+	for (const { columnHeader: { dimensions }, data: { rows } } of responseData) {
+		for (const row of rows) {
+			const data: IDataObject = {};
+			if (dimensions) {
+				for (let i = 0; i < dimensions.length; i++) {
+					data[dimensions[i]] = row.dimensions[i];
+					data['total'] = row.metrics[0].values.join(',');
+				}
+			} else {
 				data['total'] = row.metrics[0].values.join(',');
 			}
-		} else {
-			data['total'] = row.metrics[0].values.join(',');
+			response.push(data);
 		}
-		responseData.push(data);
 	}
-	return responseData;
+	return response;
+}
+
+export function merge(responseData: [any]) { // tslint:disable-line:no-any
+	const response: { columnHeader: IDataObject, data: { rows: [] } } = {
+		columnHeader: responseData[0].columnHeader,
+		data: responseData[0].data,
+	};
+	const allRows = [];
+	for (const { data: { rows } } of responseData) {
+		allRows.push(...rows);
+	}
+	response.data.rows = allRows as [];
+	return [response];
 }
diff --git a/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.ts b/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.ts
index 54ef98af43..84081b766d 100644
--- a/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/GoogleAnalytics.node.ts
@@ -24,13 +24,14 @@ import {
 import {
 	googleApiRequest,
 	googleApiRequestAllItems,
+	merge,
 	simplify,
 } from './GenericFunctions';
 
 import * as moment from 'moment-timezone';
 
 import {
-	IData
+	IData,
 } from './Interfaces';
 
 export class GoogleAnalytics implements INodeType {
@@ -69,7 +70,7 @@ export class GoogleAnalytics implements INodeType {
 						value: 'userActivity',
 					},
 				],
-				default:'report',
+				default: 'report',
 			},
 			//-------------------------------
 			// Reports Operations
@@ -152,12 +153,13 @@ export class GoogleAnalytics implements INodeType {
 		let endpoint = '';
 		let responseData;
 		for (let i = 0; i < items.length; i++) {
-			if(resource === 'report') {
-				if(operation === 'get') {
+			if (resource === 'report') {
+				if (operation === 'get') {
 					//https://developers.google.com/analytics/devguides/reporting/core/v4/rest/v4/reports/batchGet
 					method = 'POST';
 					endpoint = '/v4/reports:batchGet';
 					const viewId = this.getNodeParameter('viewId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
 					const additionalFields = this.getNodeParameter(
 						'additionalFields',
 						i,
@@ -165,63 +167,69 @@ export class GoogleAnalytics implements INodeType {
 					const simple = this.getNodeParameter('simple', i) as boolean;
 
 					const body: IData = {
-							viewId,
+						viewId,
 					};
 
-					if(additionalFields.useResourceQuotas){
+					if (additionalFields.useResourceQuotas) {
 						qs.useResourceQuotas = additionalFields.useResourceQuotas;
 					}
-					if(additionalFields.dateRangesUi){
+					if (additionalFields.dateRangesUi) {
 						const dateValues = (additionalFields.dateRangesUi as IDataObject).dateRanges as IDataObject;
-						if(dateValues){
+						if (dateValues) {
 							const start = dateValues.startDate as string;
 							const end = dateValues.endDate as string;
 							Object.assign(
 								body,
 								{
 									dateRanges:
-									[
-										{
-											startDate: moment(start).utc().format('YYYY-MM-DD'),
-											endDate: moment(end).utc().format('YYYY-MM-DD'),
-										},
-									],
+										[
+											{
+												startDate: moment(start).utc().format('YYYY-MM-DD'),
+												endDate: moment(end).utc().format('YYYY-MM-DD'),
+											},
+										],
 								},
 							);
 						}
 					}
 
-					if(additionalFields.metricsUi) {
+					if (additionalFields.metricsUi) {
 						const metrics = (additionalFields.metricsUi as IDataObject).metricValues as IDataObject[];
 						body.metrics = metrics;
 					}
-					if(additionalFields.dimensionUi){
+					if (additionalFields.dimensionUi) {
 						const dimensions = (additionalFields.dimensionUi as IDataObject).dimensionValues as IDataObject[];
 						if (dimensions) {
 							body.dimensions = dimensions;
 						}
 					}
-					if(additionalFields.includeEmptyRows){
+					if (additionalFields.includeEmptyRows) {
 						Object.assign(body, { includeEmptyRows: additionalFields.includeEmptyRows });
 					}
-					if(additionalFields.hideTotals){
+					if (additionalFields.hideTotals) {
 						Object.assign(body, { hideTotals: additionalFields.hideTotals });
 					}
-					if(additionalFields.hideValueRanges){
+					if (additionalFields.hideValueRanges) {
 						Object.assign(body, { hideTotals: additionalFields.hideTotals });
 					}
 
-					responseData = await googleApiRequest.call(this, method, endpoint, { reportRequests: [body] }, qs);
-					responseData = responseData.reports;
+					if (returnAll === true) {
+						responseData = await googleApiRequestAllItems.call(this, 'reports', method, endpoint, { reportRequests: [body] }, qs);
+					} else {
+						responseData = await googleApiRequest.call(this, method, endpoint, { reportRequests: [body] }, qs);
+						responseData = responseData.reports;
+					}
 
 					if (simple === true) {
 						responseData = simplify(responseData);
+					} else if (returnAll === true && responseData.length > 1) {
+						responseData = merge(responseData);
 					}
 				}
 			}
-			if(resource === 'userActivity') {
-				if(operation === 'search') {
-					// https://developers.google.com/analytics/devguides/reporting/core/v4/rest/v4/userActivity/search
+			if (resource === 'userActivity') {
+				if (operation === 'search') {
+					//https://developers.google.com/analytics/devguides/reporting/core/v4/rest/v4/userActivity/search
 					method = 'POST';
 					endpoint = '/v4/userActivity:search';
 					const viewId = this.getNodeParameter('viewId', i);
@@ -237,7 +245,7 @@ export class GoogleAnalytics implements INodeType {
 							userId,
 						},
 					};
-					if(additionalFields.activityTypes) {
+					if (additionalFields.activityTypes) {
 						Object.assign(body, { activityTypes: additionalFields.activityTypes });
 					}
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts b/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
index 2428b67b4a..962ca6b3f6 100644
--- a/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
@@ -49,6 +49,47 @@ export const reportFields = [
 		placeholder: '123456',
 		description: 'The View ID of Google Analytics',
 	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'report',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'report',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		default: 1000,
+		description: 'How many results to return.',
+	},
 	{
 		displayName: 'Simple',
 		name: 'simple',

From 29b9ebfaff577dbb64cc48fb182ad86cb0f09443 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 8 May 2021 23:35:37 +0300
Subject: [PATCH 145/231] :arrow_up: Set fflate@0.6.9 on n8n-nodes-base

Snyk has created this PR to upgrade fflate from 0.4.8 to 0.6.9.

See this package in npm:
https://www.npmjs.com/package/fflate

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 14ec528fc6..9c2eff8a4e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -602,7 +602,7 @@
     "cheerio": "1.0.0-rc.6",
     "cron": "^1.7.2",
     "eventsource": "^1.0.7",
-    "fflate": "^0.4.8",
+    "fflate": "^0.6.9",
     "formidable": "^1.2.1",
     "get-system-fonts": "^2.0.2",
     "glob-promise": "^3.4.0",

From b47f4bc012b9379b3ea21725101c03daf222b87c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 8 May 2021 21:49:55 -0500
Subject: [PATCH 146/231] :bug: Fix issue that nodes did execute even if there
 was no input data

---
 packages/core/src/WorkflowExecute.ts       |   7 +
 packages/core/test/Helpers.ts              |  24 +++
 packages/core/test/WorkflowExecute.test.ts | 170 ++++++++++++++++++++-
 3 files changed, 199 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 8d474a458f..5c73d4c9ef 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -401,6 +401,13 @@ export class WorkflowExecute {
 
 							nodeToAdd = parentNode;
 						}
+						const parentNodesNodeToAdd = workflow.getParentNodes(nodeToAdd as string);
+						if (parentNodesNodeToAdd.includes(parentNodeName) && nodeSuccessData[outputIndex].length === 0) {
+							// We do not add the node if there is no input data and the node that should be connected
+							// is a child of the parent node. Because else it would run a node even though it should be
+							// specifically not run, as it did not receive any data.
+							nodeToAdd = undefined;
+						}
 
 						if (nodeToAdd === undefined) {
 							// No node has to get added so process
diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts
index 4335e9e1e9..1a1fa9d12d 100644
--- a/packages/core/test/Helpers.ts
+++ b/packages/core/test/Helpers.ts
@@ -465,6 +465,30 @@ class NodeTypesClass implements INodeTypes {
 				},
 			},
 		},
+		'n8n-nodes-base.noOp': {
+			sourcePath: '',
+			type: {
+				description: {
+					displayName: 'No Operation, do nothing',
+					name: 'noOp',
+					icon: 'fa:arrow-right',
+					group: ['organization'],
+					version: 1,
+					description: 'No Operation',
+					defaults: {
+						name: 'NoOp',
+						color: '#b0b0b0',
+					},
+					inputs: ['main'],
+					outputs: ['main'],
+					properties: [],
+				},
+				execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+					const items = this.getInputData();
+					return this.prepareOutputData(items);
+				},
+			},
+		},
 		'n8n-nodes-base.set': {
 			sourcePath: '',
 			type: {
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index 8c7a51c0ba..454dd521b5 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -1154,6 +1154,174 @@ describe('WorkflowExecute', () => {
 					},
 				},
 			},
+			{
+				description: 'should not use empty data in sibling if parent did not send any data',
+				input: {
+					// Leave the workflowData in regular JSON to be able to easily
+					// copy it from/in the UI
+					workflowData: {
+						"nodes": [
+							{
+								"parameters": {},
+								"name": "Start",
+								"type": "n8n-nodes-base.start",
+								"typeVersion": 1,
+								"position": [
+									250,
+									300,
+								],
+							},
+							{
+								"parameters": {
+									"values": {
+										"number": [
+											{
+												"name": "value1",
+											},
+										],
+									},
+									"options": {},
+								},
+								"name": "Set",
+								"type": "n8n-nodes-base.set",
+								"typeVersion": 1,
+								"position": [
+									450,
+									300,
+								],
+							},
+							{
+								"parameters": {},
+								"name": "Merge",
+								"type": "n8n-nodes-base.merge",
+								"typeVersion": 1,
+								"position": [
+									1050,
+									250,
+								],
+							},
+							{
+								"parameters": {
+									"conditions": {
+										"number": [
+											{
+												"value1": "={{$json[\"value1\"]}}",
+												"operation": "equal",
+												"value2": 1,
+											},
+										],
+									},
+								},
+								"name": "IF",
+								"type": "n8n-nodes-base.if",
+								"typeVersion": 1,
+								"position": [
+									650,
+									300,
+								],
+							},
+							{
+								"parameters": {},
+								"name": "NoOpTrue",
+								"type": "n8n-nodes-base.noOp",
+								"typeVersion": 1,
+								"position": [
+									850,
+									150,
+								],
+							},
+							{
+								"parameters": {},
+								"name": "NoOpFalse",
+								"type": "n8n-nodes-base.noOp",
+								"typeVersion": 1,
+								"position": [
+									850,
+									400,
+								],
+							},
+						],
+						"connections": {
+							"Start": {
+								"main": [
+									[
+										{
+											"node": "Set",
+											"type": "main",
+											"index": 0,
+										},
+									],
+								],
+							},
+							"Set": {
+								"main": [
+									[
+										{
+											"node": "IF",
+											"type": "main",
+											"index": 0,
+										},
+									],
+								],
+							},
+							"IF": {
+								"main": [
+									[
+										{
+											"node": "NoOpTrue",
+											"type": "main",
+											"index": 0,
+										},
+										{
+											"node": "Merge",
+											"type": "main",
+											"index": 1,
+										},
+									],
+									[
+										{
+											"node": "NoOpFalse",
+											"type": "main",
+											"index": 0,
+										},
+									],
+								],
+							},
+							"NoOpTrue": {
+								"main": [
+									[
+										{
+											"node": "Merge",
+											"type": "main",
+											"index": 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: [
+						'Start',
+						'Set',
+						'IF',
+						'NoOpFalse',
+					],
+					nodeData: {
+						IF: [
+							[],
+						],
+						NoOpFalse: [
+							[
+								{
+									value1: 0,
+								},
+							],
+						],
+					},
+				},
+			},
 		];
 
 		const fakeLogger = {
@@ -1165,7 +1333,6 @@ describe('WorkflowExecute', () => {
 			error:  () => {},
 		} as ILogger;
 
-
 		const executionMode = 'manual';
 		const nodeTypes = Helpers.NodeTypes();
 		LoggerProxy.init(fakeLogger);
@@ -1213,7 +1380,6 @@ describe('WorkflowExecute', () => {
 				expect(result.finished).toEqual(true);
 				expect(result.data.executionData!.contextData).toEqual({});
 				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
-				expect(result.data.executionData!.waitingExecution).toEqual({});
 			});
 		}
 

From afce58c19a4265edc4cfa8a3b0445aaafe18950c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 14:15:47 -0500
Subject: [PATCH 147/231] :bug: Fix issue with Google Sheets update with custom
 key row #1736

---
 packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index 2aa2541f23..aca82ddea2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -286,7 +286,7 @@ export class GoogleSheet {
 			throw new NodeOperationError(this.executeFunctions.getNode(), `The range "${range}" is not valid.`);
 		}
 
-		const keyRowRange = `${sheet ? sheet + '!' : ''}${rangeStartSplit[1]}${dataStartRowIndex}:${rangeEndSplit[1]}${dataStartRowIndex}`;
+		const keyRowRange = `${sheet ? sheet + '!' : ''}${rangeStartSplit[1]}${keyRowIndex + 1}:${rangeEndSplit[1]}${keyRowIndex + 1}`;
 
 		const sheetDatakeyRow = await this.getData(this.encodeRange(keyRowRange), valueRenderMode);
 
@@ -302,7 +302,7 @@ export class GoogleSheet {
 			throw new NodeOperationError(this.executeFunctions.getNode(), `Could not find column for key "${indexKey}"!`);
 		}
 
-		const startRowIndex = rangeStartSplit[2] || '';
+		const startRowIndex = rangeStartSplit[2] || dataStartRowIndex;
 		const endRowIndex = rangeEndSplit[2] || '';
 
 		const keyColumn = this.getColumnWithOffset(rangeStartSplit[1], keyIndex);

From b05c4d5a55f9208937d16f2fa37a4ad2286586f3 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:24:17 +0000
Subject: [PATCH 148/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.70?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 69a76944f1..35b12c5b17 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.69.0",
+  "version": "0.70.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 897d3c9391b1b186f7cabd8b2e024c2be49a3ea5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:24:34 +0000
Subject: [PATCH 149/231] :arrow_up: Set n8n-core@0.70.0 on n8n-node-dev

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 64c637beb4..5eaea0bc0d 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,7 +59,7 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "^0.67.0",
+    "n8n-core": "~0.70.0",
     "n8n-workflow": "^0.55.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",

From 75a677269a363b8c66bf4c4264a08e8d4cb3ac7f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:24:34 +0000
Subject: [PATCH 150/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 5eaea0bc0d..1a69587813 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From a6f97838a7c027bdcd6cb2983cbcb992a05af504 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:24:54 +0000
Subject: [PATCH 151/231] :arrow_up: Set n8n-core@0.70.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 9c2eff8a4e..3ad0b62e5a 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -623,7 +623,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.69.0",
+    "n8n-core": "~0.70.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",

From 5f0b017c77e1e15c2fcdb69fbeb60e3d2976218b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:24:54 +0000
Subject: [PATCH 152/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.116.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3ad0b62e5a..4e2d4bd19f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.115.0",
+  "version": "0.116.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8ce1086262b7d5bc60ea3567458f62ef57d30b0e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:25:53 +0000
Subject: [PATCH 153/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.89.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index ccf591fe6b..54311ff034 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.88.0",
+  "version": "0.89.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From ffacdcdbce38d71e92ed5aa931beefa9bdac2b29 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:26:48 +0000
Subject: [PATCH 154/231] :arrow_up: Set n8n-core@0.70.0, n8n-editor-ui@0.89.0
 and n8n-nodes-base@0.116.0 on n8n

---
 packages/cli/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index aa48f92da2..892ccc83c6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -104,9 +104,9 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.69.0",
-    "n8n-editor-ui": "~0.88.0",
-    "n8n-nodes-base": "~0.115.0",
+    "n8n-core": "~0.70.0",
+    "n8n-editor-ui": "~0.89.0",
+    "n8n-nodes-base": "~0.116.0",
     "n8n-workflow": "~0.57.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 958657278bffe6dcd2ebf4b3efd7b13fe063bc77 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 19:26:49 +0000
Subject: [PATCH 155/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.119.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 892ccc83c6..468adbf379 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.118.0",
+  "version": "0.119.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From e3ab0b86792a983faca498eb4a32eea47f20444a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 17:55:27 -0500
Subject: [PATCH 156/231] :books: Fix job link

---
 README.md                   | 4 +---
 docker/images/n8n/README.md | 4 +---
 packages/cli/README.md      | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6e1e7e1766..1fd4f1128c 100644
--- a/README.md
+++ b/README.md
@@ -63,9 +63,7 @@ If you have problems or questions go to our forum, we will then try to help you
 ## Jobs
 
 If you are interested in working for n8n and so shape the future of the project
-check out our job posts:
-
-[https://n8n.join.com](https://n8n.join.com)
+check out our [job posts](https://apply.workable.com/n8n/)
 
 
 
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index ef0d7123e7..436942ef40 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -262,9 +262,7 @@ If you have problems or questions go to our forum, we will then try to help you
 ## Jobs
 
 If you are interested in working for n8n and so shape the future of the project
-check out our job posts:
-
-[https://n8n.join.com](https://n8n.join.com)
+check out our [job posts](https://apply.workable.com/n8n/)
 
 
 
diff --git a/packages/cli/README.md b/packages/cli/README.md
index e7f951bbbe..61da7bcf35 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -87,9 +87,7 @@ If you have problems or questions go to our forum, we will then try to help you
 ## Jobs
 
 If you are interested in working for n8n and so shape the future of the project
-check out our job posts:
-
-[https://n8n.join.com](https://n8n.join.com)
+check out our [job posts](https://apply.workable.com/n8n/)
 
 
 ## Upgrading

From 1d13f7d46ceea6b8f74bdfd05b49bfffebd3e367 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 17:56:57 -0500
Subject: [PATCH 157/231] :books: Change example docker command to persist data

---
 docker/images/n8n/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index 436942ef40..cb484addb0 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -49,6 +49,7 @@ Additional information and example workflows on the n8n.io website: [https://n8n
 docker run -it --rm \
 	--name n8n \
 	-p 5678:5678 \
+	-v ~/.n8n:/home/node/.n8n \
 	n8nio/n8n
 ```
 

From b47de284f52580fc4ae5fe20ede7d39bb17c3e9b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 May 2021 22:41:18 -0500
Subject: [PATCH 158/231] :arrow_up: Set n8n-workflow@0.57.0 on n8n-node-dev

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 1a69587813..c9beb8b379 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -60,7 +60,7 @@
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
     "n8n-core": "~0.70.0",
-    "n8n-workflow": "^0.55.0",
+    "n8n-workflow": "^0.57.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From caa55a022b5789e56674808e89c54ba9bec0279b Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Wed, 12 May 2021 05:12:53 +0200
Subject: [PATCH 159/231] :sparkles: Add more FE hooks (#1772)

* :sparkles: add FE hook for expressionEdit dialogVisibleChanged

* :zap: update FE hook for expressionEdit dialogVisibleChanged

* :sparkles: add FE hook for expressionEdit itemSelected

* :sparkles: add FE hook for nodeSettings valueChanged

* :sparkles: add FE hook for nodeSettings credentialSelected

* cleanup
---
 .../editor-ui/src/components/ExpressionEdit.vue | 17 +++++++++++++++--
 .../editor-ui/src/components/NodeSettings.vue   |  8 ++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index ada71f6869..c073ce7793 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -30,7 +30,7 @@
 						<div class="editor-description">
 							Result
 						</div>
-						<expression-input :parameter="parameter" resolvedValue="true" rows="8" :value="value" :path="path"></expression-input>
+						<expression-input :parameter="parameter" resolvedValue="true" ref="expressionResult" rows="8" :value="value" :path="path"></expression-input>
 					</div>
 
 				</el-col>
@@ -52,7 +52,11 @@ import {
 	Workflow,
 } from 'n8n-workflow';
 
-export default Vue.extend({
+import { externalHooks } from '@/components/mixins/externalHooks';
+
+import mixins from 'vue-typed-mixins';
+
+export default mixins(externalHooks).extend({
 	name: 'ExpressionEdit',
 	props: [
 		'dialogVisible',
@@ -81,7 +85,16 @@ export default Vue.extend({
 		},
 
 		itemSelected (eventData: IVariableItemSelected) {
+			// User inserted item from Expression Editor variable selector
 			(this.$refs.inputFieldExpression as any).itemSelected(eventData); // tslint:disable-line:no-any
+
+			this.$externalHooks().run('expressionEdit.itemSelected', { parameter: this.parameter, value: this.value, selectedItem: eventData });
+		},
+	},
+	watch: {
+		dialogVisible (newValue) {
+			const resolvedExpressionValue = this.$refs.expressionResult && (this.$refs.expressionResult as any).getValue() || undefined;  // tslint:disable-line:no-any
+			this.$externalHooks().run('expressionEdit.dialogVisibleChanged', { dialogVisible: newValue, parameter: this.parameter, value: this.value, resolvedExpressionValue });
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 07f8ac7b2d..7bdf7ea5dd 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -59,12 +59,14 @@ import NodeCredentials from '@/components/NodeCredentials.vue';
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
 import { get, set, unset } from 'lodash';
 
+import { externalHooks } from '@/components/mixins/externalHooks';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { nodeHelpers } from '@/components/mixins/nodeHelpers';
 
 import mixins from 'vue-typed-mixins';
 
 export default mixins(
+	externalHooks,
 	genericHelpers,
 	nodeHelpers,
 )
@@ -323,6 +325,8 @@ export default mixins(
 
 				// Update the issues
 				this.updateNodeCredentialIssues(node);
+
+				this.$externalHooks().run('nodeSettings.credentialSelected', { updateInformation });
 			},
 			valueChanged (parameterData: IUpdateInformation) {
 				let newValue: NodeParameterValue;
@@ -357,6 +361,7 @@ export default mixins(
 
 					// Get only the parameters which are different to the defaults
 					let nodeParameters = NodeHelpers.getNodeParameters(nodeType.properties, node.parameters, false, false);
+					const oldNodeParameters = Object.assign({}, nodeParameters);
 
 					// Copy the data because it is the data of vuex so make sure that
 					// we do not edit it directly
@@ -404,7 +409,10 @@ export default mixins(
 						name: node.name,
 						value: nodeParameters,
 					};
+					
 					this.$store.commit('setNodeParameters', updateInformation);
+					
+					this.$externalHooks().run('nodeSettings.valueChanged', { parameterPath, newValue, parameters: this.parameters, oldNodeParameters });
 
 					this.updateNodeParameterIssues(node, nodeType);
 					this.updateNodeCredentialIssues(node);

From 6ffc544888524a9c76eacf93c5e3326da54c75af Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 12 May 2021 05:15:22 +0200
Subject: [PATCH 160/231] :zap: Add await statement to hooks (#1775)

---
 packages/cli/src/WorkflowRunnerProcess.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 14ae4a1abf..4a09c76a89 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -194,9 +194,9 @@ export class WorkflowRunnerProcess {
 	 * @param {any[]} parameters
 	 * @memberof WorkflowRunnerProcess
 	 */
-	sendHookToParentProcess(hook: string, parameters: any[]) { // tslint:disable-line:no-any
+	async sendHookToParentProcess(hook: string, parameters: any[]) { // tslint:disable-line:no-any
 		try {
-			sendToParentProcess('processHook', {
+			await sendToParentProcess('processHook', {
 				hook,
 				parameters,
 			});
@@ -217,22 +217,22 @@ export class WorkflowRunnerProcess {
 		const hookFunctions: IWorkflowExecuteHooks = {
 			nodeExecuteBefore: [
 				async (nodeName: string): Promise<void> => {
-					this.sendHookToParentProcess('nodeExecuteBefore', [nodeName]);
+					await this.sendHookToParentProcess('nodeExecuteBefore', [nodeName]);
 				},
 			],
 			nodeExecuteAfter: [
 				async (nodeName: string, data: ITaskData): Promise<void> => {
-					this.sendHookToParentProcess('nodeExecuteAfter', [nodeName, data]);
+					await this.sendHookToParentProcess('nodeExecuteAfter', [nodeName, data]);
 				},
 			],
 			workflowExecuteBefore: [
 				async (): Promise<void> => {
-					this.sendHookToParentProcess('workflowExecuteBefore', []);
+					await this.sendHookToParentProcess('workflowExecuteBefore', []);
 				},
 			],
 			workflowExecuteAfter: [
 				async (fullRunData: IRun, newStaticData?: IDataObject): Promise<void> => {
-					this.sendHookToParentProcess('workflowExecuteAfter', [fullRunData, newStaticData]);
+					await this.sendHookToParentProcess('workflowExecuteAfter', [fullRunData, newStaticData]);
 				},
 			],
 		};

From 0867c7bbfe60f821129d2bd961c74f668827458a Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 12 May 2021 05:43:24 +0200
Subject: [PATCH 161/231] :bug: Fix issue with long credential names in MySQL
 (#1771)

---
 .../1620729500000-ChangeCredentialDataSize.ts  | 18 ++++++++++++++++++
 .../src/databases/mysqldb/migrations/index.ts  |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts

diff --git a/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts b/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts
new file mode 100644
index 0000000000..789e1d2172
--- /dev/null
+++ b/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts
@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import * as config from '../../../../config';
+
+export class ChangeCredentialDataSize1620729500000 implements MigrationInterface {
+	name = 'ChangeCredentialDataSize1620729500000';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `data` MEDIUMTEXT NOT NULL');
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `data` TEXT NOT NULL');
+	}
+}
diff --git a/packages/cli/src/databases/mysqldb/migrations/index.ts b/packages/cli/src/databases/mysqldb/migrations/index.ts
index 08ca45edbf..f5c110fec2 100644
--- a/packages/cli/src/databases/mysqldb/migrations/index.ts
+++ b/packages/cli/src/databases/mysqldb/migrations/index.ts
@@ -4,6 +4,7 @@ import { CreateIndexStoppedAt1594902918301 } from './1594902918301-CreateIndexSt
 import { AddWebhookId1611149998770 } from './1611149998770-AddWebhookId';
 import { MakeStoppedAtNullable1607431743767 } from './1607431743767-MakeStoppedAtNullable';
 import { ChangeDataSize1615306975123 } from './1615306975123-ChangeDataSize';
+import { ChangeCredentialDataSize1620729500000 } from './1620729500000-ChangeCredentialDataSize';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -12,4 +13,5 @@ export const mysqlMigrations = [
 	AddWebhookId1611149998770,
 	MakeStoppedAtNullable1607431743767,
 	ChangeDataSize1615306975123,
+	ChangeCredentialDataSize1620729500000,
 ];

From 6134175a06518b0d93dce50d1908979521afbe33 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 11 May 2021 23:04:56 -0500
Subject: [PATCH 162/231] :bug: Fix MySQL credential bug

---
 .../migrations/1620729500000-ChangeCredentialDataSize.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts b/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts
index 789e1d2172..ea1bd42049 100644
--- a/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts
+++ b/packages/cli/src/databases/mysqldb/migrations/1620729500000-ChangeCredentialDataSize.ts
@@ -7,12 +7,12 @@ export class ChangeCredentialDataSize1620729500000 implements MigrationInterface
 	async up(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.get('database.tablePrefix');
 
-		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `data` MEDIUMTEXT NOT NULL');
+		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `type` varchar(128) NOT NULL');
 	}
 
 	async down(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.get('database.tablePrefix');
 
-		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `data` TEXT NOT NULL');
+		await queryRunner.query('ALTER TABLE `' + tablePrefix + 'credentials_entity` MODIFY COLUMN `type` varchar(32) NOT NULL');
 	}
 }

From 7bc79c879d96d577e77b0990dd3536451f88a59c Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 12 May 2021 06:13:39 +0200
Subject: [PATCH 163/231] :pencil: Add database type and execution mode to
 issues template (#1762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added database type and execution mode to issues template

* Bump n8n version suggestion

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>

* Bump node.js version as suggested

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 98d3702d9c..9a150b04b1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,8 +22,10 @@ A clear and concise description of what you expected to happen.
 
 **Environment (please complete the following information):**
  - OS: [e.g. Ubuntu Linux 18.04]
- - n8n Version [e.g. 0.26.0]
- - Node.js Version [e.g. 10.16.0]
+ - n8n Version [e.g. 0.119.0]
+ - Node.js Version [e.g. 14.16.0]
+ - Database system [e.g. SQLite; n8n uses SQLite as default otherwise changed]
+ - Operation mode [e.g. own; operation modes are `own`, `main` and `queue`. Default is `own`]
 
 **Additional context**
 Add any other context about the problem here.

From c632f7982f5c3d40213c3ca8790a9f65bdad40e1 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 12 May 2021 00:20:40 -0400
Subject: [PATCH 164/231] :zap: Add parameter to include credentials in
 querystring (Woocommerce) (#1756)

---
 .../credentials/WooCommerceApi.credentials.ts          |  9 +++++++++
 .../nodes-base/nodes/WooCommerce/GenericFunctions.ts   |  9 ++++++++-
 .../nodes-base/nodes/WooCommerce/WooCommerce.node.ts   | 10 +++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
index aa3809f05c..9a95411cbf 100644
--- a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
+++ b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
@@ -27,5 +27,14 @@ export class WooCommerceApi implements ICredentialType {
 			default: '',
 			placeholder: 'https://example.com',
 		},
+		{
+			displayName: 'Include Credentials in Query',
+			name: 'includeCredentialsInQuery',
+			type: 'boolean' as NodePropertyTypes,
+			default: false,
+			description: `Occasionally, some servers may not parse the Authorization header correctly</br>
+			(if you see a “Consumer key is missing” error when authenticating over SSL, you have a server issue).</br>
+			In this case, you may provide the consumer key/secret as query string parameters instead.`,
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index f08f6e272e..3e42c88505 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -9,6 +9,7 @@ import {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
+
 import {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -36,6 +37,7 @@ export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunct
 	if (credentials === undefined) {
 		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
+
 	let options: OptionsWithUri = {
 		auth: {
 			user: credentials.consumerKey as string,
@@ -47,11 +49,16 @@ export async function woocommerceApiRequest(this: IHookFunctions | IExecuteFunct
 		uri: uri || `${credentials.url}/wp-json/wc/v3${resource}`,
 		json: true,
 	};
+
+	if (credentials.includeCredentialsInQuery === true) {
+		delete options.auth;
+		Object.assign(qs, { consumer_key: credentials.consumerKey, consumer_secret: credentials.consumerSecret });
+	}
+
 	if (!Object.keys(body).length) {
 		delete options.form;
 	}
 	options = Object.assign({}, options, option);
-
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 04c76fd4d0..025318bdcf 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -367,7 +367,7 @@ export class WooCommerce implements INodeType {
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#retrieve-a-product
 				if (operation === 'get') {
 					const productId = this.getNodeParameter('productId', i) as string;
-					responseData = await woocommerceApiRequest.call(this,'GET', `/products/${productId}`, {}, qs);
+					responseData = await woocommerceApiRequest.call(this, 'GET', `/products/${productId}`, {}, qs);
 				}
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#list-all-products
 				if (operation === 'getAll') {
@@ -413,7 +413,7 @@ export class WooCommerce implements INodeType {
 						qs.status = options.status as string;
 					}
 					if (options.stockStatus) {
-						qs.stock_status	 = options.stockStatus as string;
+						qs.stock_status = options.stockStatus as string;
 					}
 					if (options.tag) {
 						qs.tag = options.tag as string;
@@ -434,7 +434,7 @@ export class WooCommerce implements INodeType {
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#delete-a-product
 				if (operation === 'delete') {
 					const productId = this.getNodeParameter('productId', i) as string;
-					responseData = await woocommerceApiRequest.call(this,'DELETE', `/products/${productId}`, {}, { force: true });
+					responseData = await woocommerceApiRequest.call(this, 'DELETE', `/products/${productId}`, {}, { force: true });
 				}
 			}
 			if (resource === 'order') {
@@ -583,7 +583,7 @@ export class WooCommerce implements INodeType {
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#retrieve-an-order
 				if (operation === 'get') {
 					const orderId = this.getNodeParameter('orderId', i) as string;
-					responseData = await woocommerceApiRequest.call(this,'GET', `/orders/${orderId}`, {}, qs);
+					responseData = await woocommerceApiRequest.call(this, 'GET', `/orders/${orderId}`, {}, qs);
 				}
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#list-all-orders
 				if (operation === 'getAll') {
@@ -629,7 +629,7 @@ export class WooCommerce implements INodeType {
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#delete-an-order
 				if (operation === 'delete') {
 					const orderId = this.getNodeParameter('orderId', i) as string;
-					responseData = await woocommerceApiRequest.call(this,'DELETE', `/orders/${orderId}`, {}, { force: true });
+					responseData = await woocommerceApiRequest.call(this, 'DELETE', `/orders/${orderId}`, {}, { force: true });
 				}
 			}
 			if (Array.isArray(responseData)) {

From c739a498f19668bf480b6b806d32bef4e84d3b2b Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 12 May 2021 17:51:54 +0200
Subject: [PATCH 165/231] :bug: Fix ordering when auto refreshing (#1761)

* Fix ordering when auto refreshing

* Fix ordering for current executinos as well
---
 packages/cli/src/Server.ts                           | 1 +
 packages/editor-ui/src/components/ExecutionsList.vue | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index cbe43697f3..fb4523af3c 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1732,6 +1732,7 @@ class App {
 						}
 					);
 				}
+				returnData.sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
 
 				return returnData;
 			}
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index d576c6898b..e0e129a737 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -438,7 +438,8 @@ export default mixins(
 
 			this.$store.commit('setActiveExecutions', results[1]);
 
-			const alreadyPresentExecutionIds = this.finishedExecutions.map(exec => exec.id);
+			// execution IDs are typed as string, int conversion is necessary so we can order.
+			const alreadyPresentExecutionIds = this.finishedExecutions.map(exec => parseInt(exec.id, 10));
 			let lastId = 0;
 			const gaps = [] as number[];
 			for(let i = results[0].results.length - 1; i >= 0; i--) {
@@ -459,7 +460,7 @@ export default mixins(
 
 				// Check new results from end to start
 				// Add new items accordingly.
-				const executionIndex = alreadyPresentExecutionIds.indexOf(currentItem.id);
+				const executionIndex = alreadyPresentExecutionIds.indexOf(currentId);
 				if (executionIndex !== -1) {
 					// Execution that we received is already present.
 
@@ -477,7 +478,7 @@ export default mixins(
 				// Find the correct position to place this newcomer
 				let j;
 				for (j = this.finishedExecutions.length - 1; j >= 0; j--) {
-					if (currentItem.id < this.finishedExecutions[j].id) {
+					if (currentId < parseInt(this.finishedExecutions[j].id, 10)) {
 						this.finishedExecutions.splice(j + 1, 0, currentItem);
 						break;
 					}

From 6460ce3965514b44e850352040a00ba6cf66e65b Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Wed, 12 May 2021 20:48:48 +0200
Subject: [PATCH 166/231] :bug: Fix Clockify Trigger bug (#1778)

* Fix the empty results bug

* Fix return value
---
 .../nodes-base/nodes/Clockify/ClockifyTrigger.node.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index 9f6384ed70..fb4637e8f9 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -24,7 +24,7 @@ export class ClockifyTrigger implements INodeType {
 		displayName: 'Clockify Trigger',
 		icon: 'file:clockify.png',
 		name: 'clockifyTrigger',
-		group: ['trigger'],
+		group: [ 'trigger' ],
 		version: 1,
 		description: 'Watches Clockify For Events',
 		defaults: {
@@ -32,7 +32,7 @@ export class ClockifyTrigger implements INodeType {
 			color: '#000000',
 		},
 		inputs: [],
-		outputs: ['main'],
+		outputs: [ 'main' ],
 		credentials: [
 			{
 				name: 'clockifyApi',
@@ -109,7 +109,7 @@ export class ClockifyTrigger implements INodeType {
 				qs.start = webhookData.lastTimeChecked;
 				qs.end = moment().tz(workflowTimezone).format('YYYY-MM-DDTHH:mm:ss') + 'Z';
 				qs.hydrated = true;
-				qs['in-progress'] = false;
+				qs[ 'in-progress' ] = false;
 				break;
 		}
 
@@ -117,8 +117,8 @@ export class ClockifyTrigger implements INodeType {
 		webhookData.lastTimeChecked = qs.end;
 
 		if (Array.isArray(result) && result.length !== 0) {
-			result = [this.helpers.returnJsonArray(result)];
+			return [ this.helpers.returnJsonArray(result) ];
 		}
-		return result;
+		return null;
 	}
 }

From 779da62845430a09ebd442fc33a0687951a3bfe9 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Wed, 12 May 2021 20:50:53 +0200
Subject: [PATCH 167/231] :zap: Enable sandbox env in Paddle (#1777)

* Enable sandbox env in Paddle

* Change sandbox option displayName
---
 packages/nodes-base/credentials/PaddleApi.credentials.ts | 6 ++++++
 packages/nodes-base/nodes/Paddle/GenericFunctions.ts     | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/credentials/PaddleApi.credentials.ts b/packages/nodes-base/credentials/PaddleApi.credentials.ts
index 76c0d5bfb3..5aba2bb032 100644
--- a/packages/nodes-base/credentials/PaddleApi.credentials.ts
+++ b/packages/nodes-base/credentials/PaddleApi.credentials.ts
@@ -20,5 +20,11 @@ export class PaddleApi implements ICredentialType {
 			type: 'string' as NodePropertyTypes,
 			default: '',
 		},
+		{
+			displayName: 'Use Sandbox environment API',
+			name: 'sandbox',
+			type: 'boolean' as NodePropertyTypes,
+			default: false,
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index 0baed95f52..b169582b5e 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -16,17 +16,21 @@ import {
 
 export async function paddleApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, endpoint: string, method: string, body: any = {}, query?: IDataObject, uri?: string): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('paddleApi');
+	const productionUrl = 'https://vendors.paddle.com/api';
+	const sandboxUrl = 'https://sandbox-vendors.paddle.com/api';
 
 	if (credentials === undefined) {
 		throw new NodeOperationError(this.getNode(), 'Could not retrieve credentials!');
 	}
 
+	const isSandbox = credentials.sandbox;
+
 	const options: OptionsWithUri = {
 		method,
 		headers: {
 			'content-type': 'application/json',
 		},
-		uri: `https://vendors.paddle.com/api${endpoint}`,
+		uri: `${isSandbox === true ? sandboxUrl : productionUrl}${endpoint}`,
 		body,
 		json: true,
 	};

From b42e1dc366e051dfdd46c39d61bc1bc03ece7772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 12 May 2021 21:21:56 +0200
Subject: [PATCH 168/231] :bug: Fix parsing issues in Firestore node (#1759)

* :zap: Fix empty document parsing

* :zap: Add geopoint parsing

* :zap: Fix date misdetection

* :fire: Remove logging

* :zap: Add ISO-8601 format to date validation
---
 .../Google/Firebase/CloudFirestore/GenericFunctions.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index 8200a95064..4c5501dbaf 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -12,6 +12,8 @@ import {
 	IDataObject, NodeApiError,
 } from 'n8n-workflow';
 
+import * as moment from 'moment-timezone';
+
 export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri: string | null = null): Promise<any> { // tslint:disable-line:no-any
 
 	const options: OptionsWithUri = {
@@ -58,6 +60,7 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
 	return returnData;
 }
 
+const isValidDate = (str: string) => moment(str, ['YYYY-MM-DD HH:mm:ss Z', moment.ISO_8601], true).isValid();
 
 // Both functions below were taken from Stack Overflow jsonToDocument was fixed as it was unable to handle null values correctly
 // https://stackoverflow.com/questions/62246410/how-to-convert-a-firestore-document-to-plain-json-and-vice-versa
@@ -73,7 +76,7 @@ export function jsonToDocument(value: string | number | IDataObject | IDataObjec
 		} else {
 			return { 'integerValue': value };
 		}
-	} else if (Date.parse(value as string)) {
+	} else if (isValidDate(value as string)) {
 		const date = new Date(Date.parse(value as string));
 		return { 'timestampValue': date.toISOString() };
 	} else if (typeof value === 'string') {
@@ -108,13 +111,14 @@ export function fullDocumentToJson(data: IDataObject): IDataObject {
 
 
 export function documentToJson(fields: IDataObject): IDataObject {
+	if (fields === undefined) return {};
 	const result = {};
 	for (const f of Object.keys(fields)) {
 		const key = f, value = fields[f],
 			isDocumentType = ['stringValue', 'booleanValue', 'doubleValue',
-				'integerValue', 'timestampValue', 'mapValue', 'arrayValue', 'nullValue'].find(t => t === key);
+				'integerValue', 'timestampValue', 'mapValue', 'arrayValue', 'nullValue', 'geoPointValue'].find(t => t === key);
 		if (isDocumentType) {
-			const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue', 'nullValue']
+			const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue', 'nullValue', 'geoPointValue']
 				.find(t => t === key);
 			if (item) {
 				return value as IDataObject;

From 1888f5c4a54af25fb95cf6d63a6251b88b01ee90 Mon Sep 17 00:00:00 2001
From: Harshil Agrawal <ghagrawal17@gmail.com>
Date: Wed, 12 May 2021 21:52:31 +0200
Subject: [PATCH 169/231] :books: Update documentation for npm package (#1770)

---
 packages/cli/README.md | 143 +++++++++++++++++++++++++++--------------
 1 file changed, 95 insertions(+), 48 deletions(-)

diff --git a/packages/cli/README.md b/packages/cli/README.md
index 61da7bcf35..d7aad52434 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2,7 +2,7 @@
 
 ![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-logo.png)
 
-n8n is a free and open [fair-code](http://faircode.io) distributed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools.
+n8n is a free and open [fair-code](http://faircode.io) distributed node-based Workflow Automation Tool. You can self-host n8n, easily extend it, and even use it with internal tools.
 
 <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a>
 
@@ -11,98 +11,145 @@ n8n is a free and open [fair-code](http://faircode.io) distributed node based Wo
 
 <!-- TOC -->
 - [Demo](#demo)
+- [Getting Started](#getting-started)
+	- [Use npx](#use-npx)
+	- [Run with Docker](#run-with-docker)
+	- [Install with npm](#install-with-npm)
+	- [Sign-up on n8n.cloud](#sign-up-on-n8n.cloud)
 - [Available integrations](#available-integrations)
 - [Documentation](#documentation)
 - [Create Custom Nodes](#create-custom-nodes)
-- [Hosted n8n](#hosted-n8n)
+- [Contributing](#contributing)
 - [What does n8n mean and how do you pronounce it](#what-does-n8n-mean-and-how-do-you-pronounce-it)
 - [Support](#support)
 - [Jobs](#jobs)
 - [Upgrading](#upgrading)
 - [License](#license)
-- [Development](#development)
 <!-- /TOC -->
 
 ## Demo
 
-[:tv: A short demo (< 3 min)](https://www.youtube.com/watch?v=3w7xIMKLVAg)
-which shows how to create a simple workflow which automatically sends a new
-Slack notification every time a Github repository received or lost a star.
+📺  Here's a [short demo (<3 min)](https://www.youtube.com/watch?v=3w7xIMKLVAg) that shows how to create a simple workflow to automatically sends a notification on Slack every time a GitHub repository gets starred or un-starred.
 
+## Getting Started
+
+There are a couple of ways to get started with n8n.
+
+### Use npx
+
+To spin up n8n using npx, you can run:
+
+```bash
+npx n8n
+```
+
+It will download everything that is needed to start n8n.
+
+You can then access n8n by opening:
+[http://localhost:5678](http://localhost:5678)
+
+**Note:** The minimum required version for Node.js is v14.15. Make sure to update Node.js to v14.15 or above.
+
+### Run with Docker
+
+To play around with n8n, you can also start it using Docker:
+
+```bash
+docker run -it --rm \
+  --name n8n \
+  -p 5678:5678 \
+  n8nio/n8n
+```
+
+Be aware that all the data will be lost once the Docker container gets removed. To persist the data mount the `~/.n8n` folder:
+
+```bash
+docker run -it --rm \
+  --name n8n \
+  -p 5678:5678 \
+  -v ~/.n8n:/home/node/.n8n \
+  n8nio/n8n
+```
+
+n8n also offers a Docker image for Raspberry Pi: `n8nio/n8n:latest-rpi`.
+
+Refer to the [documentation](https://github.com/n8n-io/n8n/blob/master/docker/images/n8n/README.md) for more information on the Docker setup.
+
+### Install with npm
+
+To install n8n globally using npm:
+
+```bash
+npm install n8n -g
+```
+
+After the installation, start n8n running the following command:
+
+```bash
+n8n
+# or
+n8n start
+```
+
+### Sign-up on n8n.cloud
+
+Sign-up for an [n8n.cloud](https://www.n8n.cloud/) account.
+
+While n8n.cloud and n8n are the same in terms of features, n8n.cloud provides certain conveniences such as:
+- Not having to set up and maintain your n8n instance
+- Managed OAuth for authentication
+- Easily upgrading to the newer n8n versions
 
 ## Available integrations
 
-n8n has 200+ different nodes to automate workflows. The list can be found on: [https://n8n.io/nodes](https://n8n.io/nodes)
-
+n8n has 280+ different nodes that allow you to connect various services and build your automation workflows. You can find the list of all the integrations at [https://n8n.io/integrations](https://n8n.io/integrations)
 
 ## Documentation
 
-The official n8n documentation can be found under: [https://docs.n8n.io](https://docs.n8n.io)
+To learn more about n8n, refer to the official documentation here: [https://docs.n8n.io](https://docs.n8n.io)
 
-Additional information and example workflows on the n8n.io website: [https://n8n.io](https://n8n.io)
+You can find additional information and example workflows on the [n8n.io](https://n8n.io) website.
 
 
 ## Create Custom Nodes
 
-It is very easy to create own nodes for n8n. More information about that can
-be found in the documentation of "n8n-node-dev" which is a small CLI which
-helps with n8n-node-development.
+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)
 
-[To n8n-node-dev](https://github.com/n8n-io/n8n/tree/master/packages/node-dev)
+## Contributing
 
-Additional information can be found on the  [ documentation page](https://docs.n8n.io/#/create-node).
+🐛  Did you find a bug?
 
+✨  Do you want to contribute a feature?
 
-## Hosted n8n
+The [CONTRIBUTING guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) will help you set up your development environment.
 
-If you are interested in a hosted version of n8n on our infrastructure please contact us via:
-[hosting@n8n.io](mailto:hosting@n8n.io)
+You can find more information on how you can contribute to the project on our documentation: [How can I contribute?](https://docs.n8n.io/reference/contributing.html)
 
+## What does n8n mean, and how do you pronounce it?
 
+**Short answer:** n8n is an abbreviation for "nodemation", and it is pronounced as n-eight-n.
 
-## What does n8n mean and how do you pronounce it?
-
-**Short answer:** It means "nodemation" and it is pronounced as n-eight-n.
-
-**Long answer:** I get that question quite often (more often than I expected)
-so I decided it is probably best to answer it here. While looking for a
-good name for the project with a free domain I realized very quickly that all the
-good ones I could think of were already taken. So, in the end, I chose
-nodemation. "node-" in the sense that it uses a Node-View and that it uses
-Node.js and "-mation" for "automation" which is what the project is supposed to help with.
-However, I did not like how long the name was and I could not imagine writing
-something that long every time in the CLI. That is when I then ended up on
-"n8n". Sure does not work perfectly but does neither for Kubernetes (k8s) and
-did not hear anybody complain there. So I guess it should be ok.
+**Long answer:** In n8n, you build your automation ("-mation") workflows by connecting different nodes in the Editor UI. The project is also built using Node.js. As a consequence, the project was named nodemation.
 
+However, the name was long, and it wouldn't be a good idea to use such a long name in the CLI. Hence, nodemation got abbreviated as "n8n" (there are eight characters between the first and the last n!).
 
 ## Support
 
-If you have problems or questions go to our forum, we will then try to help you asap:
-
-[https://community.n8n.io](https://community.n8n.io)
-
-
+If you run into issues or have any questions reach out to us via our community forum: [https://community.n8n.io](https://community.n8n.io).
 
 ## Jobs
 
-If you are interested in working for n8n and so shape the future of the project
-check out our [job posts](https://apply.workable.com/n8n/)
+If you are interested in working at n8n and building the project, check out the [job openings](https://apply.workable.com/n8n/).
 
 
 ## Upgrading
 
-Before you upgrade to the latest version make sure to check here if there are any breaking changes which concern you:
-[Breaking Changes](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md)
+Before you upgrade to the latest version, make sure to check the changelogs: [Changelog](https://docs.n8n.io/reference/changelog.html)
 
+You can also find breaking changes here: [Breaking Changes](./BREAKING-CHANGES.md)
 
 ## License
 
-n8n is [fair-code](http://faircode.io) distributed under [**Apache 2.0 with Commons Clause**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md) license
+n8n is [fair-code](http://faircode.io) distributed under [**Apache 2.0 with Commons Clause**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md) license.
 
-Additional information about license can be found in the [FAQ](https://docs.n8n.io/#/faq?id=license)
-
-
-## Development
-
-Have you found a bug :bug: ? Or maybe you have a nice feature :sparkles: to contribute ? The [CONTRIBUTING guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) will help you get your development environment ready in minutes.
+Additional information on the license can be found in the [FAQ](https://docs.n8n.io/reference/faq.html#license)

From 40510a7ab4ceba46d6c96ae9e65dac02b4d231b1 Mon Sep 17 00:00:00 2001
From: DeskYT <54146274+DeskYT@users.noreply.github.com>
Date: Thu, 13 May 2021 01:21:18 +0300
Subject: [PATCH 170/231] :zap: Fix hubspotApiRequestAllItems for some (#1781)

---
 packages/nodes-base/nodes/Hubspot/GenericFunctions.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
index dd98e667da..352e2da88b 100644
--- a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
@@ -76,9 +76,7 @@ export async function hubspotApiRequestAllItems(this: IHookFunctions | IExecuteF
 			return returnData;
 		}
 	} while (
-		responseData['has-more'] !== undefined &&
-		responseData['has-more'] !== null &&
-		responseData['has-more'] !== false
+		responseData['hasMore'] || responseData['has-more']
 	);
 	return returnData;
 }

From bbf7c87c0414efa8ac9c54cf65f21b1bfba2e45f Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Thu, 13 May 2021 01:38:00 +0300
Subject: [PATCH 171/231] :arrow_up: Set amqplib@0.7.1 on n8n-nodes-base

Snyk has created this PR to upgrade amqplib from 0.6.0 to 0.7.1.

See this package in npm:
https://www.npmjs.com/package/amqplib

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4e2d4bd19f..fac858637f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -595,7 +595,7 @@
     "@types/lossless-json": "^1.0.0",
     "@types/promise-ftp": "^1.3.4",
     "@types/snowflake-sdk": "^1.5.1",
-    "amqplib": "^0.6.0",
+    "amqplib": "^0.7.1",
     "aws4": "^1.8.0",
     "basic-auth": "^2.0.1",
     "change-case": "^4.1.1",

From 744dd1fda6ffa0b7ccbb6ac304176df03c5a6641 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 12 May 2021 18:00:46 -0500
Subject: [PATCH 172/231] :zap: Improved logging and wait for workflow
 deactivate

---
 packages/cli/src/ActiveWorkflowRunner.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 9f9b9f3580..c0ae7c76be 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -517,8 +517,8 @@ export class ActiveWorkflowRunner {
 
 			if (workflowInstance.getTriggerNodes().length !== 0
 				|| workflowInstance.getPollNodes().length !== 0) {
-					await this.activeWorkflows.add(workflowId, workflowInstance, additionalData, mode, activation, getTriggerFunctions, getPollFunctions);
-				Logger.info(`Successfully activated workflow "${workflowData.name}"`);
+				await this.activeWorkflows.add(workflowId, workflowInstance, additionalData, mode, activation, getTriggerFunctions, getPollFunctions);
+				Logger.verbose(`Successfully activated workflow "${workflowData.name}"`, { workflowId, workflowName: workflowData.name });
 			}
 
 			if (this.activationErrors[workflowId] !== undefined) {
@@ -569,7 +569,8 @@ export class ActiveWorkflowRunner {
 			// if it's active in memory then it's a trigger
 			// so remove from list of actives workflows
 			if (this.activeWorkflows.isActive(workflowId)) {
-				this.activeWorkflows.remove(workflowId);
+				await this.activeWorkflows.remove(workflowId);
+				Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
 			}
 
 			return;

From 4801510b0cbc86390f8e3ca8eef008c2880f14ec Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 12 May 2021 18:01:12 -0500
Subject: [PATCH 173/231] :zap: Minor improvements

---
 packages/cli/src/ActiveWorkflowRunner.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index c0ae7c76be..60b10b5b08 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -35,7 +35,7 @@ import {
 } from 'n8n-workflow';
 
 import * as express from 'express';
-import { 
+import {
 	LoggerProxy as Logger,
 } from 'n8n-workflow';
 
@@ -67,15 +67,15 @@ export class ActiveWorkflowRunner {
 
 			for (const workflowData of workflowsData) {
 				console.log(`   - ${workflowData.name}`);
-				Logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {workflowName: workflowData.name, workflowId: workflowData.id});
+				Logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, { workflowName: workflowData.name, workflowId: workflowData.id });
 				try {
 					await this.add(workflowData.id.toString(), 'init', workflowData);
-					Logger.verbose(`Successfully started workflow "${workflowData.name}"`, {workflowName: workflowData.name, workflowId: workflowData.id});
+					Logger.verbose(`Successfully started workflow "${workflowData.name}"`, { workflowName: workflowData.name, workflowId: workflowData.id });
 					console.log(`     => Started`);
 				} catch (error) {
 					console.log(`     => ERROR: Workflow could not be activated:`);
 					console.log(`               ${error.message}`);
-					Logger.error(`Unable to initialize workflow "${workflowData.name}" (startup)`, {workflowName: workflowData.name, workflowId: workflowData.id});
+					Logger.error(`Unable to initialize workflow "${workflowData.name}" (startup)`, { workflowName: workflowData.name, workflowId: workflowData.id });
 				}
 			}
 			Logger.verbose('Finished initializing active workflows (startup)');
@@ -188,7 +188,7 @@ export class ActiveWorkflowRunner {
 		}
 
 		const nodeTypes = NodeTypes();
-		const workflow = new Workflow({ id: webhook.workflowId.toString(), name: workflowData.name, nodes: workflowData.nodes, connections: workflowData.connections, active: workflowData.active, nodeTypes, staticData: workflowData.staticData, settings: workflowData.settings});
+		const workflow = new Workflow({ id: webhook.workflowId.toString(), name: workflowData.name, nodes: workflowData.nodes, connections: workflowData.connections, active: workflowData.active, nodeTypes, staticData: workflowData.staticData, settings: workflowData.settings });
 
 		const credentials = await WorkflowCredentials([workflow.getNode(webhook.node as string) as INode]);
 
@@ -225,8 +225,8 @@ export class ActiveWorkflowRunner {
 	 * @returns {Promise<string[]>}
 	 * @memberof ActiveWorkflowRunner
 	 */
-	async getWebhookMethods(path: string) : Promise<string[]> {
-		const webhooks = await Db.collections.Webhook?.find({ webhookPath: path}) as IWebhookDb[];
+	async getWebhookMethods(path: string): Promise<string[]> {
+		const webhooks = await Db.collections.Webhook?.find({ webhookPath: path }) as IWebhookDb[];
 
 		// Gather all request methods in string array
 		const webhookMethods: string[] = webhooks.map(webhook => webhook.method);
@@ -463,7 +463,7 @@ export class ActiveWorkflowRunner {
 	 * @returns {IGetExecuteTriggerFunctions}
 	 * @memberof ActiveWorkflowRunner
 	 */
-	getExecuteTriggerFunctions(workflowData: IWorkflowDb, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): IGetExecuteTriggerFunctions{
+	getExecuteTriggerFunctions(workflowData: IWorkflowDb, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): IGetExecuteTriggerFunctions {
 		return ((workflow: Workflow, node: INode) => {
 			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(workflow, node, additionalData, mode, activation);
 			returnFunctions.emit = (data: INodeExecutionData[][]): void => {

From 6cf5e3c974137e5392a8fef24d9ac484a8f4dc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 14 May 2021 21:17:39 +0200
Subject: [PATCH 174/231] :art: Replace Zulip logo (#1790)

---
 packages/nodes-base/nodes/Zulip/Zulip.node.ts |   2 +-
 packages/nodes-base/nodes/Zulip/zulip.png     | Bin 2389 -> 0 bytes
 packages/nodes-base/nodes/Zulip/zulip.svg     |  12 ++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 delete mode 100644 packages/nodes-base/nodes/Zulip/zulip.png
 create mode 100644 packages/nodes-base/nodes/Zulip/zulip.svg

diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 15eadc4861..86b5af80bf 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -41,7 +41,7 @@ export class Zulip implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Zulip',
 		name: 'zulip',
-		icon: 'file:zulip.png',
+		icon: 'file:zulip.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Zulip/zulip.png b/packages/nodes-base/nodes/Zulip/zulip.png
deleted file mode 100644
index 77b3d0411ba26cba02e94df6f59e261c008644dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2389
zcmW+%2{_c-8$OdESLk1Ei6LX``w}%>U0EmFFd@4LLo=mpqfl{WVv4L8DKsSw$&77~
zC9;ftnK47zw`jX=A+DPG|J?8S&iT%Hzwdj`d!FY!&!ONPPf3W$iU9y5Y;CNZp?G3v
zhzji>C=D|Jc5UMvT&<z)(8N&n+rbyyo-!VfHOsA-8f49mzTk9Mj`i10Kx=Nz)ClBE
zet*?}Wvsa!q=MVSn&CoTKR3$Y_p)X<6};Z6H-ojaoa)Kp>ZxI<y<)6~Io=OZK_n0-
zgSS%#9mJaDRE+jkz8Qd0ObDFgLaEvr4m8)zjWYRt^$R>mOc}4NVr;CE-w)N-K!k4w
zUyQJKG;r9JV*`*ww6#+l*4$3EYGSa0)Af9~3j!eq2&owDVUF!+hSXL<GPpgJZwDa$
z+G!3XxO!p;YH66~H_Y;&TfAHtubbw+dOy{?JOOEbxj4?6;vDuq+Wl=gwm1`Y<&=Wo
z@s2MG?W^;xpJtkt-q1(dm7*|85mt&Jrb?GB6@pGExEsm28ov5C^`xgcwkSg>)=v4N
zg+{Oiif9Hx^=l_bt}&>}6c;5jPUD7C+vnN3nbAkxFJqo($I>#aB0aRC?9?MpX<Wi+
z2Uw_hpaJO!Fa-b&o({HNFTEG@EK57fM={k^DFLe$i&eYkph>jW^EF2Xn5g=g0K5wD
zK>%wQumfFdOJ$r+b3D$3;HY@rPVI`VPN)q?#T+?@0m;^?m#x$T%}_z6>VBpOoF4E}
z0{%$gCIy`L6!z5Ty{<~Cco<%MCo(t1?=I=gUxcIg0<5lhDW<#Y-gdXV<Yw@fizeAw
zGx4-aqLXo?lkp`7HG&0*{u5k7gPVrZu6iI$M+&D6i0Z&a4tPid$AiELUeH;0ySap1
zPfMtIaFvmBjg}qrBqQiSynQlWC;1GL><CN8Dkfs}qp={tOonhm(F={R(+2*UFndK1
zav0d{1zG^efKq-JwYw&pU76Nen#?Q;XJmvHlKtojXXy#&^Wr^Au3O|0j5E#}rFx^|
z-DT69<!_%BC)-NLVRT*oRJK2Y!0P^PtqMpY00q5zp#J6h6cjK~&W<hs_VXuPAiDK^
z6ZL&t@MC*xV`HO@Zf(82wfW5fAtNRDx;i+>ZfkBXFE61|BP0F%lto0OR%ak%v)fu3
zj2n<S<R_N410dXCYh~_g!+uJ=f|E5r)cKoDYRTqw+-h^3kfd&_d;#3m^)a0SOH%Go
zCK`1a8DqI|#?Ai~Y)&7^_Jtq3q}$_gRcLeQOJm)q&n>Io2YrRbS}*W4n-S4}dr+|V
zKH%yuGBnSO$SVgM)yIt4y|qa@{W_#CN2n%qU%oRwzjj;tEE4$i9xFE(w>hwTfAt%~
z8zU$)JM7hw!%M9LAb67W?Aoz=xuRuOqBNwqa3Ri4)}Y?u`0|<zPei=F(#KnyE@GZS
zc5FD;V&hfgO8%z}f77#^?{Lxl;B$PVjiIQT=&^nb(?*$h=H0DPBJ4(Yhlr8<BT>|E
za_oH$ig|ijVfI8+J{&1q$wOFuO$<{{gxzuu$THI|zTtf=ZJbClGVctVp79rNS0)Qt
z65S(5y6f(;Q2xIpE%OoR>S&V9lNibKz~k`$B&~}=;U@1hwqfT7+n!%2EA58S*`6!m
znDXD(hOuDLGfQVF(V`fspi0{|5yl|<q^%nY=6-ddyg)Br&d0@lR~0U4s)Ad}qfo@2
zxoYx&dP9m{=Va8Q61T7x<Es{dSc3Cxl5KQXH7#W5?yh`&MWgi}E5jpClEDi<Ew?p;
zy}pLU+VHu$ru_DO_5K0;5}`ZaRuxS6(Lvk2GS9z8L`HJhX>rUCt$}3GwUj=2AIXG&
zT%3f{eA`(?UhCgDcMI<J_b=ucyy2_#m0<0^6W>NH89&WIee9jXBgNA8z(ytZgfx5B
zY<yj8ct>B!gS(WQGtwImm=O9pgwq%EsAB11Ue&Utc5!WJ(spa(Tw_)Ln)5;L{ke|D
zD^#}Rgdt%*k&2>FNj?Akt^H`$LVy;W&>sxkJGoBysC$avlw%P1&5QbBAs~4#Lga-z
zVqa>wicg--K$;4CTHmqY-|#8pbL_7Xd-GNI?lxlHP|QMl>_=D2Bz!EjUtdcMFAST-
z(ZAqm7mj_JfW1$bI_VRmzF8$H2P-M}BEZ-Pks6N>cP-j}(%aNKMe^=fBwjU<IFHp@
z4^g!AJn!+`eN#j%H>52yZ}aXSWl#2GGtSCJ3v%pG8wIPH<))hYM87;_Sc(`dZXj1C
zcrd>)lKqn#p%Ij+nY0;Xob~;WCxTQh%-<~EJ7Py3$eXYWPp@p{>B*hW<ymj;&VzsY
zytqQAGqu??nwW;l26@jZKAseC<n{2Cq0j&3=B=#6+&_g;Dbv^|@s2oAO%y|mGqZg&
z3o`sEwze&ej-|y`QHQeKgTv7d`noa=%XCtyhT^&K-ri;BR@5PijH=YavRs{Gn(=+@
zz~H8NEj$X7M;J$!-YtsM<N1U2=`#p*wLYVZw|-kNKdN>np6l;H9GF112Mxl5^7Xf$
zM^sgFpNVrmZroB)JNk{?fr4|-9th0@Zqg^?CUcf<&d;xxHXv*%4!0juTWnVPvY*}h
zG-nP9a|?}dw!Iwz_0z3F`rBWNFN<>ypZvZ|U9D@;@hglDdD2SHX-s-79V-4dSDE}}
z;*s9)z|B2lqK3f|{bSmTsVrq3ahngtp>ZA_u2E6_^N2=0)zImt;~E+SZw~9Y(t)tR
z;nxX=Ek|EgPAumuzS`=lJfP(!_h;;nt>%aAulQQ0*B>9UfUV>R7EP0nYm31dordv0
ze|)-lfk^yNMGhy(s3+k7=P?zjD;FVoLbYpGgh_N6471s$u{qRZprRA|o|e8wH~wDL
ze`$O%are_H&+#FAnnlssOJ-N+r6rq-s1F~CN0`JhcrSx`3_T(aPRA3AsR$>UWgoZY
zUB$rB>wlztmSMXs6`(U8WM>ze>I%%g;u|=1!?gW(BD|T=^6E?}3v-Huuxx=Je(1#z
zU^-E(JLNxXT09eZI^{CyyWxw^v47uLFzse$P;&t1e2X>jCn52>rR9Q?*2WB0?mSXJ
yP!JG&1cdtn0$*@kb&F*7<=6SeU$lP4!tCY1f+nn7JX2xkr?9nlw5qW1Py9cZf1I5F

diff --git a/packages/nodes-base/nodes/Zulip/zulip.svg b/packages/nodes-base/nodes/Zulip/zulip.svg
new file mode 100644
index 0000000000..82b59ed82c
--- /dev/null
+++ b/packages/nodes-base/nodes/Zulip/zulip.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#24ADFF" offset="0%"></stop>
+            <stop stop-color="#7B71FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g>
+        <path d="M128,0 C198.692448,0 256,57.307552 256,128 C256,198.692448 198.692448,256 128,256 C57.307552,256 0,198.692448 0,128 C0,57.307552 57.307552,0 128,0 Z M121.679533,118.222163 L75.7877336,159.200897 C71.0603547,162.920702 67.9584879,169.060511 67.9584879,175.967416 C67.9584879,187.245548 76.232162,196.475047 86.3444303,196.475047 L172.590938,196.475047 C182.703207,196.475047 190.976881,187.245548 190.976881,175.967416 C190.976881,164.68624 182.703207,155.459784 172.590938,155.459784 L107.299534,155.459784 C106.331533,155.459784 105.719683,154.300009 106.191507,153.356359 L123.024994,119.652857 C123.639888,118.669635 122.531861,117.491595 121.679533,118.222163 Z M172.590938,59.3627915 L86.3444303,59.3627915 C76.232162,59.3627915 67.9584879,68.58925 67.9584879,79.870426 C67.9584879,91.1485579 76.232162,100.378058 86.3444303,100.378058 L86.3444303,100.378058 L151.635834,100.378058 C152.603836,100.378058 153.215686,101.537833 152.743861,102.481482 L152.743861,102.481482 L135.910374,136.184985 C135.29548,137.168207 136.403507,138.346246 137.255836,137.615679 L137.255836,137.615679 L183.147635,96.6308563 C187.875014,92.9080074 190.976881,86.7712425 190.976881,79.8643379 C190.976881,68.586206 182.703207,59.3567064 172.590938,59.3627915 L172.590938,59.3627915 Z" fill="url(#linearGradient-1)"></path>
+    </g>
+</svg>
\ No newline at end of file

From 1aa0a5cc8d6e5154aa4c9604b7f7284773c6d2ee Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 14 May 2021 18:16:48 -0500
Subject: [PATCH 175/231] :zap: Make it possible to read sibling parameter

---
 packages/core/src/NodeExecuteFunctions.ts     |  8 +++---
 .../src/components/VariableSelector.vue       |  2 +-
 packages/workflow/src/Expression.ts           | 14 +++++-----
 packages/workflow/src/WorkflowDataProxy.ts    | 28 ++++++++++++++-----
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index aeeb39c810..726526afc1 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -691,7 +691,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
 				return continueOnFail(node);
 			},
 			evaluateExpression: (expression: string, itemIndex: number) => {
-				return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode);
+				return workflow.expression.resolveSimpleParameterValue('=' + expression, {}, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode);
 			},
 			async executeWorkflow(workflowInfo: IExecuteWorkflowInfo, inputData?: INodeExecutionData[]): Promise<any> { // tslint:disable-line:no-any
 				return additionalData.executeWorkflow(workflowInfo, additionalData, inputData);
@@ -742,7 +742,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
 				return getWorkflowMetadata(workflow);
 			},
 			getWorkflowDataProxy: (itemIndex: number): IWorkflowDataProxyData => {
-				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode);
+				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, {}, mode);
 				return dataProxy.getDataProxy();
 			},
 			getWorkflowStaticData(type: string): IDataObject {
@@ -789,7 +789,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
 			},
 			evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => {
 				evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex;
-				return workflow.expression.resolveSimpleParameterValue('=' + expression, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData, mode);
+				return workflow.expression.resolveSimpleParameterValue('=' + expression, {}, runExecutionData, runIndex, evaluateItemIndex, node.name, connectionInputData, mode);
 			},
 			getContext(type: string): IContextObject {
 				return NodeHelpers.getContext(runExecutionData, type, node);
@@ -841,7 +841,7 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
 				return getWorkflowMetadata(workflow);
 			},
 			getWorkflowDataProxy: (): IWorkflowDataProxyData => {
-				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, mode);
+				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, node.name, connectionInputData, {}, mode);
 				return dataProxy.getDataProxy();
 			},
 			getWorkflowStaticData(type: string): IDataObject {
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index c4d031859a..2ddb7458b9 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -379,7 +379,7 @@ export default mixins(
 					return returnData;
 				}
 
-				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, nodeName, connectionInputData, 'manual');
+				const dataProxy = new WorkflowDataProxy(workflow, runExecutionData, runIndex, itemIndex, nodeName, connectionInputData, {}, 'manual');
 				const proxy = dataProxy.getDataProxy();
 
 				// @ts-ignore
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 0cfc80e2a2..c653422308 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -59,7 +59,7 @@ export class Expression {
 	 * @returns {(NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[])}
 	 * @memberof Workflow
 	 */
-	resolveSimpleParameterValue(parameterValue: NodeParameterValue, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString = false, selfData = {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
+	resolveSimpleParameterValue(parameterValue: NodeParameterValue, siblingParameters: INodeParameters, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, returnObjectAsString = false, selfData = {}): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] {
 		// Check if it is an expression
 		if (typeof parameterValue !== 'string' || parameterValue.charAt(0) !== '=') {
 			// Is no expression so return value
@@ -72,7 +72,7 @@ export class Expression {
 		parameterValue = parameterValue.substr(1);
 
 		// Generate a data proxy which allows to query workflow data
-		const dataProxy = new WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, -1, selfData);
+		const dataProxy = new WorkflowDataProxy(this.workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, -1, selfData);
 		const data = dataProxy.getDataProxy();
 
 		// Execute the expression
@@ -179,17 +179,17 @@ export class Expression {
 		};
 
 		// Helper function which resolves a parameter value depending on if it is simply or not
-		const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) => {
+		const resolveParameterValue = (value: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[], siblingParameters: INodeParameters) => {
 			if (isComplexParameter(value)) {
 				return this.getParameterValue(value, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
 			} else {
-				return this.resolveSimpleParameterValue(value as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
+				return this.resolveSimpleParameterValue(value as NodeParameterValue, siblingParameters, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
 			}
 		};
 
 		// Check if it value is a simple one that we can get it resolved directly
 		if (!isComplexParameter(parameterValue)) {
-			return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
+			return this.resolveSimpleParameterValue(parameterValue as NodeParameterValue, {}, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, mode, returnObjectAsString, selfData);
 		}
 
 		// The parameter value is complex so resolve depending on type
@@ -198,7 +198,7 @@ export class Expression {
 			// Data is an array
 			const returnData = [];
 			for (const item of parameterValue) {
-				returnData.push(resolveParameterValue(item));
+				returnData.push(resolveParameterValue(item, {}));
 			}
 
 			if (returnObjectAsString === true && typeof returnData === 'object') {
@@ -212,7 +212,7 @@ export class Expression {
 			// Data is an object
 			const returnData: INodeParameters = {};
 			for (const key of Object.keys(parameterValue)) {
-				returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key]);
+				returnData[key] = resolveParameterValue((parameterValue as INodeParameters)[key], parameterValue as INodeParameters);
 			}
 
 			if (returnObjectAsString === true && typeof returnData === 'object') {
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index b81a0263f0..562a4897f6 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -1,9 +1,11 @@
 import {
 	IDataObject,
 	INodeExecutionData,
+	INodeParameters,
 	IRunExecutionData,
 	IWorkflowDataProxyData,
 	NodeHelpers,
+	NodeParameterValue,
 	Workflow,
 	WorkflowExecuteMode,
 } from './';
@@ -18,12 +20,13 @@ export class WorkflowDataProxy {
 	private itemIndex: number;
 	private activeNodeName: string;
 	private connectionInputData: INodeExecutionData[];
+	private siblingParameters: INodeParameters;
 	private mode: WorkflowExecuteMode;
 	private selfData: IDataObject;
 
 
 
-	constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], mode: WorkflowExecuteMode, defaultReturnRunIndex = -1, selfData = {}) {
+	constructor(workflow: Workflow, runExecutionData: IRunExecutionData | null, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, defaultReturnRunIndex = -1, selfData = {}) {
 		this.workflow = workflow;
 		this.runExecutionData = runExecutionData;
 		this.defaultReturnRunIndex = defaultReturnRunIndex;
@@ -31,6 +34,7 @@ export class WorkflowDataProxy {
 		this.itemIndex = itemIndex;
 		this.activeNodeName = activeNodeName;
 		this.connectionInputData = connectionInputData;
+		this.siblingParameters = siblingParameters;
 		this.mode = mode;
 		this.selfData = selfData;
 	}
@@ -108,12 +112,22 @@ export class WorkflowDataProxy {
 			get(target, name, receiver) {
 				name = name.toString();
 
-				if (!node.parameters.hasOwnProperty(name)) {
-					// Parameter does not exist on node
-					throw new Error(`Could not find parameter "${name}" on node "${nodeName}"`);
-				}
+				let returnValue: INodeParameters | NodeParameterValue | NodeParameterValue[] | INodeParameters[];
+				if (name[0] === '/') {
+					const key = name.slice(1);
+					if (!that.siblingParameters.hasOwnProperty(key)) {
+						throw new Error(`Could not find sibling parameter "${key}" on node "${nodeName}"`);
 
-				const returnValue = node.parameters[name];
+					}
+					returnValue = that.siblingParameters[key];
+				} else {
+					if (!node.parameters.hasOwnProperty(name)) {
+						// Parameter does not exist on node
+						throw new Error(`Could not find parameter "${name}" on node "${nodeName}"`);
+					}
+
+					returnValue = node.parameters[name];
+				}
 
 				if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') {
 					// The found value is an expression so resolve it
@@ -361,7 +375,7 @@ export class WorkflowDataProxy {
 			},
 			$item: (itemIndex: number, runIndex?: number) => {
 				const defaultReturnRunIndex = runIndex === undefined ? -1 : runIndex;
-				const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.mode, defaultReturnRunIndex);
+				const dataProxy = new WorkflowDataProxy(this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.activeNodeName, this.connectionInputData, that.siblingParameters, that.mode, defaultReturnRunIndex);
 				return dataProxy.getDataProxy();
 			},
 			$items: (nodeName?: string, outputIndex?: number, runIndex?: number) => {

From 05dc0c327e63957b7e2c4c11e140f9a5bd30c88f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 14 May 2021 18:20:21 -0500
Subject: [PATCH 176/231] :zap: Change used symbol for sibling parameter

---
 packages/workflow/src/WorkflowDataProxy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 562a4897f6..fe52de7a07 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -113,7 +113,7 @@ export class WorkflowDataProxy {
 				name = name.toString();
 
 				let returnValue: INodeParameters | NodeParameterValue | NodeParameterValue[] | INodeParameters[];
-				if (name[0] === '/') {
+				if (name[0] === '&') {
 					const key = name.slice(1);
 					if (!that.siblingParameters.hasOwnProperty(key)) {
 						throw new Error(`Could not find sibling parameter "${key}" on node "${nodeName}"`);

From cb2887a8ab6a7b6e3ae23fdf8bdffda30a5142d8 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 15 May 2021 00:28:51 -0500
Subject: [PATCH 177/231] :bug: Fix issue that expressions did not resolve for
 displayOptions

---
 .../src/components/ParameterInput.vue         |  2 +-
 .../src/components/ParameterInputList.vue     | 40 +++++++++++++++++--
 .../src/components/mixins/workflowHelpers.ts  | 15 ++++++-
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 225859590f..25a68a8173 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -466,7 +466,7 @@ export default mixins(
 					} else if (typeof nodeParameters[key] === 'object') {
 						returnData[key] = this.getResolveNodeParameters(nodeParameters[key] as INodeParameters);
 					} else {
-						returnData[key] = this.resolveExpression(nodeParameters[key] as string);
+						returnData[key] = this.resolveExpression(nodeParameters[key] as string, nodeParameters);
 					}
 				}
 				return returnData;
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 939452e3a0..c34c0c94f4 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -86,7 +86,7 @@ import { IUpdateInformation } from '@/Interface';
 
 import MultipleParameter from '@/components/MultipleParameter.vue';
 import { genericHelpers } from '@/components/mixins/genericHelpers';
-import { nodeHelpers } from '@/components/mixins/nodeHelpers';
+import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 
 import { get } from 'lodash';
@@ -95,7 +95,7 @@ import mixins from 'vue-typed-mixins';
 
 export default mixins(
 	genericHelpers,
-	nodeHelpers,
+	workflowHelpers,
 )
 	.extend({
 		name: 'ParameterInputList',
@@ -157,7 +157,41 @@ export default mixins(
 					// If it is not defined no need to do a proper check
 					return true;
 				}
-				return this.displayParameter(this.nodeValues, parameter, this.path);
+
+				const nodeValues = {};
+				let rawValues = this.nodeValues;
+				if (this.path) {
+					rawValues = get(this.nodeValues, this.path);
+				}
+
+				// Resolve expressions
+				const resolveKeys = Object.keys(rawValues);
+				let key: string;
+				let i = 0;
+				do {
+					key = resolveKeys.shift();
+					if (typeof rawValues[key] === 'string' && rawValues[key].charAt(0) === '=') {
+						// Contains an expression that
+						if (rawValues[key].includes('$parameter') && resolveKeys.some(parameterName => rawValues[key].includes(parameterName))) {
+							// Contains probably an expression of a missing parameter so skip
+							resolveKeys.push(key);
+							continue;
+						} else {
+							// Contains probably no expression with a missing parameter so resolve
+							nodeValues[key] = this.resolveExpression(rawValues[key], nodeValues);
+						}
+					} else {
+						// Does not contain an expression, add directly
+						nodeValues[key] = rawValues[key];
+					}
+					// TODO: Think about how to calculate this best
+					if (i++ > 50) {
+						// Make sure we do not get caught
+						break;
+					}
+				} while(resolveKeys.length !== 0);
+
+				return this.displayParameter(nodeValues, parameter, '');
 			},
 			valueChanged (parameterData: IUpdateInformation): void {
 				this.$emit('valueChanged', parameterData);
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index b3ba72b272..30dbc34e5b 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -2,9 +2,11 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 
 import {
 	IConnections,
+	IDataObject,
 	INode,
 	INodeExecutionData,
 	INodeIssues,
+	INodeParameters,
 	INodeType,
 	INodeTypes,
 	INodeTypeData,
@@ -336,7 +338,7 @@ export const workflowHelpers = mixins(
 			},
 
 			// Executes the given expression and returns its value
-			resolveExpression (expression: string) {
+			resolveExpression (expression: string, siblingParameters: INodeParameters) {
 				const inputIndex = 0;
 				const itemIndex = 0;
 				const runIndex = 0;
@@ -362,7 +364,16 @@ export const workflowHelpers = mixins(
 					connectionInputData = [];
 				}
 
-				return workflow.expression.getParameterValue(expression, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', true);
+				const parameters = {
+					'__xxxxxxx__': expression,
+					...siblingParameters,
+				};
+				const returnData =  workflow.expression.getParameterValue(parameters, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', false) as IDataObject;
+
+				if (typeof returnData['__xxxxxxx__'] === 'object') {
+					return workflow.expression.convertObjectValueToString(returnData['__xxxxxxx__'] as object);
+				}
+				return returnData['__xxxxxxx__'];
 			},
 
 			// Saves the currently loaded workflow to the database.

From 446c2845403453b7b6d928616d2d393495e16099 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 15 May 2021 00:36:41 -0500
Subject: [PATCH 178/231] :shirt: Fix lint issue

---
 packages/editor-ui/src/components/ParameterInputList.vue    | 6 +++---
 packages/editor-ui/src/components/mixins/workflowHelpers.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index c34c0c94f4..1fc75ebf16 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -76,9 +76,9 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
 
 import {
+	INodeParameters,
 	INodeProperties,
 } from 'n8n-workflow';
 
@@ -158,7 +158,7 @@ export default mixins(
 					return true;
 				}
 
-				const nodeValues = {};
+				const nodeValues: INodeParameters = {};
 				let rawValues = this.nodeValues;
 				if (this.path) {
 					rawValues = get(this.nodeValues, this.path);
@@ -169,7 +169,7 @@ export default mixins(
 				let key: string;
 				let i = 0;
 				do {
-					key = resolveKeys.shift();
+					key = resolveKeys.shift() as string;
 					if (typeof rawValues[key] === 'string' && rawValues[key].charAt(0) === '=') {
 						// Contains an expression that
 						if (rawValues[key].includes('$parameter') && resolveKeys.some(parameterName => rawValues[key].includes(parameterName))) {
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index 30dbc34e5b..aceef67fcc 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -338,7 +338,7 @@ export const workflowHelpers = mixins(
 			},
 
 			// Executes the given expression and returns its value
-			resolveExpression (expression: string, siblingParameters: INodeParameters) {
+			resolveExpression (expression: string, siblingParameters: INodeParameters = {}) {
 				const inputIndex = 0;
 				const itemIndex = 0;
 				const runIndex = 0;

From 55c261658a1a9470d22258a399a79f586647c411 Mon Sep 17 00:00:00 2001
From: Daniel Lazaro <mynameislizardo@gmail.com>
Date: Sat, 15 May 2021 12:02:07 -0400
Subject: [PATCH 179/231] :zap: Fix typo (#1793)

---
 packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index c76e783351..aa71a8fb86 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -18,7 +18,7 @@ export class TogglTrigger implements INodeType {
 		icon: 'file:toggl.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Toggl events occure',
+		description: 'Starts the workflow when Toggl events occur',
 		defaults: {
 			name: 'Toggl',
 			color: '#00FF00',

From fd86229b3029efe1d8e7e963cbe8c0f454b44aac Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 15 May 2021 17:51:14 -0500
Subject: [PATCH 180/231] :bug: Fix issue that it did not save values for
 parameters which did get displayed depending on another parameter with
 expression

---
 .../editor-ui/src/components/NodeSettings.vue |   7 +-
 .../src/components/ParameterInput.vue         |   4 +-
 .../src/components/ParameterInputList.vue     |  25 +++-
 .../src/components/mixins/workflowHelpers.ts  |   1 -
 packages/workflow/src/NodeHelpers.ts          |   4 +
 packages/workflow/test/NodeHelpers.test.ts    | 127 +++++++++++++++++-
 6 files changed, 157 insertions(+), 11 deletions(-)

diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 7bdf7ea5dd..303b1fcb26 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -37,9 +37,6 @@
 <script lang="ts">
 import Vue from 'vue';
 import {
-	INodeIssues,
-	INodeIssueData,
-	INodeIssueObjectProperty,
 	INodeTypeDescription,
 	INodeParameters,
 	INodeProperties,
@@ -409,9 +406,9 @@ export default mixins(
 						name: node.name,
 						value: nodeParameters,
 					};
-					
+
 					this.$store.commit('setNodeParameters', updateInformation);
-					
+
 					this.$externalHooks().run('nodeSettings.valueChanged', { parameterPath, newValue, parameters: this.parameters, oldNodeParameters });
 
 					this.updateNodeParameterIssues(node, nodeType);
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 25a68a8173..ae2be2e8cd 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -464,9 +464,9 @@ export default mixins(
 							return this.resolveExpression(value as string) as string;
 						});
 					} else if (typeof nodeParameters[key] === 'object') {
-						returnData[key] = this.getResolveNodeParameters(nodeParameters[key] as INodeParameters);
+						returnData[key] = this.getResolveNodeParameters(nodeParameters[key] as INodeParameters) as INodeParameters;
 					} else {
-						returnData[key] = this.resolveExpression(nodeParameters[key] as string, nodeParameters);
+						returnData[key] = this.resolveExpression(nodeParameters[key] as string, nodeParameters) as NodeParameterValue;
 					}
 				}
 				return returnData;
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 1fc75ebf16..3eee27653b 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -80,6 +80,7 @@
 import {
 	INodeParameters,
 	INodeProperties,
+	NodeParameterValue,
 } from 'n8n-workflow';
 
 import { IUpdateInformation } from '@/Interface';
@@ -110,9 +111,12 @@ export default mixins(
 			'hideDelete', // boolean
 		],
 		computed: {
-			filteredParameters (): INodeProperties {
+			filteredParameters (): INodeProperties[] {
 				return this.parameters.filter((parameter: INodeProperties) => this.displayNodeParameter(parameter));
 			},
+			filteredParameterNames (): string[] {
+				return this.filteredParameters.map(parameter => parameter.name);
+			},
 		},
 		methods: {
 			multipleValues (parameter: INodeProperties): boolean {
@@ -178,7 +182,7 @@ export default mixins(
 							continue;
 						} else {
 							// Contains probably no expression with a missing parameter so resolve
-							nodeValues[key] = this.resolveExpression(rawValues[key], nodeValues);
+							nodeValues[key] = this.resolveExpression(rawValues[key], nodeValues) as NodeParameterValue;
 						}
 					} else {
 						// Does not contain an expression, add directly
@@ -197,6 +201,23 @@ export default mixins(
 				this.$emit('valueChanged', parameterData);
 			},
 		},
+		watch: {
+			filteredParameterNames(newValue, oldValue) {
+				// After a parameter does not get displayed anymore make sure that its value gets removed
+				// Is only needed for the edge-case when a parameter gets displayed depending on another field
+				// which contains an expression.
+				for (const parameter of oldValue) {
+					if (!newValue.includes(parameter)) {
+						const parameterData = {
+							name: `${this.path}.${parameter}`,
+							node: this.$store.getters.activeNode.name,
+							value: undefined,
+						};
+						this.$emit('valueChanged', parameterData);
+					}
+				}
+			},
+		},
 		beforeCreate: function () { // tslint:disable-line
 		// Because we have a circular dependency on CollectionParameter import it here
 		// to not break Vue.
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index aceef67fcc..9d4d476390 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -337,7 +337,6 @@ export const workflowHelpers = mixins(
 				return nodeData;
 			},
 
-			// Executes the given expression and returns its value
 			resolveExpression (expression: string, siblingParameters: INodeParameters = {}) {
 				const inputIndex = 0;
 				const itemIndex = 0;
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 52f3e2668a..65715e3fa4 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -296,6 +296,10 @@ export function displayParameter(nodeValues: INodeParameters, parameter: INodePr
 				values.push.apply(values, value);
 			}
 
+			if (values.some(v => (typeof v) === 'string' && (v as string).charAt(0) === '=')) {
+				return true;
+			}
+
 			if (values.length === 0 || !parameter.displayOptions.show[propertyName].some(v => values.includes(v))) {
 				return false;
 			}
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 0e0c01c185..ceb3611b3f 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -2677,7 +2677,7 @@ describe('Workflow', () => {
 					},
 				},
 				{
-				description: 'complex type "fixedCollection" with "multipleValues: true". Which contains complex type "fixedCollection" with "multipleValues: true". One value set.',
+					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains complex type "fixedCollection" with "multipleValues: true". One value set.',
 					input: {
 						nodePropertiesArray: [
 							{
@@ -2814,6 +2814,131 @@ describe('Workflow', () => {
 						},
 					},
 				},
+				{
+					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameters which get displayed on a parameter with a default expression with relative parameter references.',
+					input: {
+						nodePropertiesArray: [
+							{
+								displayName: 'Values1',
+								name: 'values1',
+								type: 'fixedCollection',
+								typeOptions: {
+									multipleValues: true,
+								},
+								description: 'The value to set.',
+								default: {},
+								options: [
+									{
+										displayName: 'Options1',
+										name: 'options1',
+										values: [
+											{
+												displayName: 'Key',
+												name: 'key',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Type',
+												name: 'type',
+												type: 'hidden',
+												default: '={{$parameter["&key"].split("|")[1]}}',
+											},
+											{
+												displayName: 'Title Value',
+												name: 'titleValue',
+												displayOptions: {
+													show: {
+														type: [
+															'title',
+														],
+													},
+												},
+												type: 'string',
+												default: 'defaultTitle',
+											},
+											{
+												displayName: 'Title Number',
+												name: 'numberValue',
+												displayOptions: {
+													show: {
+														type: [
+															'number',
+														],
+													},
+												},
+												type: 'number',
+												default: 1,
+											},
+										],
+									},
+								],
+							},
+						],
+						nodeValues: {
+							values1: {
+								options1: [
+									{
+										key: 'asdf|title',
+										titleValue: 'different',
+									},
+								],
+							},
+						},
+					},
+					output: {
+						noneDisplayedFalse: {
+							defaultsFalse: {
+								values1: {
+									options1: [
+										{
+											key: 'asdf|title',
+											titleValue: 'different',
+										},
+									],
+								},
+							},
+							defaultsTrue: {
+								values1: {
+									options1: [
+										{
+											key: 'asdf|title',
+											type: '={{$parameter["&key"].split("|")[1]}}',
+											// This is not great that it displays this theoretically hidden parameter
+											// but because we can not resolve the values for now
+											numberValue: 1,
+											titleValue: 'different',
+										},
+									],
+								},
+							},
+						},
+						noneDisplayedTrue: {
+							defaultsFalse: {
+								values1: {
+									options1: [
+										{
+											key: 'asdf|title',
+											titleValue: 'different',
+										},
+									],
+								},
+							},
+							defaultsTrue: {
+								values1: {
+									options1: [
+										{
+											key: 'asdf|title',
+											type: '={{$parameter["&key"].split("|")[1]}}',
+											titleValue: 'different',
+											numberValue: 1,
+										},
+									],
+								},
+							},
+						},
+					},
+				},
 			];
 
 

From 0877b0779d9ac179fef12db789c2e29044a09e57 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 15 May 2021 18:59:33 -0500
Subject: [PATCH 181/231] :bug: Fix issue with displaying parameter with root
 level reference

---
 .../src/components/ParameterInputList.vue        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 3eee27653b..21f55127f5 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -90,7 +90,7 @@ import { genericHelpers } from '@/components/mixins/genericHelpers';
 import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 
-import { get } from 'lodash';
+import { get, set } from 'lodash';
 
 import mixins from 'vue-typed-mixins';
 
@@ -172,6 +172,7 @@ export default mixins(
 				const resolveKeys = Object.keys(rawValues);
 				let key: string;
 				let i = 0;
+				let parameterGotResolved = false;
 				do {
 					key = resolveKeys.shift() as string;
 					if (typeof rawValues[key] === 'string' && rawValues[key].charAt(0) === '=') {
@@ -183,6 +184,7 @@ export default mixins(
 						} else {
 							// Contains probably no expression with a missing parameter so resolve
 							nodeValues[key] = this.resolveExpression(rawValues[key], nodeValues) as NodeParameterValue;
+							parameterGotResolved = true;
 						}
 					} else {
 						// Does not contain an expression, add directly
@@ -195,7 +197,17 @@ export default mixins(
 					}
 				} while(resolveKeys.length !== 0);
 
-				return this.displayParameter(nodeValues, parameter, '');
+				if (parameterGotResolved === true) {
+					if (this.path) {
+						rawValues = JSON.parse(JSON.stringify(this.nodeValues));
+						set(rawValues, this.path, nodeValues);
+						return this.displayParameter(rawValues, parameter, this.path);
+					} else {
+						return this.displayParameter(nodeValues, parameter, '');
+					}
+				}
+
+				return this.displayParameter(this.nodeValues, parameter, this.path);
 			},
 			valueChanged (parameterData: IUpdateInformation): void {
 				this.$emit('valueChanged', parameterData);

From 3e98612881ef0bd5d8a24731f89aba741c3eb2e5 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sun, 16 May 2021 02:33:15 +0200
Subject: [PATCH 182/231] :sparkles: Add Force node reconnect option to IMAP
 trigger node (#1792)

* Adding reconnect feature to IMAP nodes

* Fixing clear interval and persisting last UID in static data
---
 .../nodes-base/nodes/EmailReadImap.node.ts    | 86 ++++++++++++++++---
 1 file changed, 75 insertions(+), 11 deletions(-)

diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index 6c9f18bf31..fb90534a7c 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -24,6 +24,10 @@ import {
 
 import * as lodash from 'lodash';
 
+import {
+	LoggerProxy as Logger
+} from 'n8n-workflow';
+
 export class EmailReadImap implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'EmailReadImap',
@@ -158,6 +162,13 @@ export class EmailReadImap implements INodeType {
 						default: false,
 						description: 'Do connect even if SSL certificate validation is not possible.',
 					},
+					{
+						displayName: 'Force reconnect',
+						name: 'forceReconnect',
+						type: 'number',
+						default: 60,
+						description: 'Sets an interval (in minutes) to force a reconnection.',
+					},
 				],
 			},
 		],
@@ -176,16 +187,8 @@ export class EmailReadImap implements INodeType {
 		const postProcessAction = this.getNodeParameter('postProcessAction') as string;
 		const options = this.getNodeParameter('options', {}) as IDataObject;
 
-		let searchCriteria = [
-			'UNSEEN',
-		];
-		if (options.customEmailConfig !== undefined) {
-			try {
-				searchCriteria = JSON.parse(options.customEmailConfig as string);
-			} catch (error) {
-				throw new NodeOperationError(this.getNode(), `Custom email config is not valid JSON.`);
-			}
-		}
+		const staticData = this.getWorkflowStaticData('node');
+		Logger.debug('Loaded static data for node "EmailReadImap"', {staticData});
 
 		// Returns the email text
 		const getText = async (parts: any[], message: Message, subtype: string) => { // tslint:disable-line:no-any
@@ -237,7 +240,7 @@ export class EmailReadImap implements INodeType {
 
 
 		// Returns all the new unseen messages
-		const getNewEmails = async (connection: ImapSimple, searchCriteria: string[]): Promise<INodeExecutionData[]> => {
+		const getNewEmails = async (connection: ImapSimple, searchCriteria: Array<string | string[]>): Promise<INodeExecutionData[]> => {
 			const format = this.getNodeParameter('format', 0) as string;
 
 			let fetchOptions = {};
@@ -277,6 +280,12 @@ export class EmailReadImap implements INodeType {
 				const dataPropertyAttachmentsPrefixName = this.getNodeParameter('dataPropertyAttachmentsPrefixName') as string;
 
 				for (const message of results) {
+					if (staticData.lastMessageUid !== undefined && message.attributes.uid <= (staticData.lastMessageUid as number)) {
+						continue;
+					}
+					if (staticData.lastMessageUid === undefined || staticData.lastMessageUid as number < message.attributes.uid) {
+						staticData.lastMessageUid = message.attributes.uid;
+					}
 					const part = lodash.find(message.parts, { which: '' });
 
 					if (part === undefined) {
@@ -295,6 +304,12 @@ export class EmailReadImap implements INodeType {
 				}
 
 				for (const message of results) {
+					if (staticData.lastMessageUid !== undefined && message.attributes.uid <= (staticData.lastMessageUid as number)) {
+						continue;
+					}
+					if (staticData.lastMessageUid === undefined || staticData.lastMessageUid as number < message.attributes.uid) {
+						staticData.lastMessageUid = message.attributes.uid;
+					}
 					const parts = getParts(message.attributes.struct!);
 
 					newEmail = {
@@ -335,6 +350,12 @@ export class EmailReadImap implements INodeType {
 				}
 			} else if (format === 'raw') {
 				for (const message of results) {
+					if (staticData.lastMessageUid !== undefined && message.attributes.uid <= (staticData.lastMessageUid as number)) {
+						continue;
+					}
+					if (staticData.lastMessageUid === undefined || staticData.lastMessageUid as number < message.attributes.uid) {
+						staticData.lastMessageUid = message.attributes.uid;
+					}
 					const part = lodash.find(message.parts, { which: 'TEXT' });
 
 					if (part === undefined) {
@@ -366,6 +387,33 @@ export class EmailReadImap implements INodeType {
 				},
 				onmail: async () => {
 					if (connection) {
+						let searchCriteria = [
+							'UNSEEN',
+						] as Array<string | string[]>;
+						if (options.customEmailConfig !== undefined) {
+							try {
+								searchCriteria = JSON.parse(options.customEmailConfig as string);
+							} catch (error) {
+								throw new NodeOperationError(this.getNode(), `Custom email config is not valid JSON.`);
+							}
+						}
+						if (staticData.lastMessageUid !== undefined) {
+							searchCriteria.push(['UID', `${staticData.lastMessageUid as number}:*`]);
+							/** 
+							 * A short explanation about UIDs and how they work
+							 * can be found here: https://dev.to/kehers/imap-new-messages-since-last-check-44gm
+							 * TL;DR:
+							 * - You cannot filter using ['UID', 'CURRENT ID + 1:*'] because IMAP
+							 * won't return correct results if current id + 1 does not yet exist.
+							 * - UIDs can change but this is not being treated here.
+							 * If the mailbox is recreated (lets say you remove all emails, remove
+							 * the mail box and create another with same name, UIDs will change)
+							 * - You can check if UIDs changed in the above example
+							 * by checking UIDValidity.
+							 */
+							Logger.debug('Querying for new messages on node "EmailReadImap"', {searchCriteria});
+						}
+				
 						const returnData = await getNewEmails(connection, searchCriteria);
 
 						if (returnData.length) {
@@ -386,7 +434,9 @@ export class EmailReadImap implements INodeType {
 			return imapConnect(config).then(async conn => {
 				conn.on('error', async err => {
 					if (err.code.toUpperCase() === 'ECONNRESET') {
+						Logger.verbose('IMAP connection was reset - reconnecting.');
 						connection = await establishConnection();
+						await connection.openBox(mailbox);
 					}
 					throw err;
 				});
@@ -398,8 +448,22 @@ export class EmailReadImap implements INodeType {
 
 		await connection.openBox(mailbox);
 
+		let reconnectionInterval: NodeJS.Timeout | undefined;
+
+		if (options.forceReconnect !== undefined) {
+			reconnectionInterval = setInterval(async () => {
+				Logger.verbose('Forcing reconnection of IMAP node.');
+				await connection.end();
+				connection = await establishConnection();
+				await connection.openBox(mailbox);
+			}, options.forceReconnect as number * 1000 * 60);
+		}
+
 		// When workflow and so node gets set to inactive close the connectoin
 		async function closeFunction() {
+			if (reconnectionInterval) {
+				clearInterval(reconnectionInterval);
+			}
 			await connection.end();
 		}
 

From e6d67dfcafa144aef1f32eef19f5c0fe7b407b55 Mon Sep 17 00:00:00 2001
From: DerEnderKeks <DerEnderKeks@users.noreply.github.com>
Date: Sun, 16 May 2021 02:55:13 +0200
Subject: [PATCH 183/231] :sparkles: Add position parameter for playlist add
 operation of Spotify node (#1794)

---
 .../nodes-base/nodes/Spotify/Spotify.node.ts  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 762713bd2a..58210e4e9e 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -445,6 +445,25 @@ export class Spotify implements INodeType {
 				placeholder: 'spotify:track:0xE4LEFzSNGsz1F6kvXsHU',
 				description: `The track's Spotify URI or its ID. The track to add/delete from the playlist.`,
 			},
+			{
+				displayName: 'Position',
+				name: 'position',
+				type: 'string',
+				default: '',
+				required: false,
+				displayOptions: {
+					show: {
+						resource: [
+							'playlist',
+						],
+						operation: [
+							'add',
+						],
+					},
+				},
+				placeholder: '0',
+				description: `The track's new position in the playlist.`,
+			},
 			// -----------------------------------------------------
 			//         Track Operations
 			//		   Get a Track, Get a Track's Audio Features
@@ -918,15 +937,17 @@ export class Spotify implements INodeType {
 						requestMethod = 'POST';
 
 						const trackId = this.getNodeParameter('trackID', i) as string;
+						const position = this.getNodeParameter('position', i) as string;
 
 						qs = {
 							uris: trackId,
 						};
 
+						if (position.length > 0) qs.position = position;
+
 						endpoint = `/playlists/${id}/tracks`;
 
 						responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
-
 					}
 				} else if (operation === 'getUserPlaylists') {
 					requestMethod = 'GET';

From 2063333ee5617f213f286caa0ef5749562eb150c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 15 May 2021 20:01:25 -0500
Subject: [PATCH 184/231] :zap: Minor improvements to Spotify Node

---
 .../nodes-base/nodes/Spotify/Spotify.node.ts  | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 58210e4e9e..696e1fff33 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -446,11 +446,11 @@ export class Spotify implements INodeType {
 				description: `The track's Spotify URI or its ID. The track to add/delete from the playlist.`,
 			},
 			{
-				displayName: 'Position',
-				name: 'position',
-				type: 'string',
-				default: '',
-				required: false,
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
 				displayOptions: {
 					show: {
 						resource: [
@@ -461,9 +461,21 @@ export class Spotify implements INodeType {
 						],
 					},
 				},
-				placeholder: '0',
-				description: `The track's new position in the playlist.`,
+				options: [
+					{
+						displayName: 'Position',
+						name: 'position',
+						type: 'number',
+						typeOptions: {
+							minValue: 0,
+						},
+						default: 0,
+						placeholder: '0',
+						description: `The new track's position in the playlist.`,
+					},
+				],
 			},
+
 			// -----------------------------------------------------
 			//         Track Operations
 			//		   Get a Track, Get a Track's Audio Features
@@ -937,13 +949,15 @@ export class Spotify implements INodeType {
 						requestMethod = 'POST';
 
 						const trackId = this.getNodeParameter('trackID', i) as string;
-						const position = this.getNodeParameter('position', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
 						qs = {
 							uris: trackId,
 						};
 
-						if (position.length > 0) qs.position = position;
+						if (additionalFields.position !== undefined) {
+							qs.position = additionalFields.position;
+						}
 
 						endpoint = `/playlists/${id}/tracks`;
 

From 6961bc66e9409b1deaf0453f9686cbceacdc8f48 Mon Sep 17 00:00:00 2001
From: mdasmendel <mdasmendel@yahoo.com>
Date: Sun, 16 May 2021 04:20:37 +0300
Subject: [PATCH 185/231] :zap: Inject workflow ID on workflow update (#1788)

---
 packages/cli/src/Server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index fb4523af3c..4b717037c9 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -572,6 +572,7 @@ class App {
 
 			const newWorkflowData = req.body as IWorkflowBase;
 			const id = req.params.id;
+			newWorkflowData.id = id;
 
 			await this.externalHooks.run('workflow.update', [newWorkflowData]);
 

From 21f9af887620e558cc2ee35e4110235474095459 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sun, 16 May 2021 14:35:11 -0400
Subject: [PATCH 186/231] :sparkles: Add iCalendar Node (#1725)

* :sparkles: iCalendar Node

* :zap: Improvements

* :zap: Improvements

* iCal node copy touch-up

* :zap: Minor improvement

Co-authored-by: sirdavidoff <1670123+sirdavidoff@users.noreply.github.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/editor-ui/src/main.ts              |   2 +
 packages/nodes-base/nodes/DateTime.node.ts  |   2 +-
 packages/nodes-base/nodes/ICalendar.node.ts | 358 ++++++++++++++++++++
 packages/nodes-base/package.json            |   2 +
 4 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 packages/nodes-base/nodes/ICalendar.node.ts

diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index af74cd0fcd..bc982d7aa4 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -93,6 +93,7 @@ import {
 	faTrash,
 	faUndo,
 	faUsers,
+	faClock,
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
@@ -174,6 +175,7 @@ library.add(faTimes);
 library.add(faTrash);
 library.add(faUndo);
 library.add(faUsers);
+library.add(faClock);
 
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
diff --git a/packages/nodes-base/nodes/DateTime.node.ts b/packages/nodes-base/nodes/DateTime.node.ts
index 8279d654b4..d0aeb44731 100644
--- a/packages/nodes-base/nodes/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime.node.ts
@@ -23,7 +23,7 @@ export class DateTime implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Date & Time',
 		name: 'dateTime',
-		icon: 'fa:calendar',
+		icon: 'fa:clock',
 		group: ['transform'],
 		version: 1,
 		description: 'Allows you to manipulate date and time values',
diff --git a/packages/nodes-base/nodes/ICalendar.node.ts b/packages/nodes-base/nodes/ICalendar.node.ts
new file mode 100644
index 0000000000..97e66fd67b
--- /dev/null
+++ b/packages/nodes-base/nodes/ICalendar.node.ts
@@ -0,0 +1,358 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	promisify,
+} from 'util';
+
+import * as moment from 'moment-timezone';
+
+import * as ics from 'ics';
+
+const createEvent = promisify(ics.createEvent);
+
+export class ICalendar implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'iCalendar',
+		name: 'iCal',
+		icon: 'fa:calendar',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"]}}',
+		description: 'Create iCalendar file',
+		defaults: {
+			name: 'iCalendar',
+			color: '#408000',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [
+					{
+						name: 'Create Event File',
+						value: 'createEventFile',
+					},
+				],
+				default: 'createEventFile',
+			},
+			{
+				displayName: 'Event Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Start',
+				name: 'start',
+				type: 'dateTime',
+				default: '',
+				required: true,
+				description: 'Date and time at which the event begins. (For all-day events, the time will be ignored.)',
+			},
+			{
+				displayName: 'End',
+				name: 'end',
+				type: 'dateTime',
+				default: '',
+				required: true,
+				description: 'Date and time at which the event ends. (For all-day events, the time will be ignored.)',
+			},
+			{
+				displayName: 'All Day',
+				name: 'allDay',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the event lasts all day or not.',
+			},
+			{
+				displayName: 'Binary Property',
+				name: 'binaryPropertyName',
+				type: 'string',
+				default: 'data',
+				required: true,
+				description: 'The field that your iCalendar file will be<br />available under in the output.',
+			},
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: [
+							'createEventFile',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'Attendees',
+						name: 'attendeesUi',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: true,
+						},
+						placeholder: 'Add Attendee',
+						default: {},
+						options: [
+							{
+								displayName: 'Attendees',
+								name: 'attendeeValues',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										required: true,
+										default: '',
+									},
+									{
+										displayName: 'Email',
+										name: 'email',
+										type: 'string',
+										required: true,
+										default: '',
+									},
+									{
+										displayName: 'RSVP',
+										name: 'rsvp',
+										type: 'boolean',
+										default: false,
+										description: `Whether the attendee has to confirm attendance or not.`,
+									},
+								],
+							},
+						],
+					},
+					{
+						displayName: 'Busy Status',
+						name: 'busyStatus',
+						type: 'options',
+						options: [
+							{
+								name: 'Busy',
+								value: 'BUSY',
+							},
+							{
+								name: 'Tentative',
+								value: 'TENTATIVE',
+							},
+						],
+						default: '',
+						description: 'Used to specify busy status for Microsoft applications, like Outlook.',
+					},
+					{
+						displayName: 'Calendar Name',
+						name: 'calName',
+						type: 'string',
+						default: '',
+						description: 'Specifies the calendar (not event) name. Used by Apple iCal and Microsoft Outlook (<a href="https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/1da58449-b97e-46bd-b018-a1ce576f3e6d" target="_blank">spec</a>).',
+					},
+					{
+						displayName: 'Description',
+						name: 'description',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'File Name',
+						name: 'fileName',
+						type: 'string',
+						default: '',
+						description: 'The name of the file to be generated. Default value is event.ics.',
+					},
+					{
+						displayName: 'Geolocation',
+						name: 'geolocationUi',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: false,
+						},
+						placeholder: 'Add Geolocation',
+						default: {},
+						options: [
+							{
+								displayName: 'Geolocation',
+								name: 'geolocationValues',
+								values: [
+									{
+										displayName: 'Latitude',
+										name: 'lat',
+										type: 'string',
+										default: '',
+									},
+									{
+										displayName: 'Longitude',
+										name: 'lon',
+										type: 'string',
+										default: '',
+									},
+								],
+							},
+						],
+					},
+					{
+						displayName: 'Location',
+						name: 'location',
+						type: 'string',
+						default: '',
+						description: 'The intended venue.',
+					},
+					{
+						displayName: 'Recurrence Rule',
+						name: 'recurrenceRule',
+						type: 'string',
+						default: '',
+						description: `A rule to define the repeat pattern of the event (RRULE). (<a href="https://icalendar.org/rrule-tool.html" target="_blank">Rule generator</a>)`,
+					},
+					{
+						displayName: 'Organizer',
+						name: 'organizerUi',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: false,
+						},
+						placeholder: 'Add Organizer',
+						default: {},
+						options: [
+							{
+								displayName: 'Organizer',
+								name: 'organizerValues',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										required: true,
+									},
+									{
+										displayName: 'Email',
+										name: 'email',
+										type: 'string',
+										default: '',
+										required: true,
+									},
+								],
+							},
+						],
+					},
+					{
+						displayName: 'Sequence',
+						name: 'sequence',
+						type: 'number',
+						default: 0,
+						description: 'When sending an update for an event (with the same uid), defines the revision sequence number.',
+					},
+					{
+						displayName: 'Status',
+						name: 'status',
+						type: 'options',
+						options: [
+							{
+								name: 'Confirmed',
+								value: 'CONFIRMED',
+							},
+							{
+								name: 'Cancelled',
+								value: 'CANCELLED',
+							},
+							{
+								name: 'Tentative',
+								value: 'TENTATIVE',
+							},
+						],
+						default: 'CONFIRMED',
+					},
+					{
+						displayName: 'UID',
+						name: 'uid',
+						type: 'string',
+						default: '',
+						description: `Universally unique id for the event (will be auto-generated if not specified here). Should be globally unique.`,
+					},
+					{
+						displayName: 'URL',
+						name: 'url',
+						type: 'string',
+						default: '',
+						description: 'URL associated with event.',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = (items.length as unknown) as number;
+		const returnData: INodeExecutionData[] = [];
+		const operation = this.getNodeParameter('operation', 0) as string;
+		if (operation === 'createEventFile') {
+			for (let i = 0; i < length; i++) {
+				const title = this.getNodeParameter('title', i) as string;
+				const allDay = this.getNodeParameter('allDay', i) as boolean;
+				const start = this.getNodeParameter('start', i) as string;
+				let end = this.getNodeParameter('end', i) as string;
+				end = (allDay) ? moment(end).utc().add(1, 'day').format() as string : end;
+				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i) as string;
+				const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+				let fileName = 'event.ics';
+
+				if (additionalFields.fileName) {
+					fileName = additionalFields.fileName as string;
+				}
+
+				const data: ics.EventAttributes = {
+					title,
+					start: (moment(start).toArray().splice(0, (allDay) ? 3 : 6) as ics.DateArray),
+					end: (moment(end).toArray().splice(0, (allDay) ? 3 : 6) as ics.DateArray),
+					startInputType: 'utc',
+					endInputType: 'utc',
+				};
+
+				if (additionalFields.geolocationUi) {
+					data.geo = (additionalFields.geolocationUi as IDataObject).geolocationValues as ics.GeoCoordinates;
+					delete additionalFields.geolocationUi;
+				}
+
+				if (additionalFields.organizerUi) {
+					data.organizer = (additionalFields.organizerUi as IDataObject).organizerValues as ics.Person;
+					delete additionalFields.organizerUi;
+				}
+
+				if (additionalFields.attendeesUi) {
+					data.attendees = (additionalFields.attendeesUi as IDataObject).attendeeValues as ics.Attendee[];
+					delete additionalFields.attendeesUi;
+				}
+
+				Object.assign(data, additionalFields);
+				const buffer = Buffer.from(await createEvent(data) as string);
+				const binaryData = await this.helpers.prepareBinaryData(buffer, fileName, 'text/calendar');
+				returnData.push(
+					{
+						json: {},
+						binary: {
+							[binaryPropertyName]: binaryData,
+						},
+					},
+				);
+			}
+		}
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index fac858637f..9fd9a948ce 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -394,6 +394,7 @@
       "dist/nodes/Hubspot/HubspotTrigger.node.js",
       "dist/nodes/HumanticAI/HumanticAi.node.js",
       "dist/nodes/Hunter/Hunter.node.js",
+      "dist/nodes/ICalendar.node.js",
       "dist/nodes/If.node.js",
       "dist/nodes/Iterable/Iterable.node.js",
       "dist/nodes/Intercom/Intercom.node.js",
@@ -608,6 +609,7 @@
     "glob-promise": "^3.4.0",
     "gm": "^1.23.1",
     "iconv-lite": "^0.6.2",
+    "ics": "^2.27.0",
     "imap-simple": "^4.3.0",
     "iso-639-1": "^2.1.3",
     "jsonwebtoken": "^8.5.1",

From 93b7b809a3c0bcb506902d7b42fa2cd8eee1f283 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:42:56 +0000
Subject: [PATCH 187/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.58.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index e5247ba349..548430d812 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 4de0daa2c29225d58e54b56229a229fe68a8e519 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:14 +0000
Subject: [PATCH 188/231] :arrow_up: Set n8n-workflow@0.58.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 35b12c5b17..ea4319399d 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.57.0",
+    "n8n-workflow": "~0.58.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",

From da3856e875b9b8fb1fd77c480d08dcb77a6ccf01 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:14 +0000
Subject: [PATCH 189/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.71?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index ea4319399d..138060370b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.70.0",
+  "version": "0.71.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 088705bb594985b8d3c1e33691948d02ef7c9d4d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:30 +0000
Subject: [PATCH 190/231] :arrow_up: Set n8n-core@0.71.0 and
 n8n-workflow@0.58.0 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index c9beb8b379..1dd1262222 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.70.0",
-    "n8n-workflow": "^0.57.0",
+    "n8n-core": "~0.71.0",
+    "n8n-workflow": "~0.58.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 222e2368d3d46cf1fc9ec542dda391f19ca0d48c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:30 +0000
Subject: [PATCH 191/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.13.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 1dd1262222..dffabdfa7f 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 811a24c29f9d282e218aff08350375d4f184a7aa Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:50 +0000
Subject: [PATCH 192/231] :arrow_up: Set n8n-core@0.71.0 and
 n8n-workflow@0.58.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 9fd9a948ce..5f7186c60d 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -587,7 +587,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.57.0",
+    "n8n-workflow": "~0.58.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -625,7 +625,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.70.0",
+    "n8n-core": "~0.71.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",

From 33477716bcd8e3756e3680e072a9fff06abd2d6a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:43:50 +0000
Subject: [PATCH 193/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.117.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5f7186c60d..5ab51ed341 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.116.0",
+  "version": "0.117.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 16bec73cd696f5021af80a9ce5e033019e73c059 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:44:51 +0000
Subject: [PATCH 194/231] :arrow_up: Set n8n-workflow@0.58.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 54311ff034..7f66657082 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -65,7 +65,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.57.0",
+    "n8n-workflow": "~0.58.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",

From b28921240cf8a264926b814c014957cb796ade5c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:44:52 +0000
Subject: [PATCH 195/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.90.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 7f66657082..aa145e9b7e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.89.0",
+  "version": "0.90.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From cee789d9f32c1244035cf98186a84c37554022a2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:46:22 +0000
Subject: [PATCH 196/231] :arrow_up: Set n8n-core@0.71.0, n8n-editor-ui@0.90.0,
 n8n-nodes-base@0.117.0 and n8n-workflow@0.58.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 468adbf379..8f01e44ccc 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -104,10 +104,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.70.0",
-    "n8n-editor-ui": "~0.89.0",
-    "n8n-nodes-base": "~0.116.0",
-    "n8n-workflow": "~0.57.0",
+    "n8n-core": "~0.71.0",
+    "n8n-editor-ui": "~0.90.0",
+    "n8n-nodes-base": "~0.117.0",
+    "n8n-workflow": "~0.58.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",

From a68145a88b9ab3eef136a3f375ff49f2c6b15179 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:46:23 +0000
Subject: [PATCH 197/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.120.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8f01e44ccc..1d852cd6ea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.119.0",
+  "version": "0.120.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 002f53a4af3b007aed3763d2f7ce15b1d9f1eb0e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 18:16:24 -0500
Subject: [PATCH 198/231] :sparkles: Allow to load sibling parameters in
 loadOptionsMethod

---
 packages/cli/src/Server.ts                       |  3 ++-
 packages/core/src/LoadNodeParameterOptions.ts    |  6 ++++--
 packages/core/src/NodeExecuteFunctions.ts        | 16 +++++++++-------
 packages/editor-ui/src/Interface.ts              |  4 ++--
 .../editor-ui/src/components/ParameterInput.vue  |  2 +-
 .../editor-ui/src/components/mixins/restApi.ts   |  3 ++-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 4b717037c9..0346558d50 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -717,6 +717,7 @@ class App {
 		// get generated dynamically
 		this.app.get(`/${this.restEndpoint}/node-parameter-options`, ResponseHelper.send(async (req: express.Request, res: express.Response): Promise<INodePropertyOptions[]> => {
 			const nodeType = req.query.nodeType as string;
+			const path = req.query.path as string;
 			let credentials: INodeCredentials | undefined = undefined;
 			const currentNodeParameters = JSON.parse('' + req.query.currentNodeParameters) as INodeParameters;
 			if (req.query.credentials !== undefined) {
@@ -726,7 +727,7 @@ class App {
 
 			const nodeTypes = NodeTypes();
 
-			const loadDataInstance = new LoadNodeParameterOptions(nodeType, nodeTypes, JSON.parse('' + req.query.currentNodeParameters), credentials!);
+			const loadDataInstance = new LoadNodeParameterOptions(nodeType, nodeTypes, path, JSON.parse('' + req.query.currentNodeParameters), credentials!);
 
 			const workflowData = loadDataInstance.getWorkflowData() as IWorkflowBase;
 			const workflowCredentials = await WorkflowCredentials(workflowData.nodes);
diff --git a/packages/core/src/LoadNodeParameterOptions.ts b/packages/core/src/LoadNodeParameterOptions.ts
index 6a9b457503..d112f63bfd 100644
--- a/packages/core/src/LoadNodeParameterOptions.ts
+++ b/packages/core/src/LoadNodeParameterOptions.ts
@@ -18,10 +18,12 @@ const TEMP_WORKFLOW_NAME = 'Temp-Workflow';
 
 
 export class LoadNodeParameterOptions {
+	path: string;
 	workflow: Workflow;
 
 
-	constructor(nodeTypeName: string, nodeTypes: INodeTypes, currentNodeParameters: INodeParameters, credentials?: INodeCredentials) {
+	constructor(nodeTypeName: string, nodeTypes: INodeTypes, path: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials) {
+		this.path = path;
 		const nodeType = nodeTypes.getByName(nodeTypeName);
 
 		if (nodeType === undefined) {
@@ -89,7 +91,7 @@ export class LoadNodeParameterOptions {
 			throw new Error(`The node-type "${node!.type}" does not have the method "${methodName}" defined!`);
 		}
 
-		const thisArgs = NodeExecuteFunctions.getLoadOptionsFunctions(this.workflow, node!, additionalData);
+		const thisArgs = NodeExecuteFunctions.getLoadOptionsFunctions(this.workflow, node!, this.path, additionalData);
 
 		return nodeType!.methods.loadOptions[methodName].call(thisArgs);
 	}
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 726526afc1..36004fd10c 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -871,18 +871,20 @@ export function getExecuteSingleFunctions(workflow: Workflow, runExecutionData:
  * @param {IWorkflowExecuteAdditionalData} additionalData
  * @returns {ILoadOptionsFunctions}
  */
-export function getLoadOptionsFunctions(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData): ILoadOptionsFunctions {
-	return ((workflow: Workflow, node: INode) => {
+export function getLoadOptionsFunctions(workflow: Workflow, node: INode, path: string, additionalData: IWorkflowExecuteAdditionalData): ILoadOptionsFunctions {
+	return ((workflow: Workflow, node: INode, path: string) => {
 		const that = {
 			getCredentials(type: string): ICredentialDataDecryptedObject | undefined {
 				return getCredentials(workflow, node, type, additionalData, 'internal');
 			},
-			getCurrentNodeParameter: (parameterName: string): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | object | undefined => {
+			getCurrentNodeParameter: (parameterPath: string): NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[] | object | undefined => {
 				const nodeParameters = additionalData.currentNodeParameters;
-				if (nodeParameters && nodeParameters[parameterName]) {
-					return nodeParameters[parameterName];
+
+				if (parameterPath.charAt(0) === '&') {
+					parameterPath = `${path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
 				}
-				return undefined;
+
+				return get(nodeParameters, parameterPath);
 			},
 			getCurrentNodeParameters: (): INodeParameters | undefined => {
 				return additionalData.currentNodeParameters;
@@ -915,7 +917,7 @@ export function getLoadOptionsFunctions(workflow: Workflow, node: INode, additio
 			},
 		};
 		return that;
-	})(workflow, node);
+	})(workflow, node, path);
 
 }
 
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 1ac72fd90a..4fdbd770f8 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -131,7 +131,7 @@ export interface IRestApi {
 	getSettings(): Promise<IN8nUISettings>;
 	getNodeTypes(): Promise<INodeTypeDescription[]>;
 	getNodesInformation(nodeList: string[]): Promise<INodeTypeDescription[]>;
-	getNodeParameterOptions(nodeType: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
+	getNodeParameterOptions(nodeType: string, path: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
 	removeTestWebhook(workflowId: string): Promise<boolean>;
 	runWorkflow(runData: IStartRunData): Promise<IExecutionPushResponse>;
 	createNewWorkflow(sendData: IWorkflowData): Promise<IWorkflowDb>;
@@ -444,4 +444,4 @@ export interface ILinkMenuItemProperties {
 	icon: string;
 	href: string;
 	newWindow?: boolean;
-}
\ No newline at end of file
+}
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index ae2be2e8cd..4ed7460733 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -484,7 +484,7 @@ export default mixins(
 				const resolvedNodeParameters = this.getResolveNodeParameters(currentNodeParameters);
 
 				try {
-					const options = await this.restApi().getNodeParameterOptions(this.node.type, this.remoteMethod, resolvedNodeParameters, this.node.credentials);
+					const options = await this.restApi().getNodeParameterOptions(this.node.type, this.path, this.remoteMethod, resolvedNodeParameters, this.node.credentials);
 					this.remoteParameterOptions.push.apply(this.remoteParameterOptions, options);
 				} catch (error) {
 					this.remoteParameterOptionsLoadingIssues = error.message;
diff --git a/packages/editor-ui/src/components/mixins/restApi.ts b/packages/editor-ui/src/components/mixins/restApi.ts
index d6aeff88c1..f51df9183e 100644
--- a/packages/editor-ui/src/components/mixins/restApi.ts
+++ b/packages/editor-ui/src/components/mixins/restApi.ts
@@ -157,9 +157,10 @@ export const restApi = Vue.extend({
 				},
 
 				// Returns all the parameter options from the server
-				getNodeParameterOptions: (nodeType: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]> => {
+				getNodeParameterOptions: (nodeType: string, path: string, methodName: string, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]> => {
 					const sendData = {
 						nodeType,
+						path,
 						methodName,
 						credentials,
 						currentNodeParameters,

From bf7800cb156624fd7e6a825f4efd138128fffe21 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 16 May 2021 19:25:04 -0500
Subject: [PATCH 199/231] :bug: Fix bug with sibling loading with
 fixedCollections

---
 .../src/components/ParameterInput.vue         | 19 ++-----------------
 .../src/components/mixins/workflowHelpers.ts  | 12 ++++++++++--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 4ed7460733..ef97066938 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -230,7 +230,7 @@ export default mixins(
 
 				// Get the resolved parameter values of the current node
 				const currentNodeParameters = this.$store.getters.activeNode.parameters;
-				const resolvedNodeParameters = this.getResolveNodeParameters(currentNodeParameters);
+				const resolvedNodeParameters = this.resolveParameter(currentNodeParameters);
 
 				const returnValues: string[] = [];
 				for (const parameterPath of loadOptionsDependsOn) {
@@ -456,21 +456,6 @@ export default mixins(
 			},
 		},
 		methods: {
-			getResolveNodeParameters (nodeParameters: INodeParameters): INodeParameters {
-				const returnData: INodeParameters = {};
-				for (const key of Object.keys(nodeParameters)) {
-					if (Array.isArray(nodeParameters[key])) {
-						returnData[key] = (nodeParameters[key] as string[]).map(value => {
-							return this.resolveExpression(value as string) as string;
-						});
-					} else if (typeof nodeParameters[key] === 'object') {
-						returnData[key] = this.getResolveNodeParameters(nodeParameters[key] as INodeParameters) as INodeParameters;
-					} else {
-						returnData[key] = this.resolveExpression(nodeParameters[key] as string, nodeParameters) as NodeParameterValue;
-					}
-				}
-				return returnData;
-			},
 			async loadRemoteParameterOptions () {
 				if (this.node === null || this.remoteMethod === undefined || this.remoteParameterOptionsLoading) {
 					return;
@@ -481,7 +466,7 @@ export default mixins(
 
 				// Get the resolved parameter values of the current node
 				const currentNodeParameters = this.$store.getters.activeNode.parameters;
-				const resolvedNodeParameters = this.getResolveNodeParameters(currentNodeParameters);
+				const resolvedNodeParameters = this.resolveParameter(currentNodeParameters) as INodeParameters;
 
 				try {
 					const options = await this.restApi().getNodeParameterOptions(this.node.type, this.path, this.remoteMethod, resolvedNodeParameters, this.node.credentials);
diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index 9d4d476390..c7cc565ee9 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeIssues,
 	INodeParameters,
+	NodeParameterValue,
 	INodeType,
 	INodeTypes,
 	INodeTypeData,
@@ -337,7 +338,8 @@ export const workflowHelpers = mixins(
 				return nodeData;
 			},
 
-			resolveExpression (expression: string, siblingParameters: INodeParameters = {}) {
+
+			resolveParameter(parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[]) {
 				const inputIndex = 0;
 				const itemIndex = 0;
 				const runIndex = 0;
@@ -363,13 +365,19 @@ export const workflowHelpers = mixins(
 					connectionInputData = [];
 				}
 
+				return workflow.expression.getParameterValue(parameter, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', false) as IDataObject;
+			},
+
+			resolveExpression(expression: string, siblingParameters: INodeParameters = {}) {
+
 				const parameters = {
 					'__xxxxxxx__': expression,
 					...siblingParameters,
 				};
-				const returnData =  workflow.expression.getParameterValue(parameters, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', false) as IDataObject;
+				const returnData = this.resolveParameter(parameters) as IDataObject;
 
 				if (typeof returnData['__xxxxxxx__'] === 'object') {
+					const workflow = this.getWorkflow();
 					return workflow.expression.convertObjectValueToString(returnData['__xxxxxxx__'] as object);
 				}
 				return returnData['__xxxxxxx__'];

From a3ab3f2de53ae3ea78bca0cee0763dcc66d46abb Mon Sep 17 00:00:00 2001
From: Tanay Pant <7481165+tanay1337@users.noreply.github.com>
Date: Mon, 17 May 2021 10:50:57 +0200
Subject: [PATCH 200/231] :bug: Fix broken link

---
 packages/nodes-base/nodes/Strapi/EntryDescription.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Strapi/EntryDescription.ts b/packages/nodes-base/nodes/Strapi/EntryDescription.ts
index 7305aa6ce7..08b70e25d0 100644
--- a/packages/nodes-base/nodes/Strapi/EntryDescription.ts
+++ b/packages/nodes-base/nodes/Strapi/EntryDescription.ts
@@ -285,7 +285,7 @@ export const entryFields = [
 					alwaysOpenEditWindow: true,
 				},
 				default: '',
-				description: 'JSON query to filter the data.<a href="https://strapi.io/documentation/v3.x/content-api/parameters.html#filters" target="_blank"> Info</a>',
+				description: 'JSON query to filter the data. <a href="https://strapi.io/documentation/developer-docs/latest/developer-resources/content-api/content-api.html#filters" target="_blank">More info</a>.',
 			},
 		],
 	},

From 6e8de269ecfce29b42fc8f7b2493b44a8cc1ce2d Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Wed, 19 May 2021 01:39:26 +0200
Subject: [PATCH 201/231] :bug: Fix order title type on Keap (#1798)

---
 packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
index eee5dc7519..a3277c94cf 100644
--- a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
+++ b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
@@ -83,7 +83,7 @@ export const ecommerceOrderFields = [
 	{
 		displayName: 'Order Title',
 		name: 'orderTitle',
-		type: 'dateTime',
+		type: 'string',
 		required: true,
 		displayOptions: {
 			show: {

From 0fdae7fec33adb1e08c97ec970169002f83838c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 19 May 2021 02:05:49 +0200
Subject: [PATCH 202/231] :zap: Add API key to Twilio credentials (#1797)

* :zap: Add API key to Twilio credentials

* :zap: Minor simplification

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/TwilioApi.credentials.ts      | 52 +++++++++++++++++++
 .../nodes/Twilio/GenericFunctions.ts          | 31 ++++++++---
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/packages/nodes-base/credentials/TwilioApi.credentials.ts b/packages/nodes-base/credentials/TwilioApi.credentials.ts
index 8fb77cc29e..1e2ee45fdf 100644
--- a/packages/nodes-base/credentials/TwilioApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwilioApi.credentials.ts
@@ -9,6 +9,22 @@ export class TwilioApi implements ICredentialType {
 	displayName = 'Twilio API';
 	documentationUrl = 'twilio';
 	properties = [
+		{
+			displayName: 'Auth Type',
+			name: 'authType',
+			type: 'options' as NodePropertyTypes,
+			default: 'authToken',
+			options: [
+				{
+					name: 'Auth Token',
+					value: 'authToken',
+				},
+				{
+					name: 'API Key',
+					value: 'apiKey',
+				},
+			],
+		},
 		{
 			displayName: 'Account SID',
 			name: 'accountSid',
@@ -20,6 +36,42 @@ export class TwilioApi implements ICredentialType {
 			name: 'authToken',
 			type: 'string' as NodePropertyTypes,
 			default: '',
+			displayOptions: {
+				show: {
+					authType: [
+						'authToken',
+					],
+				},
+			},
+		},
+		{
+			displayName: 'API Key SID',
+			name: 'apiKeySid',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			displayOptions: {
+				show: {
+					authType: [
+						'apiKey',
+					],
+				},
+			},
+		},
+		{
+			displayName: 'API Key Secret',
+			name: 'apiKeySecret',
+			type: 'string' as NodePropertyTypes,
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			displayOptions: {
+				show: {
+					authType: [
+						'apiKey',
+					],
+				},
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
index e5eaf606e0..3532030f3c 100644
--- a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
@@ -7,6 +7,10 @@ import {
 	IDataObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
+import {
+	OptionsWithUri,
+} from 'request';
+
 /**
  * Make an API request to Twilio
  *
@@ -17,7 +21,14 @@ import {
  * @returns {Promise<any>}
  */
 export async function twilioApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: IDataObject, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('twilioApi');
+	const credentials = this.getCredentials('twilioApi') as {
+		accountSid: string;
+		authType: 'authToken' | 'apiKey';
+		authToken: string;
+		apiKeySid: string;
+		apiKeySecret: string;
+	};
+
 	if (credentials === undefined) {
 		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
 	}
@@ -26,18 +37,26 @@ export async function twilioApiRequest(this: IHookFunctions | IExecuteFunctions,
 		query = {};
 	}
 
-	const options = {
+	const options: OptionsWithUri = {
 		method,
 		form: body,
 		qs: query,
 		uri: `https://api.twilio.com/2010-04-01/Accounts/${credentials.accountSid}${endpoint}`,
-		auth: {
-			user: credentials.accountSid as string,
-			pass: credentials.authToken as string,
-		},
 		json: true,
 	};
 
+	if (credentials.authType === 'apiKey') {
+		options.auth = {
+			user: credentials.apiKeySid,
+			password: credentials.apiKeySecret,
+		};
+	} else if (credentials.authType === 'authToken') {
+		options.auth = {
+			user: credentials.accountSid,
+			pass: credentials.authToken,
+		};
+	}
+
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {

From 76e1b9fba06d82d554d3db68970c7ec0fba89783 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 19 May 2021 02:12:26 +0200
Subject: [PATCH 203/231] :bug: Fix get profile operation on Slack Node (#1799)

---
 packages/nodes-base/nodes/Slack/Slack.node.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 7a73e14075..42c3864e17 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -1035,11 +1035,11 @@ export class Slack implements INodeType {
 				if (operation === 'get') {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
-					const body: IDataObject = {};
+					const qs: IDataObject = {};
 
-					Object.assign(body, additionalFields);
+					Object.assign(qs, additionalFields);
 
-					responseData = await slackApiRequest.call(this, 'POST', '/users.profile.get', body);
+					responseData = await slackApiRequest.call(this, 'POST', '/users.profile.get', undefined, qs);
 
 					responseData = responseData.profile;
 				}

From 2ac4e425d681c3147067c176c54cdef04ef16f10 Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Wed, 19 May 2021 02:33:43 +0200
Subject: [PATCH 204/231] :zap: Fix activity type in post operation on Orbit
 Node (#1796)

---
 packages/nodes-base/nodes/Orbit/Orbit.node.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 6059c0cfc4..de80e61123 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -414,10 +414,12 @@ export class Orbit implements INodeType {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 					const body: IDataObject = {
 						type: 'post',
+						activity_type: 'post',
 						url,
 					};
 					if (additionalFields.publishedAt) {
 						body.occurred_at = additionalFields.publishedAt as string;
+						delete body.publishedAt;
 					}
 
 					responseData = await orbitApiRequest.call(this, 'POST', `/${workspaceId}/members/${memberId}/activities/`, body);

From b9b6e8b5df48e2a6d350eef34e210b2cc89c3f70 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 19 May 2021 18:07:26 -0500
Subject: [PATCH 205/231] :bug: Fix issue that it did export default parameter
 values if they were objects

---
 packages/workflow/package.json             |  1 +
 packages/workflow/src/NodeHelpers.ts       |  6 +-
 packages/workflow/test/NodeHelpers.test.ts | 89 ++++++++++++++++++++++
 3 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 548430d812..6d2213b810 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "lodash.get": "^4.4.2",
+    "lodash.isequal": "^4.5.0",
     "riot-tmpl": "^3.0.8",
     "xml2js": "^0.4.23"
   },
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 65715e3fa4..b298038af2 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -21,7 +21,7 @@ import {
 	Workflow
 } from './Workflow';
 
-import { get } from 'lodash';
+import { get, isEqual } from 'lodash';
 
 
 
@@ -585,7 +585,9 @@ export function getNodeParameters(nodePropertiesArray: INodeProperties[], nodeVa
 					nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name] || nodeProperties.default;
 				}
 				nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
-			} else if (nodeValues[nodeProperties.name] !== nodeProperties.default || (nodeValues[nodeProperties.name] !== undefined && parentType === 'collection')) {
+			} else if ((nodeValues[nodeProperties.name] !== nodeProperties.default && typeof nodeValues[nodeProperties.name] !== 'object') ||
+				(typeof nodeValues[nodeProperties.name] === 'object' && !isEqual(nodeValues[nodeProperties.name], nodeProperties.default)) ||
+				(nodeValues[nodeProperties.name] !== undefined && parentType === 'collection')) {
 				// Set only if it is different to the default value
 				nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name];
 				nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index ceb3611b3f..048aaeed88 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -2939,6 +2939,95 @@ describe('Workflow', () => {
 						},
 					},
 				},
+				{
+					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type multiOptions and has so an array default value.',
+					input: {
+						nodePropertiesArray: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								type: 'fixedCollection',
+								typeOptions: {
+									multipleValues: true,
+								},
+								default: {},
+								options: [
+									{
+										name: 'propertyValues',
+										displayName: 'Property',
+										values: [
+											{
+												displayName: 'Options',
+												name: 'multiSelectValue',
+												type: 'multiOptions',
+												options: [
+													{
+														name: 'Value1',
+														value: 'value1',
+													},
+													{
+														name: 'Value2',
+														value: 'value2',
+													},
+												],
+												default: [],
+											},
+										],
+									},
+								],
+							},
+						],
+						nodeValues: {
+							values: {
+								propertyValues: [
+									{
+										multiSelectValue: [],
+									}
+								]
+							},
+						},
+					},
+					output: {
+						noneDisplayedFalse: {
+							defaultsFalse: {
+								values: {
+									propertyValues: [
+										{
+										}
+									],
+								},
+							},
+							defaultsTrue: {
+								values: {
+									propertyValues: [
+										{
+											multiSelectValue: [],
+										}
+									],
+								},
+							},
+						},
+						noneDisplayedTrue: {
+							defaultsFalse: {
+								values: {
+									propertyValues: [
+										{
+										}
+									],
+								},
+							},
+							defaultsTrue: {
+								values: {
+									propertyValues: [
+										{
+											multiSelectValue: [],
+										}
+									],
+								},
+							},
+						},
+					},
+				},
 			];
 
 

From e18370cb10faf16b99e944c5ce6e0c4af662eaf0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 19 May 2021 18:44:27 -0500
Subject: [PATCH 206/231] :bug: Fix issue with default value for multipleValues
 string with none stanard default value

---
 packages/workflow/src/NodeHelpers.ts       |  5 +-
 packages/workflow/test/NodeHelpers.test.ts | 94 ++++++++++++++++++++--
 2 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index b298038af2..0a86250e2a 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -612,9 +612,8 @@ export function getNodeParameters(nodePropertiesArray: INodeProperties[], nodeVa
 				if (nodeValues[nodeProperties.name] !== undefined) {
 					nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name];
 				} else if (returnDefaults === true) {
-					// Does not have values defined but defaults should be returned which is in the
-					// case of a collection with multipleValues always an empty array
-					nodeParameters[nodeProperties.name] = [];
+					// Does not have values defined but defaults should be returned
+					nodeParameters[nodeProperties.name] = JSON.parse(JSON.stringify(nodeProperties.default));
 				}
 				nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
 			} else {
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 048aaeed88..98ce77c4fd 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -2174,7 +2174,7 @@ describe('Workflow', () => {
 								typeOptions: {
 									multipleValues: true,
 								},
-								default: {},
+								default: [],
 								options: [
 									{
 										displayName: 'string1',
@@ -2195,17 +2195,13 @@ describe('Workflow', () => {
 					},
 					output: {
 						noneDisplayedFalse: {
-							defaultsFalse: {
-								// collection1: [],
-							},
+							defaultsFalse: {},
 							defaultsTrue: {
 								collection1: [],
 							},
 						},
 						noneDisplayedTrue: {
-							defaultsFalse: {
-								// collection1: [],
-							},
+							defaultsFalse: {},
 							defaultsTrue: {
 								collection1: [],
 							},
@@ -2940,7 +2936,7 @@ describe('Workflow', () => {
 					},
 				},
 				{
-					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type multiOptions and has so an array default value.',
+					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type "multiOptions" and has so an array default value',
 					input: {
 						nodePropertiesArray: [
 							{
@@ -3028,6 +3024,88 @@ describe('Workflow', () => {
 						},
 					},
 				},
+				{
+					description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type "string" with "multipleValues: true" and a custom default value',
+					input: {
+						nodePropertiesArray: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								type: 'fixedCollection',
+								typeOptions: {
+									multipleValues: true,
+								},
+								default: {},
+								options: [
+									{
+										name: 'propertyValues',
+										displayName: 'Property',
+										values: [
+											{
+												displayName: 'MultiString',
+												name: 'multiString',
+												type: 'string',
+												typeOptions: {
+													multipleValues: true,
+												},
+												default: ['value1'],
+											},
+										],
+									},
+								],
+							},
+						],
+						nodeValues: {
+							values: {
+								propertyValues: [
+									{
+										multiString: ['value1'],
+									}
+								]
+							},
+						},
+					},
+					output: {
+						noneDisplayedFalse: {
+							defaultsFalse: {
+								values: {
+									propertyValues: [
+										{
+										}
+									],
+								},
+							},
+							defaultsTrue: {
+								values: {
+									propertyValues: [
+										{
+											multiString: ['value1'],
+										}
+									],
+								},
+							},
+						},
+						noneDisplayedTrue: {
+							defaultsFalse: {
+								values: {
+									propertyValues: [
+										{
+										}
+									],
+								},
+							},
+							defaultsTrue: {
+								values: {
+									propertyValues: [
+										{
+											multiString: ['value1'],
+										}
+									],
+								},
+							},
+						},
+					},
+				},
 			];
 
 

From e21382baee8c268f9852b0173d29e631251ee597 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 19 May 2021 19:26:29 -0500
Subject: [PATCH 207/231] :bug: Fix issue that it sets default values correctly
 for multipleValues and makes previous change backward compatible

---
 .../editor-ui/src/components/FixedCollectionParameter.vue | 6 +++++-
 packages/workflow/src/NodeHelpers.ts                      | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 9588e51a80..2d10f5b3ad 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -177,7 +177,11 @@ export default mixins(genericHelpers)
 					} else if (optionParameter.typeOptions !== undefined && optionParameter.typeOptions.multipleValues === true) {
 						// Multiple values are allowed so append option to array
 						newParameterValue[optionParameter.name] = get(this.nodeValues, `${this.path}.${optionParameter.name}`, []);
-						(newParameterValue[optionParameter.name] as INodeParameters[]).push(JSON.parse(JSON.stringify(optionParameter.default)));
+						if (Array.isArray(optionParameter.default)) {
+							(newParameterValue[optionParameter.name] as INodeParameters[]).push(...JSON.parse(JSON.stringify(optionParameter.default)));
+						} else if (optionParameter.default !== '' && typeof optionParameter.default !== 'object') {
+							(newParameterValue[optionParameter.name] as INodeParameters[]).push(JSON.parse(JSON.stringify(optionParameter.default)));
+						}
 					} else {
 						// Add a new option
 						newParameterValue[optionParameter.name] = JSON.parse(JSON.stringify(optionParameter.default));
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 0a86250e2a..018ea8c4b6 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -613,7 +613,13 @@ export function getNodeParameters(nodePropertiesArray: INodeProperties[], nodeVa
 					nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name];
 				} else if (returnDefaults === true) {
 					// Does not have values defined but defaults should be returned
-					nodeParameters[nodeProperties.name] = JSON.parse(JSON.stringify(nodeProperties.default));
+					if (Array.isArray(nodeProperties.default)) {
+						nodeParameters[nodeProperties.name] = JSON.parse(JSON.stringify(nodeProperties.default));
+					} else {
+						// As it is probably wrong for many nodes, do we keep on returning an empty array if
+						// anything else than an array is set as default
+						nodeParameters[nodeProperties.name] = [];
+					}
 				}
 				nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
 			} else {

From 481dbae16b5119cb3ad9d9f7dc782759f024afe1 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 20 May 2021 02:46:06 +0200
Subject: [PATCH 208/231] :bug: Fixing the limit for searching deals on hubspot
 (#1803)

---
 packages/nodes-base/nodes/Hubspot/Hubspot.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index b99fbaf0d7..3c9d57e98c 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -2106,7 +2106,7 @@ export class Hubspot implements INodeType {
 							responseData = await hubspotApiRequestAllItems.call(this, 'results', 'POST', endpoint, body, qs);
 
 						} else {
-							qs.count = this.getNodeParameter('limit', 0) as number;
+							body.limit = this.getNodeParameter('limit', 0) as number;
 							responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
 							responseData = responseData.results;
 						}

From 7ccc0f40a2067a8e4c259693ca1caa636c42f5e2 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 20 May 2021 02:47:55 +0200
Subject: [PATCH 209/231] :bug: Correct paging parameter on Strava Node (#1804)

---
 packages/nodes-base/nodes/Strava/Strava.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index e9f257e1f3..5fbf6d7b45 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -137,7 +137,7 @@ export class Strava implements INodeType {
 
 						responseData = await stravaApiRequestAllItems.call(this, 'GET', `/activities`, {}, qs);
 					} else {
-						qs.limit = this.getNodeParameter('limit', i) as number;
+						qs.per_page = this.getNodeParameter('limit', i) as number;
 
 						responseData = await stravaApiRequest.call(this, 'GET', `/activities`, {}, qs);
 					}

From d3aa637ff4e634abad08150a27e9d2fce7d8fa07 Mon Sep 17 00:00:00 2001
From: Jacob Spizziri <jacob.spizziri@gmail.com>
Date: Wed, 19 May 2021 20:04:43 -0500
Subject: [PATCH 210/231] :sparkles: Add header authentication to GraphQL node
 (#1805)

---
 .../nodes-base/nodes/GraphQL/GraphQL.node.ts  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index e18b2057d3..25b347f502 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -25,7 +25,37 @@ export class GraphQL implements INodeType {
 		},
 		inputs: ['main'],
 		outputs: ['main'],
+		credentials: [
+			{
+				name: 'httpHeaderAuth',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'headerAuth',
+						],
+					},
+				},
+			},
+		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Header Auth',
+						value: 'headerAuth',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+				],
+				default: 'none',
+				description: 'The way to authenticate.',
+			},
 			{
 				displayName: 'HTTP Request Method',
 				name: 'requestMethod',
@@ -200,6 +230,7 @@ export class GraphQL implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 
 		const items = this.getInputData();
+		const httpHeaderAuth = this.getCredentials('httpHeaderAuth');
 
 		let requestOptions: OptionsWithUri & RequestPromiseOptions;
 
@@ -228,6 +259,11 @@ export class GraphQL implements INodeType {
 				rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false) as boolean,
 			};
 
+			// Add credentials if any are set
+			if (httpHeaderAuth !== undefined) {
+				requestOptions.headers![httpHeaderAuth.name as string] = httpHeaderAuth.value;
+			}
+
 			const gqlQuery = this.getNodeParameter('query', itemIndex, '') as string;
 			if (requestMethod === 'GET') {
 				requestOptions.qs = {

From 72436bd03edd445cd9010f63eb2ce9696e7c30d7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 19 May 2021 20:05:44 -0500
Subject: [PATCH 211/231] :shirt: Fix lint issue

---
 packages/workflow/test/NodeHelpers.test.ts | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 98ce77c4fd..d94be5b77c 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -2978,8 +2978,8 @@ describe('Workflow', () => {
 								propertyValues: [
 									{
 										multiSelectValue: [],
-									}
-								]
+									},
+								],
 							},
 						},
 					},
@@ -2989,7 +2989,7 @@ describe('Workflow', () => {
 								values: {
 									propertyValues: [
 										{
-										}
+										},
 									],
 								},
 							},
@@ -2998,7 +2998,7 @@ describe('Workflow', () => {
 									propertyValues: [
 										{
 											multiSelectValue: [],
-										}
+										},
 									],
 								},
 							},
@@ -3008,7 +3008,7 @@ describe('Workflow', () => {
 								values: {
 									propertyValues: [
 										{
-										}
+										},
 									],
 								},
 							},
@@ -3017,7 +3017,7 @@ describe('Workflow', () => {
 									propertyValues: [
 										{
 											multiSelectValue: [],
-										}
+										},
 									],
 								},
 							},
@@ -3060,8 +3060,8 @@ describe('Workflow', () => {
 								propertyValues: [
 									{
 										multiString: ['value1'],
-									}
-								]
+									},
+								],
 							},
 						},
 					},
@@ -3071,7 +3071,7 @@ describe('Workflow', () => {
 								values: {
 									propertyValues: [
 										{
-										}
+										},
 									],
 								},
 							},
@@ -3080,7 +3080,7 @@ describe('Workflow', () => {
 									propertyValues: [
 										{
 											multiString: ['value1'],
-										}
+										},
 									],
 								},
 							},
@@ -3090,7 +3090,7 @@ describe('Workflow', () => {
 								values: {
 									propertyValues: [
 										{
-										}
+										},
 									],
 								},
 							},
@@ -3099,7 +3099,7 @@ describe('Workflow', () => {
 									propertyValues: [
 										{
 											multiString: ['value1'],
-										}
+										},
 									],
 								},
 							},

From ed6f2c5b8a78f3d7c230a3e9dc48fb8692d18f1a Mon Sep 17 00:00:00 2001
From: Jan <janober@users.noreply.github.com>
Date: Thu, 20 May 2021 16:31:23 -0500
Subject: [PATCH 212/231] :sparkles: Add Notion Node (#1811)

* :sparkles: Notion Node

* :zap: Improvements

* test

* :zap: Improvements

* :zap: Improvements

* :zap: Add missing url field

* Remove linter errors

* :zap: Add filters

* :zap: Add and & or filters

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Fixed style on some options

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: Improvements

* :zap: improvements

* :zap: Rename DatabasePage -> Search to Get All

* :zap: Improvements

* :zap: Minor improvements

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
---
 .../credentials/NotionApi.credentials.ts      |  18 +
 .../NotionOAuth2Api.credentials.ts            |  47 +
 .../nodes-base/nodes/Jira/GenericFunctions.ts |   2 +
 .../nodes/Notion/BlockDescription.ts          | 123 +++
 packages/nodes-base/nodes/Notion/Blocks.ts    | 571 ++++++++++
 .../nodes/Notion/DatabaseDescription.ts       | 100 ++
 .../nodes/Notion/DatabasePageDescription.ts   | 994 ++++++++++++++++++
 packages/nodes-base/nodes/Notion/Filters.ts   | 371 +++++++
 .../nodes/Notion/GenericFunctions.ts          | 542 ++++++++++
 .../nodes-base/nodes/Notion/Notion.node.ts    | 514 +++++++++
 .../nodes/Notion/NotionTrigger.node.ts        | 188 ++++
 .../nodes/Notion/PageDescription.ts           | 332 ++++++
 .../nodes/Notion/UserDescription.ts           | 100 ++
 packages/nodes-base/nodes/Notion/notion.svg   |   1 +
 packages/nodes-base/package.json              |   4 +
 15 files changed, 3907 insertions(+)
 create mode 100644 packages/nodes-base/credentials/NotionApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Notion/BlockDescription.ts
 create mode 100644 packages/nodes-base/nodes/Notion/Blocks.ts
 create mode 100644 packages/nodes-base/nodes/Notion/DatabaseDescription.ts
 create mode 100644 packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
 create mode 100644 packages/nodes-base/nodes/Notion/Filters.ts
 create mode 100644 packages/nodes-base/nodes/Notion/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Notion/Notion.node.ts
 create mode 100644 packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
 create mode 100644 packages/nodes-base/nodes/Notion/PageDescription.ts
 create mode 100644 packages/nodes-base/nodes/Notion/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/Notion/notion.svg

diff --git a/packages/nodes-base/credentials/NotionApi.credentials.ts b/packages/nodes-base/credentials/NotionApi.credentials.ts
new file mode 100644
index 0000000000..b90fe7f364
--- /dev/null
+++ b/packages/nodes-base/credentials/NotionApi.credentials.ts
@@ -0,0 +1,18 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class NotionApi implements ICredentialType {
+	name = 'notionApi';
+	displayName = 'Notion API';
+	documentationUrl = 'notion';
+	properties = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts b/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..d89c92a170
--- /dev/null
+++ b/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
@@ -0,0 +1,47 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class NotionOAuth2Api implements ICredentialType {
+	name = 'notionOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'Notion OAuth2 API';
+	documentationUrl = 'notion';
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://api.notion.com/v1/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://api.notion.com/v1/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index 8e384c1a76..88ec689ae5 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -66,6 +66,8 @@ export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecut
 		delete options.qs;
 	}
 
+	console.log(options);
+
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/Notion/BlockDescription.ts b/packages/nodes-base/nodes/Notion/BlockDescription.ts
new file mode 100644
index 0000000000..a9d2b773ca
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/BlockDescription.ts
@@ -0,0 +1,123 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	blocks,
+} from './Blocks';
+
+export const blockOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'block',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Append',
+				value: 'append',
+				description: 'Append a block',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all children blocks',
+			},
+		],
+		default: 'append',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const blockFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                block:append                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Block ID',
+		name: 'blockId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'block',
+				],
+				operation: [
+					'append',
+				],
+			},
+		},
+		description: `The ID of block. A page it is also considered a block. Hence, a Page ID can be used as well.`,
+	},
+	...blocks('block', 'append'),
+	/* -------------------------------------------------------------------------- */
+	/*                                block:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Block ID',
+		name: 'blockId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'block',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'block',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'block',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/Blocks.ts b/packages/nodes-base/nodes/Notion/Blocks.ts
new file mode 100644
index 0000000000..7e5fe98c76
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/Blocks.ts
@@ -0,0 +1,571 @@
+import {
+	IDisplayOptions,
+	INodeProperties,
+} from 'n8n-workflow';
+
+const colors = [
+	{
+		name: 'Default',
+		value: 'default',
+	},
+	{
+		name: 'Gray',
+		value: 'gray',
+	},
+	{
+		name: 'Brown',
+		value: 'brown',
+	},
+	{
+		name: 'Orange',
+		value: 'orange',
+	},
+	{
+		name: 'Yellow',
+		value: 'yellow',
+	},
+	{
+		name: 'Green',
+		value: 'green',
+	},
+	{
+		name: 'Blue',
+		value: 'blue',
+	},
+	{
+		name: 'Purple',
+		value: 'purple',
+	},
+	{
+		name: 'Pink',
+		value: 'pink',
+	},
+	{
+		name: 'Red',
+		value: 'red',
+	},
+	{
+		name: 'Gray Background',
+		value: 'gray_background',
+	},
+	{
+		name: 'Brown Background',
+		value: 'brown_background',
+	},
+	{
+		name: 'Orange Background',
+		value: 'orange_background',
+	},
+	{
+		name: 'Yellow Background',
+		value: 'yellow_background',
+	},
+	{
+		name: 'Green Background',
+		value: 'green_background',
+	},
+	{
+		name: 'Blue Background',
+		value: 'blue_background',
+	},
+	{
+		name: 'Purple Background',
+		value: 'purple_background',
+	},
+	{
+		name: 'Pink Background',
+		value: 'pink_background',
+	},
+	{
+		name: 'Red Background',
+		value: 'red_background',
+	},
+];
+
+const annotation = [
+	{
+		displayName: 'Annotations',
+		name: 'annotationUi',
+		type: 'collection',
+		placeholder: 'Add Annotation',
+		default: {},
+		options: [
+			{
+				displayName: 'Bold',
+				name: 'bold',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the text is bolded.',
+			},
+			{
+				displayName: 'Italic',
+				name: 'italic',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the text is italicized.',
+			},
+			{
+				displayName: 'Strikethrough',
+				name: 'strikethrough',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the text is struck through.',
+			},
+			{
+				displayName: 'Underline',
+				name: 'underline',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the text is underlined.',
+			},
+			{
+				displayName: 'Code',
+				name: 'code',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the text is code style.',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'options',
+				options: colors,
+				default: '',
+				description: 'Color of the text.',
+			},
+		],
+		description: 'All annotations that apply to this rich text.',
+	},
+] as INodeProperties[];
+
+const typeMention = [
+	{
+		displayName: 'Type',
+		name: 'mentionType',
+		type: 'options',
+		displayOptions: {
+			show: {
+				textType: [
+					'mention',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Database',
+				value: 'database',
+			},
+			{
+				name: 'Date',
+				value: 'date',
+			},
+			{
+				name: 'Page',
+				value: 'page',
+			},
+			{
+				name: 'User',
+				value: 'user',
+			},
+		],
+		default: '',
+		description: `An inline mention of a user, page, database, or date. In the app these are</br>
+		created by typing @ followed by the name of a user, page, database, or a date.`,
+	},
+	{
+		displayName: 'User ID',
+		name: 'user',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		displayOptions: {
+			show: {
+				mentionType: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: 'The id of the user being mentioned.',
+	},
+	{
+		displayName: 'Page ID',
+		name: 'page',
+		type: 'string',
+		displayOptions: {
+			show: {
+				mentionType: [
+					'page',
+				],
+			},
+		},
+		default: '',
+		description: 'The id of the page being mentioned.',
+	},
+	{
+		displayName: 'Database ID',
+		name: 'database',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getDatabases',
+		},
+		displayOptions: {
+			show: {
+				mentionType: [
+					'database',
+				],
+			},
+		},
+		default: '',
+		description: 'The id of the database being mentioned.',
+	},
+	{
+		displayName: 'Range',
+		name: 'range',
+		displayOptions: {
+			show: {
+				mentionType: [
+					'date',
+				],
+			},
+		},
+		type: 'boolean',
+		default: false,
+		description: 'Weather or not you want to define a date range.',
+	},
+	{
+		displayName: 'Date',
+		name: 'date',
+		displayOptions: {
+			show: {
+				mentionType: [
+					'date',
+				],
+				range: [
+					false,
+				],
+			},
+		},
+		type: 'dateTime',
+		default: '',
+		description: 'An ISO 8601 format date, with optional time.',
+	},
+	{
+		displayName: 'Date Start',
+		name: 'dateStart',
+		displayOptions: {
+			show: {
+				mentionType: [
+					'date',
+				],
+				range: [
+					true,
+				],
+			},
+		},
+		type: 'dateTime',
+		default: '',
+		description: 'An ISO 8601 format date, with optional time.',
+	},
+	{
+		displayName: 'Date End',
+		name: 'dateEnd',
+		displayOptions: {
+			show: {
+				range: [
+					true,
+				],
+				mentionType: [
+					'date',
+				],
+			},
+		},
+		type: 'dateTime',
+		default: '',
+		description: `An ISO 8601 formatted date, with optional time. Represents the end of a date range.`,
+	},
+] as INodeProperties[];
+
+const typeEquation = [
+	{
+		displayName: 'Expression',
+		name: 'expression',
+		type: 'string',
+		displayOptions: {
+			show: {
+				textType: [
+					'equation',
+				],
+			},
+		},
+		default: '',
+		description: '',
+	},
+] as INodeProperties[];
+
+const typeText = [
+	{
+		displayName: 'Text',
+		name: 'text',
+		displayOptions: {
+			show: {
+				textType: [
+					'text',
+				],
+			},
+		},
+		type: 'string',
+		default: '',
+		description: `Text content. This field contains the actual content</br>
+		of your text and is probably the field you'll use most often.`,
+	},
+	{
+		displayName: 'Is Link',
+		name: 'isLink',
+		displayOptions: {
+			show: {
+				textType: [
+					'text',
+				],
+			},
+		},
+		type: 'boolean',
+		default: false,
+	},
+	{
+		displayName: 'Text Link',
+		name: 'textLink',
+		displayOptions: {
+			show: {
+				textType: [
+					'text',
+				],
+				isLink: [
+					true,
+				],
+			},
+		},
+		type: 'string',
+		default: '',
+		description: 'The URL that this link points to.',
+	},
+] as INodeProperties[];
+
+export const text = (displayOptions: IDisplayOptions) => [
+	{
+		displayName: 'Text',
+		name: 'text',
+		placeholder: 'Add Text',
+		type: 'fixedCollection',
+		default: '',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions,
+		options: [
+			{
+				name: 'text',
+				displayName: 'Text',
+				values: [
+					{
+						displayName: 'Type',
+						name: 'textType',
+						type: 'options',
+						options: [
+							{
+								name: 'Equation',
+								value: 'equation',
+							},
+							{
+								name: 'Mention',
+								value: 'mention',
+							},
+							{
+								name: 'Text',
+								value: 'text',
+							},
+						],
+						default: 'text',
+						description: '',
+					},
+					...typeText,
+					...typeMention,
+					...typeEquation,
+
+					...annotation,
+				],
+			},
+		],
+		description: 'Rich text in the block.',
+	}] as INodeProperties[];
+
+
+const todo = (type: string) => [{
+	displayName: 'Checked',
+	name: 'checked',
+	type: 'boolean',
+	default: false,
+	displayOptions: {
+		show: {
+			type: [
+				type,
+			],
+		},
+	},
+	description: 'Whether the to_do is checked or not.',
+}] as INodeProperties[];
+
+const title = (type: string) => [{
+	displayName: 'Title',
+	name: 'title',
+	type: 'string',
+	default: '',
+	displayOptions: {
+		show: {
+			type: [
+				type,
+			],
+		},
+	},
+	description: 'Plain text of page title.',
+}] as INodeProperties[];
+
+const richText = (displayOptions: IDisplayOptions) => [
+	{
+		displayName: 'Rich Text',
+		name: 'richText',
+		type: 'boolean',
+		displayOptions,
+		default: false,
+	},
+] as INodeProperties[];
+
+const textContent = (displayOptions: IDisplayOptions) => [
+	{
+		displayName: 'Text',
+		name: 'textContent',
+		type: 'string',
+		displayOptions,
+		default: '',
+	},
+] as INodeProperties[];
+
+const block = (blockType: string) => {
+	const data: INodeProperties[] = [];
+	switch (blockType) {
+		case 'to_do':
+			data.push(...todo(blockType));
+			data.push(...richText({
+				show: {
+					type: [
+						blockType,
+					],
+				},
+			}));
+			data.push(...textContent({
+				show: {
+					type: [
+						blockType,
+					],
+					richText: [
+						false,
+					],
+				},
+			}));
+			data.push(...text({
+				show: {
+					type: [
+						blockType,
+					],
+					richText: [
+						true,
+					],
+				},
+			}));
+			break;
+		case 'child_page':
+			data.push(...title(blockType));
+			break;
+		default:
+			data.push(...richText({
+				show: {
+					type: [
+						blockType,
+					],
+				},
+			}));
+			data.push(...textContent({
+				show: {
+					type: [
+						blockType,
+					],
+					richText: [
+						false,
+					],
+				},
+			}));
+			data.push(...text({
+				show: {
+					type: [
+						blockType,
+					],
+					richText: [
+						true,
+					],
+				},
+			}));
+			break;
+	}
+	return data;
+};
+
+export const blocks = (resource: string, operation: string) => [{
+	displayName: 'Blocks',
+	name: 'blockUi',
+	type: 'fixedCollection',
+	typeOptions: {
+		multipleValues: true,
+	},
+	default: '',
+	displayOptions: {
+		show: {
+			resource: [
+				resource,
+			],
+			operation: [
+				operation,
+			],
+		},
+	},
+	placeholder: 'Add Block',
+	options: [
+		{
+			name: 'blockValues',
+			displayName: 'Block',
+			values: [
+				{
+					displayName: 'Type',
+					name: 'type',
+					type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getBlockTypes',
+					},
+					description: 'Type of block',
+					default: 'paragraph',
+				},
+				...block('paragraph'),
+				...block('heading_1'),
+				...block('heading_2'),
+				...block('heading_3'),
+				...block('toggle'),
+				...block('to_do'),
+				...block('child_page'),
+				...block('bulleted_list_item'),
+				...block('numbered_list_item'),
+			],
+		},
+	],
+},
+] as INodeProperties[];
+
diff --git a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
new file mode 100644
index 0000000000..5213e581ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts
@@ -0,0 +1,100 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const databaseOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'database',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a database',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all databases',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const databaseFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                database:get                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Database ID',
+		name: 'databaseId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'database',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                database:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'database',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'database',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
new file mode 100644
index 0000000000..5ef0485fb9
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
@@ -0,0 +1,994 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	blocks,
+	text,
+} from './Blocks';
+
+import {
+	filters,
+} from './Filters';
+
+export const databasePageOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a pages in a database',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all pages in a database',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update pages in a database',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const databasePageFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                databasePage:create                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Database ID',
+		name: 'databaseId',
+		type: 'options',
+		default: '',
+		typeOptions: {
+			loadOptionsMethod: 'getDatabases',
+		},
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'The ID of the database that this databasePage belongs to.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Properties',
+		name: 'propertiesUi',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'Add Property',
+		options: [
+			{
+				name: 'propertyValues',
+				displayName: 'Property',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getDatabaseProperties',
+							loadOptionsDependsOn: [
+								'databaseId',
+							],
+						},
+						default: '',
+					},
+					{
+						displayName: 'Type',
+						name: 'type',
+						type: 'hidden',
+						default: '={{$parameter["&key"].split("|")[1]}}',
+					},
+					{
+						displayName: 'Title',
+						name: 'title',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'title',
+								],
+							},
+						},
+						default: '',
+					},
+					{
+						displayName: 'Rich Text',
+						name: 'richText',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								type: [
+									'rich_text',
+								],
+							},
+						},
+						default: false,
+					},
+					{
+						displayName: 'Text',
+						name: 'textContent',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'rich_text',
+								],
+								richText: [
+									false,
+								],
+							},
+						},
+						default: '',
+					},
+					...text({
+						show: {
+							type: [
+								'rich_text',
+							],
+							richText: [
+								true,
+							],
+						},
+					}),
+					{
+						displayName: 'Phone Number',
+						name: 'phoneValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'phone_number',
+								],
+							},
+						},
+						default: '',
+						description: `Phone number. No structure is enforced.`,
+					},
+					{
+						displayName: 'Options',
+						name: 'multiSelectValue',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getPropertySelectValues',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'multi_select',
+								],
+							},
+						},
+						default: [],
+						description: `Name of the options you want to set.
+						Multiples can be defined separated by comma.`,
+					},
+					{
+						displayName: 'Option',
+						name: 'selectValue',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getPropertySelectValues',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'select',
+								],
+							},
+						},
+						default: '',
+						description: `Name of the option you want to set.`,
+					},
+					{
+						displayName: 'Email',
+						name: 'emailValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'email',
+								],
+							},
+						},
+						default: '',
+						description: 'Email address.',
+					},
+					{
+						displayName: 'URL',
+						name: 'urlValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'url',
+								],
+							},
+						},
+						default: '',
+						description: 'Web address.',
+					},
+					{
+						displayName: 'User IDs',
+						name: 'peopleValue',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getUsers',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'people',
+								],
+							},
+						},
+						default: [],
+						description: 'List of users. Multiples can be defined separated by comma.',
+					},
+					{
+						displayName: 'Relation IDs',
+						name: 'relationValue',
+						type: 'string',
+						typeOptions: {
+							multipleValues: true,
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'relation',
+								],
+							},
+						},
+						default: [],
+						description: 'List of databases that belong to another database. Multiples can be defined separated by comma.',
+					},
+					{
+						displayName: 'Checked',
+						name: 'checkboxValue',
+						displayOptions: {
+							show: {
+								type: [
+									'checkbox',
+								],
+							},
+						},
+						type: 'boolean',
+						default: false,
+						description: `
+						Whether or not the checkbox is checked.</br>
+						true represents checked.</br>
+						false represents unchecked.
+						`,
+					},
+					{
+						displayName: 'Number',
+						name: 'numberValue',
+						displayOptions: {
+							show: {
+								type: [
+									'number',
+								],
+							},
+						},
+						type: 'number',
+						default: 0,
+						description: 'Number value.',
+					},
+					{
+						displayName: 'Range',
+						name: 'range',
+						displayOptions: {
+							show: {
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'boolean',
+						default: false,
+						description: 'Weather or not you want to define a date range.',
+					},
+					{
+						displayName: 'Date',
+						name: 'date',
+						displayOptions: {
+							show: {
+								range: [
+									false,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: 'An ISO 8601 format date, with optional time.',
+					},
+					{
+						displayName: 'Date Start',
+						name: 'dateStart',
+						displayOptions: {
+							show: {
+								range: [
+									true,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: 'An ISO 8601 format date, with optional time.',
+					},
+					{
+						displayName: 'Date End',
+						name: 'dateEnd',
+						displayOptions: {
+							show: {
+								range: [
+									true,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: `
+						An ISO 8601 formatted date, with optional time. Represents the end of a date range.`,
+					},
+				],
+			},
+		],
+	},
+	...blocks('databasePage', 'create'),
+	/* -------------------------------------------------------------------------- */
+	/*                      databasePage:update                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page ID',
+		name: 'pageId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		description: 'The ID of the databasePage to update.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Properties',
+		name: 'propertiesUi',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'Add Property',
+		options: [
+			{
+				name: 'propertyValues',
+				displayName: 'Property',
+				values: [
+					{
+						displayName: 'Key',
+						name: 'key',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getDatabaseIdFromPage',
+							loadOptionsDependsOn: [
+								'pageId',
+							],
+						},
+						default: '',
+					},
+					{
+						displayName: 'Type',
+						name: 'type',
+						type: 'hidden',
+						default: '={{$parameter["&key"].split("|")[1]}}',
+					},
+					{
+						displayName: 'Title',
+						name: 'title',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'title',
+								],
+							},
+						},
+						default: '',
+					},
+					{
+						displayName: 'Rich Text',
+						name: 'richText',
+						type: 'boolean',
+						displayOptions: {
+							show: {
+								type: [
+									'rich_text',
+								],
+							},
+						},
+						default: false,
+					},
+					{
+						displayName: 'Text',
+						name: 'textContent',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'rich_text',
+								],
+								richText: [
+									false,
+								],
+							},
+						},
+						default: '',
+					},
+					...text({
+						show: {
+							type: [
+								'rich_text',
+							],
+							richText: [
+								true,
+							],
+						},
+					}),
+					{
+						displayName: 'Phone Number',
+						name: 'phoneValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'phone_number',
+								],
+							},
+						},
+						default: '',
+						description: `Phone number. No structure is enforced.`,
+					},
+					{
+						displayName: 'Options',
+						name: 'multiSelectValue',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getDatabaseOptionsFromPage',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'multi_select',
+								],
+							},
+						},
+						default: [],
+						description: `Name of the options you want to set.
+						Multiples can be defined separated by comma.`,
+					},
+					{
+						displayName: 'Option',
+						name: 'selectValue',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getDatabaseOptionsFromPage',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'select',
+								],
+							},
+						},
+						default: '',
+						description: `Name of the option you want to set.`,
+					},
+					{
+						displayName: 'Email',
+						name: 'emailValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'email',
+								],
+							},
+						},
+						default: '',
+						description: 'Email address.',
+					},
+					{
+						displayName: 'URL',
+						name: 'urlValue',
+						type: 'string',
+						displayOptions: {
+							show: {
+								type: [
+									'url',
+								],
+							},
+						},
+						default: '',
+						description: 'Web address.',
+					},
+					{
+						displayName: 'User IDs',
+						name: 'peopleValue',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getUsers',
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'people',
+								],
+							},
+						},
+						default: [],
+						description: 'List of users. Multiples can be defined separated by comma.',
+					},
+					{
+						displayName: 'Relation IDs',
+						name: 'relationValue',
+						type: 'string',
+						typeOptions: {
+							multipleValues: true,
+						},
+						displayOptions: {
+							show: {
+								type: [
+									'relation',
+								],
+							},
+						},
+						default: [],
+						description: 'List of databases that belong to another database. Multiples can be defined separated by comma.',
+					},
+					{
+						displayName: 'Checked',
+						name: 'checkboxValue',
+						displayOptions: {
+							show: {
+								type: [
+									'checkbox',
+								],
+							},
+						},
+						type: 'boolean',
+						default: false,
+						description: `
+						Whether or not the checkbox is checked.</br>
+						true represents checked.</br>
+						false represents unchecked.
+						`,
+					},
+					{
+						displayName: 'Number',
+						name: 'numberValue',
+						displayOptions: {
+							show: {
+								type: [
+									'number',
+								],
+							},
+						},
+						type: 'number',
+						default: 0,
+						description: 'Number value.',
+					},
+					{
+						displayName: 'Range',
+						name: 'range',
+						displayOptions: {
+							show: {
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'boolean',
+						default: false,
+						description: 'Weather or not you want to define a date range.',
+					},
+					{
+						displayName: 'Date',
+						name: 'date',
+						displayOptions: {
+							show: {
+								range: [
+									false,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: 'An ISO 8601 format date, with optional time.',
+					},
+					{
+						displayName: 'Date Start',
+						name: 'dateStart',
+						displayOptions: {
+							show: {
+								range: [
+									true,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: 'An ISO 8601 format date, with optional time.',
+					},
+					{
+						displayName: 'Date End',
+						name: 'dateEnd',
+						displayOptions: {
+							show: {
+								range: [
+									true,
+								],
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'dateTime',
+						default: '',
+						description: `
+						An ISO 8601 formatted date, with optional time. Represents the end of a date range.`,
+					},
+				],
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                databasePage:getAll                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Database ID',
+		name: 'databaseId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getDatabases',
+		},
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'databasePage',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'databasePage',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Filters',
+				name: 'filter',
+				placeholder: 'Add Filter',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Single Condition',
+						name: 'singleCondition',
+						values: [
+							...filters,
+						],
+					},
+					{
+						displayName: 'Multiple Condition',
+						name: 'multipleCondition',
+						values: [
+							{
+								displayName: 'Condition',
+								name: 'condition',
+								placeholder: 'Add Condition',
+								type: 'fixedCollection',
+								typeOptions: {
+									multipleValues: true,
+								},
+								default: {},
+								options: [
+									{
+										displayName: 'OR',
+										name: 'or',
+										values: [
+											...filters,
+										],
+									},
+									{
+										displayName: 'AND',
+										name: 'and',
+										values: [
+											...filters,
+										],
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Sort',
+				name: 'sort',
+				placeholder: 'Add Sort',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Sort',
+						name: 'sortValue',
+						values: [
+							{
+								displayName: 'Timestamp',
+								name: 'timestamp',
+								type: 'boolean',
+								default: false,
+								description: `Whether or not to use the record's timestamp to sort the response.`,
+							},
+							{
+								displayName: 'Property Name',
+								name: 'key',
+								type: 'options',
+								displayOptions: {
+									show: {
+										timestamp: [
+											false,
+										],
+									},
+								},
+								typeOptions: {
+									loadOptionsMethod: 'getFilterProperties',
+									loadOptionsDependsOn: [
+										'datatabaseId',
+									],
+								},
+								default: '',
+								description: 'The name of the property to filter by.',
+							},
+							{
+								displayName: 'Property Name',
+								name: 'key',
+								type: 'options',
+								options: [
+									{
+										name: 'Created Time',
+										value: 'created_time',
+									},
+									{
+										name: 'Last Edited Time',
+										value: 'last_edited_time',
+									},
+								],
+								displayOptions: {
+									show: {
+										timestamp: [
+											true,
+										],
+									},
+								},
+								default: '',
+								description: 'The name of the property to filter by.',
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'hidden',
+								displayOptions: {
+									show: {
+										timestamp: [
+											true,
+										],
+									},
+								},
+								default: '={{$parameter["&key"].split("|")[1]}}',
+							},
+							{
+								displayName: 'Direction',
+								name: 'direction',
+								type: 'options',
+								options: [
+									{
+										name: 'Ascending',
+										value: 'ascending',
+									},
+									{
+										name: 'Descending',
+										value: 'descending',
+									},
+								],
+								default: '',
+								description: 'The direction to sort.',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/Filters.ts b/packages/nodes-base/nodes/Notion/Filters.ts
new file mode 100644
index 0000000000..dcf159afff
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/Filters.ts
@@ -0,0 +1,371 @@
+import {
+	getConditions
+} from './GenericFunctions';
+
+export const filters = [{
+	displayName: 'Property Name',
+	name: 'key',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getFilterProperties',
+		loadOptionsDependsOn: [
+			'datatabaseId',
+		],
+	},
+	default: '',
+	description: 'The name of the property to filter by.',
+},
+{
+	displayName: 'Type',
+	name: 'type',
+	type: 'hidden',
+	default: '={{$parameter["&key"].split("|")[1]}}',
+},
+...getConditions(),
+{
+	displayName: 'Title',
+	name: 'titleValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'title',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+},
+{
+	displayName: 'Text',
+	name: 'richTextValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'rich_text',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+},
+{
+	displayName: 'Phone Number',
+	name: 'phoneNumberValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'phone_number',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: `Phone number. No structure is enforced.`,
+},
+{
+	displayName: 'Option',
+	name: 'multiSelectValue',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getPropertySelectValues',
+	},
+	displayOptions: {
+		show: {
+			type: [
+				'multi_select',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: [],
+	description: `Name of the options you want to set.
+	Multiples can be defined separated by comma.`,
+},
+{
+	displayName: 'Option',
+	name: 'selectValue',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getPropertySelectValues',
+	},
+	displayOptions: {
+		show: {
+			type: [
+				'select',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: `Name of the option you want to set.`,
+},
+{
+	displayName: 'Email',
+	name: 'emailValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'email',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: 'Email address.',
+},
+{
+	displayName: 'URL',
+	name: 'urlValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'url',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: 'Web address.',
+},
+{
+	displayName: 'User ID',
+	name: 'peopleValue',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getUsers',
+	},
+	displayOptions: {
+		show: {
+			type: [
+				'people',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: 'List of users. Multiples can be defined separated by comma.',
+},
+{
+	displayName: 'User ID',
+	name: 'createdByValue',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getUsers',
+	},
+	displayOptions: {
+		show: {
+			type: [
+				'created_by',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: 'List of users. Multiples can be defined separated by comma.',
+},
+{
+	displayName: 'User ID',
+	name: 'lastEditedByValue',
+	type: 'options',
+	typeOptions: {
+		loadOptionsMethod: 'getUsers',
+	},
+	displayOptions: {
+		show: {
+			type: [
+				'last_edited_by',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+	description: 'List of users. Multiples can be defined separated by comma.',
+},
+{
+	displayName: 'Relation ID',
+	name: 'relationValue',
+	type: 'string',
+	displayOptions: {
+		show: {
+			type: [
+				'relation',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	default: '',
+},
+{
+	displayName: 'Checked',
+	name: 'checkboxValue',
+	displayOptions: {
+		show: {
+			type: [
+				'checkbox',
+			],
+		},
+	},
+	type: 'boolean',
+	default: false,
+	description: `Whether or not the checkbox is checked.</br>
+				true represents checked.</br>
+				false represents unchecked.`,
+},
+{
+	displayName: 'Number',
+	name: 'numberValue',
+	displayOptions: {
+		show: {
+			type: [
+				'number',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+			],
+		},
+	},
+	type: 'number',
+	default: 0,
+	description: 'Number value.',
+},
+{
+	displayName: 'Date',
+	name: 'date',
+	displayOptions: {
+		show: {
+			type: [
+				'date',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+				'past_week',
+				'past_month',
+				'past_year',
+				'next_week',
+				'next_month',
+				'next_year',
+			],
+		},
+	},
+	type: 'dateTime',
+	default: '',
+	description: 'An ISO 8601 format date, with optional time.',
+},
+{
+	displayName: 'Created Time',
+	name: 'createdTimeValue',
+	displayOptions: {
+		show: {
+			type: [
+				'created_time',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+				'past_week',
+				'past_month',
+				'past_year',
+				'next_week',
+				'next_month',
+				'next_year',
+			],
+		},
+	},
+	type: 'dateTime',
+	default: '',
+	description: 'An ISO 8601 format date, with optional time.',
+},
+{
+	displayName: 'Last Edited Time',
+	name: 'lastEditedTime',
+	displayOptions: {
+		show: {
+			type: [
+				'last_edited_time',
+			],
+		},
+		hide: {
+			condition: [
+				'is_empty',
+				'is_not_empty',
+				'past_week',
+				'past_month',
+				'past_year',
+				'next_week',
+				'next_month',
+				'next_year',
+			],
+		},
+	},
+	type: 'dateTime',
+	default: '',
+	description: 'An ISO 8601 format date, with optional time.',
+}];
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
new file mode 100644
index 0000000000..df54434d28
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -0,0 +1,542 @@
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	IDisplayOptions,
+	INodeProperties,
+	IPollFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+import {
+	camelCase,
+	capitalCase,
+} from 'change-case';
+
+import * as moment from 'moment-timezone';
+
+export async function notionApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	try {
+		let options: OptionsWithUri = {
+			headers: {
+				'Notion-Version': '2021-05-13',
+			},
+			method,
+			qs,
+			body,
+			uri: uri || `https://api.notion.com/v1${resource}`,
+			json: true,
+		};
+
+		options = Object.assign({}, options, option);
+		const credentials = this.getCredentials('notionApi') as IDataObject;
+		options!.headers!['Authorization'] = `Bearer ${credentials.apiKey}`;
+		return this.helpers.request!(options);
+
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+export async function notionApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await notionApiRequest.call(this, method, endpoint, body, query);
+		const { next_cursor } = responseData;
+		query['start_cursor'] = next_cursor;
+		body['start_cursor'] = next_cursor;
+		returnData.push.apply(returnData, responseData[propertyName]);
+		if (query.limit && query.limit <= returnData.length) {
+			return returnData;
+		}
+	} while (
+		responseData.has_more !== false
+	);
+
+	return returnData;
+}
+
+export function getBlockTypes() {
+	return [
+		{
+			name: 'Paragraph',
+			value: 'paragraph',
+		},
+		{
+			name: 'Heading 1',
+			value: 'heading_1',
+		},
+		{
+			name: 'Heading 2',
+			value: 'heading_2',
+		},
+		{
+			name: 'Heading 3',
+			value: 'heading_3',
+		},
+		{
+			name: 'Toggle',
+			value: 'toggle',
+		},
+		{
+			name: 'To-Do',
+			value: 'to_do',
+		},
+		// {
+		// 	name: 'Child Page',
+		// 	value: 'child_page',
+		// },
+		{
+			name: 'Bulleted List Item',
+			value: 'bulleted_list_item',
+		},
+		{
+			name: 'Numbered List Item',
+			value: 'numbered_list_item',
+		},
+	];
+}
+
+function textContent(content: string) {
+	return {
+		text: {
+			content,
+		},
+	};
+}
+
+export function formatTitle(content: string) {
+	return {
+		title: [
+			textContent(content),
+		],
+	};
+}
+
+export function formatText(content: string) {
+	return {
+		text: [
+			textContent(content),
+		],
+	};
+}
+
+function getLink(text: { textLink: string, isLink: boolean }) {
+	if (text.isLink === true) {
+		return {
+			link: {
+				url: text.textLink,
+			},
+		};
+	}
+	return {};
+}
+
+function getTexts(texts: [{ textType: string, text: string, isLink: boolean, range: boolean, textLink: string, mentionType: string, dateStart: string, dateEnd: string, date: string, annotationUi: IDataObject, expression: string }]) {
+	const results = [];
+	for (const text of texts) {
+		if (text.textType === 'text') {
+			results.push({
+				type: 'text',
+				text: {
+					content: text.text,
+					...getLink(text),
+				},
+				annotations: text.annotationUi,
+			});
+		} else if (text.textType === 'mention') {
+			if (text.mentionType === 'date') {
+				results.push({
+					type: 'mention',
+					mention: {
+						type: text.mentionType,
+						[text.mentionType]: (text.range === true)
+							? { start: text.dateStart, end: text.dateEnd }
+							: { start: text.date, end: null },
+					},
+					annotations: text.annotationUi,
+				});
+			} else {
+				//@ts-ignore
+				results.push({
+					type: 'mention',
+					mention: {
+						type: text.mentionType,
+						//@ts-ignore
+						[text.mentionType]: { id: text[text.mentionType] as string },
+					},
+					annotations: text.annotationUi,
+				});
+			}
+		} else if (text.textType === 'equation') {
+			results.push({
+				type: 'equation',
+				equation: {
+					expression: text.expression,
+				},
+				annotations: text.annotationUi,
+			});
+		}
+	}
+	return results;
+}
+
+export function formatBlocks(blocks: IDataObject[]) {
+	const results = [];
+	for (const block of blocks) {
+		results.push({
+			object: 'block',
+			type: block.type,
+			[block.type as string]: {
+				...(block.type === 'to_do') ? { checked: block.checked } : { checked: false },
+				//@ts-expect-error
+				// tslint:disable-next-line: no-any
+				text: (block.richText === false) ? formatText(block.textContent).text : getTexts(block.text.text as any || []),
+			},
+		});
+	}
+	return results;
+}
+
+// tslint:disable-next-line: no-any
+function getPropertyKeyValue(value: any, type: string, timezone: string) {
+	let result = {};
+	switch (type) {
+		case 'rich_text':
+			if (value.richText === false) {
+				result = { rich_text: [{ text: { content: value.textContent } }] };
+			} else {
+				result = { rich_text: getTexts(value.text.text) };
+			}
+			break;
+		case 'title':
+			result = { title: [{ text: { content: value.title } }] };
+			break;
+		case 'number':
+			result = { type: 'number', number: value.numberValue };
+			break;
+		case 'url':
+			result = { type: 'url', url: value.urlValue };
+			break;
+		case 'checkbox':
+			result = { type: 'checkbox', checkbox: value.checkboxValue };
+			break;
+		case 'relation':
+			result = {
+				// tslint:disable-next-line: no-any
+				type: 'relation', relation: (value.relationValue).reduce((acc: [], cur: any) => {
+					return acc.concat(cur.split(',').map((relation: string) => ({ id: relation })));
+				}, []),
+			};
+			break;
+		case 'multi_select':
+			result = {
+				// tslint:disable-next-line: no-any
+				type: 'multi_select', multi_select: value.multiSelectValue.filter((id: any) => id !== null).map((option: string) => ({ id: option })),
+			};
+			break;
+		case 'email':
+			result = {
+				type: 'email', email: value.emailValue,
+			};
+			break;
+		case 'people':
+			result = {
+				type: 'people', people: value.peopleValue.map((option: string) => ({ id: option })),
+			};
+			break;
+		case 'phone_number':
+			result = {
+				type: 'phone_number', phone_number: value.phoneValue,
+			};
+			break;
+		case 'select':
+			result = {
+				type: 'select', select: { id: value.selectValue },
+			};
+			break;
+		case 'date':
+			if (value.range === true) {
+				result = {
+					type: 'date', date: { start: moment.tz(value.dateStart, timezone).utc().format(), end: moment.tz(value.dateEnd, timezone).utc().format() },
+				};
+			} else {
+				result = {
+					type: 'date', date: { start: moment.tz(value.date, timezone).utc().format(), end: null },
+				};
+			}
+			break;
+		default:
+	}
+	return result;
+}
+
+function getNameAndType(key: string) {
+	const [name, type] = key.split('|');
+	return {
+		name,
+		type,
+	};
+}
+
+export function mapProperties(properties: IDataObject[], timezone: string) {
+	return properties.reduce((obj, value) => Object.assign(obj, {
+		[`${(value.key as string).split('|')[0]}`]: getPropertyKeyValue(value, (value.key as string).split('|')[1], timezone),
+	}), {});
+}
+
+export function mapSorting(data: [{ key: string, type: string, direction: string, timestamp: boolean }]) {
+	return data.map((sort) => {
+		return {
+			direction: sort.direction,
+			[(sort.timestamp) ? 'timestamp' : 'property']: sort.key.split('|')[0],
+		};
+	});
+}
+
+export function mapFilters(filters: IDataObject[], timezone: string) {
+	// tslint:disable-next-line: no-any
+	return filters.reduce((obj, value: { [key: string]: any }) => {
+		let key = getNameAndType(value.key).type;
+		let valuePropertyName = value[`${camelCase(key)}Value`];
+		if (['is_empty', 'is_not_empty'].includes(value.condition as string)) {
+			valuePropertyName = true;
+		} else if (['past_week', 'past_month', 'past_year', 'next_week', 'next_month', 'next_year'].includes(value.condition as string)) {
+			valuePropertyName = {};
+		}
+		if (key === 'rich_text') {
+			key = 'text';
+		} else if (key === 'phone_number') {
+			key = 'phone';
+		} else if (key === 'date') {
+			valuePropertyName = (valuePropertyName !== undefined && !Object.keys(valuePropertyName).length) ? {} : moment.tz(value.date, timezone).utc().format();
+		}
+		return Object.assign(obj, {
+			['property']: getNameAndType(value.key).name,
+			[key]: { [`${value.condition}`]: valuePropertyName },
+		});
+	}, {});
+}
+
+// tslint:disable-next-line: no-any
+export function simplifyProperties(properties: any) {
+	// tslint:disable-next-line: no-any
+	const results: any = {};
+	for (const key of Object.keys(properties)) {
+		const type = (properties[key] as IDataObject).type as string;
+		if (['text'].includes(properties[key].type)) {
+			const texts = properties[key].text.map((e: { plain_text: string }) => e.plain_text || {}).join('');
+			results[`${key}`] = texts;
+		} else if (['url', 'created_time', 'checkbox', 'number', 'last_edited_time', 'email', 'phone_number', 'date'].includes(properties[key].type)) {
+			// tslint:disable-next-line: no-any
+			results[`${key}`] = properties[key][type] as any;
+		} else if (['title'].includes(properties[key].type)) {
+			if (Array.isArray(properties[key][type]) && properties[key][type].length !== 0) {
+				results[`${key}`] = properties[key][type][0].plain_text;
+			} else {
+				results[`${key}`] = '';
+			}
+		} else if (['created_by', 'last_edited_by', 'select'].includes(properties[key].type)) {
+			results[`${key}`] = properties[key][type].name;
+		} else if (['people'].includes(properties[key].type)) {
+			if (Array.isArray(properties[key][type])) {
+				// tslint:disable-next-line: no-any
+				results[`${key}`] = properties[key][type].map((person: any) => person.person.email || {});
+			} else {
+				results[`${key}`] = properties[key][type];
+			}
+		} else if (['multi_select'].includes(properties[key].type)) {
+			if (Array.isArray(properties[key][type])) {
+				results[`${key}`] = properties[key][type].map((e: IDataObject) => e.name || {});
+			} else {
+				results[`${key}`] = properties[key][type].options.map((e: IDataObject) => e.name || {});
+			}
+		} else if (['relation'].includes(properties[key].type)) {
+			if (Array.isArray(properties[key][type])) {
+				results[`${key}`] = properties[key][type].map((e: IDataObject) => e.id || {});
+			} else {
+				results[`${key}`] = properties[key][type].database_id;
+			}
+		} else if (['formula'].includes(properties[key].type)) {
+			results[`${key}`] = properties[key][type][properties[key][type].type];
+
+		} else if (['rollup'].includes(properties[key].type)) {
+			//TODO figure how to resolve rollup field type
+			// results[`${key}`] = properties[key][type][properties[key][type].type];
+		}
+	}
+	return results;
+}
+
+// tslint:disable-next-line: no-any
+export function simplifyObjects(objects: any) {
+	if (!Array.isArray(objects)) {
+		objects = [objects];
+	}
+	const results: IDataObject[] = [];
+	for (const { object, id, properties, parent, title } of objects) {
+		if (object === 'page' && (parent.type === 'page_id' || parent.type === 'workspace')) {
+			results.push({
+				id,
+				title: properties.title.title[0].plain_text,
+			});
+		} else if (object === 'page' && parent.type === 'database_id') {
+			results.push({
+				id,
+				...simplifyProperties(properties),
+			});
+		} else if (object === 'database') {
+			results.push({
+				id,
+				title: title[0].plain_text,
+			});
+		}
+	}
+	return results;
+}
+
+export function getFormattedChildren(children: IDataObject[]) {
+	const results: IDataObject[] = [];
+	for (const child of children) {
+		const type = child.type;
+		results.push({ [`${type}`]: child, object: 'block', type });
+	}
+	return results;
+}
+
+export function getConditions() {
+
+	const elements: INodeProperties[] = [];
+
+	const types: { [key: string]: string } = {
+		title: 'rich_text',
+		rich_text: 'rich_text',
+		number: 'number',
+		checkbox: 'checkbox',
+		select: 'select',
+		multi_select: 'multi_select',
+		date: 'date',
+		people: 'people',
+		files: 'files',
+		url: 'rich_text',
+		email: 'rich_text',
+		phone_number: 'rich_text',
+		relation: 'relation',
+		//formula: 'formula',
+		created_by: 'people',
+		created_time: 'date',
+		last_edited_by: 'people',
+		last_edited_time: 'date',
+	};
+
+	const typeConditions: { [key: string]: string[] } = {
+		rich_text: [
+			'equals',
+			'does_not_equal',
+			'contains',
+			'does_not_contain',
+			'starts_with',
+			'ends_with',
+			'is_empty',
+			'is_not_empty',
+		],
+		number: [
+			'equals',
+			'does_not_equal',
+			'grater_than',
+			'less_than',
+			'greater_than_or_equal_to',
+			'less_than_or_equal_to',
+			'is_empty',
+			'is_not_empty',
+		],
+		checkbox: [
+			'equals',
+			'does_not_equal',
+		],
+		select: [
+			'equals',
+			'does_not_equal',
+			'is_empty',
+			'is_not_empty',
+		],
+		multi_select: [
+			'contains',
+			'does_not_equal',
+			'is_empty',
+			'is_not_empty',
+		],
+		date: [
+			'equals',
+			'before',
+			'after',
+			'on_or_before',
+			'is_empty',
+			'is_not_empty',
+			'on_or_after',
+			'past_week',
+			'past_month',
+			'past_year',
+			'next_week',
+			'next_month',
+			'next_year',
+		],
+		people: [
+			'contains',
+			'does_not_contain',
+			'is_empty',
+			'is_not_empty',
+		],
+		files: [
+			'is_empty',
+			'is_not_empty',
+		],
+		relation: [
+			'contains',
+			'does_not_contain',
+			'is_empty',
+			'is_not_empty',
+		],
+		formula: [
+			'contains',
+			'does_not_contain',
+			'is_empty',
+			'is_not_empty',
+		],
+	};
+
+	for (const type of Object.keys(types)) {
+		elements.push(
+			{
+				displayName: 'Condition',
+				name: 'condition',
+				type: 'options',
+				displayOptions: {
+					show: {
+						type: [
+							type,
+						],
+					},
+				} as IDisplayOptions,
+				options: (typeConditions[types[type]] as string[]).map((type: string) => ({ name: capitalCase(type), value: type })),
+				default: '',
+				description: 'The value of the property to filter by.',
+			} as INodeProperties,
+		);
+	}
+	return elements;
+}
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.ts b/packages/nodes-base/nodes/Notion/Notion.node.ts
new file mode 100644
index 0000000000..78b3cf921a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/Notion.node.ts
@@ -0,0 +1,514 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	formatBlocks,
+	formatTitle,
+	getBlockTypes,
+	mapFilters,
+	mapProperties,
+	mapSorting,
+	notionApiRequest,
+	notionApiRequestAllItems,
+	simplifyObjects,
+} from './GenericFunctions';
+
+import {
+	databaseFields,
+	databaseOperations,
+} from './DatabaseDescription';
+
+import {
+	userFields,
+	userOperations,
+} from './UserDescription';
+
+import {
+	pageFields,
+	pageOperations,
+} from './PageDescription';
+
+import {
+	blockFields,
+	blockOperations,
+} from './BlockDescription';
+
+import {
+	databasePageFields,
+	databasePageOperations,
+} from './DatabasePageDescription';
+
+export class Notion implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Notion (Beta)',
+		name: 'notion',
+		icon: 'file:notion.svg',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Notion API (Beta)',
+		defaults: {
+			name: 'Notion',
+			color: '#000000',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'notionApi',
+				required: true,
+				// displayOptions: {
+				// 	show: {
+				// 		authentication: [
+				// 			'apiKey',
+				// 		],
+				// 	},
+				// },
+			},
+			// {
+			// 	name: 'notionOAuth2Api',
+			// 	required: true,
+			// 	displayOptions: {
+			// 		show: {
+			// 			authentication: [
+			// 				'oAuth2',
+			// 			],
+			// 		},
+			// 	},
+			// },
+		],
+		properties: [
+			// {
+			// 	displayName: 'Authentication',
+			// 	name: 'authentication',
+			// 	type: 'options',
+			// 	options: [
+			// 		{
+			// 			name: 'API Key',
+			// 			value: 'apiKey',
+			// 		},
+			// 		{
+			// 			name: 'OAuth2',
+			// 			value: 'oAuth2',
+			// 		},
+			// 	],
+			// 	default: 'apiKey',
+			// 	description: 'The resource to operate on.',
+			// },
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Block',
+						value: 'block',
+					},
+					{
+						name: 'Database',
+						value: 'database',
+					},
+					{
+						name: 'Database Page',
+						value: 'databasePage',
+					},
+					{
+						name: 'Page',
+						value: 'page',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+				],
+				default: 'page',
+				description: 'Resource to consume.',
+			},
+			...blockOperations,
+			...blockFields,
+			...databaseOperations,
+			...databaseFields,
+			...databasePageOperations,
+			...databasePageFields,
+			...pageOperations,
+			...pageFields,
+			...userOperations,
+			...userFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getDatabases(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const body: IDataObject = {
+					page_size: 100,
+					filter: { property: 'object', value: 'database' },
+				};
+				const databases = await notionApiRequestAllItems.call(this, 'results', 'POST', `/search`, body);
+				for (const database of databases) {
+					returnData.push({
+						name: database.title[0].plain_text,
+						value: database.id,
+					});
+				}
+				returnData.sort((a, b) => {
+					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) { return -1; }
+					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+			async getDatabaseProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const databaseId = this.getCurrentNodeParameter('databaseId') as string;
+				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+				for (const key of Object.keys(properties)) {
+					//remove parameters that cannot be set from the API.
+					if (!['created_time', 'last_edited_time', 'created_by', 'last_edited_by', 'formula', 'files'].includes(properties[key].type)) {
+						returnData.push({
+							name: `${key} - (${properties[key].type})`,
+							value: `${key}|${properties[key].type}`,
+						});
+					}
+				}
+				returnData.sort((a, b) => {
+					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) { return -1; }
+					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+			async getFilterProperties(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const databaseId = this.getCurrentNodeParameter('databaseId') as string;
+				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+				for (const key of Object.keys(properties)) {
+					returnData.push({
+						name: `${key} - (${properties[key].type})`,
+						value: `${key}|${properties[key].type}`,
+					});
+				}
+				returnData.sort((a, b) => {
+					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) { return -1; }
+					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+			async getBlockTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				return getBlockTypes();
+			},
+			async getPropertySelectValues(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
+				const databaseId = this.getCurrentNodeParameter('databaseId') as string;
+				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+				return (properties[name][type].options).map((option: IDataObject) => ({ name: option.name, value: option.id }));
+			},
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const users = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+				for (const user of users) {
+					returnData.push({
+						name: user.name,
+						value: user.id,
+					});
+				}
+				return returnData;
+			},
+			async getDatabaseIdFromPage(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const pageId = this.getCurrentNodeParameter('pageId') as string;
+				const { parent: { database_id: databaseId } } = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+				for (const key of Object.keys(properties)) {
+					//remove parameters that cannot be set from the API.
+					if (!['created_time', 'last_edited_time', 'created_by', 'last_edited_by', 'formula', 'files'].includes(properties[key].type)) {
+						returnData.push({
+							name: `${key} - (${properties[key].type})`,
+							value: `${key}|${properties[key].type}`,
+						});
+					}
+				}
+				returnData.sort((a, b) => {
+					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) { return -1; }
+					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+
+			async getDatabaseOptionsFromPage(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const pageId = this.getCurrentNodeParameter('pageId') as string;
+				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
+				const { parent: { database_id: databaseId } } = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+				return (properties[name][type].options).map((option: IDataObject) => ({ name: option.name, value: option.id }));
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length as unknown as number;
+		let responseData;
+		const qs: IDataObject = {};
+		const timezone = this.getTimezone();
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		if (resource === 'block') {
+
+			if (operation === 'append') {
+				for (let i = 0; i < length; i++) {
+					const blockId = this.getNodeParameter('blockId', i) as string;
+					const body: IDataObject = {
+						children: formatBlocks(this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[]),
+					};
+					const block = await notionApiRequest.call(this, 'PATCH', `/blocks/${blockId}/children`, body);
+					returnData.push(block);
+				}
+			}
+
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					const blockId = this.getNodeParameter('blockId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll) {
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', `/blocks/${blockId}/children`, {});
+					} else {
+						qs.page_size = this.getNodeParameter('limit', i) as number;
+						responseData = await notionApiRequest.call(this, 'GET', `/blocks/${blockId}/children`, {});
+						responseData = responseData.results;
+					}
+					returnData.push.apply(returnData, responseData);
+				}
+			}
+		}
+
+		if (resource === 'database') {
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					const databaseId = this.getNodeParameter('databaseId', i) as string;
+					responseData = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
+					returnData.push(responseData);
+				}
+			}
+
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					const body: IDataObject = {
+						page_size: 100,
+						filter: { property: 'object', value: 'database' },
+					};
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll) {
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'POST', `/search`, body);
+					} else {
+						body['page_size'] = this.getNodeParameter('limit', i) as number;
+						responseData = await notionApiRequest.call(this, 'POST', `/search`, body);
+						responseData = responseData.results;
+					}
+					returnData.push.apply(returnData, responseData);
+				}
+			}
+		}
+
+		if (resource === 'databasePage') {
+
+			if (operation === 'create') {
+				for (let i = 0; i < length; i++) {
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					// tslint:disable-next-line: no-any
+					const body: { [key: string]: any } = {
+						parent: {},
+						properties: {},
+					};
+					body.parent['database_id'] = this.getNodeParameter('databaseId', i) as string;
+					const properties = this.getNodeParameter('propertiesUi.propertyValues', i, []) as IDataObject[];
+					if (properties.length !== 0) {
+						body.properties = mapProperties(properties, timezone) as IDataObject;
+					}
+					body.children = formatBlocks(this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[]);
+					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+					returnData.push.apply(returnData, Array.isArray(responseData) ? responseData : [responseData]);
+				}
+			}
+
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					const simple = this.getNodeParameter('simple', 0) as boolean;
+					const databaseId = this.getNodeParameter('databaseId', i) as string;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const filters = this.getNodeParameter('options.filter', i, {}) as IDataObject;
+					const sort = this.getNodeParameter('options.sort.sortValue', i, []) as IDataObject[];
+					const body: IDataObject = {
+						filter: {},
+					};
+					if (filters.singleCondition) {
+						body['filter'] = mapFilters([filters.singleCondition] as IDataObject[], timezone);
+					}
+					if (filters.multipleCondition) {
+						const { or, and } = (filters.multipleCondition as IDataObject).condition as IDataObject;
+						if (Array.isArray(or) && or.length !== 0) {
+							Object.assign(body.filter, { or: (or as IDataObject[]).map((data) => mapFilters([data], timezone)) });
+						}
+						if (Array.isArray(and) && and.length !== 0) {
+							Object.assign(body.filter, { and: (and as IDataObject[]).map((data) => mapFilters([data], timezone)) });
+						}
+					}
+					if (!Object.keys(body.filter as IDataObject).length) {
+						delete body.filter;
+					}
+					if (sort) {
+						//@ts-expect-error
+						body['sorts'] = mapSorting(sort);
+					}
+					if (returnAll) {
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'POST', `/databases/${databaseId}/query`, body, {});
+					} else {
+						body.page_size = this.getNodeParameter('limit', i) as number;
+						responseData = await notionApiRequest.call(this, 'POST', `/databases/${databaseId}/query`, body, qs);
+						responseData = responseData.results;
+					}
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+					returnData.push.apply(returnData, responseData);
+				}
+			}
+
+			if (operation === 'update') {
+				for (let i = 0; i < length; i++) {
+					const pageId = this.getNodeParameter('pageId', i) as string;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const properties = this.getNodeParameter('propertiesUi.propertyValues', i, []) as IDataObject[];
+					// tslint:disable-next-line: no-any
+					const body: { [key: string]: any } = {
+						properties: {},
+					};
+					if (properties.length !== 0) {
+						body.properties = mapProperties(properties, timezone) as IDataObject;
+					}
+					responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, body);
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+					returnData.push.apply(returnData, Array.isArray(responseData) ? responseData : [responseData]);
+				}
+			}
+		}
+
+		if (resource === 'user') {
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					const userId = this.getNodeParameter('userId', i) as string;
+					responseData = await notionApiRequest.call(this, 'GET', `/users/${userId}`);
+					returnData.push(responseData);
+				}
+			}
+			if (operation === 'getAll') {
+				for (let i = 0; i < length; i++) {
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					if (returnAll) {
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'GET', '/users');
+						responseData = responseData.splice(0, qs.limit);
+					}
+					returnData.push.apply(returnData, responseData);
+				}
+			}
+		}
+
+		if (resource === 'page') {
+
+			if (operation === 'create') {
+				for (let i = 0; i < length; i++) {
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					// tslint:disable-next-line: no-any
+					const body: { [key: string]: any } = {
+						parent: {},
+						properties: {},
+					};
+					body.parent['page_id'] = this.getNodeParameter('pageId', i) as string;
+					body.properties = formatTitle(this.getNodeParameter('title', i) as string);
+					body.children = formatBlocks(this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[]);
+					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+					returnData.push.apply(returnData, Array.isArray(responseData) ? responseData : [responseData]);
+				}
+			}
+
+			if (operation === 'get') {
+				for (let i = 0; i < length; i++) {
+					const pageId = this.getNodeParameter('pageId', i) as string;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					responseData = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+					returnData.push.apply(returnData, Array.isArray(responseData) ? responseData : [responseData]);
+				}
+			}
+
+			if (operation === 'search') {
+				for (let i = 0; i < length; i++) {
+					const text = this.getNodeParameter('text', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					const simple = this.getNodeParameter('simple', i) as boolean;
+					const body: IDataObject = {};
+
+					if (text) {
+						body['query'] = text;
+					}
+
+					if (options.filter) {
+						const filter = (options.filter as IDataObject || {}).filters as IDataObject[] || [];
+						body['filter'] = filter;
+					}
+
+					if (options.sort) {
+						const sort = (options.sort as IDataObject || {}).sortValue as IDataObject || {};
+						body['sort'] = sort;
+					}
+					if (returnAll) {
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'POST', '/search', body);
+					} else {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+						responseData = await notionApiRequestAllItems.call(this, 'results', 'POST', '/search', body);
+						responseData = responseData.splice(0, qs.limit);
+					}
+
+					if (simple === true) {
+						responseData = simplifyObjects(responseData);
+					}
+
+					returnData.push.apply(returnData, responseData);
+				}
+			}
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
new file mode 100644
index 0000000000..66e09fbc8e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -0,0 +1,188 @@
+import {
+	IPollFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	notionApiRequest,
+	simplifyObjects,
+} from './GenericFunctions';
+
+import * as moment from 'moment';
+
+export class NotionTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Notion Trigger (Beta)',
+		name: 'notionTrigger',
+		icon: 'file:notion.svg',
+		group: ['trigger'],
+		version: 1,
+		description: 'Starts the workflow when Notion events occur',
+		subtitle: '={{$parameter["event"]}}',
+		defaults: {
+			name: 'Notion Trigger',
+			color: '#000000',
+		},
+		credentials: [
+			{
+				name: 'notionApi',
+				required: true,
+			},
+		],
+		polling: true,
+		inputs: [],
+		outputs: ['main'],
+		properties: [
+			{
+				displayName: 'Event',
+				name: 'event',
+				type: 'options',
+				options: [
+					{
+						name: 'Page Added to Database',
+						value: 'pageAddedToDatabase',
+					},
+					// {
+					// 	name: 'Record Updated',
+					// 	value: 'recordUpdated',
+					// },
+				],
+				required: true,
+				default: '',
+			},
+			{
+				displayName: 'Database',
+				name: 'databaseId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getDatabases',
+				},
+				displayOptions: {
+					show: {
+						event: [
+							'pageAddedToDatabase',
+						],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'The ID of this database.',
+			},
+			{
+				displayName: 'Simple',
+				name: 'simple',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						event: [
+							'pageAddedToDatabase',
+						],
+					},
+				},
+				default: true,
+				description: 'When set to true a simplify version of the response will be used else the raw data.',
+			},
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getDatabases(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { results: databases } = await notionApiRequest.call(this, 'POST', `/search`, { page_size: 100, filter: { property: 'object', value: 'database' } });
+				for (const database of databases) {
+					returnData.push({
+						name: database.title[0].plain_text,
+						value: database.id,
+					});
+				}
+				returnData.sort((a, b) => {
+					if (a.name.toLocaleLowerCase() < b.name.toLocaleLowerCase()) { return -1; }
+					if (a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase()) { return 1; }
+					return 0;
+				});
+				return returnData;
+			},
+		},
+	};
+
+	async poll(this: IPollFunctions): Promise<INodeExecutionData[][] | null> {
+		const webhookData = this.getWorkflowStaticData('node');
+		const databaseId = this.getNodeParameter('databaseId') as string;
+		const event = this.getNodeParameter('event') as string;
+		const simple = this.getNodeParameter('simple') as boolean;
+
+		const now = moment().utc().format();
+
+		const startDate = webhookData.lastTimeChecked as string || now;
+
+		const endDate = now;
+
+		webhookData.lastTimeChecked = endDate;
+
+		const sortProperty = (event === 'pageAddedToDatabase') ? 'created_time' : 'last_edited_time';
+
+		const body: IDataObject = {
+			page_size: 1,
+			sorts: [
+				{
+					timestamp: sortProperty,
+					direction: 'descending',
+				},
+			],
+		};
+
+		let records: IDataObject[] = [];
+
+		let hasMore = true;
+
+		//get last record
+		let { results: data } = await notionApiRequest.call(this, 'POST', `/databases/${databaseId}/query`, body);
+
+		if (this.getMode() === 'manual') {
+			if (simple === true) {
+				data = simplifyObjects(data);
+			}
+			if (Array.isArray(data) && data.length) {
+				return [this.helpers.returnJsonArray(data)];
+			}
+		}
+
+		// if something changed after the last check
+		if (Object.keys(data[0]).length !== 0 && webhookData.lastRecordProccesed !== data[0].id) {
+			do {
+				body.page_size = 10;
+				const { results, has_more, next_cursor } = await notionApiRequest.call(this, 'POST', `/databases/${databaseId}/query`, body);
+				records.push.apply(records, results);
+				hasMore = has_more;
+				if (next_cursor !== null) {
+					body['start_cursor'] = next_cursor;
+				}
+			} while (!moment(records[records.length - 1][sortProperty] as string).isSameOrBefore(startDate) && hasMore === true);
+
+			if (this.getMode() !== 'manual') {
+				records = records.filter((record: IDataObject) => moment(record[sortProperty] as string).isBetween(startDate, endDate));
+			}
+
+			if (simple === true) {
+				records = simplifyObjects(records);
+			}
+
+			webhookData.lastRecordProccesed = data[0].id;
+
+			if (Array.isArray(records) && records.length) {
+				return [this.helpers.returnJsonArray(records)];
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/packages/nodes-base/nodes/Notion/PageDescription.ts b/packages/nodes-base/nodes/Notion/PageDescription.ts
new file mode 100644
index 0000000000..4612eb8be8
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/PageDescription.ts
@@ -0,0 +1,332 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	blocks,
+} from './Blocks';
+
+export const pageOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a page',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a page',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Text search of pages',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const pageFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                page:create                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Parent Page ID',
+		name: 'pageId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'The ID of the parent page that this child page belongs to.',
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		description: 'Page title. Appears at the top of the page and can be found via Quick Find.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	...blocks('page', 'create'),
+	/* -------------------------------------------------------------------------- */
+	/*                                page:get                                    */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Page ID',
+		name: 'pageId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                page:search                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Search Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'search',
+				],
+			},
+		},
+		description: 'The text to search for.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'search',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'search',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Simple',
+		name: 'simple',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'search',
+				],
+			},
+		},
+		default: true,
+		description: 'When set to true a simplify version of the response will be used else the raw data.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: [
+					'page',
+				],
+				operation: [
+					'search',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Filters',
+				name: 'filter',
+				placeholder: 'Add Filter',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Filter',
+						name: 'filters',
+						values: [
+							{
+								displayName: 'Property',
+								name: 'property',
+								type: 'options',
+								options: [
+									{
+										name: 'Object',
+										value: 'object',
+									},
+								],
+								default: 'object',
+								description: 'The name of the property to filter by.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'options',
+								options: [
+									{
+										name: 'Database',
+										value: 'database',
+									},
+									{
+										name: 'Page',
+										value: 'page',
+									},
+								],
+								default: '',
+								description: 'The value of the property to filter by.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Sort',
+				name: 'sort',
+				placeholder: 'Add Sort',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Sort',
+						name: 'sortValue',
+						values: [
+							{
+								displayName: 'Direction',
+								name: 'direction',
+								type: 'options',
+								options: [
+									{
+										name: 'Ascending',
+										value: 'ascending',
+									},
+									{
+										name: 'Descending',
+										value: 'descending',
+									},
+								],
+								default: '',
+								description: 'The direction to sort.',
+							},
+							{
+								displayName: 'Timestamp',
+								name: 'timestamp',
+								type: 'options',
+								options: [
+									{
+										name: 'Last Edited Time',
+										value: 'last_edited_time',
+									},
+								],
+								default: 'last_edited_time',
+								description: `The name of the timestamp to sort against.`,
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/UserDescription.ts b/packages/nodes-base/nodes/Notion/UserDescription.ts
new file mode 100644
index 0000000000..42ce84bf49
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/UserDescription.ts
@@ -0,0 +1,100 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a user',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all users',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const userFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                user:get                                    */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                user:getAll                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: false,
+		description: 'If all results should be returned or only up to a given limit.',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/notion.svg b/packages/nodes-base/nodes/Notion/notion.svg
new file mode 100644
index 0000000000..2fd319930d
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/notion.svg
@@ -0,0 +1 @@
+<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="12 0.18999999999999906 487.619 510.941"><path d="M96.085 91.118c15.81 12.845 21.741 11.865 51.43 9.884l279.888-16.806c5.936 0 1-5.922-.98-6.906L379.94 43.686c-8.907-6.915-20.773-14.834-43.516-12.853L65.408 50.6c-9.884.98-11.858 5.922-7.922 9.883zm16.804 65.228v294.491c0 15.827 7.909 21.748 25.71 20.769l307.597-17.799c17.81-.979 19.794-11.865 19.794-24.722V136.57c0-12.836-4.938-19.758-15.84-18.77l-321.442 18.77c-11.863.997-15.82 6.931-15.82 19.776zm303.659 15.797c1.972 8.903 0 17.798-8.92 18.799l-14.82 2.953v217.412c-12.868 6.916-24.734 10.87-34.622 10.87-15.831 0-19.796-4.945-31.654-19.76l-96.944-152.19v147.248l30.677 6.922s0 17.78-24.75 17.78l-68.23 3.958c-1.982-3.958 0-13.832 6.921-15.81l17.805-4.935V210.7l-24.721-1.981c-1.983-8.903 2.955-21.74 16.812-22.736l73.195-4.934 100.889 154.171V198.836l-25.723-2.952c-1.974-10.884 5.927-18.787 15.819-19.767zM42.653 23.919l281.9-20.76c34.618-2.969 43.525-.98 65.283 14.825l89.986 63.247c14.848 10.876 19.797 13.837 19.797 25.693v346.883c0 21.74-7.92 34.597-35.608 36.564L136.64 510.14c-20.785.991-30.677-1.971-41.562-15.815l-66.267-85.978C16.938 392.52 12 380.68 12 366.828V58.495c0-17.778 7.922-32.608 30.653-34.576z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5ab51ed341..e659f4a3e0 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -171,6 +171,8 @@
       "dist/credentials/NasaApi.credentials.js",
       "dist/credentials/NextCloudApi.credentials.js",
       "dist/credentials/NextCloudOAuth2Api.credentials.js",
+      "dist/credentials/NotionApi.credentials.js",
+      "dist/credentials/NotionOAuth2Api.credentials.js",
       "dist/credentials/OAuth1Api.credentials.js",
       "dist/credentials/OAuth2Api.credentials.js",
       "dist/credentials/OpenWeatherMapApi.credentials.js",
@@ -449,6 +451,8 @@
       "dist/nodes/Nasa/Nasa.node.js",
       "dist/nodes/NextCloud/NextCloud.node.js",
       "dist/nodes/NoOp.node.js",
+      "dist/nodes/Notion/Notion.node.js",
+      "dist/nodes/Notion/NotionTrigger.node.js",
       "dist/nodes/OpenThesaurus/OpenThesaurus.node.js",
       "dist/nodes/OpenWeatherMap.node.js",
       "dist/nodes/Orbit/Orbit.node.js",

From 6f4e3f132c70438a5c25dfc6eee46beceef98ea4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 16:33:12 -0500
Subject: [PATCH 213/231] :zap: Optimize icons

---
 packages/nodes-base/nodes/Zulip/zulip.svg | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/nodes-base/nodes/Zulip/zulip.svg b/packages/nodes-base/nodes/Zulip/zulip.svg
index 82b59ed82c..bea31eed7c 100644
--- a/packages/nodes-base/nodes/Zulip/zulip.svg
+++ b/packages/nodes-base/nodes/Zulip/zulip.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#24ADFF" offset="0%"></stop>
-            <stop stop-color="#7B71FF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g>
-        <path d="M128,0 C198.692448,0 256,57.307552 256,128 C256,198.692448 198.692448,256 128,256 C57.307552,256 0,198.692448 0,128 C0,57.307552 57.307552,0 128,0 Z M121.679533,118.222163 L75.7877336,159.200897 C71.0603547,162.920702 67.9584879,169.060511 67.9584879,175.967416 C67.9584879,187.245548 76.232162,196.475047 86.3444303,196.475047 L172.590938,196.475047 C182.703207,196.475047 190.976881,187.245548 190.976881,175.967416 C190.976881,164.68624 182.703207,155.459784 172.590938,155.459784 L107.299534,155.459784 C106.331533,155.459784 105.719683,154.300009 106.191507,153.356359 L123.024994,119.652857 C123.639888,118.669635 122.531861,117.491595 121.679533,118.222163 Z M172.590938,59.3627915 L86.3444303,59.3627915 C76.232162,59.3627915 67.9584879,68.58925 67.9584879,79.870426 C67.9584879,91.1485579 76.232162,100.378058 86.3444303,100.378058 L86.3444303,100.378058 L151.635834,100.378058 C152.603836,100.378058 153.215686,101.537833 152.743861,102.481482 L152.743861,102.481482 L135.910374,136.184985 C135.29548,137.168207 136.403507,138.346246 137.255836,137.615679 L137.255836,137.615679 L183.147635,96.6308563 C187.875014,92.9080074 190.976881,86.7712425 190.976881,79.8643379 C190.976881,68.586206 182.703207,59.3567064 172.590938,59.3627915 L172.590938,59.3627915 Z" fill="url(#linearGradient-1)"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="256" height="256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a"><stop stop-color="#24ADFF" offset="0%"/><stop stop-color="#7B71FF" offset="100%"/></linearGradient></defs><path d="M128 0c70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128C57.308 256 0 198.692 0 128 0 57.308 57.308 0 128 0zm-6.32 118.222l-45.892 40.979c-4.728 3.72-7.83 9.86-7.83 16.766 0 11.279 8.274 20.508 18.386 20.508h86.247c10.112 0 18.386-9.23 18.386-20.508 0-11.28-8.274-20.507-18.386-20.507H107.3c-.968 0-1.58-1.16-1.108-2.104l16.833-33.703c.615-.983-.493-2.161-1.345-1.43zm50.91-58.86H86.345c-10.112 0-18.386 9.227-18.386 20.508 0 11.279 8.274 20.508 18.386 20.508h65.292c.968 0 1.58 1.16 1.108 2.103l-16.834 33.704c-.615.983.494 2.161 1.346 1.43l45.892-40.984c4.727-3.723 7.829-9.86 7.829-16.767 0-11.278-8.274-20.507-18.386-20.501z" fill="url(#a)"/></svg>
\ No newline at end of file

From 217476c269831ff69b0466e75a7c7aff4dd582ed Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:42:08 +0000
Subject: [PATCH 214/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.59.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 6d2213b810..cd65b2048b 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.58.0",
+  "version": "0.59.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From a60f5e09973397173abf1d0f833efcc5803bf514 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:42:26 +0000
Subject: [PATCH 215/231] :arrow_up: Set n8n-workflow@0.59.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 138060370b..37ce3c6a45 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.58.0",
+    "n8n-workflow": "~0.59.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",

From 67ce1a5c1fc28c3385853df278358c1c308daba7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:42:26 +0000
Subject: [PATCH 216/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.72?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 37ce3c6a45..26f3b8b9d2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.71.0",
+  "version": "0.72.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 0b570f2df99f05fbe6f1cc9ac7d49b45b1e27026 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:42:42 +0000
Subject: [PATCH 217/231] :arrow_up: Set n8n-core@0.72.0 and
 n8n-workflow@0.59.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e659f4a3e0..f8f673e29f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -591,7 +591,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.58.0",
+    "n8n-workflow": "~0.59.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -629,7 +629,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.71.0",
+    "n8n-core": "~0.72.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",

From 19ba5bc1effe0cf231e8a3adf57944e27bcdcabb Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:42:42 +0000
Subject: [PATCH 218/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.118.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f8f673e29f..16c050f145 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.117.0",
+  "version": "0.118.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 1bef4d72863846cc90519750de55a2cdb9db4cd0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:43:50 +0000
Subject: [PATCH 219/231] :arrow_up: Set n8n-workflow@0.59.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index aa145e9b7e..7bfc759fb3 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -65,7 +65,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.58.0",
+    "n8n-workflow": "~0.59.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",

From de898880ec71b17a2fc5250408c784bf1e1efabb Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:43:50 +0000
Subject: [PATCH 220/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.91.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 7bfc759fb3..b86a1f9a4e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.90.0",
+  "version": "0.91.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From feef50cdd21302a16b52b3e2eb8e84c47c47344f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:44:52 +0000
Subject: [PATCH 221/231] :arrow_up: Set n8n-core@0.72.0, n8n-editor-ui@0.91.0,
 n8n-nodes-base@0.118.0 and n8n-workflow@0.59.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1d852cd6ea..c53552d8e3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -104,10 +104,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.71.0",
-    "n8n-editor-ui": "~0.90.0",
-    "n8n-nodes-base": "~0.117.0",
-    "n8n-workflow": "~0.58.0",
+    "n8n-core": "~0.72.0",
+    "n8n-editor-ui": "~0.91.0",
+    "n8n-nodes-base": "~0.118.0",
+    "n8n-workflow": "~0.59.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",

From 343e63e667842bd992a76fc61ea2822e0d5b67b0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 20 May 2021 21:44:52 +0000
Subject: [PATCH 222/231] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.121.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c53552d8e3..2955cd9507 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.120.0",
+  "version": "0.121.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From f43781b137a0c118d4bb493e8e4ce75c490d2f74 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 21 May 2021 21:54:30 -0500
Subject: [PATCH 223/231] :bug: Switch back to bcryptjs to fix issues with
 FreeBSD and ARM #1696

---
 packages/cli/package.json  | 3 ++-
 packages/cli/src/Server.ts | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2955cd9507..252994f485 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -55,6 +55,7 @@
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
     "@types/basic-auth": "^1.1.2",
+    "@types/bcryptjs": "^2.4.2",
     "@types/bull": "^3.3.10",
     "@types/compression": "1.0.1",
     "@types/connect-history-api-fallback": "^1.3.1",
@@ -79,11 +80,11 @@
     "typescript": "~3.9.7"
   },
   "dependencies": {
-    "@node-rs/bcrypt": "^1.2.0",
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
     "@types/jsonwebtoken": "^8.3.4",
     "basic-auth": "^2.0.1",
+    "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "body-parser-xml": "^1.1.0",
     "bull": "^3.19.0",
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 0346558d50..a758d045b6 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -22,7 +22,9 @@ import { RequestOptions } from 'oauth-1.0a';
 import * as csrf from 'csrf';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
-import { compare } from '@node-rs/bcrypt';
+// IMPORRTANT! Do not switch to anther bcrypt library unless really needed and
+// tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
+import { compare } from 'bcryptjs';
 import * as promClient from 'prom-client';
 
 import {

From 246fca490359f7c40c0961d399dd38c1f2583040 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 21 May 2021 22:03:18 -0500
Subject: [PATCH 224/231] :bug: Fix typo and remove not needed import

---
 packages/cli/src/Server.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index a758d045b6..ba4eb543d0 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -8,7 +8,6 @@ import {
 	resolve as pathResolve,
 } from 'path';
 import {
-	getConnection,
 	getConnectionManager,
 	In,
 } from 'typeorm';
@@ -22,7 +21,7 @@ import { RequestOptions } from 'oauth-1.0a';
 import * as csrf from 'csrf';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
-// IMPORRTANT! Do not switch to anther bcrypt library unless really needed and
+// IMPORTANT! Do not switch to anther bcrypt library unless really necessary and
 // tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
 import { compare } from 'bcryptjs';
 import * as promClient from 'prom-client';

From c67a120fed1d715563b4bf43b01f173bbbe65523 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 21 May 2021 22:42:29 -0500
Subject: [PATCH 225/231] :zap: Remove no longer used function

---
 packages/cli/src/GenericHelpers.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 8dba633baa..80b107f2be 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -11,22 +11,6 @@ import { IPackageVersions } from './';
 let versionCache: IPackageVersions | undefined;
 
 
-/**
- * Displays a message to the user
- *
- * @export
- * @param {string} message The message to display
- * @param {string} [level='log']
- */
-export function logOutput(message: string, level = 'log'): void {
-	if (level === 'log') {
-		console.log(message);
-	} else if (level === 'error') {
-		console.error(message);
-	}
-}
-
-
 /**
  * Returns the base URL n8n is reachable from
  *

From 40614672e67a83b2a410b289915e45495e818216 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 21 May 2021 22:51:38 -0500
Subject: [PATCH 226/231] :zap: Add deprecation warning for "executeSingle"

---
 packages/cli/src/LoadNodesAndCredentials.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index a69c6be33f..a925b805e7 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -6,9 +6,16 @@ import {
 	ICredentialType,
 	INodeType,
 	INodeTypeData,
+	Logger,
+	LoggerProxy,
 } from 'n8n-workflow';
 
 import * as config from '../config';
+
+import {
+	getLogger,
+} from '../src/Logger';
+
 import {
 	access as fsAccess,
 	readdir as fsReaddir,
@@ -31,7 +38,12 @@ class LoadNodesAndCredentialsClass {
 
 	nodeModulesPath = '';
 
+	logger: Logger;
+
 	async init() {
+		this.logger = getLogger();
+		LoggerProxy.init(this.logger);
+
 		// Get the path to the node-modules folder to be later able
 		// to load the credentials and nodes
 		const checkPaths = [
@@ -171,6 +183,10 @@ class LoadNodesAndCredentialsClass {
 			tempNode.description.icon = 'file:' + path.join(path.dirname(filePath), tempNode.description.icon.substr(5));
 		}
 
+		if (tempNode.executeSingle) {
+			this.logger.warn(`"executeSingle" will get deprecated soon. Please update the code of node "${packageName}.${nodeName}" to use "execute" instead!`, { filePath });
+		}
+
 		if (this.includeNodes !== undefined && !this.includeNodes.includes(fullNodeName)) {
 			return;
 		}

From e0602372f62f016f8fbcc8e0665e91e1f0649fb4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 21 May 2021 23:41:06 -0500
Subject: [PATCH 227/231] :shirt: Fix lint issue

---
 packages/cli/src/LoadNodesAndCredentials.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index a925b805e7..2b1263e6d0 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -4,9 +4,9 @@ import {
 } from 'n8n-core';
 import {
 	ICredentialType,
+	ILogger,
 	INodeType,
 	INodeTypeData,
-	Logger,
 	LoggerProxy,
 } from 'n8n-workflow';
 
@@ -38,7 +38,7 @@ class LoadNodesAndCredentialsClass {
 
 	nodeModulesPath = '';
 
-	logger: Logger;
+	logger: ILogger;
 
 	async init() {
 		this.logger = getLogger();

From 353b911620ac500d236023c93918956b7bb48d35 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 23 May 2021 11:41:34 -0500
Subject: [PATCH 228/231] :bug: Remove console.log

---
 packages/nodes-base/nodes/Jira/GenericFunctions.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index 88ec689ae5..8e384c1a76 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -66,8 +66,6 @@ export async function jiraSoftwareCloudApiRequest(this: IHookFunctions | IExecut
 		delete options.qs;
 	}
 
-	console.log(options);
-
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {

From ce9951d8776b0ff851fbdb480c28ad6213bad52b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 24 May 2021 11:03:31 -0500
Subject: [PATCH 229/231] :shirt: Fix lint issue

---
 packages/nodes-base/nodes/EmailSend.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/EmailSend.node.ts b/packages/nodes-base/nodes/EmailSend.node.ts
index cbe1dd5cbe..bceb617006 100644
--- a/packages/nodes-base/nodes/EmailSend.node.ts
+++ b/packages/nodes-base/nodes/EmailSend.node.ts
@@ -210,7 +210,7 @@ export class EmailSend implements INodeType {
 			// Send the email
 			const info = await transporter.sendMail(mailOptions);
 
-			returnData.push({ json: info });
+			returnData.push({ json: info as unknown as IDataObject });
 		}
 
 		return this.prepareOutputData(returnData);

From 2a7a87eb4d53978d15e8fc448bc227ce44215b06 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Mon, 24 May 2021 17:45:58 -0400
Subject: [PATCH 230/231] :bug: Fix issue when filtering fields type select &
 multi_select on Notion Node (#1819)

Also, it adds a change to how the links are handled. Before, if a link were left blank, the node would error. Now, if the link is left blank, it gets ignored.
---
 packages/nodes-base/nodes/Notion/GenericFunctions.ts | 4 +++-
 packages/nodes-base/nodes/Notion/Notion.node.ts      | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index df54434d28..de91bc3083 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -136,7 +136,7 @@ export function formatText(content: string) {
 }
 
 function getLink(text: { textLink: string, isLink: boolean }) {
-	if (text.isLink === true) {
+	if (text.isLink === true && text.textLink !== '') {
 		return {
 			link: {
 				url: text.textLink,
@@ -270,10 +270,12 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
 			};
 			break;
 		case 'date':
+			//&& value.dateStart !== 'Invalid date' && value.dateEnd !== 'Invalid date'
 			if (value.range === true) {
 				result = {
 					type: 'date', date: { start: moment.tz(value.dateStart, timezone).utc().format(), end: moment.tz(value.dateEnd, timezone).utc().format() },
 				};
+				//if (value.date !== 'Invalid date')
 			} else {
 				result = {
 					type: 'date', date: { start: moment.tz(value.date, timezone).utc().format(), end: null },
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.ts b/packages/nodes-base/nodes/Notion/Notion.node.ts
index 78b3cf921a..5ae5325d77 100644
--- a/packages/nodes-base/nodes/Notion/Notion.node.ts
+++ b/packages/nodes-base/nodes/Notion/Notion.node.ts
@@ -212,8 +212,11 @@ export class Notion implements INodeType {
 			async getPropertySelectValues(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const [name, type] = (this.getCurrentNodeParameter('&key') as string).split('|');
 				const databaseId = this.getCurrentNodeParameter('databaseId') as string;
+				const resource = this.getCurrentNodeParameter('resource') as string;
+				const operation = this.getCurrentNodeParameter('operation') as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				return (properties[name][type].options).map((option: IDataObject) => ({ name: option.name, value: option.id }));
+				const useNames = (resource === 'databasePage' && operation === 'getAll');
+				return (properties[name][type].options).map((option: IDataObject) => ({ name: option.name, value: (['select', 'multi_select'].includes(type) && useNames) ? option.name : option.id }));
 			},
 			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];

From 61937c52ba80ccbc4eb522c690091c4868858a19 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Mon, 24 May 2021 17:51:06 -0400
Subject: [PATCH 231/231] :bug: Fix issue when using any operation of the
 resource drive (#1818)

* :bug: Fix issue when using any operation of the resource drive

* :bug: Remove console.log

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes/Google/Drive/GoogleDrive.node.ts          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 7deb795b68..6aaf6f5ad6 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -1970,7 +1970,6 @@ export class GoogleDrive implements INodeType {
 					// ----------------------------------
 					//         list
 					// ----------------------------------
-
 					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
 
 					const qs: IDataObject = {};
@@ -1986,6 +1985,7 @@ export class GoogleDrive implements INodeType {
 						const data = await googleApiRequest.call(this, 'GET', `/drive/v3/drives`, {}, qs);
 						response = data.drives as IDataObject[];
 					}
+
 					returnData.push.apply(returnData, response);
 				}
 				if (operation === 'update') {
@@ -2004,7 +2004,8 @@ export class GoogleDrive implements INodeType {
 					returnData.push(response as IDataObject);
 				}
 
-			} else if (resource === 'file') {
+			}
+			if (resource === 'file') {
 				if (operation === 'copy') {
 					// ----------------------------------
 					//         copy
@@ -2026,7 +2027,7 @@ export class GoogleDrive implements INodeType {
 					const qs = {
 						supportsAllDrives: true,
 					};
-					
+
 					const response = await googleApiRequest.call(this, 'POST', `/drive/v3/files/${fileId}/copy`, body, qs);
 
 					returnData.push(response as IDataObject);
@@ -2264,7 +2265,8 @@ export class GoogleDrive implements INodeType {
 					returnData.push(responseData as IDataObject);
 				}
 
-			} else if (resource === 'folder') {
+			}
+			if (resource === 'folder') {
 				if (operation === 'create') {
 					// ----------------------------------
 					//         folder:create
@@ -2326,11 +2328,8 @@ export class GoogleDrive implements INodeType {
 
 					returnData.push(response as IDataObject);
 				}
-			} else {
-				throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
 			}
 		}
-
 		if (resource === 'file' && operation === 'download') {
 			// For file downloads the files get attached to the existing items
 			return this.prepareOutputData(items);