diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 05d08a7db5..9136e15b17 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -29,7 +29,7 @@ FROM node:14.15-alpine
 
 USER root
 
-RUN apk add --update graphicsmagick tzdata tini su-exec
+RUN apk add --update graphicsmagick tzdata tini su-exec git
 
 WORKDIR /data
 
diff --git a/docker/images/n8n-debian/Dockerfile b/docker/images/n8n-debian/Dockerfile
index bfe10565aa..95c79828e4 100644
--- a/docker/images/n8n-debian/Dockerfile
+++ b/docker/images/n8n-debian/Dockerfile
@@ -6,7 +6,7 @@ RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!"
 
 RUN \
 	apt-get update && \
-	apt-get -y install graphicsmagick gosu
+	apt-get -y install graphicsmagick gosu git
 
 # Set a custom user to not have n8n run as root
 USER root
diff --git a/docker/images/n8n-rpi/Dockerfile b/docker/images/n8n-rpi/Dockerfile
index 329b7e7dfe..8a3f94838e 100644
--- a/docker/images/n8n-rpi/Dockerfile
+++ b/docker/images/n8n-rpi/Dockerfile
@@ -6,7 +6,7 @@ RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!"
 
 RUN \
 	apt-get update && \
-	apt-get -y install graphicsmagick gosu
+	apt-get -y install graphicsmagick gosu git
 
 RUN npm_config_user=root npm install -g full-icu n8n@${N8N_VERSION}
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d8790254aa..74c4d914a9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.122.1",
+  "version": "0.124.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -106,10 +106,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.73.0",
-    "n8n-editor-ui": "~0.92.0",
-    "n8n-nodes-base": "~0.119.1",
-    "n8n-workflow": "~0.60.0",
+    "n8n-core": "~0.74.0",
+    "n8n-editor-ui": "~0.94.1",
+    "n8n-nodes-base": "~0.121.0",
+    "n8n-workflow": "~0.61.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",
@@ -118,7 +118,8 @@
     "sqlite3": "^5.0.1",
     "sse-channel": "^3.1.1",
     "tslib": "1.14.1",
-    "typeorm": "^0.2.30"
+    "typeorm": "^0.2.30",
+    "winston": "^3.3.3"
   },
   "jest": {
     "transform": {
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index c323e8373e..66d4ec02e2 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -313,7 +313,6 @@ export class ActiveWorkflowRunner {
 
 			try {
 				await Db.collections.Webhook?.insert(webhook);
-
 				const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, activation, false);
 				if (webhookExists !== true) {
 					// If webhook does not exist yet create it
@@ -341,7 +340,7 @@ export class ActiveWorkflowRunner {
 					errorMessage = error.message;
 				}
 
-				throw new Error(errorMessage);
+				throw error;
 			}
 		}
 		// Save static data!
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 19796bb997..df965c50e7 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -336,12 +336,45 @@ export interface IPackageVersions {
 	cli: string;
 }
 
-export interface IPushData {
-	data: IPushDataExecutionFinished | IPushDataNodeExecuteAfter | IPushDataNodeExecuteBefore | IPushDataTestWebhook | IPushDataConsoleMessage;
-	type: IPushDataType;
-}
+export type IPushDataType = IPushData['type'];
 
-export type IPushDataType = 'executionFinished' | 'executionStarted' | 'nodeExecuteAfter' | 'nodeExecuteBefore' | 'sendConsoleMessage' | 'testWebhookDeleted' | 'testWebhookReceived';
+export type IPushData =
+	| PushDataExecutionFinished
+	| PushDataExecutionStarted
+	| PushDataExecuteAfter
+	| PushDataExecuteBefore
+	| PushDataConsoleMessage
+	| PushDataTestWebhook;
+
+type PushDataExecutionFinished = {
+	data: IPushDataExecutionFinished;
+	type: 'executionFinished';
+};
+
+type PushDataExecutionStarted = {
+	data: IPushDataExecutionStarted;
+	type: 'executionStarted';
+};
+
+type PushDataExecuteAfter = {
+	data: IPushDataNodeExecuteAfter;
+	type: 'nodeExecuteAfter';
+};
+
+type PushDataExecuteBefore = {
+	data: IPushDataNodeExecuteBefore;
+	type: 'nodeExecuteBefore';
+};
+
+type PushDataConsoleMessage = {
+	data: IPushDataConsoleMessage;
+	type: 'sendConsoleMessage';
+};
+
+type PushDataTestWebhook = {
+	data: IPushDataTestWebhook;
+	type: 'testWebhookDeleted' | 'testWebhookReceived';
+};
 
 export interface IPushDataExecutionFinished {
 	data: IRun;
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index 014589e0b8..465fdb5dde 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -93,6 +93,10 @@ export function sendErrorResponse(res: Response, error: ResponseError) {
 		message: 'Unknown error',
 	};
 
+	if (error.name === 'NodeApiError') {
+		Object.assign(response, error);
+	}
+
 	if (error.errorCode) {
 		response.code = error.errorCode;
 	}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index b7ce5394b5..f19c88289e 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -673,10 +673,13 @@ class App {
 			await WorkflowHelpers.validateWorkflow(updateData);
 			await Db.collections.Workflow!.update(id, updateData).catch(WorkflowHelpers.throwDuplicateEntryError);
 
-			const tablePrefix = config.get('database.tablePrefix');
-			await TagHelpers.removeRelations(req.params.id, tablePrefix);
-			if (tags?.length) {
-				await TagHelpers.createRelations(req.params.id, tags, tablePrefix);
+			if (tags) {
+				const tablePrefix = config.get('database.tablePrefix');
+				await TagHelpers.removeRelations(req.params.id, tablePrefix);
+
+				if (tags.length) {
+					await TagHelpers.createRelations(req.params.id, tags, tablePrefix);
+				}
 			}
 
 			// We sadly get nothing back from "update". Neither if it updated a record
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 570baf536b..9d0478d997 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -387,7 +387,12 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					}
 
 					// 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 });
+					Logger.debug(`Save execution data to database for execution ID ${this.executionId}`, { 
+						executionId: this.executionId, 
+						workflowId: this.workflowData.id, 
+						finished: fullExecutionData.finished,
+						stoppedAt: fullExecutionData.stoppedAt,
+					});
 
 					const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
 
@@ -404,6 +409,12 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						executeErrorWorkflow(this.workflowData, fullRunData, this.mode, this.executionId, this.retryOf);
 					}
 				} catch (error) {
+					Logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, { 
+						executionId: this.executionId, 
+						workflowId: this.workflowData.id,
+						error,
+					});
+					
 					if (!isManualMode) {
 						executeErrorWorkflow(this.workflowData, fullRunData, this.mode, undefined, this.retryOf);
 					}
@@ -438,14 +449,8 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						}
 					}
 
-					// Check config to know if execution should be saved or not
-					let saveDataErrorExecution = config.get('executions.saveDataOnError') as string;
-					if (this.workflowData.settings !== undefined) {
-						saveDataErrorExecution = (this.workflowData.settings.saveDataErrorExecution as string) || saveDataErrorExecution;
-					}
-
 					const workflowDidSucceed = !fullRunData.data.resultData.error;
-					if (workflowDidSucceed === false && saveDataErrorExecution === 'none') {
+					if (workflowDidSucceed === false) {
 						executeErrorWorkflow(this.workflowData, fullRunData, this.mode, undefined, this.retryOf);
 					}
 
@@ -473,7 +478,6 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 
 					if (fullRunData.finished === true && this.retryOf !== undefined) {
 						// If the retry was successful save the reference it on the original execution
-						// await Db.collections.Execution!.save(executionData as IExecutionFlattedDb);
 						await Db.collections.Execution!.update(this.retryOf, { retrySuccessId: this.executionId });
 					}
 				} catch (error) {
@@ -663,7 +667,7 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 }
 
 
-export function sendMessageToUI(source: string, message: string) {
+export function sendMessageToUI(source: string, message: any) { // tslint:disable-line:no-any
 	if (this.sessionId === undefined) {
 		return;
 	}
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 109bfda98c..3dbc77cf6c 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -137,7 +137,7 @@ export class WorkflowRunnerProcess {
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(this.data.credentials, undefined, workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000);
 		additionalData.hooks = this.getProcessForwardHooks();
 
-		additionalData.sendMessageToUI = async (source: string, message: string) => {
+		additionalData.sendMessageToUI = async (source: string, message: any) => { // tslint:disable-line:no-any
 			if (workflowRunner.data!.executionMode !== 'manual') {
 				return;
 			}
diff --git a/packages/cli/src/databases/mysqldb/migrations/1620826335440-UniqueWorkflowNames.ts b/packages/cli/src/databases/mysqldb/migrations/1620826335440-UniqueWorkflowNames.ts
index defe831fd3..3dcf379028 100644
--- a/packages/cli/src/databases/mysqldb/migrations/1620826335440-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/mysqldb/migrations/1620826335440-UniqueWorkflowNames.ts
@@ -13,27 +13,27 @@ export class UniqueWorkflowNames1620826335440 implements MigrationInterface {
 			`);
 
 			for (const { name } of workflowNames) {
-
-				const duplicates = await queryRunner.query(`
+				const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(`
 					SELECT id, name
 					FROM ${tablePrefix}workflow_entity
-					WHERE name = '${name}'
+					WHERE name = :name
 					ORDER BY createdAt ASC
-				`);
+				`, { name }, {});
+
+				const duplicates = await queryRunner.query(duplicatesQuery, parameters);
 
 				if (duplicates.length > 1) {
-
 					await Promise.all(duplicates.map(({ id, name }: { id: number; name: string; }, index: number) => {
 						if (index === 0) return Promise.resolve();
-						return queryRunner.query(`
+						const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(`
 							UPDATE ${tablePrefix}workflow_entity
-							SET name = '${name} ${index + 1}'
+							SET name = :name
 							WHERE id = '${id}'
-						`);
+						`, { name: `${name} ${index + 1}`}, {});
+
+						return queryRunner.query(updateQuery, updateParams);
 					}));
-
 				}
-
 			}
 
 			await queryRunner.query('ALTER TABLE `' + tablePrefix + 'workflow_entity` ADD UNIQUE INDEX `IDX_' + tablePrefix + '943d8f922be094eb507cb9a7f9` (`name`)');
diff --git a/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts b/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts
index 8c12e24003..ab6adb2995 100644
--- a/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts
@@ -12,34 +12,33 @@ export class UniqueWorkflowNames1620824779533 implements MigrationInterface {
 				tablePrefix = schema + '.' + tablePrefix;
 			}
 
-
 			const workflowNames = await queryRunner.query(`
 				SELECT name
 				FROM ${tablePrefix}workflow_entity
 			`);
 
 			for (const { name } of workflowNames) {
-
-				const duplicates = await queryRunner.query(`
+				const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(`
 					SELECT id, name
 					FROM ${tablePrefix}workflow_entity
-					WHERE name = '${name}'
+					WHERE name = :name
 					ORDER BY "createdAt" ASC
-				`);
+				`, { name }, {});
+
+				const duplicates = await queryRunner.query(duplicatesQuery, parameters);
 
 				if (duplicates.length > 1) {
-
 					await Promise.all(duplicates.map(({ id, name }: { id: number; name: string; }, index: number) => {
 						if (index === 0) return Promise.resolve();
-						return queryRunner.query(`
+						const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(`
 							UPDATE ${tablePrefix}workflow_entity
-							SET name = '${name} ${index + 1}'
+							SET name = :name
 							WHERE id = '${id}'
-						`);
+						`, { name: `${name} ${index + 1}`}, {});
+
+						return queryRunner.query(updateQuery, updateParams);
 					}));
-
 				}
-
 			}
 
 			await queryRunner.query(`CREATE UNIQUE INDEX "IDX_${tablePrefixPure}a252c527c4c89237221fe2c0ab" ON ${tablePrefix}workflow_entity ("name") `);
diff --git a/packages/cli/src/databases/sqlite/migrations/1620821879465-UniqueWorkflowNames.ts b/packages/cli/src/databases/sqlite/migrations/1620821879465-UniqueWorkflowNames.ts
index 2f38cf35bd..732b080ed0 100644
--- a/packages/cli/src/databases/sqlite/migrations/1620821879465-UniqueWorkflowNames.ts
+++ b/packages/cli/src/databases/sqlite/migrations/1620821879465-UniqueWorkflowNames.ts
@@ -13,27 +13,27 @@ export class UniqueWorkflowNames1620821879465 implements MigrationInterface {
 			`);
 
 			for (const { name } of workflowNames) {
-
-				const duplicates = await queryRunner.query(`
+				const [duplicatesQuery, parameters] = queryRunner.connection.driver.escapeQueryWithParameters(`
 					SELECT id, name
 					FROM "${tablePrefix}workflow_entity"
-					WHERE name = "${name}"
+					WHERE name = :name
 					ORDER BY createdAt ASC
-				`);
+				`, { name }, {});
+
+				const duplicates = await queryRunner.query(duplicatesQuery, parameters);
 
 				if (duplicates.length > 1) {
-
 					await Promise.all(duplicates.map(({ id, name }: { id: number; name: string; }, index: number) => {
 						if (index === 0) return Promise.resolve();
-						return queryRunner.query(`
+						const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(`
 							UPDATE "${tablePrefix}workflow_entity"
-							SET name = "${name} ${index + 1}"
+							SET name = :name
 							WHERE id = '${id}'
-						`);
+						`, { name: `${name} ${index + 1}`}, {});
+
+						return queryRunner.query(updateQuery, updateParams);
 					}));
-
 				}
-
 			}
 
 			await queryRunner.query(`CREATE UNIQUE INDEX "IDX_${tablePrefix}943d8f922be094eb507cb9a7f9" ON "${tablePrefix}workflow_entity" ("name") `);
diff --git a/packages/core/package.json b/packages/core/package.json
index 5924681d11..949103dee5 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.73.0",
+  "version": "0.74.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.60.0",
+    "n8n-workflow": "~0.61.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 5b5698bf18..218eb097d4 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -749,7 +749,7 @@ export function getExecuteFunctions(workflow: Workflow, runExecutionData: IRunEx
 				return workflow.getStaticData(type, node);
 			},
 			prepareOutputData: NodeHelpers.prepareOutputData,
-			sendMessageToUI(message: string): void {
+			sendMessageToUI(message: any): void { // tslint:disable-line:no-any
 				if (mode !== 'manual') {
 					return;
 				}
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 085fbfe03d..ce692a13f3 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.92.0",
+  "version": "0.94.1",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -67,7 +67,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.60.0",
+    "n8n-workflow": "~0.61.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index b674cbf730..3dab3901ee 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -355,12 +355,45 @@ export interface IExecutionDeleteFilter {
 	ids?: string[];
 }
 
-export interface IPushData {
-	data: IPushDataExecutionFinished | IPushDataNodeExecuteAfter | IPushDataNodeExecuteBefore | IPushDataTestWebhook | IPushDataConsoleMessage;
-	type: IPushDataType;
-}
+export type IPushDataType = IPushData['type'];
 
-export type IPushDataType = 'executionFinished' | 'executionStarted' | 'nodeExecuteAfter' | 'nodeExecuteBefore' | 'sendConsoleMessage' | 'testWebhookDeleted' | 'testWebhookReceived';
+export type IPushData =
+	| PushDataExecutionFinished
+	| PushDataExecutionStarted
+	| PushDataExecuteAfter
+	| PushDataExecuteBefore
+	| PushDataConsoleMessage
+	| PushDataTestWebhook;
+
+type PushDataExecutionFinished = {
+	data: IPushDataExecutionFinished;
+	type: 'executionFinished';
+};
+
+type PushDataExecutionStarted = {
+	data: IPushDataExecutionStarted;
+	type: 'executionStarted';
+};
+
+type PushDataExecuteAfter = {
+	data: IPushDataNodeExecuteAfter;
+	type: 'nodeExecuteAfter';
+};
+
+type PushDataExecuteBefore = {
+	data: IPushDataNodeExecuteBefore;
+	type: 'nodeExecuteBefore';
+};
+
+type PushDataConsoleMessage = {
+	data: IPushDataConsoleMessage;
+	type: 'sendConsoleMessage';
+};
+
+type PushDataTestWebhook = {
+	data: IPushDataTestWebhook;
+	type: 'testWebhookDeleted' | 'testWebhookReceived';
+};
 
 export interface IPushDataExecutionStarted {
 	executionId: string;
diff --git a/packages/editor-ui/src/api/helpers.ts b/packages/editor-ui/src/api/helpers.ts
index ea4d16e10c..df3f5d8ddd 100644
--- a/packages/editor-ui/src/api/helpers.ts
+++ b/packages/editor-ui/src/api/helpers.ts
@@ -68,9 +68,14 @@ export async function makeRestApiRequest(context: IRestApiContext, method: Metho
 
 		const errorResponseData = error.response.data;
 		if (errorResponseData !== undefined && errorResponseData.message !== undefined) {
+			if (errorResponseData.name === 'NodeApiError') {
+				errorResponseData.httpStatusCode = error.response.status;
+				throw errorResponseData;
+			}
+
 			throw new ResponseError(errorResponseData.message, {errorCode: errorResponseData.code, httpStatusCode: error.response.status, stack: errorResponseData.stack});
 		}
 
 		throw error;
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/editor-ui/src/components/Error/NodeViewError.vue b/packages/editor-ui/src/components/Error/NodeViewError.vue
index 2c8cc2f056..ccb5532463 100644
--- a/packages/editor-ui/src/components/Error/NodeViewError.vue
+++ b/packages/editor-ui/src/components/Error/NodeViewError.vue
@@ -37,10 +37,11 @@
 							<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">
+							<el-button v-if="displayCause" class="copy-button" @click="copyCause" circle type="text" title="Copy to clipboard">
 								<font-awesome-icon icon="copy" />
 							</el-button>
 							<vue-json-pretty
+								v-if="displayCause"
 								:data="error.cause"
 								:deep="3"
 								:showLength="true"
@@ -48,6 +49,9 @@
 								path="error"
 								class="json-data"
 							/>
+							<span v-else>
+								The exact cause can sadly not displayed right now as the returned data is too large.
+							</span>
 						</div>
 					</el-card>
 				</div>
@@ -67,13 +71,14 @@
 </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';
-
+import {
+	MAX_DISPLAY_DATA_SIZE,
+} from '@/constants';
 
 export default mixins(
 	copyPaste,
@@ -86,6 +91,11 @@ export default mixins(
 	components: {
 		VueJsonPretty,
 	},
+	computed: {
+		displayCause(): boolean {
+			return JSON.stringify(this.error.cause).length < MAX_DISPLAY_DATA_SIZE;
+		},
+	},
 	methods: {
 		copyCause() {
 			this.copyToClipboard(JSON.stringify(this.error.cause));
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index e08bc63f17..fe5e5f4482 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -73,9 +73,15 @@ export default mixins(
 		};
 	},
 	methods: {
-		valueChanged (value: string) {
+		valueChanged (value: string, forceUpdate = false) {
 			this.latestValue = value;
-			this.callDebounced('updateDisplayValue', 500);
+
+			if (forceUpdate === true) {
+				this.updateDisplayValue();
+				this.$emit('valueChanged', this.latestValue);
+			} else {
+				this.callDebounced('updateDisplayValue', 500);
+			}
 		},
 
 		updateDisplayValue () {
diff --git a/packages/editor-ui/src/components/ExpressionInput.vue b/packages/editor-ui/src/components/ExpressionInput.vue
index a42ff6613b..0035262eab 100644
--- a/packages/editor-ui/src/components/ExpressionInput.vue
+++ b/packages/editor-ui/src/components/ExpressionInput.vue
@@ -233,12 +233,14 @@ export default mixins(
 					this.update();
 				} else {
 					// If no position got found add it to end
-					let newValue = this.value;
-					if (newValue !== '=') {
-						newValue += ` `;
+					let newValue = this.getValue();
+					if (newValue === '=' || newValue === '=0') {
+						newValue = `{{${eventData.variable}}}\n`;
+					} else {
+						newValue += ` {{${eventData.variable}}}\n`;
 					}
-					newValue += `{{${eventData.variable}}}\n`;
-					this.$emit('change', newValue);
+
+					this.$emit('change', newValue, true);
 					if (!this.resolvedValue) {
 						Vue.nextTick(() => {
 							this.initValue();
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 316dc16879..09faab9bc7 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -431,7 +431,11 @@ export default mixins(
 						const importConfirm = await this.confirmMessage(`When you switch workflows your current workflow changes will be lost.`, 'Save your Changes?', 'warning', 'Yes, switch workflows and forget changes');
 						if (importConfirm === true) {
 							this.$store.commit('setStateDirty', false);
-							this.$router.push({ name: 'NodeViewNew' });
+							if (this.$router.currentRoute.name === 'NodeViewNew') {
+								this.$root.$emit('newWorkflow');
+							} else {
+								this.$router.push({ name: 'NodeViewNew' });
+							}
 
 							this.$showMessage({
 								title: 'Workflow created',
@@ -440,7 +444,9 @@ export default mixins(
 							});
 						}
 					} else {
-						this.$router.push({ name: 'NodeViewNew' });
+						if (this.$router.currentRoute.name !== 'NodeViewNew') {
+							this.$router.push({ name: 'NodeViewNew' });
+						}
 
 						this.$showMessage({
 							title: 'Workflow created',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index ef97066938..7bf2e2f5f0 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -533,7 +533,7 @@ export default mixins(
 					// @ts-ignore
 					if (this.$refs.inputField.$el) {
 						// @ts-ignore
-						(this.$refs.inputField.$el.querySelector('input') as HTMLInputElement).focus();
+						(this.$refs.inputField.$el.querySelector(this.getStringInputType === 'textarea' ? 'textarea' : 'input') as HTMLInputElement).focus();
 					}
 				});
 			},
diff --git a/packages/editor-ui/src/components/TagsContainer.vue b/packages/editor-ui/src/components/TagsContainer.vue
index 719a9fc562..7f2411d406 100644
--- a/packages/editor-ui/src/components/TagsContainer.vue
+++ b/packages/editor-ui/src/components/TagsContainer.vue
@@ -6,6 +6,7 @@
 					v-for="tag in tags"
 					:key="tag.id"
 					:class="{clickable: !tag.hidden}"
+					@click="(e) => onClick(e, tag)"
 				>
 					<el-tag
 						:title="tag.title"
@@ -108,7 +109,9 @@ export default Vue.extend({
 			}
 		},
 		onClick(e: MouseEvent, tag: TagEl) {
-			e.stopPropagation();
+			if (this.clickable) {
+				e.stopPropagation();
+			}
 
 			// if tag is hidden or not displayed
 			if (!tag.hidden) {
diff --git a/packages/editor-ui/src/components/WorkflowOpen.vue b/packages/editor-ui/src/components/WorkflowOpen.vue
index bf03843ad9..568b35a574 100644
--- a/packages/editor-ui/src/components/WorkflowOpen.vue
+++ b/packages/editor-ui/src/components/WorkflowOpen.vue
@@ -32,7 +32,7 @@
 						<template slot-scope="scope">
 							<div :key="scope.row.id">
 								<span class="name">{{scope.row.name}}</span>
-								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" @click="onTagClick" />
+								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" />
 							</div>
 						</template>
 					</el-table-column>
@@ -124,11 +124,6 @@ export default mixins(
 		updateTagsFilter(tags: string[]) {
 			this.filterTagIds = tags;
 		},
-		onTagClick(tagId: string) {
-			if (tagId !== 'count' && !this.filterTagIds.includes(tagId)) {
-				this.filterTagIds.push(tagId);
-			}
-		},
 		async openWorkflow (data: IWorkflowShortResponse, column: any) { // tslint:disable-line:no-any
 			if (column.label !== 'Active') {
 
diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
index b98efe7104..038335a904 100644
--- a/packages/editor-ui/src/components/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -163,7 +163,7 @@ export const pushConnection = mixins(
 				}
 
 				if (receivedData.type === 'sendConsoleMessage') {
-					const pushData = receivedData.data as IPushDataConsoleMessage;
+					const pushData = receivedData.data;
 					console.log(pushData.source, pushData.message); // eslint-disable-line no-console
 					return true;
 				}
@@ -175,12 +175,12 @@ export const pushConnection = mixins(
 					return false;
 				}
 
-				if (['nodeExecuteAfter', 'nodeExecuteBefore'].includes(receivedData.type)) {
+				if (receivedData.type === 'nodeExecuteAfter' || receivedData.type === 'nodeExecuteBefore') {
 					if (this.$store.getters.isActionActive('workflowRunning') === false) {
 						// No workflow is running so ignore the messages
 						return false;
 					}
-					const pushData = receivedData.data as IPushDataNodeExecuteBefore;
+					const pushData = receivedData.data;
 					if (this.$store.getters.activeExecutionId !== pushData.executionId) {
 						// The data is not for the currently active execution or
 						// we do not have the execution id yet.
@@ -193,7 +193,7 @@ export const pushConnection = mixins(
 
 				if (receivedData.type === 'executionFinished') {
 					// The workflow finished executing
-					const pushData = receivedData.data as IPushDataExecutionFinished;
+					const pushData = receivedData.data;
 
 					this.$store.commit('finishActiveExecution', pushData);
 
@@ -279,7 +279,7 @@ export const pushConnection = mixins(
 					});
 
 				} else if (receivedData.type === 'executionStarted') {
-					const pushData = receivedData.data as IPushDataExecutionStarted;
+					const pushData = receivedData.data;
 
 					const executionData: IExecutionsCurrentSummaryExtended = {
 						id: pushData.executionId,
@@ -294,15 +294,15 @@ export const pushConnection = mixins(
 					this.$store.commit('addActiveExecution', executionData);
 				} else if (receivedData.type === 'nodeExecuteAfter') {
 					// A node finished to execute. Add its data
-					const pushData = receivedData.data as IPushDataNodeExecuteAfter;
+					const pushData = receivedData.data;
 					this.$store.commit('addNodeExecutionData', pushData);
 				} else if (receivedData.type === 'nodeExecuteBefore') {
 					// A node started to be executed. Set it as executing.
-					const pushData = receivedData.data as IPushDataNodeExecuteBefore;
+					const pushData = receivedData.data;
 					this.$store.commit('setExecutingNode', pushData.nodeName);
 				} else if (receivedData.type === 'testWebhookDeleted') {
 					// A test-webhook got deleted
-					const pushData = receivedData.data as IPushDataTestWebhook;
+					const pushData = receivedData.data;
 
 					if (pushData.workflowId === this.$store.getters.workflowId) {
 						this.$store.commit('setExecutionWaitingForWebhook', false);
@@ -310,7 +310,7 @@ export const pushConnection = mixins(
 					}
 				} else if (receivedData.type === 'testWebhookReceived') {
 					// A test-webhook did get called
-					const pushData = receivedData.data as IPushDataTestWebhook;
+					const pushData = receivedData.data;
 
 					if (pushData.workflowId === this.$store.getters.workflowId) {
 						this.$store.commit('setExecutionWaitingForWebhook', false);
diff --git a/packages/editor-ui/src/components/mixins/showMessage.ts b/packages/editor-ui/src/components/mixins/showMessage.ts
index f7d9c21b2e..61fe20a5c4 100644
--- a/packages/editor-ui/src/components/mixins/showMessage.ts
+++ b/packages/editor-ui/src/components/mixins/showMessage.ts
@@ -1,16 +1,12 @@
-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 = mixins(externalHooks).extend({
 	methods: {
-		$showMessage (messageData: ElNotificationOptions) {
+		$showMessage(messageData: ElNotificationOptions) {
 			messageData.dangerouslyUseHTMLString = true;
 			if (messageData.position === undefined) {
 				messageData.position = 'bottom-right';
@@ -18,14 +14,47 @@ export const showMessage = mixins(externalHooks).extend({
 
 			return Notification(messageData);
 		},
-		$showError (error: Error, title: string, message: string) {
+
+		$showError(error: Error, title: string, message: string) {
 			this.$showMessage({
 				title,
-				message: `${message}<br /><i>${error.message}</i>`,
+				message: `
+					${message}
+					<br>
+					<i>${error.message}</i>
+					${this.collapsableDetails(error)}`,
 				type: 'error',
 				duration: 0,
 			});
-			this.$externalHooks().run('showMessage.showError', { title, message, errorMessage: error.message });
+
+			this.$externalHooks().run('showMessage.showError', {
+				title,
+				message,
+				errorMessage: error.message,
+			});
+		},
+
+		// @ts-ignore
+		collapsableDetails({ description, node }: Error) {
+			if (!description) return '';
+
+			const errorDescription =
+				description.length > 500
+					? `${description.slice(0, 500)}...`
+					: description;
+
+			return `
+				<br>
+				<br>
+				<details>
+					<summary
+						style="color: #ff6d5a; font-weight: bold; cursor: pointer;"
+					>
+						Show Details
+					</summary>
+					<p>${node.name}: ${errorDescription}</p>
+				</details>
+			`;
 		},
 	},
 });
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 0bc1275d26..d04c9fafb5 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -495,10 +495,14 @@ export default mixins(
 					e.stopPropagation();
 					e.preventDefault();
 
-					this.$router.push({ name: 'NodeViewNew' });
+					if (this.$router.currentRoute.name === 'NodeViewNew') {
+						this.$root.$emit('newWorkflow');
+					} else {
+						this.$router.push({ name: 'NodeViewNew' });
+					}
 
 					this.$showMessage({
-						title: 'Created',
+						title: 'Workflow created',
 						message: 'A new workflow got created!',
 						type: 'success',
 					});
@@ -2063,6 +2067,8 @@ export default mixins(
 				const resData = await this.importWorkflowData(data.data as IWorkflowDataUpdate);
 			});
 
+			this.$root.$on('newWorkflow', this.newWorkflow);
+
 			this.$root.$on('importWorkflowUrl', async (data: IDataObject) => {
 				const workflowData = await this.getWorkflowDataFromUrl(data.url as string);
 				if (workflowData !== undefined) {
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index dffabdfa7f..ef69b53ac2 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.71.0",
-    "n8n-workflow": "~0.58.0",
+    "n8n-core": "~0.74.0",
+    "n8n-workflow": "~0.61.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",
diff --git a/packages/nodes-base/credentials/ActiveCampaignApi.credentials.ts b/packages/nodes-base/credentials/ActiveCampaignApi.credentials.ts
index 191fb595cc..13fd6bb7d8 100644
--- a/packages/nodes-base/credentials/ActiveCampaignApi.credentials.ts
+++ b/packages/nodes-base/credentials/ActiveCampaignApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class ActiveCampaignApi implements ICredentialType {
 	name = 'activeCampaignApi';
 	displayName = 'ActiveCampaign API';
 	documentationUrl = 'activeCampaign';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API URL',
 			name: 'apiUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts
index eca46ade93..ce87666dce 100644
--- a/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts
+++ b/packages/nodes-base/credentials/AcuitySchedulingApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AcuitySchedulingApi implements ICredentialType {
 	name = 'acuitySchedulingApi';
 	displayName = 'Acuity Scheduling API';
 	documentationUrl = 'acuityScheduling';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User ID',
 			name: 'userId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
index b5dce3ae31..b9526517c9 100644
--- a/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/AcuitySchedulingOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,38 +11,38 @@ export class AcuitySchedulingOAuth2Api implements ICredentialType {
 	];
 	displayName = 'AcuityScheduling OAuth2 API';
 	documentationUrl = 'acuityScheduling';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://acuityscheduling.com/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://acuityscheduling.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'api-v1',
 			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AffinityApi.credentials.ts b/packages/nodes-base/credentials/AffinityApi.credentials.ts
index f466a54d52..e9da5ec49e 100644
--- a/packages/nodes-base/credentials/AffinityApi.credentials.ts
+++ b/packages/nodes-base/credentials/AffinityApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AffinityApi implements ICredentialType {
 	name = 'affinityApi';
 	displayName = 'Affinity API';
 	documentationUrl = 'affinity';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AgileCrmApi.credentials.ts b/packages/nodes-base/credentials/AgileCrmApi.credentials.ts
index 99b4f6d851..e18ff85b55 100644
--- a/packages/nodes-base/credentials/AgileCrmApi.credentials.ts
+++ b/packages/nodes-base/credentials/AgileCrmApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AgileCrmApi implements ICredentialType {
 	name = 'agileCrmApi';
 	displayName = 'AgileCRM API';
 	documentationUrl = 'agileCrm';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'example',
 			description: 'If the domain is https://example.agilecrm.com "example" would have to be entered.',
diff --git a/packages/nodes-base/credentials/AirtableApi.credentials.ts b/packages/nodes-base/credentials/AirtableApi.credentials.ts
index 11845171c5..2a3d8cdbfc 100644
--- a/packages/nodes-base/credentials/AirtableApi.credentials.ts
+++ b/packages/nodes-base/credentials/AirtableApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class AirtableApi implements ICredentialType {
 	name = 'airtableApi';
 	displayName = 'Airtable API';
 	documentationUrl = 'airtable';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Amqp.credentials.ts b/packages/nodes-base/credentials/Amqp.credentials.ts
index 2323a0dc46..4c243088d1 100644
--- a/packages/nodes-base/credentials/Amqp.credentials.ts
+++ b/packages/nodes-base/credentials/Amqp.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,29 +8,29 @@ export class Amqp implements ICredentialType {
 	name = 'amqp';
 	displayName = 'AMQP';
 	documentationUrl = 'amqp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Hostname',
 			name: 'hostname',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 5672,
 		},
 		{
 			displayName: 'User',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -39,7 +39,7 @@ export class Amqp implements ICredentialType {
 		{
 			displayName: 'Transport Type',
 			name: 'transportType',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Optional Transport Type to use.',
 		},
diff --git a/packages/nodes-base/credentials/ApiTemplateIoApi.credentials.ts b/packages/nodes-base/credentials/ApiTemplateIoApi.credentials.ts
index e06f005ad5..1597ded98a 100644
--- a/packages/nodes-base/credentials/ApiTemplateIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/ApiTemplateIoApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ApiTemplateIoApi implements ICredentialType {
 	name = 'apiTemplateIoApi';
 	displayName = 'APITemplate.io API';
 	documentationUrl = 'apiTemplateIo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AsanaApi.credentials.ts b/packages/nodes-base/credentials/AsanaApi.credentials.ts
index c9096ed8a4..d2dffcf121 100644
--- a/packages/nodes-base/credentials/AsanaApi.credentials.ts
+++ b/packages/nodes-base/credentials/AsanaApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AsanaApi implements ICredentialType {
 	name = 'asanaApi';
 	displayName = 'Asana API';
 	documentationUrl = 'asana';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts
index b40949bb66..3bb966f2ec 100644
--- a/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/AsanaOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AsanaOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class AsanaOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Asana OAuth2 API';
 	documentationUrl = 'asana';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.asana.com/-/oauth_authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.asana.com/-/oauth_token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/AutomizyApi.credentials.ts b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
index 7f4bcc4e37..545015a1d2 100644
--- a/packages/nodes-base/credentials/AutomizyApi.credentials.ts
+++ b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AutomizyApi implements ICredentialType {
 	name = 'automizyApi';
 	displayName = 'Automizy API';
 	documentationUrl = 'automizy';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/AutopilotApi.credentials.ts b/packages/nodes-base/credentials/AutopilotApi.credentials.ts
index 6c947f9474..dad6d5a1c0 100644
--- a/packages/nodes-base/credentials/AutopilotApi.credentials.ts
+++ b/packages/nodes-base/credentials/AutopilotApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class AutopilotApi implements ICredentialType {
 	name = 'autopilotApi';
 	displayName = 'Autopilot API';
 	documentationUrl = 'autopilot';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 732817d4b8..8dcd0d893b 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,23 +8,23 @@ export class Aws implements ICredentialType {
 	name = 'aws';
 	displayName = 'AWS';
 	documentationUrl = 'aws';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Region',
 			name: 'region',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'us-east-1',
 		},
 		{
 			displayName: 'Access Key Id',
 			name: 'accessKeyId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Secret Access Key',
 			name: 'secretAccessKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			typeOptions: {
 				password: true,
@@ -33,14 +33,14 @@ export class Aws implements ICredentialType {
 		{
 			displayName: 'Custom Endpoints',
 			name: 'customEndpoints',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 		{
 			displayName: 'Rekognition Endpoint',
 			name: 'rekognitionEndpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and Rekognition using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
@@ -55,7 +55,7 @@ export class Aws implements ICredentialType {
 			displayName: 'Lambda Endpoint',
 			name: 'lambdaEndpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and Lambda using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
@@ -70,7 +70,7 @@ export class Aws implements ICredentialType {
 			displayName: 'SNS Endpoint',
 			name: 'snsEndpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and SNS using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
@@ -85,7 +85,7 @@ export class Aws implements ICredentialType {
 			displayName: 'SES Endpoint',
 			name: 'sesEndpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and SES using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
@@ -100,7 +100,7 @@ export class Aws implements ICredentialType {
 			displayName: 'SQS Endpoint',
 			name: 'sqsEndpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and SQS using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
@@ -115,7 +115,7 @@ export class Aws implements ICredentialType {
 			displayName: 'S3 Endpoint',
 			name: 's3Endpoint',
 			description: 'If you use Amazon VPC to host n8n, you can establish a connection between your VPC and S3 using a VPC endpoint. Leave blank to use the default endpoint.',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					customEndpoints: [
diff --git a/packages/nodes-base/credentials/BannerbearApi.credentials.ts b/packages/nodes-base/credentials/BannerbearApi.credentials.ts
index ab91a43dc3..99a6633c53 100644
--- a/packages/nodes-base/credentials/BannerbearApi.credentials.ts
+++ b/packages/nodes-base/credentials/BannerbearApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BannerbearApi implements ICredentialType {
 	name = 'bannerbearApi';
 	displayName = 'Bannerbear API';
 	documentationUrl = 'bannerbear';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Project API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BeeminderApi.credentials.ts b/packages/nodes-base/credentials/BeeminderApi.credentials.ts
index d0d126e9e7..cd5bace822 100644
--- a/packages/nodes-base/credentials/BeeminderApi.credentials.ts
+++ b/packages/nodes-base/credentials/BeeminderApi.credentials.ts
@@ -1,22 +1,22 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BeeminderApi implements ICredentialType {
 	name = 'beeminderApi';
 	displayName = 'Beeminder API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Auth Token',
 			name: 'authToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BitbucketApi.credentials.ts b/packages/nodes-base/credentials/BitbucketApi.credentials.ts
index 6fddffd211..8262b457b6 100644
--- a/packages/nodes-base/credentials/BitbucketApi.credentials.ts
+++ b/packages/nodes-base/credentials/BitbucketApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BitbucketApi implements ICredentialType {
 	name = 'bitbucketApi';
 	displayName = 'Bitbucket API';
 	documentationUrl = 'bitbucket';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'App Password',
 			name: 'appPassword',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BitlyApi.credentials.ts b/packages/nodes-base/credentials/BitlyApi.credentials.ts
index 66105dd2ba..66f457e821 100644
--- a/packages/nodes-base/credentials/BitlyApi.credentials.ts
+++ b/packages/nodes-base/credentials/BitlyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BitlyApi implements ICredentialType {
 	name = 'bitlyApi';
 	displayName = 'Bitly API';
 	documentationUrl = 'bitly';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
index bdd8b6bfea..b5bdd1a557 100644
--- a/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/BitlyOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,32 +11,32 @@ export class BitlyOAuth2Api implements ICredentialType {
 	extends = [
 		'oAuth2Api',
 	];
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://bitly.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api-ssl.bitly.com/oauth/access_token',
 			required: true,
 		},
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -46,13 +46,13 @@ export class BitlyOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 			description: 'For some services additional query parameters have to be set which can be defined here.',
 			placeholder: '',
@@ -60,7 +60,7 @@ export class BitlyOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/BitwardenApi.credentials.ts b/packages/nodes-base/credentials/BitwardenApi.credentials.ts
index 93a3f3f1d6..680c38be0e 100644
--- a/packages/nodes-base/credentials/BitwardenApi.credentials.ts
+++ b/packages/nodes-base/credentials/BitwardenApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 // https://bitwarden.com/help/article/public-api/#authentication
@@ -9,23 +9,23 @@ export class BitwardenApi implements ICredentialType {
 	name = 'bitwardenApi';
 	displayName = 'Bitwarden API';
 	documentationUrl = 'bitwarden';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Environment',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'cloudHosted',
 			options: [
 				{
@@ -41,7 +41,7 @@ export class BitwardenApi implements ICredentialType {
 		{
 			displayName: 'Self-hosted domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://www.mydomain.com',
 			displayOptions: {
diff --git a/packages/nodes-base/credentials/BoxOAuth2Api.credentials.ts b/packages/nodes-base/credentials/BoxOAuth2Api.credentials.ts
index e4208aff55..f900954e55 100644
--- a/packages/nodes-base/credentials/BoxOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/BoxOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BoxOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class BoxOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Box OAuth2 API';
 	documentationUrl = 'box';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://account.box.com/api/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.box.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BrandfetchApi.credentials.ts b/packages/nodes-base/credentials/BrandfetchApi.credentials.ts
index 27ebc7f78e..4954940b5c 100644
--- a/packages/nodes-base/credentials/BrandfetchApi.credentials.ts
+++ b/packages/nodes-base/credentials/BrandfetchApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BrandfetchApi implements ICredentialType {
 	name = 'brandfetchApi';
 	displayName = 'Brandfetch API';
 	documentationUrl = 'brandfetch';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/BubbleApi.credentials.ts b/packages/nodes-base/credentials/BubbleApi.credentials.ts
index dbeb7bb655..7428acbfd5 100644
--- a/packages/nodes-base/credentials/BubbleApi.credentials.ts
+++ b/packages/nodes-base/credentials/BubbleApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class BubbleApi implements ICredentialType {
 	name = 'bubbleApi';
 	displayName = 'Bubble API';
 	documentationUrl = 'bubble';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'App Name',
 			name: 'appName',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Environment',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'live',
 			options: [
 				{
@@ -39,7 +39,7 @@ export class BubbleApi implements ICredentialType {
 		{
 			displayName: 'Hosting',
 			name: 'hosting',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'bubbleHosted',
 			options: [
 				{
@@ -55,7 +55,7 @@ export class BubbleApi implements ICredentialType {
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			placeholder: 'mydomain.com',
 			default: '',
 			displayOptions: {
diff --git a/packages/nodes-base/credentials/CalendlyApi.credentials.ts b/packages/nodes-base/credentials/CalendlyApi.credentials.ts
index fcba123d84..d6418e4579 100644
--- a/packages/nodes-base/credentials/CalendlyApi.credentials.ts
+++ b/packages/nodes-base/credentials/CalendlyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class CalendlyApi implements ICredentialType {
 	name = 'calendlyApi';
 	displayName = 'Calendly API';
 	documentationUrl = 'calendly';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ChargebeeApi.credentials.ts b/packages/nodes-base/credentials/ChargebeeApi.credentials.ts
index f398390ca1..ee08c7c8ad 100644
--- a/packages/nodes-base/credentials/ChargebeeApi.credentials.ts
+++ b/packages/nodes-base/credentials/ChargebeeApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class ChargebeeApi implements ICredentialType {
 	name = 'chargebeeApi';
 	displayName = 'Chargebee API';
 	documentationUrl = 'chargebee';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Account Name',
 			name: 'accountName',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Api Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/CircleCiApi.credentials.ts b/packages/nodes-base/credentials/CircleCiApi.credentials.ts
index e5d314b652..6ba6b96418 100644
--- a/packages/nodes-base/credentials/CircleCiApi.credentials.ts
+++ b/packages/nodes-base/credentials/CircleCiApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class CircleCiApi implements ICredentialType {
 	name = 'circleCiApi';
 	displayName = 'CircleCI API';
 	documentationUrl = 'circleCi';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Personal API Token',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ClearbitApi.credentials.ts b/packages/nodes-base/credentials/ClearbitApi.credentials.ts
index 02da97c42d..771234dde5 100644
--- a/packages/nodes-base/credentials/ClearbitApi.credentials.ts
+++ b/packages/nodes-base/credentials/ClearbitApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ClearbitApi implements ICredentialType {
 	name = 'clearbitApi';
 	displayName = 'Clearbit API';
 	documentationUrl = 'clearbit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ClickUpApi.credentials.ts b/packages/nodes-base/credentials/ClickUpApi.credentials.ts
index f51400283f..06d2480a9c 100644
--- a/packages/nodes-base/credentials/ClickUpApi.credentials.ts
+++ b/packages/nodes-base/credentials/ClickUpApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ClickUpApi implements ICredentialType {
 	name = 'clickUpApi';
 	displayName = 'ClickUp API';
 	documentationUrl = 'clickUp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts
index 07bb9ef610..cfabf116e0 100644
--- a/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ClickUpOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ClickUpOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class ClickUpOAuth2Api implements ICredentialType {
 	];
 	displayName = 'ClickUp OAuth2 API';
 	documentationUrl = 'clickUp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.clickup.com/api',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.clickup.com/api/v2/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/ClockifyApi.credentials.ts b/packages/nodes-base/credentials/ClockifyApi.credentials.ts
index 691798b6af..87482adf32 100644
--- a/packages/nodes-base/credentials/ClockifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ClockifyApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,14 +8,14 @@ export class ClockifyApi implements ICredentialType {
 	name = 'clockifyApi';
 	displayName = 'Clockify API';
 	documentationUrl = 'clockify';
-	properties = [
+	properties: INodeProperties[] = [
 		// The credentials to get from user and save encrypted.
 		// Properties can be defined exactly in the same way
 		// as node properties.
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/CockpitApi.credentials.ts b/packages/nodes-base/credentials/CockpitApi.credentials.ts
index 94bf784f9d..ab269308fb 100644
--- a/packages/nodes-base/credentials/CockpitApi.credentials.ts
+++ b/packages/nodes-base/credentials/CockpitApi.credentials.ts
@@ -1,24 +1,24 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class CockpitApi implements ICredentialType {
 	name = 'cockpitApi';
 	displayName = 'Cockpit API';
 	documentationUrl = 'cockpit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Cockpit URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.com',
 		},
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/CodaApi.credentials.ts b/packages/nodes-base/credentials/CodaApi.credentials.ts
index 8a960dda6c..d6d250c9ad 100644
--- a/packages/nodes-base/credentials/CodaApi.credentials.ts
+++ b/packages/nodes-base/credentials/CodaApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class CodaApi implements ICredentialType {
 	name = 'codaApi';
 	displayName = 'Coda API';
 	documentationUrl = 'coda';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ContentfulApi.credentials.ts b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
index 59680f100b..0889cee7dd 100644
--- a/packages/nodes-base/credentials/ContentfulApi.credentials.ts
+++ b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 //https://www.contentful.com/developers/docs/references/authentication/
@@ -8,11 +8,11 @@ export class ContentfulApi implements ICredentialType {
 	name = 'contentfulApi';
 	displayName = 'Contenful API';
 	documentationUrl = 'contentful';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Space ID',
 			name: 'spaceId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 			description: 'The id for the Contentful space.',
@@ -20,14 +20,14 @@ export class ContentfulApi implements ICredentialType {
 		{
 			displayName: 'Content Delivery API Access token',
 			name: 'ContentDeliveryaccessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Access token that has access to the space. Can be left empty if only Delivery API should be used.',
 		},
 		{
 			displayName: 'Content Preview API Access token',
 			name: 'ContentPreviewaccessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Access token that has access to the space. Can be left empty if only Preview API should be used.',
 		},
diff --git a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
index 94195ec0fd..73e1180f7b 100644
--- a/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
+++ b/packages/nodes-base/credentials/ConvertKitApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class ConvertKitApi implements ICredentialType {
 	name = 'convertKitApi';
 	displayName = 'ConvertKit API';
 	documentationUrl = 'convertKit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Secret',
 			name: 'apiSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			typeOptions: {
 				password: true,
diff --git a/packages/nodes-base/credentials/CopperApi.credentials.ts b/packages/nodes-base/credentials/CopperApi.credentials.ts
index a9b47e6c53..917829a8ba 100644
--- a/packages/nodes-base/credentials/CopperApi.credentials.ts
+++ b/packages/nodes-base/credentials/CopperApi.credentials.ts
@@ -1,25 +1,25 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class CopperApi implements ICredentialType {
 	name = 'copperApi';
 	displayName = 'Copper API';
 	documentationUrl = 'copper';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Email',
 			name: 'email',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/CortexApi.credentials.ts b/packages/nodes-base/credentials/CortexApi.credentials.ts
index ce9a6b7dd7..9b869cec1e 100644
--- a/packages/nodes-base/credentials/CortexApi.credentials.ts
+++ b/packages/nodes-base/credentials/CortexApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class CortexApi implements ICredentialType {
 	name = 'cortexApi';
 	displayName = 'Cortex API';
 	documentationUrl = 'cortex';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'cortexApiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Cortex Instance',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			description: 'The URL of the Cortex instance',
 			default: '',
 			placeholder: 'https://localhost:9001',
diff --git a/packages/nodes-base/credentials/CrateDb.credentials.ts b/packages/nodes-base/credentials/CrateDb.credentials.ts
index 965098ce8b..9904e2ad7c 100644
--- a/packages/nodes-base/credentials/CrateDb.credentials.ts
+++ b/packages/nodes-base/credentials/CrateDb.credentials.ts
@@ -1,32 +1,32 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class CrateDb implements ICredentialType {
 	name = 'crateDb';
 	displayName = 'CrateDB';
 	documentationUrl = 'crateDb';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'doc',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'crate',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -35,7 +35,7 @@ export class CrateDb implements ICredentialType {
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'disable',
@@ -63,7 +63,7 @@ export class CrateDb implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 5432,
 		},
 	];
diff --git a/packages/nodes-base/credentials/CustomerIoApi.credentials.ts b/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
index 70387fd066..efe81d6093 100644
--- a/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/CustomerIoApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class CustomerIoApi implements ICredentialType {
 	name = 'customerIoApi';
 	displayName = 'Customer.io API';
 	documentationUrl = 'customerIo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Tracking API Key',
 			name: 'trackingApiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Required for tracking API.',
 			required: true,
@@ -20,14 +20,14 @@ export class CustomerIoApi implements ICredentialType {
 		{
 			displayName: 'Tracking Site ID',
 			name: 'trackingSiteId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Required for tracking API.',
 		},
 		{
 			displayName: 'App API Key',
 			name: 'appApiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Required for App API.',
 		},
diff --git a/packages/nodes-base/credentials/DeepLApi.credentials.ts b/packages/nodes-base/credentials/DeepLApi.credentials.ts
index 625d3b7d43..818b14c207 100644
--- a/packages/nodes-base/credentials/DeepLApi.credentials.ts
+++ b/packages/nodes-base/credentials/DeepLApi.credentials.ts
@@ -1,20 +1,20 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class DeepLApi implements ICredentialType {
 	name = 'deepLApi';
 	displayName = 'DeepL API';
 	documentationUrl = 'deepL';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Plan',
 			name: 'apiPlan',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'Pro Plan',
diff --git a/packages/nodes-base/credentials/DemioApi.credentials.ts b/packages/nodes-base/credentials/DemioApi.credentials.ts
index dc122e2f44..81c9a72095 100644
--- a/packages/nodes-base/credentials/DemioApi.credentials.ts
+++ b/packages/nodes-base/credentials/DemioApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DemioApi implements ICredentialType {
 	name = 'demioApi';
 	displayName = 'Demio API';
 	documentationUrl = 'demio';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Secret',
 			name: 'apiSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/DiscourseApi.credentials.ts b/packages/nodes-base/credentials/DiscourseApi.credentials.ts
index 98f38911e2..3abf156799 100644
--- a/packages/nodes-base/credentials/DiscourseApi.credentials.ts
+++ b/packages/nodes-base/credentials/DiscourseApi.credentials.ts
@@ -1,33 +1,33 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DiscourseApi implements ICredentialType {
 	name = 'discourseApi';
 	displayName = 'Discourse API';
 	documentationUrl = 'discourse';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/credentials/DisqusApi.credentials.ts b/packages/nodes-base/credentials/DisqusApi.credentials.ts
index 3acf068be0..c70f47c2ba 100644
--- a/packages/nodes-base/credentials/DisqusApi.credentials.ts
+++ b/packages/nodes-base/credentials/DisqusApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DisqusApi implements ICredentialType {
 	name = 'disqusApi';
 	displayName = 'Disqus API';
 	documentationUrl = 'disqus';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Visit your account details page, and grab the Access Token. See <a href="https://disqus.com/api/docs/auth/">Disqus auth</a>.',
 		},
diff --git a/packages/nodes-base/credentials/DriftApi.credentials.ts b/packages/nodes-base/credentials/DriftApi.credentials.ts
index 64f80048d1..5e7f2c5cee 100644
--- a/packages/nodes-base/credentials/DriftApi.credentials.ts
+++ b/packages/nodes-base/credentials/DriftApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DriftApi implements ICredentialType {
 	name = 'driftApi';
 	displayName = 'Drift API';
 	documentationUrl = 'drift';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Personal Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Visit your account details page, and grab the Access Token. See <a href="https://devdocs.drift.com/docs/quick-start">Drift auth</a>.',
 		},
diff --git a/packages/nodes-base/credentials/DriftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/DriftOAuth2Api.credentials.ts
index 3c011105cf..3fa072d66d 100644
--- a/packages/nodes-base/credentials/DriftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/DriftOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,37 +11,37 @@ export class DriftOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Drift OAuth2 API';
 	documentationUrl = 'drift';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://dev.drift.com/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://driftapi.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/DropboxApi.credentials.ts b/packages/nodes-base/credentials/DropboxApi.credentials.ts
index e17de90fff..7fddb26df4 100644
--- a/packages/nodes-base/credentials/DropboxApi.credentials.ts
+++ b/packages/nodes-base/credentials/DropboxApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class DropboxApi implements ICredentialType {
 	name = 'dropboxApi';
 	displayName = 'Dropbox API';
 	documentationUrl = 'dropbox';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'APP Access Type',
 			name: 'accessType',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'App Folder',
diff --git a/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts b/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
index c1515cd6f5..6ac0b512d3 100644
--- a/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/DropboxOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -17,43 +17,43 @@ export class DropboxOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Dropbox OAuth2 API';
 	documentationUrl = 'dropbox';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.dropbox.com/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.dropboxapi.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'token_access_type=offline&force_reapprove=true',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 		{
 			displayName: 'APP Access Type',
 			name: 'accessType',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'App Folder',
diff --git a/packages/nodes-base/credentials/ERPNextApi.credentials.ts b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
index 1ad997f74c..ffe6f9ac96 100644
--- a/packages/nodes-base/credentials/ERPNextApi.credentials.ts
+++ b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ERPNextApi implements ICredentialType {
 	name = 'erpNextApi';
 	displayName = 'ERPNext API';
 	documentationUrl = 'erpnext';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Secret',
 			name: 'apiSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Environment',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'cloudHosted',
 			options: [
 				{
@@ -39,7 +39,7 @@ export class ERPNextApi implements ICredentialType {
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'n8n',
 			description: 'Subdomain of cloud-hosted ERPNext instance. For example, "n8n" is the subdomain in: <code>https://n8n.erpnext.com</code>',
@@ -54,7 +54,7 @@ export class ERPNextApi implements ICredentialType {
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://www.mydomain.com',
 			description: 'Fully qualified domain name of self-hosted ERPNext instance.',
diff --git a/packages/nodes-base/credentials/EgoiApi.credentials.ts b/packages/nodes-base/credentials/EgoiApi.credentials.ts
index 08f882731b..9ee2548e81 100644
--- a/packages/nodes-base/credentials/EgoiApi.credentials.ts
+++ b/packages/nodes-base/credentials/EgoiApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,14 +8,14 @@ export class EgoiApi implements ICredentialType {
 	name = 'egoiApi';
 	displayName = 'E-goi API';
 	documentationUrl = 'egoi';
-	properties = [
+	properties: INodeProperties[] = [
 		// The credentials to get from user and save encrypted.
 		// Properties can be defined exactly in the same way
 		// as node properties.
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/EmeliaApi.credentials.ts b/packages/nodes-base/credentials/EmeliaApi.credentials.ts
index c953bafd70..c88974f19a 100644
--- a/packages/nodes-base/credentials/EmeliaApi.credentials.ts
+++ b/packages/nodes-base/credentials/EmeliaApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class EmeliaApi implements ICredentialType {
 	name = 'emeliaApi';
 	displayName = 'Emelia API';
 	documentationUrl = 'emelia';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/EventbriteApi.credentials.ts b/packages/nodes-base/credentials/EventbriteApi.credentials.ts
index e2b72c16e3..9ebe75a5aa 100644
--- a/packages/nodes-base/credentials/EventbriteApi.credentials.ts
+++ b/packages/nodes-base/credentials/EventbriteApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class EventbriteApi implements ICredentialType {
 	name = 'eventbriteApi';
 	displayName = 'Eventbrite API';
 	documentationUrl = 'eventbrite';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Private Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts b/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
index 551253499a..ea339573ae 100644
--- a/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/EventbriteOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,37 +11,37 @@ export class EventbriteOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Eventbrite OAuth2 API';
 	documentationUrl = 'eventbrite';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.eventbrite.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.eventbrite.com/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/FacebookGraphApi.credentials.ts b/packages/nodes-base/credentials/FacebookGraphApi.credentials.ts
index eba1510c53..2f329ff25a 100644
--- a/packages/nodes-base/credentials/FacebookGraphApi.credentials.ts
+++ b/packages/nodes-base/credentials/FacebookGraphApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class FacebookGraphApi implements ICredentialType {
 	name = 'facebookGraphApi';
 	displayName = 'Facebook Graph API';
 	documentationUrl = 'facebookGraph';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts b/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
index 271921397a..0ffbb29c81 100644
--- a/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
+++ b/packages/nodes-base/credentials/FacebookGraphAppApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class FacebookGraphAppApi implements ICredentialType {
@@ -10,11 +10,11 @@ export class FacebookGraphAppApi implements ICredentialType {
 	extends = [
 		'facebookGraphApi',
 	];
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'App Secret',
 			name: 'appSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: '(Optional) When the app secret is set the node will verify this signature to validate the integrity and origin of the payload.',
 		},
diff --git a/packages/nodes-base/credentials/FileMaker.credentials.ts b/packages/nodes-base/credentials/FileMaker.credentials.ts
index 1d497d63d1..ac20bd999a 100644
--- a/packages/nodes-base/credentials/FileMaker.credentials.ts
+++ b/packages/nodes-base/credentials/FileMaker.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,29 +8,29 @@ export class FileMaker implements ICredentialType {
 	name = 'fileMaker';
 	displayName = 'FileMaker API';
 	documentationUrl = 'fileMaker';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Database',
 			name: 'db',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Login',
 			name: 'login',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/FlowApi.credentials.ts b/packages/nodes-base/credentials/FlowApi.credentials.ts
index c6f33baed3..d7075029ea 100644
--- a/packages/nodes-base/credentials/FlowApi.credentials.ts
+++ b/packages/nodes-base/credentials/FlowApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class FlowApi implements ICredentialType {
 	name = 'flowApi';
 	displayName = 'Flow API';
 	documentationUrl = 'flow';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Organization ID',
 			name: 'organizationId',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 0,
 		},
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/FreshdeskApi.credentials.ts b/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
index 6feb810f50..7f23f66f4d 100644
--- a/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
+++ b/packages/nodes-base/credentials/FreshdeskApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class FreshdeskApi implements ICredentialType {
 	name = 'freshdeskApi';
 	displayName = 'Freshdesk API';
 	documentationUrl = 'freshdesk';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			placeholder: 'company',
 			description: 'If the URL you get displayed on Freshdesk is "https://company.freshdesk.com" enter "company"',
 			default: '',
diff --git a/packages/nodes-base/credentials/Ftp.credentials.ts b/packages/nodes-base/credentials/Ftp.credentials.ts
index 56e4839e63..0a94ca9812 100644
--- a/packages/nodes-base/credentials/Ftp.credentials.ts
+++ b/packages/nodes-base/credentials/Ftp.credentials.ts
@@ -1,18 +1,18 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Ftp implements ICredentialType {
 	name = 'ftp';
 	displayName = 'FTP';
 	documentationUrl = 'ftp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'localhost',
 		},
@@ -20,19 +20,19 @@ export class Ftp implements ICredentialType {
 			displayName: 'Port',
 			name: 'port',
 			required: true,
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 21,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts
index 0271104a11..7a79680d08 100644
--- a/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GSuiteAdminOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -17,11 +17,11 @@ export class GSuiteAdminOAuth2Api implements ICredentialType {
 	];
 	displayName = 'G Suite Admin OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GetResponseApi.credentials.ts b/packages/nodes-base/credentials/GetResponseApi.credentials.ts
index 1494a01930..ef9336d87b 100644
--- a/packages/nodes-base/credentials/GetResponseApi.credentials.ts
+++ b/packages/nodes-base/credentials/GetResponseApi.credentials.ts
@@ -1,16 +1,16 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GetResponseApi implements ICredentialType {
 	name = 'getResponseApi';
 	displayName = 'GetResponse API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GetResponseOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GetResponseOAuth2Api.credentials.ts
index 76ce3acb0f..97248b5461 100644
--- a/packages/nodes-base/credentials/GetResponseOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GetResponseOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GetResponseOAuth2Api implements ICredentialType {
@@ -9,37 +9,37 @@ export class GetResponseOAuth2Api implements ICredentialType {
 		'oAuth2Api',
 	];
 	displayName = 'GetResponse OAuth2 API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.getresponse.com/oauth2_authorize.html',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.getresponse.com/v3/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
index db5c05c866..d4472f61e7 100644
--- a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
+++ b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
@@ -1,24 +1,24 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GhostAdminApi implements ICredentialType {
 	name = 'ghostAdminApi';
 	displayName = 'Ghost Admin API';
 	documentationUrl = 'ghost';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'http://localhost:3001',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GhostContentApi.credentials.ts b/packages/nodes-base/credentials/GhostContentApi.credentials.ts
index 9454f0c788..b484a07f05 100644
--- a/packages/nodes-base/credentials/GhostContentApi.credentials.ts
+++ b/packages/nodes-base/credentials/GhostContentApi.credentials.ts
@@ -1,24 +1,24 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GhostContentApi implements ICredentialType {
 	name = 'ghostContentApi';
 	displayName = 'Ghost Content API';
 	documentationUrl = 'ghost';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'http://localhost:3001',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GitPassword.credentials.ts b/packages/nodes-base/credentials/GitPassword.credentials.ts
new file mode 100644
index 0000000000..8ebad4c55b
--- /dev/null
+++ b/packages/nodes-base/credentials/GitPassword.credentials.ts
@@ -0,0 +1,28 @@
+import {
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class GitPassword implements ICredentialType {
+	name = 'gitPassword';
+	displayName = 'Git';
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			description: 'The username to authenticate with.',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			description: 'The password to use in combination with the user',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/GithubApi.credentials.ts b/packages/nodes-base/credentials/GithubApi.credentials.ts
index 2906aeadb6..e6bcbec632 100644
--- a/packages/nodes-base/credentials/GithubApi.credentials.ts
+++ b/packages/nodes-base/credentials/GithubApi.credentials.ts
@@ -1,30 +1,30 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GithubApi implements ICredentialType {
 	name = 'githubApi';
 	displayName = 'Github API';
 	documentationUrl = 'github';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Github Server',
 			name: 'server',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://api.github.com',
 			description: 'The server to connect to. Does only have to get changed if Github Enterprise gets used.',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
index 88a1ab0fd0..8a3b213b20 100644
--- a/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,44 +11,44 @@ export class GithubOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Github OAuth2 API';
 	documentationUrl = 'github';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Github Server',
 			name: 'server',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://api.github.com',
 			description: 'The server to connect to. Does only have to get changed if Github Enterprise gets used.',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["server"] === "https://api.github.com" ? "https://github.com" : $self["server"]}}/login/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["server"] === "https://api.github.com" ? "https://github.com" : $self["server"]}}/login/oauth/access_token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'repo,admin:repo_hook,admin:org,admin:org_hook,gist,notifications,user,write:packages,read:packages,delete:packages,worfklow',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GitlabApi.credentials.ts b/packages/nodes-base/credentials/GitlabApi.credentials.ts
index e8d8b151b2..0171110071 100644
--- a/packages/nodes-base/credentials/GitlabApi.credentials.ts
+++ b/packages/nodes-base/credentials/GitlabApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class GitlabApi implements ICredentialType {
 	name = 'gitlabApi';
 	displayName = 'Gitlab API';
 	documentationUrl = 'gitlab';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Gitlab Server',
 			name: 'server',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://gitlab.com',
 		},
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
index 8a1afbfd7a..6385db7f8a 100644
--- a/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GitlabOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,43 +11,43 @@ export class GitlabOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Gitlab OAuth2 API';
 	documentationUrl = 'gitlab';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Gitlab Server',
 			name: 'server',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://gitlab.com',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["server"]}}/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["server"]}}/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'api',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GmailOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GmailOAuth2Api.credentials.ts
index ffe8f83d04..cf3348c724 100644
--- a/packages/nodes-base/credentials/GmailOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GmailOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -20,11 +20,11 @@ export class GmailOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Gmail OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoToWebinarOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoToWebinarOAuth2Api.credentials.ts
index 02c18bf361..e21166610a 100644
--- a/packages/nodes-base/credentials/GoToWebinarOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoToWebinarOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GoToWebinarOAuth2Api implements ICredentialType {
@@ -10,35 +10,35 @@ export class GoToWebinarOAuth2Api implements ICredentialType {
 	];
 	displayName = 'GoToWebinar OAuth2 API';
 	documentationUrl = 'goToWebinar';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.getgo.com/oauth/v2/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.getgo.com/oauth/v2/token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '', // set when creating the OAuth client
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleAnalyticsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleAnalyticsOAuth2Api.credentials.ts
index 0f76ff76b3..4feffab762 100644
--- a/packages/nodes-base/credentials/GoogleAnalyticsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleAnalyticsOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -16,11 +16,11 @@ export class GoogleAnalyticsOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Analytics OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 681759b81d..cf3e60523a 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class GoogleApi implements ICredentialType {
 	name = 'googleApi';
 	displayName = 'Google API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Service Account Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'The Google Service account similar to user-808@project.iam.gserviceaccount.com.',
 
@@ -20,21 +20,20 @@ export class GoogleApi implements ICredentialType {
 		{
 			displayName: 'Private Key',
 			name: 'privateKey',
-			lines: 5,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Use the multiline editor. Make sure there are exactly 3 lines.<br />-----BEGIN PRIVATE KEY-----<br />KEY IN A SINGLE LINE<br />-----END PRIVATE KEY-----',
 		},
 		{
 			displayName: ' Impersonate a User',
 			name: 'inpersonate',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 		{
 			displayName: 'Email',
 			name: 'delegatedEmail',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
index 5349ceebba..802db3dae9 100644
--- a/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleBigQueryOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -14,11 +14,11 @@ export class GoogleBigQueryOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google BigQuery OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleBooksOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleBooksOAuth2Api.credentials.ts
index d7453334b7..c0ec9cd285 100644
--- a/packages/nodes-base/credentials/GoogleBooksOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleBooksOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -14,11 +14,11 @@ export class GoogleBooksOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Books OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleCalendarOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleCalendarOAuth2Api.credentials.ts
index 842b095692..9fc53e2b04 100644
--- a/packages/nodes-base/credentials/GoogleCalendarOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleCalendarOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class GoogleCalendarOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Calendar OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleCloudNaturalLanguageOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleCloudNaturalLanguageOAuth2Api.credentials.ts
index 25cd0faa70..b2b234aa1d 100644
--- a/packages/nodes-base/credentials/GoogleCloudNaturalLanguageOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleCloudNaturalLanguageOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class GoogleCloudNaturalLanguageOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Cloud Natural Language OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleContactsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleContactsOAuth2Api.credentials.ts
index 966cb6b0b2..8bf763c2db 100644
--- a/packages/nodes-base/credentials/GoogleContactsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleContactsOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -14,11 +14,11 @@ export class GoogleContactsOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Contacts OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
index b0c44ae67b..870d2364a8 100644
--- a/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleDriveOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -16,11 +16,11 @@ export class GoogleDriveOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Drive OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleFirebaseCloudFirestoreOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleFirebaseCloudFirestoreOAuth2Api.credentials.ts
index 60faa5ee61..8493b184c6 100644
--- a/packages/nodes-base/credentials/GoogleFirebaseCloudFirestoreOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleFirebaseCloudFirestoreOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class GoogleFirebaseCloudFirestoreOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Firebase Cloud Firestore OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleFirebaseRealtimeDatabaseOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleFirebaseRealtimeDatabaseOAuth2Api.credentials.ts
index 845c78107d..2e6017b296 100644
--- a/packages/nodes-base/credentials/GoogleFirebaseRealtimeDatabaseOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleFirebaseRealtimeDatabaseOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -16,11 +16,11 @@ export class GoogleFirebaseRealtimeDatabaseOAuth2Api implements ICredentialType
 	];
 	displayName = 'Google Firebase Realtime Database OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
index 0dc677ea84..24bfedd935 100644
--- a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GoogleOAuth2Api implements ICredentialType {
@@ -10,29 +10,29 @@ export class GoogleOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://accounts.google.com/o/oauth2/v2/auth',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://oauth2.googleapis.com/token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'access_type=offline&prompt=consent',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
index 221f02c066..a44f89485a 100644
--- a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class GoogleSheetsOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Sheets OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleSlidesOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSlidesOAuth2Api.credentials.ts
index 7f5fb14b42..2a50b8a242 100644
--- a/packages/nodes-base/credentials/GoogleSlidesOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSlidesOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class GoogleSlidesOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Slides OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
index 4cdffd9512..789f08b02f 100644
--- a/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleTasksOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -12,11 +12,11 @@ export class GoogleTasksOAuth2Api implements ICredentialType {
 	extends = ['googleOAuth2Api'];
 	displayName = 'Google Tasks OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts
index 0cdcd608e0..ab25c51e50 100644
--- a/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleTranslateOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -14,11 +14,11 @@ export class GoogleTranslateOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Google Translate OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/GotifyApi.credentials.ts b/packages/nodes-base/credentials/GotifyApi.credentials.ts
index e417f60592..a5df10ec01 100644
--- a/packages/nodes-base/credentials/GotifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/GotifyApi.credentials.ts
@@ -1,31 +1,31 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GotifyApi implements ICredentialType {
 	name = 'gotifyApi';
 	displayName = 'Gotify API';
 	documentationUrl = 'gotify';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'App API Token',
 			name: 'appApiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: '(Optional) Needed for message creation.',
 		},
 		{
 			displayName: 'Client API Token',
 			name: 'clientApiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: '(Optional) Needed for everything (delete, getAll) but message creation.',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'The URL of the Gotify host.',
 		},
diff --git a/packages/nodes-base/credentials/GumroadApi.credentials.ts b/packages/nodes-base/credentials/GumroadApi.credentials.ts
index aebeb691a6..9d757b55c8 100644
--- a/packages/nodes-base/credentials/GumroadApi.credentials.ts
+++ b/packages/nodes-base/credentials/GumroadApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class GumroadApi implements ICredentialType {
 	name = 'gumroadApi';
 	displayName = 'Gumroad API';
 	documentationUrl = 'gumroad';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HarvestApi.credentials.ts b/packages/nodes-base/credentials/HarvestApi.credentials.ts
index 080ad2198d..d291191ec5 100644
--- a/packages/nodes-base/credentials/HarvestApi.credentials.ts
+++ b/packages/nodes-base/credentials/HarvestApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HarvestApi implements ICredentialType {
 	name = 'harvestApi';
 	displayName = 'Harvest API';
 	documentationUrl = 'harvest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Visit your account details page, and grab the Access Token. See <a href="https://help.getharvest.com/api-v2/authentication-api/authentication/authentication/">Harvest Personal Access Tokens</a>.',
 		},
diff --git a/packages/nodes-base/credentials/HarvestOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HarvestOAuth2Api.credentials.ts
index 0232af5cab..294ce9ef95 100644
--- a/packages/nodes-base/credentials/HarvestOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HarvestOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -10,37 +10,37 @@ export class HarvestOAuth2Api implements ICredentialType {
 		'oAuth2Api',
 	];
 	displayName = 'Harvest OAuth2 API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://id.getharvest.com/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://id.getharvest.com/api/v2/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'all',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/HelpScoutOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HelpScoutOAuth2Api.credentials.ts
index 19997c7aff..1b6252bc50 100644
--- a/packages/nodes-base/credentials/HelpScoutOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HelpScoutOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HelpScoutOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class HelpScoutOAuth2Api implements ICredentialType {
 	];
 	displayName = 'HelpScout OAuth2 API';
 	documentationUrl = 'helpScout';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://secure.helpscout.net/authentication/authorizeClientApplication',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.helpscout.net/v2/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HttpBasicAuth.credentials.ts b/packages/nodes-base/credentials/HttpBasicAuth.credentials.ts
index 9b4d1499a9..e2dfd2fa1c 100644
--- a/packages/nodes-base/credentials/HttpBasicAuth.credentials.ts
+++ b/packages/nodes-base/credentials/HttpBasicAuth.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class HttpBasicAuth implements ICredentialType {
 	name = 'httpBasicAuth';
 	displayName = 'Basic Auth';
 	documentationUrl = 'httpRequest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/HttpDigestAuth.credentials.ts b/packages/nodes-base/credentials/HttpDigestAuth.credentials.ts
index 5e3a6b3083..9a3efcbe93 100644
--- a/packages/nodes-base/credentials/HttpDigestAuth.credentials.ts
+++ b/packages/nodes-base/credentials/HttpDigestAuth.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class HttpDigestAuth implements ICredentialType {
 	name = 'httpDigestAuth';
 	displayName = 'Digest Auth';
 	documentationUrl = 'httpRequest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts b/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
index 9526790a7d..aa80e26fd7 100644
--- a/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
+++ b/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class HttpHeaderAuth implements ICredentialType {
 	name = 'httpHeaderAuth';
 	displayName = 'Header Auth';
 	documentationUrl = 'httpRequest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Name',
 			name: 'name',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 
 		},
 		{
 			displayName: 'Value',
 			name: 'value',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HubspotApi.credentials.ts b/packages/nodes-base/credentials/HubspotApi.credentials.ts
index 1479686d84..f475d442a7 100644
--- a/packages/nodes-base/credentials/HubspotApi.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HubspotApi implements ICredentialType {
 	name = 'hubspotApi';
 	displayName = 'Hubspot API';
 	documentationUrl = 'hubspot';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts b/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
index 2fdfbbc970..dc808767c9 100644
--- a/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotDeveloperApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HubspotDeveloperApi implements ICredentialType {
 	name = 'hubspotDeveloperApi';
 	displayName = 'Hubspot Developer API';
 	documentationUrl = 'hubspot';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Developer API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'App ID',
 			name: 'appId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			required: true,
 			default: '',
 			description: 'The App ID',
diff --git a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
index 150d336429..52187d888c 100644
--- a/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HubspotOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -16,37 +16,37 @@ export class HubspotOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Hubspot OAuth2 API';
 	documentationUrl = 'hubspot';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.hubspot.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.hubapi.com/oauth/v1/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'grant_type=authorization_code',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/HumanticAiApi.credentials.ts b/packages/nodes-base/credentials/HumanticAiApi.credentials.ts
index b9303e028a..7c84776fc1 100644
--- a/packages/nodes-base/credentials/HumanticAiApi.credentials.ts
+++ b/packages/nodes-base/credentials/HumanticAiApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HumanticAiApi implements ICredentialType {
 	name = 'humanticAiApi';
 	displayName = 'Humantic AI API';
 	documentationUrl = 'humanticAi';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HunterApi.credentials.ts b/packages/nodes-base/credentials/HunterApi.credentials.ts
index b8224223b9..79e9d7ae34 100644
--- a/packages/nodes-base/credentials/HunterApi.credentials.ts
+++ b/packages/nodes-base/credentials/HunterApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class HunterApi implements ICredentialType {
 	name = 'hunterApi';
 	displayName = 'Hunter API';
 	documentationUrl = 'hunter';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Imap.credentials.ts b/packages/nodes-base/credentials/Imap.credentials.ts
index b6e92ef1e0..190c6f932a 100644
--- a/packages/nodes-base/credentials/Imap.credentials.ts
+++ b/packages/nodes-base/credentials/Imap.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class Imap implements ICredentialType {
 	name = 'imap';
 	displayName = 'IMAP';
 	documentationUrl = 'imap';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -28,19 +28,19 @@ export class Imap implements ICredentialType {
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 993,
 		},
 		{
 			displayName: 'SSL/TLS',
 			name: 'secure',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 		},
 	];
diff --git a/packages/nodes-base/credentials/IntercomApi.credentials.ts b/packages/nodes-base/credentials/IntercomApi.credentials.ts
index f8128f0996..fd49afcc70 100644
--- a/packages/nodes-base/credentials/IntercomApi.credentials.ts
+++ b/packages/nodes-base/credentials/IntercomApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class IntercomApi implements ICredentialType {
 	name = 'intercomApi';
 	displayName = 'Intercom API';
 	documentationUrl = 'intercom';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts b/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
index e7acf816c1..3746d44bcf 100644
--- a/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
+++ b/packages/nodes-base/credentials/InvoiceNinjaApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class InvoiceNinjaApi implements ICredentialType {
 	name = 'invoiceNinjaApi';
 	displayName = 'Invoice Ninja API';
 	documentationUrl = 'invoiceNinja';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://app.invoiceninja.com',
 		},
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/IterableApi.credentials.ts b/packages/nodes-base/credentials/IterableApi.credentials.ts
index e6a5a8cca7..c5ad179173 100644
--- a/packages/nodes-base/credentials/IterableApi.credentials.ts
+++ b/packages/nodes-base/credentials/IterableApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class IterableApi implements ICredentialType {
 	name = 'iterableApi';
 	displayName = 'Iterable API';
 	documentationUrl = 'iterable';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts b/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
index 4fe11b928f..8c433b6fd6 100644
--- a/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/JiraSoftwareCloudApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class JiraSoftwareCloudApi implements ICredentialType {
 	name = 'jiraSoftwareCloudApi';
 	displayName = 'Jira SW Cloud API';
 	documentationUrl = 'jira';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.atlassian.net',
 		},
diff --git a/packages/nodes-base/credentials/JiraSoftwareServerApi.credentials.ts b/packages/nodes-base/credentials/JiraSoftwareServerApi.credentials.ts
index e912fb791d..66e5fdfdef 100644
--- a/packages/nodes-base/credentials/JiraSoftwareServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/JiraSoftwareServerApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class JiraSoftwareServerApi implements ICredentialType {
 	name = 'jiraSoftwareServerApi';
 	displayName = 'Jira SW Server API';
 	documentationUrl = 'jira';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
@@ -20,13 +20,13 @@ export class JiraSoftwareServerApi implements ICredentialType {
 			typeOptions: {
 				password: true,
 			},
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.com',
 		},
diff --git a/packages/nodes-base/credentials/JotFormApi.credentials.ts b/packages/nodes-base/credentials/JotFormApi.credentials.ts
index 14a75782d2..125a8e6e02 100644
--- a/packages/nodes-base/credentials/JotFormApi.credentials.ts
+++ b/packages/nodes-base/credentials/JotFormApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class JotFormApi implements ICredentialType {
 	name = 'jotFormApi';
 	displayName = 'JotForm API';
 	documentationUrl = 'jotForm';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Domain',
 			name: 'apiDomain',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'api.jotform.com',
diff --git a/packages/nodes-base/credentials/Kafka.credentials.ts b/packages/nodes-base/credentials/Kafka.credentials.ts
index a3fecfcdd6..17ce59f2e0 100644
--- a/packages/nodes-base/credentials/Kafka.credentials.ts
+++ b/packages/nodes-base/credentials/Kafka.credentials.ts
@@ -1,43 +1,43 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Kafka implements ICredentialType {
 	name = 'kafka';
 	displayName = 'Kafka';
 	documentationUrl = 'kafka';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'my-app',
 		},
 		{
 			displayName: 'Brokers',
 			name: 'brokers',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'kafka1:9092,kafka2:9092',
 		},
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					authentication: [
@@ -51,7 +51,7 @@ export class Kafka implements ICredentialType {
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					authentication: [
@@ -68,7 +68,7 @@ export class Kafka implements ICredentialType {
 		{
 			displayName: 'SASL mechanism',
 			name: 'saslMechanism',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			displayOptions: {
 				show: {
 					authentication: [
diff --git a/packages/nodes-base/credentials/KeapOAuth2Api.credentials.ts b/packages/nodes-base/credentials/KeapOAuth2Api.credentials.ts
index 57a7cf9e6c..b123e5e29f 100644
--- a/packages/nodes-base/credentials/KeapOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/KeapOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -14,35 +14,35 @@ export class KeapOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Keap OAuth2 API';
 	documentationUrl = 'keap';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://signin.infusionsoft.com/app/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.infusionsoft.com/token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/KitemakerApi.credentials.ts b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
index 2f372e0d31..4da67b41a8 100644
--- a/packages/nodes-base/credentials/KitemakerApi.credentials.ts
+++ b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class KitemakerApi implements ICredentialType {
 	name = 'kitemakerApi';
 	displayName = 'Kitemaker API';
 	documentationUrl = 'kitemaker';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Personal Access Token',
 			name: 'personalAccessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/LemlistApi.credentials.ts b/packages/nodes-base/credentials/LemlistApi.credentials.ts
index 348530f758..ed1272a379 100644
--- a/packages/nodes-base/credentials/LemlistApi.credentials.ts
+++ b/packages/nodes-base/credentials/LemlistApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class LemlistApi implements ICredentialType {
 	name = 'lemlistApi';
 	displayName = 'Lemlist API';
 	documentationUrl = 'lemlist';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/LineNotifyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LineNotifyOAuth2Api.credentials.ts
index b5bc61fb8f..618b0e1d20 100644
--- a/packages/nodes-base/credentials/LineNotifyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/LineNotifyOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class LineNotifyOAuth2Api implements ICredentialType {
@@ -10,38 +10,38 @@ export class LineNotifyOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Line Notify OAuth2 API';
 	documentationUrl = 'line';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://notify-bot.line.me/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://notify-bot.line.me/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'notify',
 			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/LingvaNexApi.credentials.ts b/packages/nodes-base/credentials/LingvaNexApi.credentials.ts
index 87265f98ee..b327cdcc4c 100644
--- a/packages/nodes-base/credentials/LingvaNexApi.credentials.ts
+++ b/packages/nodes-base/credentials/LingvaNexApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class LingvaNexApi implements ICredentialType {
 	name = 'lingvaNexApi';
 	displayName = 'LingvaNex API';
 	documentationUrl = 'lingvaNex';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
index 0e8ffb2086..b5b005f37b 100644
--- a/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/LinkedInOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,45 +11,45 @@ export class LinkedInOAuth2Api implements ICredentialType {
 	];
 	displayName = 'LinkedIn OAuth2 API';
 	documentationUrl = 'linkedIn';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Organization Support',
 			name: 'organizationSupport',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 			description: 'Request permissions to post as an orgaization.',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.linkedin.com/oauth/v2/authorization',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.linkedin.com/oauth/v2/accessToken',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '=r_liteprofile,r_emailaddress,w_member_social{{$self["organizationSupport"] === true ? ",w_organization_social":""}}',
 			description: 'Standard scopes for posting on behalf of a user or organization. See <a href="https://docs.microsoft.com/en-us/linkedin/marketing/getting-started#available-permissions"> this resource </a>.',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailcheckApi.credentials.ts b/packages/nodes-base/credentials/MailcheckApi.credentials.ts
index c84d857495..eb8d81a909 100644
--- a/packages/nodes-base/credentials/MailcheckApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailcheckApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MailcheckApi implements ICredentialType {
 	name = 'mailcheckApi';
 	displayName = 'Mailcheck API';
 	documentationUrl = 'mailcheck';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailchimpApi.credentials.ts b/packages/nodes-base/credentials/MailchimpApi.credentials.ts
index 32034a8f7b..a707cecea8 100644
--- a/packages/nodes-base/credentials/MailchimpApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailchimpApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MailchimpApi implements ICredentialType {
 	name = 'mailchimpApi';
 	displayName = 'Mailchimp API';
 	documentationUrl = 'mailchimp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailchimpOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MailchimpOAuth2Api.credentials.ts
index f4adbd0b09..3cd433efb2 100644
--- a/packages/nodes-base/credentials/MailchimpOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MailchimpOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,44 +11,44 @@ export class MailchimpOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Mailchimp OAuth2 API';
 	documentationUrl = 'mailchimp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://login.mailchimp.com/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://login.mailchimp.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Metadata',
 			name: 'metadataUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://login.mailchimp.com/oauth2/metadata',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
index 7ff9571ef8..00ea2cab0a 100644
--- a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MailerLiteApi implements ICredentialType {
 	name = 'mailerLiteApi';
 	displayName = 'Mailer Lite API';
 	documentationUrl = 'mailerLite';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailgunApi.credentials.ts b/packages/nodes-base/credentials/MailgunApi.credentials.ts
index f7f1bc4720..d81b339d84 100644
--- a/packages/nodes-base/credentials/MailgunApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailgunApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class MailgunApi implements ICredentialType {
 	name = 'mailgunApi';
 	displayName = 'Mailgun API';
 	documentationUrl = 'mailgun';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Domain',
 			name: 'apiDomain',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'api.eu.mailgun.net',
@@ -29,14 +29,14 @@ export class MailgunApi implements ICredentialType {
 		{
 			displayName: 'Email Domain',
 			name: 'emailDomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: '.',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts b/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
index e822db93eb..c43f0bb1a0 100644
--- a/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailjetEmailApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MailjetEmailApi implements ICredentialType {
 	name = 'mailjetEmailApi';
 	displayName = 'Mailjet Email API';
 	documentationUrl = 'mailjet';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Secret Key',
 			name: 'secretKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts b/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
index d2db7b85c3..051173e783 100644
--- a/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailjetSmsApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MailjetSmsApi implements ICredentialType {
 	name = 'mailjetSmsApi';
 	displayName = 'Mailjet SMS API';
 	documentationUrl = 'mailjet';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Token',
 			name: 'token',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MandrillApi.credentials.ts b/packages/nodes-base/credentials/MandrillApi.credentials.ts
index 00b94ddebe..f6cf68b794 100644
--- a/packages/nodes-base/credentials/MandrillApi.credentials.ts
+++ b/packages/nodes-base/credentials/MandrillApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class MandrillApi implements ICredentialType {
 	name = 'mandrillApi';
 	displayName = 'Mandrill API';
 	documentationUrl = 'mandrill';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MatrixApi.credentials.ts b/packages/nodes-base/credentials/MatrixApi.credentials.ts
index 4a03fd7331..918c54511e 100644
--- a/packages/nodes-base/credentials/MatrixApi.credentials.ts
+++ b/packages/nodes-base/credentials/MatrixApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class MatrixApi implements ICredentialType {
 	name = 'matrixApi';
 	displayName = 'Matrix API';
 	documentationUrl = 'matrix';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Homeserver URL',
 			name: 'homeserverUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://matrix-client.matrix.org',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MattermostApi.credentials.ts b/packages/nodes-base/credentials/MattermostApi.credentials.ts
index 8f19c8df10..b536b546dd 100644
--- a/packages/nodes-base/credentials/MattermostApi.credentials.ts
+++ b/packages/nodes-base/credentials/MattermostApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class MattermostApi implements ICredentialType {
 	name = 'mattermostApi';
 	displayName = 'Mattermost API';
 	documentationUrl = 'mattermost';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Base URL',
 			name: 'baseUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MauticApi.credentials.ts b/packages/nodes-base/credentials/MauticApi.credentials.ts
index 28d8cbb3da..6394a7bc82 100644
--- a/packages/nodes-base/credentials/MauticApi.credentials.ts
+++ b/packages/nodes-base/credentials/MauticApi.credentials.ts
@@ -1,30 +1,30 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MauticApi implements ICredentialType {
 	name = 'mauticApi';
 	displayName = 'Mautic API';
 	documentationUrl = 'mautic';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://name.mautic.net',
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts
index 6b8949c935..104ac82036 100644
--- a/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MauticOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MauticOAuth2Api implements ICredentialType {
@@ -10,44 +10,44 @@ export class MauticOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Mautic OAuth2 API';
 	documentationUrl = 'mautic';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://name.mautic.net',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["url"]}}/oauth/v2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{$self["url"]}}/oauth/v2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MediumApi.credentials.ts b/packages/nodes-base/credentials/MediumApi.credentials.ts
index 93417417ab..75e4919baf 100644
--- a/packages/nodes-base/credentials/MediumApi.credentials.ts
+++ b/packages/nodes-base/credentials/MediumApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MediumApi implements ICredentialType {
 	name = 'mediumApi';
 	displayName = 'Medium API';
 	documentationUrl = 'medium';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
index 8927784900..5f01fcfda8 100644
--- a/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MediumOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MediumOAuth2Api implements ICredentialType {
@@ -10,51 +10,51 @@ export class MediumOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Medium OAuth2 API';
 	documentationUrl = 'medium';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://medium.com/m/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://medium.com/v1/tokens',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'basicProfile,publishPost,listPublications',
 		},
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
index e5566b102f..3850328dc7 100644
--- a/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
+++ b/packages/nodes-base/credentials/MessageBirdApi.credentials.ts
@@ -1,14 +1,14 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class MessageBirdApi implements ICredentialType {
 	name = 'messageBirdApi';
 	displayName = 'MessageBird API';
 	documentationUrl = 'messageBird';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'accessKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
index c13e148a8e..d9ad4365fa 100644
--- a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MicrosoftExcelOAuth2Api implements ICredentialType {
@@ -10,12 +10,12 @@ export class MicrosoftExcelOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Microsoft Excel OAuth2 API';
 	documentationUrl = 'microsoft';
-	properties = [
+	properties: INodeProperties[] = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'openid offline_access Files.ReadWrite',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
index 08990b2de4..c274c0d7da 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MicrosoftOAuth2Api implements ICredentialType {
@@ -10,31 +10,31 @@ export class MicrosoftOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Microsoft OAuth2 API';
 	documentationUrl = 'microsoft';
-	properties = [
+	properties: INodeProperties[] = [
 		//info about the tenantID
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'response_mode=query',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
index 9bfc92cb8e..ad3b35efe6 100644
--- a/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MicrosoftOneDriveOAuth2Api implements ICredentialType {
@@ -10,12 +10,12 @@ export class MicrosoftOneDriveOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Microsoft Drive OAuth2 API';
 	documentationUrl = 'microsoft';
-	properties = [
+	properties: INodeProperties[] = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'openid offline_access Files.ReadWrite.All',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
index ef87526292..074c0ff2ec 100644
--- a/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOutlookOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MicrosoftOutlookOAuth2Api implements ICredentialType {
@@ -10,25 +10,25 @@ export class MicrosoftOutlookOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Microsoft Outlook OAuth2 API';
 	documentationUrl = 'microsoft';
-	properties = [
+	properties: INodeProperties[] = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'openid offline_access Mail.ReadWrite Mail.ReadWrite.Shared Mail.Send Mail.Send.Shared MailboxSettings.Read',
 		},
 		{
 			displayName: 'Use Shared Mailbox',
 			name: 'useShared',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 		{
 			displayName: 'User Principal Name',
 			name: 'userPrincipalName',
 			description: 'Target user\'s UPN or ID',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index 01b075b5c9..7d0693ca72 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -1,32 +1,32 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class MicrosoftSql implements ICredentialType {
 	name = 'microsoftSql';
 	displayName = 'Microsoft SQL';
 	documentationUrl = 'microsoftSql';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Server',
 			name: 'server',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'master',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'sa',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -35,25 +35,25 @@ export class MicrosoftSql implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 1433,
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'TLS',
 			name: 'tls',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 		},
 		{
 			displayName: 'Connect Timeout',
 			name: 'connectTimeout',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 15000,
 			description: 'Connection timeout in ms.',
 		},
diff --git a/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts
index 1afbae2471..f0b35d78f5 100644
--- a/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftTeamsOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MicrosoftTeamsOAuth2Api implements ICredentialType {
@@ -10,12 +10,12 @@ export class MicrosoftTeamsOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Microsoft Teams OAuth2 API';
 	documentationUrl = 'microsoft';
-	properties = [
+	properties: INodeProperties[] = [
 		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'openid offline_access User.ReadWrite.All Group.ReadWrite.All',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MicrosoftToDoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftToDoOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..70eb7c6bae
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftToDoOAuth2Api.credentials.ts
@@ -0,0 +1,22 @@
+import {
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class MicrosoftToDoOAuth2Api implements ICredentialType {
+	name = 'microsoftToDoOAuth2Api';
+	extends = [
+		'microsoftOAuth2Api',
+	];
+	displayName = 'Microsoft To Do OAuth2 API';
+	documentationUrl = 'microsoft';
+	properties: INodeProperties[] = [
+		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: 'openid offline_access Tasks.ReadWrite',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts b/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts
index 120d11173d..e46f9877da 100644
--- a/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts
+++ b/packages/nodes-base/credentials/MindeeInvoiceApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MindeeInvoiceApi implements ICredentialType {
 	name = 'mindeeInvoiceApi';
 	displayName = 'Mindee Invoice API';
 	documentationUrl = 'mindee';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts b/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts
index 4d9e78a3b9..2a3f486db9 100644
--- a/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts
+++ b/packages/nodes-base/credentials/MindeeReceiptApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MindeeReceiptApi implements ICredentialType {
 	name = 'mindeeReceiptApi';
 	displayName = 'Mindee Receipt API';
 	documentationUrl = 'mindee';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MoceanApi.credentials.ts b/packages/nodes-base/credentials/MoceanApi.credentials.ts
index 0b065757f1..414425e850 100644
--- a/packages/nodes-base/credentials/MoceanApi.credentials.ts
+++ b/packages/nodes-base/credentials/MoceanApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,20 +8,20 @@ export class MoceanApi implements ICredentialType {
 	name = 'moceanApi';
 	displayName = 'Mocean Api';
 	documentationUrl = 'mocean';
-	properties = [
+	properties: INodeProperties[] = [
 		// The credentials to get from user and save encrypted.
 		// Properties can be defined exactly in the same way
 		// as node properties.
 		{
 			displayName: 'API Key',
 			name: 'mocean-api-key',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Secret',
 			name: 'mocean-api-secret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MondayComApi.credentials.ts b/packages/nodes-base/credentials/MondayComApi.credentials.ts
index 2f4fa229ac..bf0342b2d7 100644
--- a/packages/nodes-base/credentials/MondayComApi.credentials.ts
+++ b/packages/nodes-base/credentials/MondayComApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class MondayComApi implements ICredentialType {
 	name = 'mondayComApi';
 	displayName = 'Monday.com API';
 	documentationUrl = 'mondayCom';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Token V2',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts
index 9adec39bc7..dbd3dd512f 100644
--- a/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MondayComOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,37 +15,37 @@ export class MondayComOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Monday.com OAuth2 API';
 	documentationUrl = 'monday';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://auth.monday.com/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://auth.monday.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MongoDb.credentials.ts b/packages/nodes-base/credentials/MongoDb.credentials.ts
index cd9ed51421..8884c577a0 100644
--- a/packages/nodes-base/credentials/MongoDb.credentials.ts
+++ b/packages/nodes-base/credentials/MongoDb.credentials.ts
@@ -1,14 +1,14 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class MongoDb implements ICredentialType {
 	name = 'mongoDb';
 	displayName = 'MongoDB';
 	documentationUrl = 'mongoDb';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Configuration Type',
 			name: 'configurationType',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'Connection String',
@@ -27,7 +27,7 @@ export class MongoDb implements ICredentialType {
 		{
 			displayName: 'Connection String',
 			name: 'connectionString',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					configurationType: [
@@ -44,7 +44,7 @@ export class MongoDb implements ICredentialType {
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					configurationType: [
@@ -57,14 +57,14 @@ export class MongoDb implements ICredentialType {
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Note: the database should still be provided even if using an override connection string',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			displayOptions: {
 				show: {
 					configurationType: [
@@ -77,7 +77,7 @@ export class MongoDb implements ICredentialType {
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -93,7 +93,7 @@ export class MongoDb implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			displayOptions: {
 				show: {
 					configurationType: [
diff --git a/packages/nodes-base/credentials/Mqtt.credentials.ts b/packages/nodes-base/credentials/Mqtt.credentials.ts
index a474e0501b..d88cdad4b6 100644
--- a/packages/nodes-base/credentials/Mqtt.credentials.ts
+++ b/packages/nodes-base/credentials/Mqtt.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Mqtt implements ICredentialType {
 	name = 'mqtt';
 	displayName = 'MQTT';
 	documentationUrl = 'mqtt';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Protocol',
 			name: 'protocol',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'mqtt',
@@ -27,25 +27,25 @@ export class Mqtt implements ICredentialType {
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 1883,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -54,14 +54,14 @@ export class Mqtt implements ICredentialType {
 		{
 			displayName: 'Clean Session',
 			name: 'clean',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 			description: `Set to false to receive QoS 1 and 2 messages while offline.`,
 		},
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Client ID. If left empty, one is autogenrated for you',
 		},
diff --git a/packages/nodes-base/credentials/Msg91Api.credentials.ts b/packages/nodes-base/credentials/Msg91Api.credentials.ts
index df78dfd6b5..bc1ce1fc48 100644
--- a/packages/nodes-base/credentials/Msg91Api.credentials.ts
+++ b/packages/nodes-base/credentials/Msg91Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,12 +8,12 @@ export class Msg91Api implements ICredentialType {
 	name = 'msg91Api';
 	displayName = 'Msg91 Api';
 	documentationUrl = 'msg91';
-	properties = [
+	properties: INodeProperties[] = [
 		// User authentication key
 		{
 			displayName: 'Authentication Key',
 			name: 'authkey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/MySql.credentials.ts b/packages/nodes-base/credentials/MySql.credentials.ts
index 083fa240fb..3e38bfa82f 100644
--- a/packages/nodes-base/credentials/MySql.credentials.ts
+++ b/packages/nodes-base/credentials/MySql.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,29 +8,29 @@ export class MySql implements ICredentialType {
 	name = 'mySql';
 	displayName = 'MySQL';
 	documentationUrl = 'mySql';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'mysql',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'mysql',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -39,20 +39,20 @@ export class MySql implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 3306,
 		},
 		{
 			displayName: 'Connect Timeout',
 			name: 'connectTimeout',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			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,
+			type: 'boolean',
 			default: false,
 		},
 		{
@@ -69,7 +69,7 @@ export class MySql implements ICredentialType {
 					],
 				},
 			},
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
@@ -86,7 +86,7 @@ export class MySql implements ICredentialType {
 					],
 				},
 			},
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
@@ -103,7 +103,7 @@ export class MySql implements ICredentialType {
 					],
 				},
 			},
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NasaApi.credentials.ts b/packages/nodes-base/credentials/NasaApi.credentials.ts
index b6bfbd4560..9e099f4ee2 100644
--- a/packages/nodes-base/credentials/NasaApi.credentials.ts
+++ b/packages/nodes-base/credentials/NasaApi.credentials.ts
@@ -1,16 +1,16 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class NasaApi implements ICredentialType {
 	name = 'nasaApi';
 	displayName = 'NASA API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'api_key',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NextCloudApi.credentials.ts b/packages/nodes-base/credentials/NextCloudApi.credentials.ts
index f979867536..a6b8946c79 100644
--- a/packages/nodes-base/credentials/NextCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/NextCloudApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,24 +8,24 @@ export class NextCloudApi implements ICredentialType {
 	name = 'nextCloudApi';
 	displayName = 'NextCloud API';
 	documentationUrl = 'nextCloud';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Web DAV URL',
 			name: 'webDavUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			placeholder: 'https://nextcloud.example.com/remote.php/webdav',
 			default: '',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NextCloudOAuth2Api.credentials.ts b/packages/nodes-base/credentials/NextCloudOAuth2Api.credentials.ts
index f197c55fc6..67af8dad11 100644
--- a/packages/nodes-base/credentials/NextCloudOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/NextCloudOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,44 +11,44 @@ export class NextCloudOAuth2Api implements ICredentialType {
 	];
 	displayName = 'NextCloud OAuth2 API';
 	documentationUrl = 'nextCloud';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Web DAV URL',
 			name: 'webDavUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			placeholder: 'https://nextcloud.example.com/remote.php/webdav',
 			default: '',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://nextcloud.example.com/apps/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://nextcloud.example.com/apps/oauth2/api/v1/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NotionApi.credentials.ts b/packages/nodes-base/credentials/NotionApi.credentials.ts
index b90fe7f364..322da31698 100644
--- a/packages/nodes-base/credentials/NotionApi.credentials.ts
+++ b/packages/nodes-base/credentials/NotionApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class NotionApi implements ICredentialType {
 	name = 'notionApi';
 	displayName = 'Notion API';
 	documentationUrl = 'notion';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts b/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
index d89c92a170..e9fe60abfe 100644
--- a/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/NotionOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class NotionOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class NotionOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Notion OAuth2 API';
 	documentationUrl = 'notion';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.notion.com/v1/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.notion.com/v1/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OAuth1Api.credentials.ts b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
index 563b6065cf..614afbc65a 100644
--- a/packages/nodes-base/credentials/OAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth1Api.credentials.ts
@@ -1,52 +1,52 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class OAuth1Api implements ICredentialType {
 	name = 'oAuth1Api';
 	displayName = 'OAuth1 API';
 	documentationUrl = 'httpRequest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Consumer Key',
 			name: 'consumerKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Consumer Secret',
 			name: 'consumerSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Request Token URL',
 			name: 'requestTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Signature Method',
 			name: 'signatureMethod',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'HMAC-SHA1',
diff --git a/packages/nodes-base/credentials/OAuth2Api.credentials.ts b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
index f61949a9fb..222444f7a5 100644
--- a/packages/nodes-base/credentials/OAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,32 +8,32 @@ export class OAuth2Api implements ICredentialType {
 	name = 'oAuth2Api';
 	displayName = 'OAuth2 API';
 	documentationUrl = 'httpRequest';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -43,13 +43,13 @@ export class OAuth2Api implements ICredentialType {
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'For some services additional query parameters have to be set which can be defined here.',
 			placeholder: 'access_type=offline',
@@ -57,7 +57,7 @@ export class OAuth2Api implements ICredentialType {
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'Body',
diff --git a/packages/nodes-base/credentials/OpenWeatherMapApi.credentials.ts b/packages/nodes-base/credentials/OpenWeatherMapApi.credentials.ts
index e15746e31b..0b62f5ddfa 100644
--- a/packages/nodes-base/credentials/OpenWeatherMapApi.credentials.ts
+++ b/packages/nodes-base/credentials/OpenWeatherMapApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class OpenWeatherMapApi implements ICredentialType {
 	name = 'openWeatherMapApi';
 	displayName = 'OpenWeatherMap API';
 	documentationUrl = 'openWeatherMap';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OrbitApi.credentials.ts b/packages/nodes-base/credentials/OrbitApi.credentials.ts
index c3d0e5650a..eecd6e7bb2 100644
--- a/packages/nodes-base/credentials/OrbitApi.credentials.ts
+++ b/packages/nodes-base/credentials/OrbitApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class OrbitApi implements ICredentialType {
 	name = 'orbitApi';
 	displayName = 'Orbit API';
 	documentationUrl = 'orbit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/OuraApi.credentials.ts b/packages/nodes-base/credentials/OuraApi.credentials.ts
index 1f1ec00e3d..dec306dded 100644
--- a/packages/nodes-base/credentials/OuraApi.credentials.ts
+++ b/packages/nodes-base/credentials/OuraApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class OuraApi implements ICredentialType {
 	name = 'ouraApi';
 	displayName = 'Oura API';
 	documentationUrl = 'oura';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Personal Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PaddleApi.credentials.ts b/packages/nodes-base/credentials/PaddleApi.credentials.ts
index 5aba2bb032..464c249f24 100644
--- a/packages/nodes-base/credentials/PaddleApi.credentials.ts
+++ b/packages/nodes-base/credentials/PaddleApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PaddleApi implements ICredentialType {
 	name = 'paddleApi';
 	displayName = 'Paddle API';
 	documentationUrl = 'paddle';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Vendor Auth Code',
 			name: 'vendorAuthCode',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Vendor ID',
 			name: 'vendorId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Use Sandbox environment API',
 			name: 'sandbox',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 	];
diff --git a/packages/nodes-base/credentials/PagerDutyApi.credentials.ts b/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
index c27d042ed9..4cf161053e 100644
--- a/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
+++ b/packages/nodes-base/credentials/PagerDutyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PagerDutyApi implements ICredentialType {
 	name = 'pagerDutyApi';
 	displayName = 'PagerDuty API';
 	documentationUrl = 'pagerDuty';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PagerDutyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/PagerDutyOAuth2Api.credentials.ts
index edc5f8245b..447a6f4941 100644
--- a/packages/nodes-base/credentials/PagerDutyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/PagerDutyOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PagerDutyOAuth2Api implements ICredentialType {
@@ -10,35 +10,35 @@ export class PagerDutyOAuth2Api implements ICredentialType {
 	];
 	displayName = 'PagerDuty OAuth2 API';
 	documentationUrl = 'pagerDuty';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.pagerduty.com/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://app.pagerduty.com/oauth/token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 			description: 'Method of authentication.',
 		},
diff --git a/packages/nodes-base/credentials/PayPalApi.credentials.ts b/packages/nodes-base/credentials/PayPalApi.credentials.ts
index 5d6f558f16..897a66b627 100644
--- a/packages/nodes-base/credentials/PayPalApi.credentials.ts
+++ b/packages/nodes-base/credentials/PayPalApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,23 +8,23 @@ export class PayPalApi implements ICredentialType {
 	name = 'payPalApi';
 	displayName = 'PayPal API';
 	documentationUrl = 'payPal';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Secret',
 			name: 'secret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Environment',
 			name: 'env',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'live',
 			options: [
 				{
diff --git a/packages/nodes-base/credentials/PeekalinkApi.credentials.ts b/packages/nodes-base/credentials/PeekalinkApi.credentials.ts
index 5d4edf3f62..512526f09b 100644
--- a/packages/nodes-base/credentials/PeekalinkApi.credentials.ts
+++ b/packages/nodes-base/credentials/PeekalinkApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PeekalinkApi implements ICredentialType {
 	name = 'peekalinkApi';
 	displayName = 'Peekalink API';
 	documentationUrl = 'peekalink';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PhantombusterApi.credentials.ts b/packages/nodes-base/credentials/PhantombusterApi.credentials.ts
index 1b33b8a7b9..228b1c670e 100644
--- a/packages/nodes-base/credentials/PhantombusterApi.credentials.ts
+++ b/packages/nodes-base/credentials/PhantombusterApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PhantombusterApi implements ICredentialType {
 	name = 'phantombusterApi';
 	displayName = 'Phantombuster API';
 	documentationUrl = 'phantombuster';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts b/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
index 519800f494..653e1df6be 100644
--- a/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/PhilipsHueOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PhilipsHueOAuth2Api implements ICredentialType {
@@ -10,41 +10,41 @@ export class PhilipsHueOAuth2Api implements ICredentialType {
 	];
 	displayName = 'PhilipHue OAuth2 API';
 	documentationUrl = 'philipsHue';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'APP ID',
 			name: 'appId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.meethue.com/oauth2/auth',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.meethue.com/oauth2/token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '={{"appid="+$self["appId"]}}',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 			description: 'Method of authentication.',
 		},
diff --git a/packages/nodes-base/credentials/PipedriveApi.credentials.ts b/packages/nodes-base/credentials/PipedriveApi.credentials.ts
index 709b8c0589..a639b783ab 100644
--- a/packages/nodes-base/credentials/PipedriveApi.credentials.ts
+++ b/packages/nodes-base/credentials/PipedriveApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class PipedriveApi implements ICredentialType {
 	name = 'pipedriveApi';
 	displayName = 'Pipedrive API';
 	documentationUrl = 'pipedrive';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PipedriveOAuth2Api.credentials.ts b/packages/nodes-base/credentials/PipedriveOAuth2Api.credentials.ts
index 9d9e79bba0..19ab08b823 100644
--- a/packages/nodes-base/credentials/PipedriveOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/PipedriveOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PipedriveOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class PipedriveOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Pipedrive OAuth2 API';
 	documentationUrl = 'pipedrive';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://oauth.pipedrive.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://oauth.pipedrive.com/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PlivoApi.credentials.ts b/packages/nodes-base/credentials/PlivoApi.credentials.ts
index c07162b283..4a648d82df 100644
--- a/packages/nodes-base/credentials/PlivoApi.credentials.ts
+++ b/packages/nodes-base/credentials/PlivoApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PlivoApi implements ICredentialType {
 	name = 'plivoApi';
 	displayName = 'Plivo API';
 	documentationUrl = 'plivo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Auth ID',
 			name: 'authId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Auth Token',
 			name: 'authToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PostHogApi.credentials.ts b/packages/nodes-base/credentials/PostHogApi.credentials.ts
index cce3f99cf6..6c8f51bf67 100644
--- a/packages/nodes-base/credentials/PostHogApi.credentials.ts
+++ b/packages/nodes-base/credentials/PostHogApi.credentials.ts
@@ -1,22 +1,22 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PostHogApi implements ICredentialType {
 	name = 'postHogApi';
 	displayName = 'PostHog API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://app.posthog.com',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index 22fd706f30..304c4f700e 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,29 +8,29 @@ export class Postgres implements ICredentialType {
 	name = 'postgres';
 	displayName = 'Postgres';
 	documentationUrl = 'postgres';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'postgres',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'postgres',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -39,14 +39,14 @@ export class Postgres implements ICredentialType {
 		{
 			displayName: 'Ignore SSL Issues',
 			name: 'allowUnauthorizedCerts',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 			description: 'Connect even if SSL certificate validation is not possible.',
 		},
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			displayOptions: {
 				show: {
 					allowUnauthorizedCerts: [
@@ -81,7 +81,7 @@ export class Postgres implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 5432,
 		},
 	];
diff --git a/packages/nodes-base/credentials/PostmarkApi.credentials.ts b/packages/nodes-base/credentials/PostmarkApi.credentials.ts
index 9f9ff5ca4a..cde9dd45de 100644
--- a/packages/nodes-base/credentials/PostmarkApi.credentials.ts
+++ b/packages/nodes-base/credentials/PostmarkApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class PostmarkApi implements ICredentialType {
 	name = 'postmarkApi';
 	displayName = 'Postmark API';
 	documentationUrl = 'postmark';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Server API Token',
 			name: 'serverToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ProfitWellApi.credentials.ts b/packages/nodes-base/credentials/ProfitWellApi.credentials.ts
index 8f1fe16307..4ccae5919a 100644
--- a/packages/nodes-base/credentials/ProfitWellApi.credentials.ts
+++ b/packages/nodes-base/credentials/ProfitWellApi.credentials.ts
@@ -1,19 +1,19 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ProfitWellApi implements ICredentialType {
 	name = 'profitWellApi';
 	displayName = 'ProfitWell API';
 	documentationUrl = 'profitWell';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Your Private Token',
 		},
 	];
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/credentials/PushbulletOAuth2Api.credentials.ts b/packages/nodes-base/credentials/PushbulletOAuth2Api.credentials.ts
index 2119241497..cb091c1fa0 100644
--- a/packages/nodes-base/credentials/PushbulletOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/PushbulletOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PushbulletOAuth2Api implements ICredentialType {
@@ -9,37 +9,37 @@ export class PushbulletOAuth2Api implements ICredentialType {
 		'oAuth2Api',
 	];
 	displayName = 'Pushbullet OAuth2 API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.pushbullet.com/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.pushbullet.com/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PushcutApi.credentials.ts b/packages/nodes-base/credentials/PushcutApi.credentials.ts
index 9f5f93b57f..2395bb410f 100644
--- a/packages/nodes-base/credentials/PushcutApi.credentials.ts
+++ b/packages/nodes-base/credentials/PushcutApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PushcutApi implements ICredentialType {
 	name = 'pushcutApi';
 	displayName = 'Pushcut API';
 	documentationUrl = 'pushcut';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/PushoverApi.credentials.ts b/packages/nodes-base/credentials/PushoverApi.credentials.ts
index 1419347f75..9cd9ba589d 100644
--- a/packages/nodes-base/credentials/PushoverApi.credentials.ts
+++ b/packages/nodes-base/credentials/PushoverApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class PushoverApi implements ICredentialType {
 	name = 'pushoverApi';
 	displayName = 'Pushover API';
 	documentationUrl = 'pushover';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/QuestDb.credentials.ts b/packages/nodes-base/credentials/QuestDb.credentials.ts
index 9c0e364d4f..ebf8828d25 100644
--- a/packages/nodes-base/credentials/QuestDb.credentials.ts
+++ b/packages/nodes-base/credentials/QuestDb.credentials.ts
@@ -1,32 +1,32 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class QuestDb implements ICredentialType {
 	name = 'questDb';
 	displayName = 'QuestDB';
 	documentationUrl = 'questDb';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'qdb',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'admin',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -35,7 +35,7 @@ export class QuestDb implements ICredentialType {
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'disable',
@@ -63,7 +63,7 @@ export class QuestDb implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 8812,
 		},
 	];
diff --git a/packages/nodes-base/credentials/QuickBaseApi.credentials.ts b/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
index b243bf4652..8c9a9d202d 100644
--- a/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
+++ b/packages/nodes-base/credentials/QuickBaseApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class QuickBaseApi implements ICredentialType {
 	name = 'quickbaseApi';
 	displayName = 'Quick Base API';
 	documentationUrl = 'quickbase';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Hostname',
 			name: 'hostname',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 			placeholder: 'demo.quickbase.com',
@@ -19,7 +19,7 @@ export class QuickBaseApi implements ICredentialType {
 		{
 			displayName: 'User Token',
 			name: 'userToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/QuickBooksOAuth2Api.credentials.ts b/packages/nodes-base/credentials/QuickBooksOAuth2Api.credentials.ts
index f48109bb26..32c808adfe 100644
--- a/packages/nodes-base/credentials/QuickBooksOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/QuickBooksOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -17,41 +17,41 @@ export class QuickBooksOAuth2Api implements ICredentialType {
 	];
 	displayName = 'QuickBooks OAuth2 API';
 	documentationUrl = 'quickbooks';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://appcenter.intuit.com/connect/oauth2',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 		{
 			displayName: 'Environment',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'production',
 			options: [
 				{
diff --git a/packages/nodes-base/credentials/RabbitMQ.credentials.ts b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
index 348c401360..416522c903 100644
--- a/packages/nodes-base/credentials/RabbitMQ.credentials.ts
+++ b/packages/nodes-base/credentials/RabbitMQ.credentials.ts
@@ -1,38 +1,38 @@
 import {
 	ICredentialType,
 	IDisplayOptions,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class RabbitMQ implements ICredentialType {
 	name = 'rabbitmq';
 	displayName = 'RabbitMQ';
 	documentationUrl = 'rabbitmq';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Hostname',
 			name: 'hostname',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'localhost',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 5672,
 		},
 		{
 			displayName: 'User',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'guest',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -42,19 +42,19 @@ export class RabbitMQ implements ICredentialType {
 		{
 			displayName: 'Vhost',
 			name: 'vhost',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '/',
 		},
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 		{
 			displayName: 'Passwordless',
 			name: 'passwordless',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			displayOptions: {
 				show: {
 					ssl: [
@@ -68,7 +68,7 @@ export class RabbitMQ implements ICredentialType {
 		{
 			displayName: 'CA Certificates',
 			name: 'ca',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -85,7 +85,7 @@ export class RabbitMQ implements ICredentialType {
 		{
 			displayName: 'Client Certificate',
 			name: 'cert',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -105,7 +105,7 @@ export class RabbitMQ implements ICredentialType {
 		{
 			displayName: 'Client Key',
 			name: 'key',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -125,7 +125,7 @@ export class RabbitMQ implements ICredentialType {
 		{
 			displayName: 'Passphrase',
 			name: 'passphrase',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -145,28 +145,28 @@ export class RabbitMQ implements ICredentialType {
 		// {
 		// 	displayName: 'Client ID',
 		// 	name: 'clientId',
-		// 	type: 'string' as NodePropertyTypes,
+		// 	type: 'string',
 		// 	default: '',
 		// 	placeholder: 'my-app',
 		// },
 		// {
 		// 	displayName: 'Brokers',
 		// 	name: 'brokers',
-		// 	type: 'string' as NodePropertyTypes,
+		// 	type: 'string',
 		// 	default: '',
 		// 	placeholder: 'kafka1:9092,kafka2:9092',
 		// },
 		// {
 		// 	displayName: 'Username',
 		// 	name: 'username',
-		// 	type: 'string' as NodePropertyTypes,
+		// 	type: 'string',
 		// 	default: '',
 		// 	description: 'Optional username if authenticated is required.',
 		// },
 		// {
 		// 	displayName: 'Password',
 		// 	name: 'password',
-		// 	type: 'string' as NodePropertyTypes,
+		// 	type: 'string',
 		// 	typeOptions: {
 		// 		password: true,
 		// 	},
diff --git a/packages/nodes-base/credentials/RaindropOAuth2Api.credentials.ts b/packages/nodes-base/credentials/RaindropOAuth2Api.credentials.ts
index f0c636ac63..abe26491dd 100644
--- a/packages/nodes-base/credentials/RaindropOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/RaindropOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 // https://developer.raindrop.io/v1/authentication
@@ -12,35 +12,35 @@ export class RaindropOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Raindrop OAuth2 API';
 	documentationUrl = 'raindrop';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://raindrop.io/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://raindrop.io/oauth/access_token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/RedditOAuth2Api.credentials.ts b/packages/nodes-base/credentials/RedditOAuth2Api.credentials.ts
index fe7def1a7a..b800a03b7f 100644
--- a/packages/nodes-base/credentials/RedditOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/RedditOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -22,47 +22,47 @@ export class RedditOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Reddit OAuth2 API';
 	documentationUrl = 'reddit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'response_type=code',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'grant_type=authorization_code',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'duration=permanent',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.reddit.com/api/v1/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.reddit.com/api/v1/access_token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Redis.credentials.ts b/packages/nodes-base/credentials/Redis.credentials.ts
index a33238b52a..6c0370d978 100644
--- a/packages/nodes-base/credentials/Redis.credentials.ts
+++ b/packages/nodes-base/credentials/Redis.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class Redis implements ICredentialType {
 	name = 'redis';
 	displayName = 'Redis';
 	documentationUrl = 'redis';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -21,13 +21,13 @@ export class Redis implements ICredentialType {
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 6379,
 		},
 	];
diff --git a/packages/nodes-base/credentials/RocketchatApi.credentials.ts b/packages/nodes-base/credentials/RocketchatApi.credentials.ts
index 9c7e9b420c..68f1deb71b 100644
--- a/packages/nodes-base/credentials/RocketchatApi.credentials.ts
+++ b/packages/nodes-base/credentials/RocketchatApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,23 +8,23 @@ export class RocketchatApi implements ICredentialType {
 	name = 'rocketchatApi';
 	displayName = 'Rocket API';
 	documentationUrl = 'rocketchat';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User Id',
 			name: 'userId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Auth Key',
 			name: 'authKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Domain',
 			name: 'domain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://n8n.rocket.chat',
 		},
diff --git a/packages/nodes-base/credentials/RundeckApi.credentials.ts b/packages/nodes-base/credentials/RundeckApi.credentials.ts
index 744095e824..d3c6458908 100644
--- a/packages/nodes-base/credentials/RundeckApi.credentials.ts
+++ b/packages/nodes-base/credentials/RundeckApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class RundeckApi implements ICredentialType {
 	name = 'rundeckApi';
 	displayName = 'Rundeck API';
 	documentationUrl = 'rundeck';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Url',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'http://127.0.0.1:4440',
 		},
 		{
 			displayName: 'Token',
 			name: 'token',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/S3.credentials.ts b/packages/nodes-base/credentials/S3.credentials.ts
index 712664f0f1..861ef19aea 100644
--- a/packages/nodes-base/credentials/S3.credentials.ts
+++ b/packages/nodes-base/credentials/S3.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,29 +8,29 @@ export class S3 implements ICredentialType {
 	name = 's3';
 	displayName = 'S3';
 	documentationUrl = 's3';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'S3 endpoint',
 			name: 'endpoint',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Region',
 			name: 'region',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'us-east-1',
 		},
 		{
 			displayName: 'Access Key Id',
 			name: 'accessKeyId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Secret Access Key',
 			name: 'secretAccessKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			typeOptions: {
 				password: true,
@@ -39,7 +39,7 @@ export class S3 implements ICredentialType {
 		{
 			displayName: 'Force path style',
 			name: 'forcePathStyle',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 	];
diff --git a/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts b/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
index ef0b7d9579..bd35f3440c 100644
--- a/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
+++ b/packages/nodes-base/credentials/SalesforceJwtApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SalesforceJwtApi implements ICredentialType {
 	name = 'salesforceJwtApi';
 	displayName = 'Salesforce JWT API';
 	documentationUrl = 'salesforce';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Environment Type',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'Production',
@@ -27,7 +27,7 @@ export class SalesforceJwtApi implements ICredentialType {
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 			description: 'Consumer Key from Salesforce Connected App.',
@@ -35,14 +35,14 @@ export class SalesforceJwtApi implements ICredentialType {
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Private Key',
 			name: 'privateKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
index eea91f8078..0aaba074ec 100644
--- a/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SalesforceOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class SalesforceOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Salesforce OAuth2 API';
 	documentationUrl = 'salesforce';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://login.salesforce.com/services/oauth2/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'https://yourcompany.salesforce.com/services/oauth2/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'full refresh_token',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 			description: 'Method of authentication.',
 		},
diff --git a/packages/nodes-base/credentials/SalesmateApi.credentials.ts b/packages/nodes-base/credentials/SalesmateApi.credentials.ts
index a2835ea02e..22f4cf5e46 100644
--- a/packages/nodes-base/credentials/SalesmateApi.credentials.ts
+++ b/packages/nodes-base/credentials/SalesmateApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SalesmateApi implements ICredentialType {
 	name = 'salesmateApi';
 	displayName = 'Salesmate API';
 	documentationUrl = 'salesmate';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Session Token',
 			name: 'sessionToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'n8n.salesmate.io',
 		},
diff --git a/packages/nodes-base/credentials/SecurityScorecardApi.credentials.ts b/packages/nodes-base/credentials/SecurityScorecardApi.credentials.ts
index db24a112e7..8453371ef4 100644
--- a/packages/nodes-base/credentials/SecurityScorecardApi.credentials.ts
+++ b/packages/nodes-base/credentials/SecurityScorecardApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SecurityScorecardApi implements ICredentialType {
 	name = 'securityScorecardApi';
 	displayName = 'SecurityScorecard API';
 	documentationUrl = 'securityScorecard';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
diff --git a/packages/nodes-base/credentials/SegmentApi.credentials.ts b/packages/nodes-base/credentials/SegmentApi.credentials.ts
index 2db8fcb1e0..bc9d6ec714 100644
--- a/packages/nodes-base/credentials/SegmentApi.credentials.ts
+++ b/packages/nodes-base/credentials/SegmentApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SegmentApi implements ICredentialType {
 	name = 'segmentApi';
 	displayName = 'Segment API';
 	documentationUrl = 'segment';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Write Key',
 			name: 'writekey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SendGridApi.credentials.ts b/packages/nodes-base/credentials/SendGridApi.credentials.ts
index 1ff2da8151..d2338f4419 100644
--- a/packages/nodes-base/credentials/SendGridApi.credentials.ts
+++ b/packages/nodes-base/credentials/SendGridApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SendGridApi implements ICredentialType {
 	name = 'sendGridApi';
 	displayName = 'SendGrid API';
 	documentationUrl = 'sendgrid';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SendyApi.credentials.ts b/packages/nodes-base/credentials/SendyApi.credentials.ts
index 244a0ec349..b8c12beddd 100644
--- a/packages/nodes-base/credentials/SendyApi.credentials.ts
+++ b/packages/nodes-base/credentials/SendyApi.credentials.ts
@@ -1,24 +1,24 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SendyApi implements ICredentialType {
 	name = 'sendyApi';
 	displayName = 'Sendy API';
 	documentationUrl = 'sendy';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://yourdomain.com',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SentryIoApi.credentials.ts b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
index 4530d50273..15ad98edcb 100644
--- a/packages/nodes-base/credentials/SentryIoApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SentryIoApi implements ICredentialType {
 	name = 'sentryIoApi';
 	displayName = 'Sentry.io API';
 	documentationUrl = 'sentryIo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Token',
 			name: 'token',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
index 9c0ee4dd23..d1d8893017 100644
--- a/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SentryIoOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class SentryIoOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Sentry.io OAuth2 API';
 	documentationUrl = 'sentryIo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://sentry.io/oauth/authorize/',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://sentry.io/oauth/token/',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'event:admin event:read org:read project:read project:releases team:read event:write org:admin project:write team:write project:admin team:admin',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
index c493d1657c..cbd05d26e2 100644
--- a/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/SentryIoServerApi.credentials.ts
@@ -1,22 +1,22 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SentryIoServerApi implements ICredentialType {
 	name = 'sentryIoServerApi';
 	displayName = 'Sentry.io Server API';
 	documentationUrl = 'sentryIo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Token',
 			name: 'token',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.com',
 		},
diff --git a/packages/nodes-base/credentials/Sftp.credentials.ts b/packages/nodes-base/credentials/Sftp.credentials.ts
index d9eb0f2747..1ff95bd42a 100644
--- a/packages/nodes-base/credentials/Sftp.credentials.ts
+++ b/packages/nodes-base/credentials/Sftp.credentials.ts
@@ -1,38 +1,38 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Sftp implements ICredentialType {
 	name = 'sftp';
 	displayName = 'SFTP';
 	documentationUrl = 'ftp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
 			required: true,
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 22,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -41,7 +41,7 @@ export class Sftp implements ICredentialType {
 		{
 			displayName: 'Private Key',
 			name: 'privateKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				alwaysOpenEditWindow: true,
 			},
@@ -54,7 +54,7 @@ export class Sftp implements ICredentialType {
 			typeOptions: {
 				password: true,
 			},
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'For an encrypted private key, this is the passphrase used to decrypt it.',
 		},
diff --git a/packages/nodes-base/credentials/ShopifyApi.credentials.ts b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
index 7d5740a232..3bc24ca7f8 100644
--- a/packages/nodes-base/credentials/ShopifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
@@ -1,39 +1,39 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ShopifyApi implements ICredentialType {
 	name = 'shopifyApi';
 	displayName = 'Shopify API';
 	documentationUrl = 'shopify';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Shop Subdomain',
 			name: 'shopSubdomain',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Only the subdomain without .myshopify.com',
 		},
 		{
 			displayName: 'Shared Secret',
 			name: 'sharedSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Signl4Api.credentials.ts b/packages/nodes-base/credentials/Signl4Api.credentials.ts
index 3c23832a31..871b621ac1 100644
--- a/packages/nodes-base/credentials/Signl4Api.credentials.ts
+++ b/packages/nodes-base/credentials/Signl4Api.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Signl4Api implements ICredentialType {
 	name = 'signl4Api';
 	displayName = 'SIGNL4 Webhook';
 	documentationUrl = 'signl4';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Team Secret',
 			name: 'teamSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'The team secret is the last part of your SIGNL4 webhook URL.',
 		},
diff --git a/packages/nodes-base/credentials/SlackApi.credentials.ts b/packages/nodes-base/credentials/SlackApi.credentials.ts
index db9a10808f..3ed5cc77da 100644
--- a/packages/nodes-base/credentials/SlackApi.credentials.ts
+++ b/packages/nodes-base/credentials/SlackApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class SlackApi implements ICredentialType {
 	name = 'slackApi';
 	displayName = 'Slack API';
 	documentationUrl = 'slack';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
index 050bdfb641..7c44beeb63 100644
--- a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 //https://api.slack.com/authentication/oauth-v2
@@ -26,36 +26,36 @@ export class SlackOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Slack OAuth2 API';
 	documentationUrl = 'slack';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://slack.com/oauth/v2/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://slack.com/api/oauth.v2.access',
 		},
 		//https://api.slack.com/scopes
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'chat:write',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: `user_scope=${userScopes.join(' ')}`,
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Sms77Api.credentials.ts b/packages/nodes-base/credentials/Sms77Api.credentials.ts
index 8d91520263..9c099a51d6 100644
--- a/packages/nodes-base/credentials/Sms77Api.credentials.ts
+++ b/packages/nodes-base/credentials/Sms77Api.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Sms77Api implements ICredentialType {
 	name = 'sms77Api';
 	displayName = 'Sms77 API';
 	documentationUrl = 'sms77';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/Smtp.credentials.ts b/packages/nodes-base/credentials/Smtp.credentials.ts
index 4dfda8c6c9..f5ae22bd57 100644
--- a/packages/nodes-base/credentials/Smtp.credentials.ts
+++ b/packages/nodes-base/credentials/Smtp.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,18 +8,18 @@ export class Smtp implements ICredentialType {
 	name = 'smtp';
 	displayName = 'SMTP';
 	documentationUrl = 'smtp';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -28,19 +28,19 @@ export class Smtp implements ICredentialType {
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 465,
 		},
 		{
 			displayName: 'SSL/TLS',
 			name: 'secure',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: true,
 		},
 	];
diff --git a/packages/nodes-base/credentials/Snowflake.credentials.ts b/packages/nodes-base/credentials/Snowflake.credentials.ts
index dde6b8df14..280aed91b9 100644
--- a/packages/nodes-base/credentials/Snowflake.credentials.ts
+++ b/packages/nodes-base/credentials/Snowflake.credentials.ts
@@ -1,44 +1,44 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class Snowflake implements ICredentialType {
 	name = 'snowflake';
 	displayName = 'Snowflake';
 	documentationUrl = 'snowflake';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Account',
 			name: 'account',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Enter the name of your Snowflake account.',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Specify the database you want to use after creating the connection.',
 		},
 		{
 			displayName: 'Warehouse',
 			name: 'warehouse',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'The default virtual warehouse to use for the session after connecting. Used for performing queries, loading data, etc.',
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -47,21 +47,21 @@ export class Snowflake implements ICredentialType {
 		{
 			displayName: 'Schema',
 			name: 'schema',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Enter the schema you want to use after creating the connection',
 		},
 		{
 			displayName: 'Role',
 			name: 'role',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Enter the security role you want to use after creating the connection',
 		},
 		{
 			displayName: 'Client Session Keep Alive',
 			name: 'clientSessionKeepAlive',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 			description: `By default, client connections typically time out approximately 3-4 hours after the most recent query was executed.<br>
 			If the parameter clientSessionKeepAlive is set to true, the client’s connection to the server will be kept alive indefinitely, even if no queries are executed.`,
diff --git a/packages/nodes-base/credentials/SpontitApi.credentials.ts b/packages/nodes-base/credentials/SpontitApi.credentials.ts
index 510093aeda..b238054419 100644
--- a/packages/nodes-base/credentials/SpontitApi.credentials.ts
+++ b/packages/nodes-base/credentials/SpontitApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SpontitApi implements ICredentialType {
 	name = 'spontitApi';
 	displayName = 'Spontit API';
 	documentationUrl = 'spontit';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
index d2fc2c9054..7dcce7ae75 100644
--- a/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SpotifyOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -11,43 +11,43 @@ export class SpotifyOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Spotify OAuth2 API';
 	documentationUrl = 'spotify';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Spotify Server',
 			name: 'server',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.spotify.com/',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://accounts.spotify.com/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://accounts.spotify.com/api/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
-			default: 'user-read-playback-state playlist-read-collaborative user-modify-playback-state playlist-modify-public user-read-currently-playing playlist-read-private user-read-recently-played playlist-modify-private user-library-read',
+			type: 'hidden',
+			default: 'user-read-playback-state playlist-read-collaborative user-modify-playback-state playlist-modify-public user-read-currently-playing playlist-read-private user-read-recently-played playlist-modify-private user-library-read user-follow-read',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SshPassword.credentials.ts b/packages/nodes-base/credentials/SshPassword.credentials.ts
index 36f9118464..6ec89c9c0b 100644
--- a/packages/nodes-base/credentials/SshPassword.credentials.ts
+++ b/packages/nodes-base/credentials/SshPassword.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SshPassword implements ICredentialType {
 	name = 'sshPassword';
 	displayName = 'SSH';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'localhost',
 		},
@@ -19,19 +19,19 @@ export class SshPassword implements ICredentialType {
 			displayName: 'Port',
 			name: 'port',
 			required: true,
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 22,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/SshPrivateKey.credentials.ts b/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
index 773046d2e2..309078446b 100644
--- a/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
+++ b/packages/nodes-base/credentials/SshPrivateKey.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SshPrivateKey implements ICredentialType {
 	name = 'sshPrivateKey';
 	displayName = 'SSH';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'localhost',
 		},
@@ -19,19 +19,19 @@ export class SshPrivateKey implements ICredentialType {
 			displayName: 'Port',
 			name: 'port',
 			required: true,
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 22,
 		},
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Private Key',
 			name: 'privateKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				rows: 4,
 			},
@@ -40,7 +40,7 @@ export class SshPrivateKey implements ICredentialType {
 		{
 			displayName: 'Passphrase',
 			name: 'passphrase',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Passphase used to create the key, if no passphase was used leave empty',
 		},
diff --git a/packages/nodes-base/credentials/StackbyApi.credentials.ts b/packages/nodes-base/credentials/StackbyApi.credentials.ts
index de4ad8f2a8..8abd2ce034 100644
--- a/packages/nodes-base/credentials/StackbyApi.credentials.ts
+++ b/packages/nodes-base/credentials/StackbyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class StackbyApi implements ICredentialType {
 	name = 'stackbyApi';
 	displayName = 'Stackby API';
 	documentationUrl = 'stackby';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/StoryblokContentApi.credentials.ts b/packages/nodes-base/credentials/StoryblokContentApi.credentials.ts
index 71c32e5358..0c23182d5d 100644
--- a/packages/nodes-base/credentials/StoryblokContentApi.credentials.ts
+++ b/packages/nodes-base/credentials/StoryblokContentApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class StoryblokContentApi implements ICredentialType {
 	name = 'storyblokContentApi';
 	displayName = 'Storyblok Content API';
 	documentationUrl = 'storyblok';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/StoryblokManagementApi.credentials.ts b/packages/nodes-base/credentials/StoryblokManagementApi.credentials.ts
index de390da8e4..aa3f4f49b6 100644
--- a/packages/nodes-base/credentials/StoryblokManagementApi.credentials.ts
+++ b/packages/nodes-base/credentials/StoryblokManagementApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class StoryblokManagementApi implements ICredentialType {
 	name = 'storyblokManagementApi';
 	displayName = 'Storyblok Management API';
 	documentationUrl = 'storyblok';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Personal Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/StrapiApi.credentials.ts b/packages/nodes-base/credentials/StrapiApi.credentials.ts
index 253c9cd6d3..990282370f 100644
--- a/packages/nodes-base/credentials/StrapiApi.credentials.ts
+++ b/packages/nodes-base/credentials/StrapiApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class StrapiApi implements ICredentialType {
 	name = 'strapiApi';
 	displayName = 'Strapi API';
 	documentationUrl = 'strapi';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -26,7 +26,7 @@ export class StrapiApi implements ICredentialType {
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://api.example.com',
 		},
diff --git a/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts b/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts
index 71d926a7f2..9769aeebe0 100644
--- a/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/StravaOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class StravaOAuth2Api implements ICredentialType {
@@ -10,38 +10,38 @@ export class StravaOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Strava OAuth2 API';
 	documentationUrl = 'strava';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.strava.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://www.strava.com/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'activity:read_all,activity:write',
 			required: true,
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/StripeApi.credentials.ts b/packages/nodes-base/credentials/StripeApi.credentials.ts
index 0a495c4db0..b6aef0d814 100644
--- a/packages/nodes-base/credentials/StripeApi.credentials.ts
+++ b/packages/nodes-base/credentials/StripeApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,14 +8,14 @@ export class StripeApi implements ICredentialType {
 	name = 'stripeApi';
 	displayName = 'Stripe Api';
 	documentationUrl = 'stripe';
-	properties = [
+	properties: INodeProperties[] = [
 		// The credentials to get from user and save encrypted.
 		// Properties can be defined exactly in the same way
 		// as node properties.
 		{
 			displayName: 'Secret Key',
 			name: 'secretKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts b/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
index 7aa5edafa4..27c3beaf94 100644
--- a/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
+++ b/packages/nodes-base/credentials/SurveyMonkeyApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class SurveyMonkeyApi implements ICredentialType {
 	name = 'surveyMonkeyApi';
 	displayName = 'SurveyMonkey API';
 	documentationUrl = 'surveyMonkey';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: `The access token must have the following scopes:</br />
 			- Create/modify webhooks</br />
@@ -24,13 +24,13 @@ export class SurveyMonkeyApi implements ICredentialType {
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
index 9cc130462c..6ba7970986 100644
--- a/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SurveyMonkeyOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -19,37 +19,37 @@ export class SurveyMonkeyOAuth2Api implements ICredentialType {
 	];
 	displayName = 'SurveyMonkey OAuth2 API';
 	documentationUrl = 'surveyMonkey';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.surveymonkey.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.surveymonkey.com/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(','),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts b/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
index 753028a4e1..2a32b29873 100644
--- a/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TaigaCloudApi implements ICredentialType {
 	name = 'taigaCloudApi';
 	displayName = 'Taiga Cloud API';
 	documentationUrl = 'taiga';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TaigaServerApi.credentials.ts b/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
index a67e7913ae..99c7125fec 100644
--- a/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TaigaServerApi implements ICredentialType {
 	name = 'taigaServerApi';
 	displayName = 'Taiga Server API';
 	documentationUrl = 'taiga';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://taiga.yourdomain.com',
 		},
diff --git a/packages/nodes-base/credentials/TapfiliateApi.credentials.ts b/packages/nodes-base/credentials/TapfiliateApi.credentials.ts
index d52df982a1..0bf0e397f5 100644
--- a/packages/nodes-base/credentials/TapfiliateApi.credentials.ts
+++ b/packages/nodes-base/credentials/TapfiliateApi.credentials.ts
@@ -1,18 +1,18 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TapfiliateApi implements ICredentialType {
 	name = 'tapfiliateApi';
 	displayName = 'Tapfiliate API';
 	documentationUrl = 'tapfiliate';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
 			required: true,
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TelegramApi.credentials.ts b/packages/nodes-base/credentials/TelegramApi.credentials.ts
index 08e71b8791..4634f11b0e 100644
--- a/packages/nodes-base/credentials/TelegramApi.credentials.ts
+++ b/packages/nodes-base/credentials/TelegramApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class TelegramApi implements ICredentialType {
 	name = 'telegramApi';
 	displayName = 'Telegram API';
 	documentationUrl = 'telegram';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			description: 'Chat with the <a href="https://telegram.me/botfather">bot father</a> to obtain the access token.',
 		},
diff --git a/packages/nodes-base/credentials/TheHiveApi.credentials.ts b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
index 0a3b415f56..a30b7b98f8 100644
--- a/packages/nodes-base/credentials/TheHiveApi.credentials.ts
+++ b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
@@ -1,24 +1,24 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TheHiveApi implements ICredentialType {
 	name = 'theHiveApi';
 	displayName = 'The Hive API';
 	documentationUrl = 'theHive';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'ApiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
 			default: '',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			description: 'The URL of TheHive instance',
 			placeholder: 'https://localhost:9000',
 		},
@@ -26,7 +26,7 @@ export class TheHiveApi implements ICredentialType {
 			displayName: 'API Version',
 			name: 'apiVersion',
 			default: '',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			description: 'The version of api to be used',
 			options: [
 				{
@@ -44,7 +44,7 @@ export class TheHiveApi implements ICredentialType {
 		{
 			displayName: 'Ignore SSL Issues',
 			name: 'allowUnauthorizedCerts',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 		},
 	];
diff --git a/packages/nodes-base/credentials/TimescaleDb.credentials.ts b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
index 7d1e195d6c..91616a27ee 100644
--- a/packages/nodes-base/credentials/TimescaleDb.credentials.ts
+++ b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
@@ -1,35 +1,35 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TimescaleDb implements ICredentialType {
 	name = 'timescaleDb';
 	displayName = 'TimescaleDB';
 	documentationUrl = 'timescaleDb';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host',
 			name: 'host',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'localhost',
 		},
 		{
 			displayName: 'Database',
 			name: 'database',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'postgres',
 		},
 		{
 			displayName: 'User',
 			name: 'user',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: 'postgres',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
@@ -38,14 +38,14 @@ export class TimescaleDb implements ICredentialType {
 		{
 			displayName: 'Ignore SSL Issues',
 			name: 'allowUnauthorizedCerts',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			default: false,
 			description: 'Connect even if SSL certificate validation is not possible.',
 		},
 		{
 			displayName: 'SSL',
 			name: 'ssl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			displayOptions: {
 				show: {
 					allowUnauthorizedCerts: [
@@ -80,7 +80,7 @@ export class TimescaleDb implements ICredentialType {
 		{
 			displayName: 'Port',
 			name: 'port',
-			type: 'number' as NodePropertyTypes,
+			type: 'number',
 			default: 5432,
 		},
 	];
diff --git a/packages/nodes-base/credentials/TodoistApi.credentials.ts b/packages/nodes-base/credentials/TodoistApi.credentials.ts
index 5f8fe0ec85..bbcf09f2ff 100644
--- a/packages/nodes-base/credentials/TodoistApi.credentials.ts
+++ b/packages/nodes-base/credentials/TodoistApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class TodoistApi implements ICredentialType {
 	name = 'todoistApi';
 	displayName = 'Todoist API';
 	documentationUrl = 'todoist';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
index b7baa37c2a..6547c773dd 100644
--- a/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TodoistOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TodoistOAuth2Api implements ICredentialType {
@@ -10,37 +10,37 @@ export class TodoistOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Todoist OAuth2 API';
 	documentationUrl = 'todoist';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://todoist.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://todoist.com/oauth/access_token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'data:read_write,data:delete',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TogglApi.credentials.ts b/packages/nodes-base/credentials/TogglApi.credentials.ts
index b0a75e05ff..039cd80c89 100644
--- a/packages/nodes-base/credentials/TogglApi.credentials.ts
+++ b/packages/nodes-base/credentials/TogglApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,17 +8,17 @@ export class TogglApi implements ICredentialType {
 	name = 'togglApi';
 	displayName = 'Toggl API';
 	documentationUrl = 'toggl';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TravisCiApi.credentials.ts b/packages/nodes-base/credentials/TravisCiApi.credentials.ts
index f4070e0da8..182904110c 100644
--- a/packages/nodes-base/credentials/TravisCiApi.credentials.ts
+++ b/packages/nodes-base/credentials/TravisCiApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TravisCiApi implements ICredentialType {
 	name = 'travisCiApi';
 	displayName = 'Travis API';
 	documentationUrl = 'travisCi';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TrelloApi.credentials.ts b/packages/nodes-base/credentials/TrelloApi.credentials.ts
index 1ef25605e9..0d50dc8d86 100644
--- a/packages/nodes-base/credentials/TrelloApi.credentials.ts
+++ b/packages/nodes-base/credentials/TrelloApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,23 +8,23 @@ export class TrelloApi implements ICredentialType {
 	name = 'trelloApi';
 	displayName = 'Trello API';
 	documentationUrl = 'trello';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'OAuth Secret',
 			name: 'oauthSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts b/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
index 69254f4f4a..22059a314c 100644
--- a/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwakeCloudApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TwakeCloudApi implements ICredentialType {
 	name = 'twakeCloudApi';
 	displayName = 'Twake API';
 	documentationUrl = 'twake';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Workspace Key',
 			name: 'workspaceKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwakeServerApi.credentials.ts b/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
index 63f922c649..75c8fcd5b2 100644
--- a/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwakeServerApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TwakeServerApi implements ICredentialType {
 	name = 'twakeServerApi';
 	displayName = 'Twake API';
 	documentationUrl = 'twake';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Host URL',
 			name: 'hostUrl',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Public ID',
 			name: 'publicId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Private API Key',
 			name: 'privateApiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TwilioApi.credentials.ts b/packages/nodes-base/credentials/TwilioApi.credentials.ts
index 1e2ee45fdf..df5e1c1f12 100644
--- a/packages/nodes-base/credentials/TwilioApi.credentials.ts
+++ b/packages/nodes-base/credentials/TwilioApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class TwilioApi implements ICredentialType {
 	name = 'twilioApi';
 	displayName = 'Twilio API';
 	documentationUrl = 'twilio';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Auth Type',
 			name: 'authType',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'authToken',
 			options: [
 				{
@@ -28,13 +28,13 @@ export class TwilioApi implements ICredentialType {
 		{
 			displayName: 'Account SID',
 			name: 'accountSid',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Auth Token',
 			name: 'authToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			displayOptions: {
 				show: {
@@ -47,7 +47,7 @@ export class TwilioApi implements ICredentialType {
 		{
 			displayName: 'API Key SID',
 			name: 'apiKeySid',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			displayOptions: {
 				show: {
@@ -60,7 +60,7 @@ export class TwilioApi implements ICredentialType {
 		{
 			displayName: 'API Key Secret',
 			name: 'apiKeySecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			typeOptions: {
 				password: true,
 			},
diff --git a/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
index 3c6b820791..dcdd5afa90 100644
--- a/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwistOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -19,37 +19,37 @@ export class TwistOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Twist OAuth2 API';
 	documentationUrl = 'twist';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://twist.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://twist.com/oauth/access_token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(','),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
index 725ae65d6c..ba32af564d 100644
--- a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class TwitterOAuth1Api implements ICredentialType {
@@ -10,29 +10,29 @@ export class TwitterOAuth1Api implements ICredentialType {
 	];
 	displayName = 'Twitter OAuth API';
 	documentationUrl = 'twitter';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Request Token URL',
 			name: 'requestTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.twitter.com/oauth/request_token',
 		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.twitter.com/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.twitter.com/oauth/access_token',
 		},
 		{
 			displayName: 'Signature Method',
 			name: 'signatureMethod',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'HMAC-SHA1',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TypeformApi.credentials.ts b/packages/nodes-base/credentials/TypeformApi.credentials.ts
index ecc2ae9e22..6889584494 100644
--- a/packages/nodes-base/credentials/TypeformApi.credentials.ts
+++ b/packages/nodes-base/credentials/TypeformApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class TypeformApi implements ICredentialType {
 	name = 'typeformApi';
 	displayName = 'Typeform API';
 	documentationUrl = 'typeform';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts
index 69cdb874b1..79c629632f 100644
--- a/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -16,37 +16,37 @@ export class TypeformOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Typeform OAuth2 API';
 	documentationUrl = 'typeform';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.typeform.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.typeform.com/oauth/token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/UProcApi.credentials.ts b/packages/nodes-base/credentials/UProcApi.credentials.ts
index 197e7140de..af18496933 100644
--- a/packages/nodes-base/credentials/UProcApi.credentials.ts
+++ b/packages/nodes-base/credentials/UProcApi.credentials.ts
@@ -1,22 +1,22 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class UProcApi implements ICredentialType {
 	name = 'uprocApi';
 	displayName = 'uProc API';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/UnleashedSoftwareApi.credentials.ts b/packages/nodes-base/credentials/UnleashedSoftwareApi.credentials.ts
index dce80d3f49..bce46bf489 100644
--- a/packages/nodes-base/credentials/UnleashedSoftwareApi.credentials.ts
+++ b/packages/nodes-base/credentials/UnleashedSoftwareApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class UnleashedSoftwareApi implements ICredentialType {
 	name = 'unleashedSoftwareApi';
 	displayName = 'Unleashed API';
 	documentationUrl = 'unleashedSoftware';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API ID',
 			name: 'apiId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			typeOptions: {
 				password: true,
diff --git a/packages/nodes-base/credentials/UpleadApi.credentials.ts b/packages/nodes-base/credentials/UpleadApi.credentials.ts
index 8c44f1dd2d..8718c46e6c 100644
--- a/packages/nodes-base/credentials/UpleadApi.credentials.ts
+++ b/packages/nodes-base/credentials/UpleadApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class UpleadApi implements ICredentialType {
 	name = 'upleadApi';
 	displayName = 'Uplead API';
 	documentationUrl = 'uplead';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/UptimeRobotApi.credentials.ts b/packages/nodes-base/credentials/UptimeRobotApi.credentials.ts
index db928f3fba..ec3fe50271 100644
--- a/packages/nodes-base/credentials/UptimeRobotApi.credentials.ts
+++ b/packages/nodes-base/credentials/UptimeRobotApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class UptimeRobotApi implements ICredentialType {
 	name = 'uptimeRobotApi';
 	displayName = 'Uptime Robot API';
 	documentationUrl = 'uptimeRobot';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/VeroApi.credentials.ts b/packages/nodes-base/credentials/VeroApi.credentials.ts
index ff20d50810..5f56d7baff 100644
--- a/packages/nodes-base/credentials/VeroApi.credentials.ts
+++ b/packages/nodes-base/credentials/VeroApi.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 
@@ -8,11 +8,11 @@ export class VeroApi implements ICredentialType {
 	name = 'veroApi';
 	displayName = 'Vero API';
 	documentationUrl = 'vero';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Auth Token',
 			name: 'authToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/VonageApi.credentials.ts b/packages/nodes-base/credentials/VonageApi.credentials.ts
index d8d235b898..bf0c4c987d 100644
--- a/packages/nodes-base/credentials/VonageApi.credentials.ts
+++ b/packages/nodes-base/credentials/VonageApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class VonageApi implements ICredentialType {
 	name = 'vonageApi';
 	displayName = 'Vonage API';
 	documentationUrl = 'vonage';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Secret',
 			name: 'apiSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/WebflowApi.credentials.ts b/packages/nodes-base/credentials/WebflowApi.credentials.ts
index 122d1aa707..f569814d6a 100644
--- a/packages/nodes-base/credentials/WebflowApi.credentials.ts
+++ b/packages/nodes-base/credentials/WebflowApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WebflowApi implements ICredentialType {
 	name = 'webflowApi';
 	displayName = 'Webflow API';
 	documentationUrl = 'webflow';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Access Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
index c9533bc392..dd352db2f7 100644
--- a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WebflowOAuth2Api implements ICredentialType {
@@ -10,31 +10,31 @@ export class WebflowOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Webflow OAuth2 API';
 	documentationUrl = 'webflow';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://webflow.com/oauth/authorize',
 			required: true,
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://api.webflow.com/oauth/access_token',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 			description: 'For some services additional query parameters have to be set which can be defined here.',
 			placeholder: '',
@@ -42,7 +42,7 @@ export class WebflowOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: '',
 		},
diff --git a/packages/nodes-base/credentials/WekanApi.credentials.ts b/packages/nodes-base/credentials/WekanApi.credentials.ts
index 0642c99c0c..fad7ce4704 100644
--- a/packages/nodes-base/credentials/WekanApi.credentials.ts
+++ b/packages/nodes-base/credentials/WekanApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WekanApi implements ICredentialType {
 	name = 'wekanApi';
 	displayName = 'Wekan API';
 	documentationUrl = 'wekan';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://wekan.yourdomain.com',
 		},
diff --git a/packages/nodes-base/credentials/WiseApi.credentials.ts b/packages/nodes-base/credentials/WiseApi.credentials.ts
index 7f9f871cbf..f3d558771b 100644
--- a/packages/nodes-base/credentials/WiseApi.credentials.ts
+++ b/packages/nodes-base/credentials/WiseApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WiseApi implements ICredentialType {
 	name = 'wiseApi';
 	displayName = 'Wise API';
 	documentationUrl = 'wise';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Environment',
 			name: 'environment',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			default: 'live',
 			options: [
 				{
diff --git a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
index 9a95411cbf..ab1e7cfab2 100644
--- a/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
+++ b/packages/nodes-base/credentials/WooCommerceApi.credentials.ts
@@ -1,36 +1,36 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WooCommerceApi implements ICredentialType {
 	name = 'wooCommerceApi';
 	displayName = 'WooCommerce API';
 	documentationUrl = 'wooCommerce';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Consumer Key',
 			name: 'consumerKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Consumer Secret',
 			name: 'consumerSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'WooCommerce URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.com',
 		},
 		{
 			displayName: 'Include Credentials in Query',
 			name: 'includeCredentialsInQuery',
-			type: 'boolean' as NodePropertyTypes,
+			type: 'boolean',
 			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>
diff --git a/packages/nodes-base/credentials/WordpressApi.credentials.ts b/packages/nodes-base/credentials/WordpressApi.credentials.ts
index 3bba48027d..1ee33494d5 100644
--- a/packages/nodes-base/credentials/WordpressApi.credentials.ts
+++ b/packages/nodes-base/credentials/WordpressApi.credentials.ts
@@ -1,29 +1,29 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WordpressApi implements ICredentialType {
 	name = 'wordpressApi';
 	displayName = 'Wordpress API';
 	documentationUrl = 'wordpress';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Username',
 			name: 'username',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Password',
 			name: 'password',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Wordpress URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://example.com',
 		},
diff --git a/packages/nodes-base/credentials/WufooApi.credentials.ts b/packages/nodes-base/credentials/WufooApi.credentials.ts
index ae31ecbf7b..ed4bd07706 100644
--- a/packages/nodes-base/credentials/WufooApi.credentials.ts
+++ b/packages/nodes-base/credentials/WufooApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class WufooApi implements ICredentialType {
 	name = 'wufooApi';
 	displayName = 'Wufoo API';
 	documentationUrl = 'wufoo';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/XeroOAuth2Api.credentials.ts b/packages/nodes-base/credentials/XeroOAuth2Api.credentials.ts
index 71ce1bfcb3..04d7f88c59 100644
--- a/packages/nodes-base/credentials/XeroOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/XeroOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -17,35 +17,35 @@ export class XeroOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Xero OAuth2 API';
 	documentationUrl = 'xero';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://login.xero.com/identity/connect/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://identity.xero.com/connect/token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/YouTubeOAuth2Api.credentials.ts b/packages/nodes-base/credentials/YouTubeOAuth2Api.credentials.ts
index 1aecc26ced..1e1a611c09 100644
--- a/packages/nodes-base/credentials/YouTubeOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/YouTubeOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 //https://developers.google.com/youtube/v3/guides/auth/client-side-web-apps#identify-access-scopes
@@ -19,11 +19,11 @@ export class YouTubeOAuth2Api implements ICredentialType {
 	];
 	displayName = 'YouTube OAuth2 API';
 	documentationUrl = 'google';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 	];
diff --git a/packages/nodes-base/credentials/YourlsApi.credentials.ts b/packages/nodes-base/credentials/YourlsApi.credentials.ts
index 8752f9a6e8..05577dc37b 100644
--- a/packages/nodes-base/credentials/YourlsApi.credentials.ts
+++ b/packages/nodes-base/credentials/YourlsApi.credentials.ts
@@ -1,23 +1,23 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class YourlsApi implements ICredentialType {
 	name = 'yourlsApi';
 	displayName = 'Yourls API';
 	documentationUrl = 'yourls';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Signature',
 			name: 'signature',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'http://localhost:8080',
 		},
diff --git a/packages/nodes-base/credentials/ZendeskApi.credentials.ts b/packages/nodes-base/credentials/ZendeskApi.credentials.ts
index a7c7cad6ff..a20fa0479e 100644
--- a/packages/nodes-base/credentials/ZendeskApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZendeskApi.credentials.ts
@@ -1,17 +1,17 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ZendeskApi implements ICredentialType {
 	name = 'zendeskApi';
 	displayName = 'Zendesk API';
 	documentationUrl = 'zendesk';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			description: 'The subdomain of your Zendesk work environment.',
 			placeholder: 'company',
 			default: '',
@@ -19,13 +19,13 @@ export class ZendeskApi implements ICredentialType {
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Token',
 			name: 'apiToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
index a835d1072b..e76ca697fd 100644
--- a/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZendeskOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 const scopes = [
@@ -15,11 +15,11 @@ export class ZendeskOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Zendesk OAuth2 API';
 	documentationUrl = 'zendesk';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Subdomain',
 			name: 'subdomain',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'n8n',
 			description: 'The subdomain of your Zendesk work environment.',
@@ -28,7 +28,7 @@ export class ZendeskOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '=https://{{$self["subdomain"]}}.zendesk.com/oauth/authorizations/new',
 			description: 'URL to get authorization code. Replace {SUBDOMAIN_HERE} with your subdomain.',
 			required: true,
@@ -36,7 +36,7 @@ export class ZendeskOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '=https://{{$self["subdomain"]}}.zendesk.com/oauth/tokens',
 			description: 'URL to get access token. Replace {SUBDOMAIN_HERE} with your subdomain.',
 			required: true,
@@ -44,27 +44,27 @@ export class ZendeskOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Client ID',
 			name: 'clientId',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Client Secret',
 			name: 'clientSecret',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			required: true,
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: scopes.join(' '),
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 			description: 'For some services additional query parameters have to be set which can be defined here.',
 			placeholder: '',
@@ -72,7 +72,7 @@ export class ZendeskOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 			description: 'Resource to consume.',
 		},
diff --git a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
index d9fedc56fe..1f19687980 100644
--- a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ZohoOAuth2Api implements ICredentialType {
@@ -10,11 +10,11 @@ export class ZohoOAuth2Api implements ICredentialType {
 	];
 	displayName = 'Zoho OAuth2 API';
 	documentationUrl = 'zoho';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'https://accounts.zoho.com/oauth/v2/auth',
@@ -33,7 +33,7 @@ export class ZohoOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'options' as NodePropertyTypes,
+			type: 'options',
 			options: [
 				{
 					name: 'US - https://accounts.zoho.com/oauth/v2/token',
@@ -62,19 +62,19 @@ export class ZohoOAuth2Api implements ICredentialType {
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'ZohoCRM.modules.ALL,ZohoCRM.settings.all,ZohoCRM.users.all',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'access_type=offline',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'body',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ZoomApi.credentials.ts b/packages/nodes-base/credentials/ZoomApi.credentials.ts
index 9cef541588..033dc4fba5 100644
--- a/packages/nodes-base/credentials/ZoomApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZoomApi.credentials.ts
@@ -1,14 +1,14 @@
-import { ICredentialType, NodePropertyTypes } from 'n8n-workflow';
+import { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class ZoomApi implements ICredentialType {
 	name = 'zoomApi';
 	displayName = 'Zoom API';
 	documentationUrl = 'zoom';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'JWT Token',
 			name: 'accessToken',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
index 49e7084488..db38dd541c 100644
--- a/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZoomOAuth2Api.credentials.ts
@@ -1,6 +1,6 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ZoomOAuth2Api implements ICredentialType {
@@ -8,35 +8,35 @@ export class ZoomOAuth2Api implements ICredentialType {
 	extends = ['oAuth2Api'];
 	displayName = 'Zoom OAuth2 API';
 	documentationUrl = 'zoom';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://zoom.us/oauth/authorize',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'https://zoom.us/oauth/token',
 		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: '',
 		},
 		{
 			displayName: 'Authentication',
 			name: 'authentication',
-			type: 'hidden' as NodePropertyTypes,
+			type: 'hidden',
 			default: 'header',
 		},
 	];
diff --git a/packages/nodes-base/credentials/ZulipApi.credentials.ts b/packages/nodes-base/credentials/ZulipApi.credentials.ts
index 98946dd813..8a6e3cf318 100644
--- a/packages/nodes-base/credentials/ZulipApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZulipApi.credentials.ts
@@ -1,30 +1,30 @@
 import {
 	ICredentialType,
-	NodePropertyTypes,
+	INodeProperties,
 } from 'n8n-workflow';
 
 export class ZulipApi implements ICredentialType {
 	name = 'zulipApi';
 	displayName = 'Zulip API';
 	documentationUrl = 'zulip';
-	properties = [
+	properties: INodeProperties[] = [
 		{
 			displayName: 'URL',
 			name: 'url',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 			placeholder: 'https://yourZulipDomain.zulipchat.com',
 		},
 		{
 			displayName: 'Email',
 			name: 'email',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 		{
 			displayName: 'API Key',
 			name: 'apiKey',
-			type: 'string' as NodePropertyTypes,
+			type: 'string',
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index d930b0b8ba..72de2d530f 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -16,7 +16,7 @@ export class AwsLambda implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AWS Lambda',
 		name: 'awsLambda',
-		icon: 'file:lambda.png',
+		icon: 'file:lambda.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["function"]}}',
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index 9d25a6762a..9b7e61191f 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -16,7 +16,7 @@ export class AwsSns implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AWS SNS',
 		name: 'awsSns',
-		icon: 'file:sns.png',
+		icon: 'file:sns.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["topic"]}}',
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index 79197b1104..90eaf32c26 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -26,7 +26,7 @@ export class AwsSnsTrigger implements INodeType {
 		displayName: 'AWS SNS Trigger',
 		subtitle: `={{$parameter["topic"].split(':')[5]}}`,
 		name: 'awsSnsTrigger',
-		icon: 'file:sns.png',
+		icon: 'file:sns.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle AWS SNS events via webhooks',
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 08a2a531a4..c71fc67e53 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -51,7 +51,7 @@ export class AwsS3 implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AWS S3',
 		name: 'awsS3',
-		icon: 'file:s3.png',
+		icon: 'file:s3.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
index e422b449cf..b3dc8bd46a 100644
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
@@ -57,7 +57,7 @@ export async function awsApiRequest(this: IHookFunctions | IExecuteFunctions | I
 	try {
 		return await this.helpers.request!(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error, { parseXml: true });
+		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Aws/S3/s3.png b/packages/nodes-base/nodes/Aws/S3/s3.png
deleted file mode 100644
index 359d5166c7..0000000000
Binary files a/packages/nodes-base/nodes/Aws/S3/s3.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Aws/S3/s3.svg b/packages/nodes-base/nodes/Aws/S3/s3.svg
new file mode 100644
index 0000000000..4d6e49ae0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/s3.svg
@@ -0,0 +1 @@
+<svg width="2065" height="2500" viewBox="0 0 256 310" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M20.624 53.686L0 64v181.02l20.624 10.254.124-.149V53.828l-.124-.142" fill="#8C3123"/><path d="M131 229L20.624 255.274V53.686L131 79.387V229" fill="#E05243"/><path d="M81.178 187.866l46.818 5.96.294-.678.263-76.77-.557-.6-46.818 5.874v66.214" fill="#8C3123"/><path d="M127.996 229.295l107.371 26.035.169-.269-.003-201.195-.17-.18-107.367 25.996v149.613" fill="#8C3123"/><path d="M174.827 187.866l-46.831 5.96v-78.048l46.831 5.874v66.214" fill="#E05243"/><path d="M174.827 89.631l-46.831 8.535-46.818-8.535 46.759-12.256 46.89 12.256" fill="#5E1F18"/><path d="M174.827 219.801l-46.831-8.591-46.818 8.591 46.761 13.053 46.888-13.053" fill="#F2B0A9"/><path d="M81.178 89.631l46.818-11.586.379-.117V.313L127.996 0 81.178 23.413v66.218" fill="#8C3123"/><path d="M174.827 89.631l-46.831-11.586V0l46.831 23.413v66.218" fill="#E05243"/><path d="M127.996 309.428l-46.823-23.405v-66.217l46.823 11.582.689.783-.187 75.906-.502 1.351" fill="#8C3123"/><path d="M127.996 309.428l46.827-23.405v-66.217l-46.827 11.582v78.04M235.367 53.686L256 64v181.02l-20.633 10.31V53.686" fill="#E05243"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
index 788e69f0e9..23ee1e0e2c 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
@@ -426,6 +426,7 @@ export class AwsTranscribe implements INodeType {
 							Media: {
 								MediaFileUri: mediaFileUri,
 							},
+							Settings: {},
 						};
 
 						if (detectLang) {
@@ -438,16 +439,16 @@ export class AwsTranscribe implements INodeType {
 							Object.assign(body.Settings, { ChannelIdentification: options.channelIdentification });
 						}
 
-						if (options.MaxAlternatives) {
+						if (options.maxAlternatives) {
 							Object.assign(body.Settings, {
-								ShowAlternatives: options.maxAlternatives,
+								ShowAlternatives: true,
 								MaxAlternatives: options.maxAlternatives,
 							});
-						}
+						} 
 
-						if (options.showSpeakerLabels) {
+						if (options.maxSpeakerLabels) {
 							Object.assign(body.Settings, {
-								ShowSpeakerLabels: options.showSpeakerLabels,
+								ShowSpeakerLabels: true,
 								MaxSpeakerLabels: options.maxSpeakerLabels,
 							});
 						}
diff --git a/packages/nodes-base/nodes/Aws/lambda.png b/packages/nodes-base/nodes/Aws/lambda.png
deleted file mode 100644
index 20446c1010..0000000000
Binary files a/packages/nodes-base/nodes/Aws/lambda.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Aws/lambda.svg b/packages/nodes-base/nodes/Aws/lambda.svg
new file mode 100644
index 0000000000..729075990f
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/lambda.svg
@@ -0,0 +1 @@
+<svg height="2500" viewBox="-3.023 -0.22 420.923 433.54" width="2443" xmlns="http://www.w3.org/2000/svg"><path d="M208.45 227.89c-1.59 2.26-2.93 4.12-4.22 6q-30.86 45.42-61.7 90.83-28.69 42.24-57.44 84.43a3.88 3.88 0 01-2.73 1.59q-40.59-.35-81.16-.88c-.3 0-.61-.09-1.2-.18a14.44 14.44 0 01.76-1.65q28.31-43.89 56.62-87.76 25.11-38.88 50.25-77.74 27.86-43.18 55.69-86.42c2.74-4.25 5.59-8.42 8.19-12.75a5.26 5.26 0 00.56-3.83c-5-15.94-10.1-31.84-15.19-47.74-2.18-6.81-4.46-13.58-6.5-20.43-.66-2.2-1.75-2.87-4-2.86-17 .07-33.9.05-50.85.05-3.22 0-3.23 0-3.23-3.18 0-20.84 0-41.68-.06-62.52 0-2.32.76-2.84 2.94-2.84q51.19.09 102.4 0a3.29 3.29 0 013.6 2.43q27 67.91 54 135.77 31.5 79.14 63 158.3c6.52 16.38 13.09 32.75 19.54 49.17.77 2 1.57 2.38 3.59 1.76 17.89-5.53 35.82-10.91 53.7-16.45 2.25-.7 3.07-.23 3.77 2 6.1 19.17 12.32 38.3 18.5 57.45.21.66.37 1.33.62 2.25-1.28.47-2.48 1-3.71 1.34q-61 19.33-121.93 38.68c-1.94.61-2.52-.05-3.17-1.68q-18.61-47.16-37.31-94.28-18.29-46.14-36.6-92.28c-1.83-4.62-3.63-9.26-5.46-13.88-.29-.79-.69-1.48-1.27-2.7z" fill="#fa7e14"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Aws/sns.png b/packages/nodes-base/nodes/Aws/sns.png
deleted file mode 100644
index 98ee9b76aa..0000000000
Binary files a/packages/nodes-base/nodes/Aws/sns.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Aws/sns.svg b/packages/nodes-base/nodes/Aws/sns.svg
new file mode 100644
index 0000000000..3b3d7bac94
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/sns.svg
@@ -0,0 +1 @@
+<svg width="2490" height="2500" viewBox="0 0 256 257" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M98.875 232.033l-26.433-7.408-25.001-28.508 31.272-.863 20.162 36.779m-61.125-18.8l-14.875-4.166-14.058-16.034 17.082-2.809 11.851 23.009" fill="#995B80"/><path d="M0 191.017l15.204 3.091 2.207-3.882V58.503l-2.207-2.561L0 64.6v126.417" fill="#7B3F65"/><path d="M73.933 69.708L15.208 55.942v138.166l8.798-.818 13.744 19.943 10.6-22.205 25.583-2.378V69.708" fill="#C17B9D"/><path d="M33.958 198.133l26.063 5.25 1.716-4.045V37.44l-1.716-3.665-26.063 13.208v151.15" fill="#7B3F65"/><path d="M208.734 81.516L60.021 33.775v169.612l17.221-2.216 21.633 30.862 17.126-35.85 92.733-11.933V81.516" fill="#C17B9D"/><path d="M181.833 256.492l-37.566-10.525-35.509-40.5 46.033-.468 27.042 51.493" fill="#995B80"/><path d="M89.591 208.95l38.33 7.417 2.977-2.566V4.117L127.921 0l-38.33 19.158V208.95" fill="#7B3F65"/><path d="M256 64.033L127.925 0v216.367l22.597-4.528 31.311 44.653 26.901-56.309-.017-.002L256 190.708V64.033" fill="#C17B9D"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index 005dc15dae..8348977ef3 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -21,7 +21,7 @@ export class BitbucketTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Bitbucket Trigger',
 		name: 'bitbucketTrigger',
-		icon: 'file:bitbucket.png',
+		icon: 'file:bitbucket.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Bitbucket events via webhooks',
diff --git a/packages/nodes-base/nodes/Bitbucket/bitbucket.png b/packages/nodes-base/nodes/Bitbucket/bitbucket.png
deleted file mode 100644
index 55c23e6e18..0000000000
Binary files a/packages/nodes-base/nodes/Bitbucket/bitbucket.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Bitbucket/bitbucket.svg b/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
new file mode 100644
index 0000000000..23c660940c
--- /dev/null
+++ b/packages/nodes-base/nodes/Bitbucket/bitbucket.svg
@@ -0,0 +1 @@
+<svg width="48" height="48" xmlns="http://www.w3.org/2000/svg" fill="none"><defs><linearGradient y2=".656" x2=".33" y1="-.17" x1=".762" id="a"><stop stop-color="#0052CC" offset=".18"/><stop stop-color="#2684FF" offset="1"/></linearGradient></defs><path stroke="null" fill="#2684FF" d="M1.721 3.873a1.465 1.465 0 011.129-.509l42.772.007a1.466 1.466 0 011.466 1.7l-6.222 38.193a1.466 1.466 0 01-1.465 1.231H9.555a1.993 1.993 0 01-1.95-1.663L1.386 5.064c-.07-.427.053-.863.336-1.191zm17.8 26.787h9.526l2.308-13.475H16.941l2.58 13.475z" clip-rule="evenodd" fill-rule="evenodd"/><path stroke="null" fill="url(#a)" d="M44.418 18.437h-12.64l-2.12 12.383h-8.755L10.567 43.09c.327.283.745.44 1.178.444H39.18a1.347 1.347 0 001.347-1.132l3.892-23.965z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 3781a4cb17..12d01ded4d 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -25,7 +25,7 @@ export class Bitly implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Bitly',
 		name: 'bitly',
-		icon: 'file:bitly.png',
+		icon: 'file:bitly.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Bitly/bitly.png b/packages/nodes-base/nodes/Bitly/bitly.png
deleted file mode 100644
index 8df2ff2934..0000000000
Binary files a/packages/nodes-base/nodes/Bitly/bitly.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Bitly/bitly.svg b/packages/nodes-base/nodes/Bitly/bitly.svg
new file mode 100644
index 0000000000..68e50d99fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Bitly/bitly.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path fill="none" d="M0 0h128v128H0z"/><path d="M63.708 0C28.443 0 0 28.306 0 65.322c0 19.193 10.266 37.736 24.703 48.877 2.78 2.145 6.091 1.949 7.989.109 1.599-1.55 1.467-5.282-1.507-7.897-11.541-10.149-19.52-25.514-19.52-40.861 0-27.564 24.474-50.756 52.044-50.756 33.558 0 51.503 27.252 51.503 50.351 0 14.114-6.902 31.155-19.361 42.025.019-.049 2.588-5.101 2.588-14.94 0-16.748-10.612-25.821-22.926-25.821-8.914 0-14.251 3.187-17.883 6.158 0-6.822.228-19.563.228-19.563 0-8.409-2.946-15.14-13.213-15.287-5.943-.084-10.353 2.641-13.103 8.803-.991 2.311-.626 4.822 1.333 5.96 1.621.941 4.287.243 5.606-1.517.881-1.1 1.375-1.335 2.141-1.252 1.261.136 1.309 2.168 1.359 3.468.038.998 1.008 15.494.477 52.746 0 10.275 8.059 22.077 27.355 22.077 8.307 0 14.686-2.322 23.953-7.587C107.871 112.398 128 94.62 128 64.55 128 26.977 97.572 0 63.708 0zm6.052 113.602c-7.183.126-12.422-2.183-12.743-8.461-.12-2.356-.082-4.865.033-6.378.695-9.174 7.11-15.774 13.443-17.041 7.876-1.576 13.123 2.026 13.123 12.337-.001 6.968-1.935 19.334-13.856 19.543z" fill="#DD5A2B"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 780a81a270..227f1e2cef 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -17,7 +17,7 @@ export class CalendlyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Calendly Trigger',
 		name: 'calendlyTrigger',
-		icon: 'file:calendly.png',
+		icon: 'file:calendly.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Starts the workflow when Calendly events occur.',
diff --git a/packages/nodes-base/nodes/Calendly/calendly.png b/packages/nodes-base/nodes/Calendly/calendly.png
deleted file mode 100644
index db40f3d678..0000000000
Binary files a/packages/nodes-base/nodes/Calendly/calendly.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Calendly/calendly.svg b/packages/nodes-base/nodes/Calendly/calendly.svg
new file mode 100644
index 0000000000..ca039910cb
--- /dev/null
+++ b/packages/nodes-base/nodes/Calendly/calendly.svg
@@ -0,0 +1 @@
+<svg height="2500" viewBox="7.4 0 344.6 360" width="2342" xmlns="http://www.w3.org/2000/svg"><g fill="#676b74"><path d="M313.8 360H45.5c-21 0-38.1-17.1-38.1-38.1V53.5c0-21 17.1-38.1 38.1-38.1h268.3c21 0 38.1 17.1 38.1 38.1v268.3c.1 21.1-17 38.2-38.1 38.2zM45.5 36.5c-9.4 0-17 7.6-17 17v268.3c0 9.4 7.6 17 17 17h268.3c9.4 0 17-7.6 17-17V53.5c0-9.4-7.6-17-17-17z"/><path d="M256.6 72.4c-4.5 0-8.1-3.6-8.1-8.1V8.1c0-4.5 3.6-8.1 8.1-8.1s8.1 3.6 8.1 8.1v56.1c0 4.5-3.6 8.2-8.1 8.2zm-154.7 0c-4.5 0-8.1-3.6-8.1-8.1V8.1c0-4.5 3.6-8.1 8.1-8.1s8.1 3.6 8.1 8.1v56.1c.1 4.5-3.6 8.2-8.1 8.2zm87.5 181.4c-33.6 0-60.9-27.3-60.9-60.9s27.3-60.9 60.9-60.9c15.2 0 29.7 5.6 40.9 15.8 1.4 1.2 1.5 3.4.2 4.7-1.2 1.4-3.4 1.5-4.7.2-10-9.1-22.9-14.1-36.4-14.1-29.9 0-54.2 24.3-54.2 54.2s24.3 54.2 54.2 54.2c13.5 0 26.4-5 36.4-14.1 1.4-1.2 3.5-1.1 4.7.2 1.2 1.4 1.1 3.5-.2 4.7-11.2 10.4-25.7 16-40.9 16z"/></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 a6d7e590c0..4764b2d9c8 100644
--- a/packages/nodes-base/nodes/ClickUp/clickup.svg
+++ b/packages/nodes-base/nodes/ClickUp/clickup.svg
@@ -1 +1 @@
-<svg viewBox="-10 0 155 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>
+<svg viewBox="-10 0 155 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/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 9f565fccb2..4ae646442e 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -50,7 +50,7 @@ export class Clockify implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Clockify',
 		name: 'clockify',
-		icon: 'file:clockify.png',
+		icon: 'file:clockify.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index fb4637e8f9..5558862ba7 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -22,7 +22,7 @@ import { IWorkspaceDto } from './WorkpaceInterfaces';
 export class ClockifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Clockify Trigger',
-		icon: 'file:clockify.png',
+		icon: 'file:clockify.svg',
 		name: 'clockifyTrigger',
 		group: [ 'trigger' ],
 		version: 1,
diff --git a/packages/nodes-base/nodes/Clockify/clockify.png b/packages/nodes-base/nodes/Clockify/clockify.png
deleted file mode 100644
index 48a49a4588..0000000000
Binary files a/packages/nodes-base/nodes/Clockify/clockify.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Clockify/clockify.svg b/packages/nodes-base/nodes/Clockify/clockify.svg
new file mode 100644
index 0000000000..3955055df7
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/clockify.svg
@@ -0,0 +1 @@
+<svg width="256" height="256" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M14 0h227v256H14z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M165.124 87.99l58.777-58.814 16.825 16.823-58.778 58.815-16.824-16.823zm-23.817 60.105c-11.503 0-20.822-9.36-20.822-20.918 0-11.546 9.319-20.918 20.822-20.918 11.503 0 20.822 9.372 20.822 20.918 0 11.558-9.319 20.918-20.822 20.918zM241 208.845l-16.824 16.835-58.778-58.816 16.825-16.835L241 208.845z" fill="#222"/><path fill-rule="evenodd" clip-rule="evenodd" d="M141.913 217.637c11.848 0 23.136-2.364 33.482-6.567l28.708 28.74C185.692 250.089 164.5 256 141.913 256 71.274 256 14 198.689 14 128.006 14 57.311 71.275 0 141.913 0c22.361 0 43.362 5.767 61.641 15.856l-28.231 28.261c-10.333-4.179-21.585-6.543-33.41-6.543-49.47 0-89.575 40.309-89.575 90.038 0 49.716 40.104 90.025 89.575 90.025z" fill="#03A9F4"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index b53af362ed..3a0d99afbd 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -36,7 +36,7 @@ export class Coda implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Coda',
 		name: 'coda',
-		icon: 'file:coda.png',
+		icon: 'file:coda.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Coda/coda.png b/packages/nodes-base/nodes/Coda/coda.png
deleted file mode 100644
index cd74b6330f..0000000000
Binary files a/packages/nodes-base/nodes/Coda/coda.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Coda/coda.svg b/packages/nodes-base/nodes/Coda/coda.svg
new file mode 100644
index 0000000000..a3e59ee319
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/coda.svg
@@ -0,0 +1 @@
+<svg width="34" height="54" xmlns="http://www.w3.org/2000/svg"><path d="M.69 48.887c0 2.489 1.557 4.184 3.704 4.184 1.896 0 3.095-1.082 3.328-2.687h-1.79c-.142.721-.733 1.118-1.52 1.118-1.199 0-1.932-1.1-1.932-2.615 0-1.516.733-2.616 1.932-2.616.787 0 1.378.397 1.52 1.118h1.79c-.233-1.605-1.432-2.687-3.328-2.687-2.147 0-3.703 1.695-3.703 4.185zm15.623 0c0-2.454-1.539-4.185-3.775-4.185-2.237 0-3.775 1.731-3.775 4.185 0 2.453 1.538 4.184 3.775 4.184 2.236 0 3.775-1.731 3.775-4.184zm-1.79 0c0 1.515-.697 2.633-1.985 2.633-1.289 0-1.986-1.118-1.986-2.633 0-1.516.697-2.634 1.986-2.634 1.288 0 1.986 1.118 1.986 2.634zm8.665 4.003h1.79V41.167h-1.79v4.402c-.358-.451-1.145-.866-2.021-.866-2.326 0-3.686 1.894-3.686 4.185 0 2.308 1.36 4.184 3.685 4.184.877 0 1.664-.415 2.022-.865v.685zm0-2.488a1.927 1.927 0 01-1.717 1.064c-1.378 0-2.2-1.1-2.2-2.58 0-1.479.822-2.579 2.2-2.579.733 0 1.413.433 1.717 1.064v3.03zM33.31 52.89v-5.248c0-1.822-1.181-2.94-3.185-2.94-1.628 0-2.88 1.028-3.113 2.399h1.718c.196-.56.644-.866 1.36-.866 1.019 0 1.52.631 1.52 1.443v.65c-.322-.235-1.127-.488-1.843-.488-1.753 0-3.095 1.065-3.095 2.58 0 1.641 1.342 2.615 2.97 2.615.895 0 1.7-.325 1.968-.595v.45h1.7zm-1.7-2.128c-.197.505-.912.812-1.628.812-.805 0-1.646-.343-1.646-1.154 0-.794.84-1.137 1.646-1.137.716 0 1.431.307 1.628.812v.667zM30.682.928H3.318A2.99 2.99 0 00.333 3.905v29.762a2.99 2.99 0 002.985 2.976h27.364a2.99 2.99 0 002.985-2.976v-1.39c-.05-1.785-.1-5.505-.1-7.192 0-.942-.696-1.736-1.592-1.736-.995 0-1.642.595-2.14 1.091-1.492 1.34-3.73 1.588-5.67 1.24-.896-.198-1.742-.446-2.439-.892-2.139-1.24-3.532-3.572-3.532-6.052 0-2.48 1.393-4.762 3.532-6.052.747-.446 1.592-.694 2.438-.892 1.89-.348 4.18-.1 5.672 1.24.547.496 1.194 1.09 2.14 1.09.895 0 1.591-.793 1.591-1.735 0-1.637.05-5.407.1-7.193v-1.29A2.99 2.99 0 0030.682.929z" fill="#F46A54"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index cb7f9ed465..7a4bcbdfb0 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -32,7 +32,7 @@ export class CoinGecko implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'CoinGecko',
 		name: 'coinGecko',
-		icon: 'file:coinGecko.png',
+		icon: 'file:coinGecko.svg',
 		group: ['output'],
 		version: 1,
 		description: 'Consume CoinGecko API',
diff --git a/packages/nodes-base/nodes/CoinGecko/coinGecko.png b/packages/nodes-base/nodes/CoinGecko/coinGecko.png
deleted file mode 100644
index 0b154ae2af..0000000000
Binary files a/packages/nodes-base/nodes/CoinGecko/coinGecko.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/CoinGecko/coinGecko.svg b/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
new file mode 100644
index 0000000000..13d2c55d87
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/coinGecko.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 276 276"><defs><style>.cls-3{fill:#fff}.cls-4{fill:#8bc53f}.cls-6{fill:#58595b}</style></defs><g id="Coin_Gecko_AI" data-name="Coin Gecko AI"><path d="M276 137.39A138 138 0 11137.39 0 138 138 0 01276 137.39z" fill="#8dc63f"/><path d="M265.65 137.44a127.63 127.63 0 11-128.21-127 127.65 127.65 0 01128.21 127z" fill="#f9e988"/><path class="cls-3" d="M140.35 18.66a70.18 70.18 0 0124.53 0 74.75 74.75 0 0123.43 7.85c7.28 4 13.57 9.43 19.83 14.52s12.49 10.3 18.42 16a93.32 93.32 0 0115.71 19 108.28 108.28 0 0111 22.17c5.33 15.66 7.18 32.53 4.52 48.62H257c-2.67-15.95-6.29-31.15-12-45.61A177.51 177.51 0 00235.56 80a209.1 209.1 0 00-12.42-20 72.31 72.31 0 00-16.64-16.8c-6.48-4.62-13.93-7.61-21.14-10.45S171 27 163.48 24.84s-15.16-3.78-23.14-5.35z"/><path class="cls-4" d="M202.74 92.39c-9.26-2.68-18.86-6.48-28.58-10.32-.56-2.44-2.72-5.48-7.09-9.19-6.35-5.51-18.28-5.37-28.59-2.93-11.38-2.68-22.62-3.63-33.41-1-88.25 24.31-38.21 83.62-70.61 143.24 4.61 9.78 54.3 66.84 126.2 51.53 0 0-24.59-59.09 30.9-87.45 45.01-23.09 77.53-65.81 11.18-83.88z"/><path class="cls-3" d="M213.64 131.2a5.35 5.35 0 11-5.38-5.32 5.36 5.36 0 015.38 5.32z"/><path d="M138.48 69.91c6.43.46 29.68 8 35.68 12.12-5-14.5-21.83-16.43-35.68-12.12z" fill="#009345"/><path class="cls-3" d="M144.6 106.58a24.68 24.68 0 11-24.69-24.67 24.68 24.68 0 0124.68 24.66z"/><path class="cls-6" d="M137.28 106.8a17.36 17.36 0 11-17.36-17.36 17.36 17.36 0 0117.36 17.36z"/><path class="cls-4" d="M233.63 142.08c-20 14.09-42.74 24.78-75 24.78-15.1 0-18.16-16-28.14-8.18-5.15 4.06-23.31 13.14-37.72 12.45S55 162 48.49 131.23C45.91 162 44.59 184.65 33 210.62c23 36.83 77.84 65.24 127.62 53-5.31-37.35 27.38-73.93 45.72-92.62 7-7.09 20.3-18.66 27.29-28.91z"/><path class="cls-6" d="M232.85 143c-6.21 5.66-13.6 9.85-21.12 13.55a134.9 134.9 0 01-23.7 8.63c-8.16 2.11-16.67 3.7-25.29 2.92s-17.43-3.71-23.14-10.17l.27-.31c7 4.54 15.08 6.14 23.12 6.37a108.27 108.27 0 0024.3-2 132.71 132.71 0 0023.61-7.3c7.63-3.15 15.18-6.8 21.68-12z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 9241dcece8..806d2d942e 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -44,7 +44,7 @@ export class ConvertKit implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'ConvertKit',
 		name: 'convertKit',
-		icon: 'file:convertKit.png',
+		icon: 'file:convertKit.svg',
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index b8f6706a8b..3587c245ff 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -24,7 +24,7 @@ export class ConvertKitTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'ConvertKit Trigger',
 		name: 'convertKitTrigger',
-		icon: 'file:convertKit.png',
+		icon: 'file:convertKit.svg',
 		subtitle: '={{$parameter["event"]}}',
 		group: ['trigger'],
 		version: 1,
diff --git a/packages/nodes-base/nodes/ConvertKit/convertKit.png b/packages/nodes-base/nodes/ConvertKit/convertKit.png
deleted file mode 100644
index 556d9cdfc2..0000000000
Binary files a/packages/nodes-base/nodes/ConvertKit/convertKit.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/ConvertKit/convertKit.svg b/packages/nodes-base/nodes/ConvertKit/convertKit.svg
new file mode 100644
index 0000000000..59f55f4941
--- /dev/null
+++ b/packages/nodes-base/nodes/ConvertKit/convertKit.svg
@@ -0,0 +1 @@
+<svg width="172" height="160" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M82.72 126.316c29.77 0 52.78-22.622 52.78-50.526 0-26.143-21.617-42.106-35.935-42.106-19.945 0-35.93 14.084-38.198 34.988-.418 3.856-3.476 7.09-7.355 7.061-6.423-.046-15.746-.1-21.658-.08-2.555.008-4.669-2.065-4.543-4.618.89-18.123 6.914-35.07 18.402-48.087C58.976 8.488 77.561 0 99.565 0c36.969 0 71.869 33.786 71.869 75.79 0 46.508-38.312 84.21-87.927 84.21-35.384 0-71.021-23.258-83.464-55.775a.702.702 0 01-.03-.377c.165-.962.494-1.841.818-2.707.471-1.258.931-2.488.864-3.906l-.215-4.529a5.523 5.523 0 013.18-5.263l1.798-.842a6.982 6.982 0 003.912-5.075 6.993 6.993 0 016.887-5.736c5.282 0 9.875 3.515 11.59 8.512 8.307 24.212 21.511 42.014 53.873 42.014z" fill="#FB6970"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index fd6f6f6146..92d991524b 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -34,7 +34,7 @@ export class CustomerIo implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Customer.io',
 		name: 'customerIo',
-		icon: 'file:customerio.png',
+		icon: 'file:customerio.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index 070df18dc3..b39a48333b 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -29,7 +29,7 @@ export class CustomerIoTrigger implements INodeType {
 		displayName: 'Customer.io Trigger',
 		name: 'customerIoTrigger',
 		group: ['trigger'],
-		icon: 'file:customerio.png',
+		icon: 'file:customerio.svg',
 		version: 1,
 		description: 'Starts the workflow on a Customer.io update. (Beta)',
 		defaults: {
diff --git a/packages/nodes-base/nodes/CustomerIo/customerio.png b/packages/nodes-base/nodes/CustomerIo/customerio.png
deleted file mode 100644
index 0e733e592a..0000000000
Binary files a/packages/nodes-base/nodes/CustomerIo/customerio.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/CustomerIo/customerio.svg b/packages/nodes-base/nodes/CustomerIo/customerio.svg
new file mode 100644
index 0000000000..396806209e
--- /dev/null
+++ b/packages/nodes-base/nodes/CustomerIo/customerio.svg
@@ -0,0 +1 @@
+<svg width="256" height="180" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M127.843 102.423a51.21 51.21 0 10-51.21-51.186 51.186 51.186 0 0051.21 51.186z" fill="#FFCD00"/><path d="M128.161 128.016h-.171c-35.127-.009-65.777-23.834-74.453-57.872-2.571-10.238-10.898-18.907-21.454-18.907H0c0 70.686 57.303 127.99 127.99 127.99h.171v-51.211z" fill="#00ECBB"/><path d="M127.843 128.016h.147c35.13 0 65.785-23.829 74.452-57.872 2.597-10.238 10.923-18.907 21.48-18.907h32.082c-.013 70.69-57.323 127.99-128.014 127.99h-.147v-51.211z" fill="#AF64FF"/><path d="M218.509 141.73a127.99 127.99 0 01-181.013 0l36.197-36.197c30 29.98 78.618 29.98 108.618 0l36.198 36.198z" fill="#7131FF"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index 36531aa9c3..2b351e8023 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -5,6 +5,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 	NodeApiError,
 	NodeOperationError,
 } from 'n8n-workflow';
@@ -95,7 +96,7 @@ export class Discord implements INodeType {
 			} while (--maxTries);
 
 			if (maxTries <= 0) {
-				throw new NodeApiError(this.getNode(), { request: options }, { message: 'Could not send message. Max. amount of rate-limit retries got reached.' });
+				throw new NodeApiError(this.getNode(), { request: options } as JsonObject, { message: 'Could not send message. Max. amount of rate-limit retries got reached.' });
 			}
 
 			returnData.push({success: true});
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index b462d83a10..2f68521790 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -11,7 +11,7 @@ import {
 	NodeApiError,
 } from 'n8n-workflow';
 
-import * as uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 import {
 	snakeCase,
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
new file mode 100644
index 0000000000..f4e6ef4b16
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -0,0 +1,437 @@
+import { IExecuteFunctions } from 'n8n-core';
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	addConfigFields,
+	addFields,
+	cloneFields,
+	commitFields,
+	logFields,
+	pushFields,
+	tagFields,
+} from './descriptions';
+
+import simpleGit, {
+	LogOptions,
+	SimpleGit,
+	SimpleGitOptions,
+} from 'simple-git';
+
+import {
+	access,
+	mkdir,
+} from 'fs/promises';
+
+import { URL } from 'url';
+
+export class Git implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Git',
+		name: 'git',
+		icon: 'file:git.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Control git.',
+		defaults: {
+			name: 'Git',
+			color: '#808080',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'gitPassword',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'gitPassword',
+						],
+					},
+				},
+			},
+		],
+		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Authenticate',
+						value: 'gitPassword',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+				],
+				displayOptions: {
+					show: {
+						operation: [
+							'clone',
+							'push',
+						],
+					},
+				},
+				default: 'none',
+				description: 'The way to authenticate.',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				default: 'log',
+				description: 'Operation to perform',
+				options: [
+					{
+						name: 'Add',
+						value: 'add',
+						description: 'Add a file or folder to commit',
+					},
+					{
+						name: 'Add Config',
+						value: 'addConfig',
+						description: 'Add configuration property',
+					},
+					{
+						name: 'Clone',
+						value: 'clone',
+						description: 'Clone a repository',
+					},
+					{
+						name: 'Commit',
+						value: 'commit',
+						description: 'Commit files or folders to git',
+					},
+					{
+						name: 'Fetch',
+						value: 'fetch',
+						description: 'Fetch from remote repository',
+					},
+					{
+						name: 'List Config',
+						value: 'listConfig',
+						description: 'Return current configuration',
+					},
+					{
+						name: 'Log',
+						value: 'log',
+						description: 'Return git commit history',
+					},
+					{
+						name: 'Pull',
+						value: 'pull',
+						description: 'Pull from remote repository',
+					},
+					{
+						name: 'Push',
+						value: 'push',
+						description: 'Push to remote repository',
+					},
+					{
+						name: 'Push Tags',
+						value: 'pushTags',
+						description: 'Push Tags to remote repository',
+					},
+					{
+						name: 'Status',
+						value: 'status',
+						description: 'Return status of current repository',
+					},
+					{
+						name: 'Tag',
+						value: 'tag',
+						description: 'Create a new tag',
+					},
+					{
+						name: 'User Setup',
+						value: 'userSetup',
+						description: 'Set the user',
+					},
+				],
+			},
+
+			{
+				displayName: 'Repository Path',
+				name: 'repositoryPath',
+				type: 'string',
+				displayOptions: {
+					hide: {
+						operation: [
+							'clone',
+						],
+					},
+				},
+				default: '',
+				placeholder: '/tmp/repository',
+				required: true,
+				description: 'Local path of the git repository to operate on.',
+			},
+			{
+				displayName: 'New Repository Path',
+				name: 'repositoryPath',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'clone',
+						],
+					},
+				},
+				default: '',
+				placeholder: '/tmp/repository',
+				required: true,
+				description: 'Local path to which the git repository should be cloned into.',
+			},
+
+			...addFields,
+			...addConfigFields,
+			...cloneFields,
+			...commitFields,
+			...logFields,
+			...pushFields,
+			...tagFields,
+			// ...userSetupFields,
+		],
+	};
+
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+
+		const prepareRepository = (repositoryPath: string): string => {
+			const authentication = this.getNodeParameter('authentication', 0) as string;
+
+			if (authentication === 'gitPassword') {
+				const gitCredentials = this.getCredentials('gitPassword') as IDataObject;
+
+				const url = new URL(repositoryPath);
+				url.username = gitCredentials.username as string;
+				url.password = gitCredentials.password as string;
+
+				return url.toString();
+			}
+
+			return repositoryPath;
+		};
+
+		const operation = this.getNodeParameter('operation', 0) as string;
+		let item: INodeExecutionData;
+		const returnItems: INodeExecutionData[] = [];
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			try {
+				item = items[itemIndex];
+
+				const repositoryPath = this.getNodeParameter('repositoryPath', itemIndex, '') as string;
+				const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
+
+				if (operation === 'clone') {
+					// Create repository folder if it does not exist
+					try {
+						await access(repositoryPath);
+					} catch (error) {
+						await mkdir(repositoryPath);
+					}
+				}
+
+				const gitOptions: Partial<SimpleGitOptions> = {
+					baseDir: repositoryPath,
+				};
+
+				const git: SimpleGit = simpleGit(gitOptions)
+					// Tell git not to ask for any information via the terminal like for
+					// example the username. As nobody will be able to answer it would
+					// n8n keep on waiting forever.
+					.env('GIT_TERMINAL_PROMPT', '0');
+
+				if (operation === 'add') {
+					// ----------------------------------
+					//         add
+					// ----------------------------------
+
+					const pathsToAdd = this.getNodeParameter('pathsToAdd', itemIndex, '') as string;
+
+					await git.add(pathsToAdd.split(','));
+
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'addConfig') {
+					// ----------------------------------
+					//         addConfig
+					// ----------------------------------
+
+					const key = this.getNodeParameter('key', itemIndex, '') as string;
+					const value = this.getNodeParameter('value', itemIndex, '') as string;
+					let append = false;
+
+					if (options.mode === 'append') {
+						append = true;
+					}
+
+					await git.addConfig(key, value, append);
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'clone') {
+					// ----------------------------------
+					//         clone
+					// ----------------------------------
+
+					let sourceRepository = this.getNodeParameter('sourceRepository', itemIndex, '') as string;
+					sourceRepository = prepareRepository(sourceRepository);
+
+					await git.clone(sourceRepository, '.');
+
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'commit') {
+					// ----------------------------------
+					//         commit
+					// ----------------------------------
+
+					const message = this.getNodeParameter('message', itemIndex, '') as string;
+
+					let pathsToAdd: string[] | undefined = undefined;
+					if (options.files !== undefined) {
+						pathsToAdd = (options.pathsToAdd as string).split(',');
+					}
+
+					await git.commit(message, pathsToAdd);
+
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'fetch') {
+					// ----------------------------------
+					//         fetch
+					// ----------------------------------
+
+					await git.fetch();
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'log') {
+					// ----------------------------------
+					//         log
+					// ----------------------------------
+
+					const logOptions: LogOptions = {};
+
+					const returnAll = this.getNodeParameter('returnAll', itemIndex, false) as boolean;
+					if (returnAll === false) {
+						logOptions.maxCount = this.getNodeParameter('limit', itemIndex, 100) as number;
+					}
+					if (options.file) {
+						logOptions.file = options.file as string;
+					}
+
+					const log = await git.log(logOptions);
+
+					// @ts-ignore
+					returnItems.push(...this.helpers.returnJsonArray(log.all));
+
+				} else if (operation === 'pull') {
+					// ----------------------------------
+					//         pull
+					// ----------------------------------
+
+					await git.pull();
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'push') {
+					// ----------------------------------
+					//         push
+					// ----------------------------------
+
+					if (options.repository) {
+						const targetRepository = prepareRepository(options.targetRepository as string);
+						await git.push(targetRepository);
+					} else {
+						const authentication = this.getNodeParameter('authentication', 0) as string;
+						if (authentication === 'gitPassword') {
+							// Try to get remote repository path from git repository itself to add
+							// authentication data
+							const config = await git.listConfig();
+							let targetRepository;
+							for (const fileName of Object.keys(config.values)) {
+								if (config.values[fileName]['remote.origin.url']) {
+									targetRepository = config.values[fileName]['remote.origin.url'];
+									break;
+								}
+							}
+
+							targetRepository = prepareRepository(targetRepository as string);
+							await git.push(targetRepository);
+						} else {
+							await git.push();
+						}
+					}
+
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'pushTags') {
+					// ----------------------------------
+					//         pushTags
+					// ----------------------------------
+
+					await git.pushTags();
+					returnItems.push({ json: { success: true } });
+
+				} else if (operation === 'listConfig') {
+					// ----------------------------------
+					//         listConfig
+					// ----------------------------------
+
+					const config = await git.listConfig();
+
+					const data = [];
+					for (const fileName of Object.keys(config.values)) {
+						data.push({
+							_file: fileName,
+							...config.values[fileName],
+						});
+					}
+
+					// @ts-ignore
+					returnItems.push(...this.helpers.returnJsonArray(data));
+
+				} else if (operation === 'status') {
+					// ----------------------------------
+					//         status
+					// ----------------------------------
+
+					const status = await git.status();
+
+					// @ts-ignore
+					returnItems.push(...this.helpers.returnJsonArray([status]));
+
+				} else if (operation === 'tag') {
+					// ----------------------------------
+					//         tag
+					// ----------------------------------
+
+					const name = this.getNodeParameter('name', itemIndex, '') as string;
+
+					await git.addTag(name);
+					returnItems.push({ json: { success: true } });
+
+				}
+
+			} catch (error) {
+
+				if (this.continueOnFail()) {
+					returnItems.push({ json: { error: error.toString() } });
+					continue;
+				}
+
+				throw error;
+			}
+		}
+
+		return this.prepareOutputData(returnItems);
+	}
+}
diff --git a/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts b/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts
new file mode 100644
index 0000000000..db336d5b9e
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts
@@ -0,0 +1,71 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const addConfigFields = [
+	{
+		displayName: 'Key',
+		name: 'key',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'addConfig',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'user.email',
+		description: 'Name of the key to set.',
+		required: true,
+	},
+	{
+		displayName: 'Value',
+		name: 'value',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'addConfig',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'name@example.com',
+		description: 'Value of the key to set.',
+		required: true,
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'addConfig',
+				],
+			},
+		},
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Mode',
+				name: 'mode',
+				type: 'options',
+				options: [
+					{
+						name: 'Append',
+						value: 'append',
+					},
+					{
+						name: 'Set',
+						value: 'set',
+					},
+				],
+				default: 'set',
+				description: 'Append setting rather than set it in the local config.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/AddDescription.ts b/packages/nodes-base/nodes/Git/descriptions/AddDescription.ts
new file mode 100644
index 0000000000..478d3f4de6
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/AddDescription.ts
@@ -0,0 +1,22 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const addFields = [
+	{
+		displayName: 'Paths to Add',
+		name: 'pathsToAdd',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'add',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'README.md',
+		description: 'Comma separated list of paths (absolute or relative to Repository Path) of files or folders to add.',
+		required: true,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/CloneDescription.ts b/packages/nodes-base/nodes/Git/descriptions/CloneDescription.ts
new file mode 100644
index 0000000000..21546e9eb5
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/CloneDescription.ts
@@ -0,0 +1,22 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const cloneFields = [
+	{
+		displayName: 'Source Repository',
+		name: 'sourceRepository',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'clone',
+				],
+			},
+		},
+		default: '',
+		placeholder: 'https://github.com/n8n-io/n8n',
+		description: 'The URL or path of the repository to clone.',
+		required: true,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
new file mode 100644
index 0000000000..5f955a2a58
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
@@ -0,0 +1,45 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const commitFields = [
+	{
+		displayName: 'Message',
+		name: 'message',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'commit',
+				],
+			},
+		},
+		default: '',
+		description: 'The commit message to use.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'commit',
+				],
+			},
+		},
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Paths to Add',
+				name: 'pathsToAdd',
+				type: 'string',
+				default: '',
+				placeholder: '/data/file1.json',
+				description: `Comma separated list of paths (absolute or relative to Repository Path) of<br />
+				files or folders to commit. If not set will all "added" files and folders be committed.`,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts b/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts
new file mode 100644
index 0000000000..f17e903e5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts
@@ -0,0 +1,64 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const logFields = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'log',
+				],
+			},
+		},
+		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: [
+					'log',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'log',
+				],
+			},
+		},
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'File',
+				name: 'file',
+				type: 'string',
+				default: 'README.md',
+				description: 'The path (absolute or relative to Repository Path) of file or folder to get the history of.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts b/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts
new file mode 100644
index 0000000000..797559b6d5
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts
@@ -0,0 +1,30 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const pushFields = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'push',
+				],
+			},
+		},
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Target Repository',
+				name: 'targetRepository',
+				type: 'string',
+				default: '',
+				placeholder: 'https://github.com/n8n-io/n8n',
+				description: 'The URL or path of the repository to push to.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/TagDescription.ts b/packages/nodes-base/nodes/Git/descriptions/TagDescription.ts
new file mode 100644
index 0000000000..bfd0f39fb0
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/TagDescription.ts
@@ -0,0 +1,21 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const tagFields = [
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'tag',
+				],
+			},
+		},
+		default: '',
+		description: 'The name of the tag to create.',
+		required: true,
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Git/descriptions/index.ts b/packages/nodes-base/nodes/Git/descriptions/index.ts
new file mode 100644
index 0000000000..568f5df05e
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/descriptions/index.ts
@@ -0,0 +1,7 @@
+export * from './AddDescription';
+export * from './AddConfigDescription';
+export * from './CloneDescription';
+export * from './CommitDescription';
+export * from './LogDescription';
+export * from './PushDescription';
+export * from './TagDescription';
diff --git a/packages/nodes-base/nodes/Git/git.svg b/packages/nodes-base/nodes/Git/git.svg
new file mode 100644
index 0000000000..637e92cea7
--- /dev/null
+++ b/packages/nodes-base/nodes/Git/git.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="97"><path fill="#F05133" d="M92.71 44.408L52.591 4.291a5.918 5.918 0 00-8.369 0l-8.33 8.332L46.459 23.19a7.022 7.022 0 017.229 1.685 7.03 7.03 0 011.67 7.275l10.186 10.185a7.028 7.028 0 017.275 1.671 7.043 7.043 0 01-9.961 9.958 7.043 7.043 0 01-1.531-7.658l-9.5-9.499v24.997a7.042 7.042 0 11-8.096 11.291 7.042 7.042 0 012.307-11.496v-25.23a7.041 7.041 0 01-3.823-9.235L31.798 16.715 4.288 44.222a5.92 5.92 0 000 8.371l40.121 40.118a5.918 5.918 0 008.369 0L92.71 52.779a5.92 5.92 0 000-8.371z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index 9a848cd58f..77423a3301 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -22,7 +22,7 @@ import {
 	recordOperations,
 } from './RecordDescription';
 
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 export class GoogleBigQuery implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index c813f44fd9..5c2d4a4d76 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -34,7 +34,7 @@ import {
 
 import * as moment from 'moment-timezone';
 
-import * as uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 6aaf6f5ad6..9cf0dcb171 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -16,7 +16,7 @@ import {
 	googleApiRequestAllItems,
 } from './GenericFunctions';
 
-import uuid = require('uuid');
+import { v4 as uuid } from 'uuid';
 
 export class GoogleDrive implements INodeType {
 	description: INodeTypeDescription = {
@@ -741,6 +741,7 @@ export class GoogleDrive implements INodeType {
 				placeholder: '',
 				description: 'Name of the binary property which contains<br />the data for the file to be uploaded.',
 			},
+
 			// ----------------------------------
 			//         file:update
 			// ----------------------------------
@@ -1898,6 +1899,91 @@ export class GoogleDrive implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: [
+							'upload',
+						],
+						resource: [
+							'file',
+						],
+					},
+				},
+				options: [
+					{
+						displayName: 'APP Properties',
+						name: 'appPropertiesUi',
+						placeholder: 'Add Property',
+						type: 'fixedCollection',
+						default: '',
+						typeOptions: {
+							multipleValues: true,
+						},
+						description: 'A collection of arbitrary key-value pairs which are private to the requesting app',
+						options: [
+							{
+								name: 'appPropertyValues',
+								displayName: 'APP Property',
+								values: [
+									{
+										displayName: 'Key',
+										name: 'key',
+										type: 'string',
+										default: '',
+										description: 'Name of the key to add.',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										type: 'string',
+										default: '',
+										description: 'Value to set for the key.',
+									},
+								],
+							},
+						],
+					},
+					{
+						displayName: 'Properties',
+						name: 'propertiesUi',
+						placeholder: 'Add Property',
+						type: 'fixedCollection',
+						default: '',
+						typeOptions: {
+							multipleValues: true,
+						},
+						description: 'A collection of arbitrary key-value pairs which are visible to all apps.',
+						options: [
+							{
+								name: 'propertyValues',
+								displayName: 'Property',
+								values: [
+									{
+										displayName: 'Key',
+										name: 'key',
+										type: 'string',
+										default: '',
+										description: 'Name of the key to add.',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										type: 'string',
+										default: '',
+										description: 'Value to set for the key.',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
 		],
 	};
 
@@ -2228,6 +2314,18 @@ export class GoogleDrive implements INodeType {
 						originalFilename,
 					};
 
+					const properties = this.getNodeParameter('options.propertiesUi.propertyValues', i, []) as IDataObject[];
+
+					if (properties.length) {
+						Object.assign(body, { properties: properties.reduce((obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }), {}) } );	
+					}
+
+					const appProperties = this.getNodeParameter('options.appPropertiesUi.appPropertyValues', i, []) as IDataObject[];
+
+					if (properties.length) {
+						Object.assign(body, { appProperties: appProperties.reduce((obj, value) => Object.assign(obj, { [`${value.key}`]: value.value }), {}) });
+					}
+
 					qs = {
 						addParents: parents.join(','),
 						// When set to true shared drives can be used.
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index 284a653c33..ac51b636d2 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -867,6 +867,18 @@ export class HttpRequest implements INodeType {
 				}
 			}
 
+			try {
+				let sendRequest: any = requestOptions; // tslint:disable-line:no-any
+				// Protect browser from sending large binary data
+				if (Buffer.isBuffer(sendRequest.body) && sendRequest.body.length > 250000) {
+					sendRequest = {
+						...requestOptions,
+						body: `Binary data got replaced with this text. Original was a Buffer with a size of ${requestOptions.body.length} byte.`,
+					};
+				}
+				this.sendMessageToUI(sendRequest);
+			} catch (e) {}
+
 			// Now that the options are all set make the actual http request
 			if (oAuth1Api !== undefined) {
 				requestPromises.push(this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions));
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 2f73f3afa9..1f26a3e5ff 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -358,21 +358,29 @@ export class Jira implements INodeType {
 			async getCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const operation = this.getCurrentNodeParameter('operation') as string;
-				let projectId;
+				let projectId: string;
+				let issueTypeId: string;
 				if (operation === 'create') {
-					projectId = this.getCurrentNodeParameter('project');
+					projectId = this.getCurrentNodeParameter('project') as string;
+					issueTypeId = this.getCurrentNodeParameter('issueType') as string;
 				} else {
-					const issueKey = this.getCurrentNodeParameter('issueKey');
-					const { fields: { project: { id } } } = await jiraSoftwareCloudApiRequest.call(this, `/api/2/issue/${issueKey}`, 'GET', {}, {});
-					projectId = id;
+					const issueKey = this.getCurrentNodeParameter('issueKey') as string;
+					const res = await jiraSoftwareCloudApiRequest.call(this, `/api/2/issue/${issueKey}`, 'GET', {}, {});
+					projectId = res.fields.project.id;
+					issueTypeId = res.fields.issuetype.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) {
-						returnData.push({
-							name: field.name,
-							value: field.id,
-						});
+
+				const res = await jiraSoftwareCloudApiRequest.call(this, `/api/2/issue/createmeta?projectIds=${projectId}&issueTypeIds=${issueTypeId}&expand=projects.issuetypes.fields`, 'GET');
+				
+				// tslint:disable-next-line: no-any
+				const fields = res.projects.find((o: any) => o.id === projectId).issuetypes.find((o: any) => o.id === issueTypeId).fields;
+				for (const key of Object.keys(fields)) {
+					const field = fields[key];
+					if (field.schema && Object.keys(field.schema).includes('customId')) {
+							returnData.push({
+								name: field.name,
+								value: field.key,
+							});
 					}
 				}
 				return returnData;
@@ -731,6 +739,8 @@ export class Jira implements INodeType {
 			}
 		}
 		if (resource === 'issueAttachment') {
+			const apiVersion = jiraVersion === 'server' ? '2' : '3' as string;
+
 			//https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-attachments/#api-rest-api-3-issue-issueidorkey-attachments-post
 			if (operation === 'add') {
 				for (let i = 0; i < length; i++) {
@@ -751,7 +761,7 @@ export class Jira implements INodeType {
 
 					responseData = await jiraSoftwareCloudApiRequest.call(
 						this,
-						`/api/3/issue/${issueKey}/attachments`,
+						`/api/${apiVersion}/issue/${issueKey}/attachments`,
 						'POST',
 						{},
 						{},
@@ -774,7 +784,7 @@ export class Jira implements INodeType {
 			if (operation === 'remove') {
 				for (let i = 0; i < length; i++) {
 					const attachmentId = this.getNodeParameter('attachmentId', i) as string;
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/attachment/${attachmentId}`, 'DELETE', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/attachment/${attachmentId}`, 'DELETE', {}, qs);
 					returnData.push({ success: true });
 				}
 			}
@@ -783,7 +793,7 @@ export class Jira implements INodeType {
 				const download = this.getNodeParameter('download', 0) as boolean;
 				for (let i = 0; i < length; i++) {
 					const attachmentId = this.getNodeParameter('attachmentId', i) as string;
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/attachment/${attachmentId}`, 'GET', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/attachment/${attachmentId}`, 'GET', {}, qs);
 					returnData.push({ json: responseData });
 				}
 				if (download) {
@@ -825,6 +835,8 @@ export class Jira implements INodeType {
 		}
 
 		if (resource === 'issueComment') {
+			const apiVersion = jiraVersion === 'server' ? '2' : '3' as string;
+
 			//https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-comments/#api-rest-api-3-issue-issueidorkey-comment-post
 			if (operation === 'add') {
 				for (let i = 0; i < length; i++) {
@@ -840,23 +852,27 @@ export class Jira implements INodeType {
 					Object.assign(body, options);
 					if (jsonParameters === false) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						Object.assign(body, {
-							body: {
-								type: 'doc',
-								version: 1,
-								content: [
-									{
-										type: 'paragraph',
-										content: [
-											{
-												type: 'text',
-												text: comment,
-											},
-										],
-									},
-								],
-							},
-						});
+						if (jiraVersion === 'server') {
+							Object.assign(body, { body: comment });
+						} else {
+							Object.assign(body, {
+								body: {
+									type: 'doc',
+									version: 1,
+									content: [
+										{
+											type: 'paragraph',
+											content: [
+												{
+													type: 'text',
+													text: comment,
+												},
+											],
+										},
+									],
+								},
+							});
+						}
 					} else {
 						const commentJson = this.getNodeParameter('commentJson', i) as string;
 						const json = validateJSON(commentJson);
@@ -867,7 +883,7 @@ export class Jira implements INodeType {
 						Object.assign(body, { body: json });
 					}
 
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/issue/${issueKey}/comment`, 'POST', body, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/issue/${issueKey}/comment`, 'POST', body, qs);
 					returnData.push(responseData);
 				}
 			}
@@ -878,7 +894,7 @@ export class Jira implements INodeType {
 					const commentId = this.getNodeParameter('commentId', i) as string;
 					const options = this.getNodeParameter('options', i) as IDataObject;
 					Object.assign(qs, options);
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/issue/${issueKey}/comment/${commentId}`, 'GET', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/issue/${issueKey}/comment/${commentId}`, 'GET', {}, qs);
 					returnData.push(responseData);
 				}
 			}
@@ -891,11 +907,11 @@ export class Jira implements INodeType {
 					const body: IDataObject = {};
 					Object.assign(qs, options);
 					if (returnAll) {
-						responseData = await jiraSoftwareCloudApiRequestAllItems.call(this, 'comments', `/api/3/issue/${issueKey}/comment`, 'GET', body, qs);
+						responseData = await jiraSoftwareCloudApiRequestAllItems.call(this, 'comments', `/api/${apiVersion}/issue/${issueKey}/comment`, 'GET', body, qs);
 					} else {
 						const limit = this.getNodeParameter('limit', i) as number;
 						body.maxResults = limit;
-						responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/issue/${issueKey}/comment`, 'GET', body, qs);
+						responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/issue/${issueKey}/comment`, 'GET', body, qs);
 						responseData = responseData.comments;
 					}
 					returnData.push.apply(returnData, responseData);
@@ -906,7 +922,7 @@ export class Jira implements INodeType {
 				for (let i = 0; i < length; i++) {
 					const issueKey = this.getNodeParameter('issueKey', i) as string;
 					const commentId = this.getNodeParameter('commentId', i) as string;
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/issue/${issueKey}/comment/${commentId}`, 'DELETE', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/issue/${issueKey}/comment/${commentId}`, 'DELETE', {}, qs);
 					returnData.push({ success: true });
 				}
 			}
@@ -925,23 +941,27 @@ export class Jira implements INodeType {
 					Object.assign(qs, options);
 					if (jsonParameters === false) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						Object.assign(body, {
-							body: {
-								type: 'doc',
-								version: 1,
-								content: [
-									{
-										type: 'paragraph',
-										content: [
-											{
-												type: 'text',
-												text: comment,
-											},
-										],
-									},
-								],
-							},
-						});
+						if (jiraVersion === 'server') {
+							Object.assign(body, { body: comment });
+						} else {
+							Object.assign(body, {
+								body: {
+									type: 'doc',
+									version: 1,
+									content: [
+										{
+											type: 'paragraph',
+											content: [
+												{
+													type: 'text',
+													text: comment,
+												},
+											],
+										},
+									],
+								},
+							});
+						}
 					} else {
 						const commentJson = this.getNodeParameter('commentJson', i) as string;
 						const json = validateJSON(commentJson);
@@ -951,13 +971,15 @@ export class Jira implements INodeType {
 
 						Object.assign(body, { body: json });
 					}
-					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/3/issue/${issueKey}/comment/${commentId}`, 'PUT', body, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/issue/${issueKey}/comment/${commentId}`, 'PUT', body, qs);
 					returnData.push(responseData);
 				}
 			}
 		}
 
 		if (resource === 'user') {
+			const apiVersion = jiraVersion === 'server' ? '2' : '3' as string;
+
 			if (operation === 'create') {
 				// https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-users/#api-rest-api-3-user-post
 				for (let i = 0; i < length; i++) {
@@ -971,14 +993,14 @@ export class Jira implements INodeType {
 
 					Object.assign(body, additionalFields);
 
-					responseData = await jiraSoftwareCloudApiRequest.call(this, '/api/3/user', 'POST', body, {});
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/user`, 'POST', body, {});
 					returnData.push(responseData);
 				}
 			} else if (operation === 'delete') {
 				// https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-users/#api-rest-api-3-user-delete
 				for (let i = 0; i < length; i++) {
 					qs.accountId = this.getNodeParameter('accountId', i);
-					responseData = await jiraSoftwareCloudApiRequest.call(this, '/api/3/user', 'DELETE', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/user`, 'DELETE', {}, qs);
 					returnData.push({ success: true });
 				}
 			} else if (operation === 'get') {
@@ -992,7 +1014,7 @@ export class Jira implements INodeType {
 						qs.expand = expand.join(',');
 					}
 
-					responseData = await jiraSoftwareCloudApiRequest.call(this, '/api/3/user', 'GET', {}, qs);
+					responseData = await jiraSoftwareCloudApiRequest.call(this, `/api/${apiVersion}/user`, 'GET', {}, qs);
 					returnData.push(responseData);
 				}
 			}
diff --git a/packages/nodes-base/nodes/MQTT/mqtt.svg b/packages/nodes-base/nodes/MQTT/mqtt.svg
index bd11e032ae..064a66a61a 100644
--- a/packages/nodes-base/nodes/MQTT/mqtt.svg
+++ b/packages/nodes-base/nodes/MQTT/mqtt.svg
@@ -1 +1 @@
-<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
+<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.4zm0-96.5v49.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/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index ebd13dae9f..596fed5147 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -16,7 +16,7 @@ export class Mailgun implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mailgun',
 		name: 'mailgun',
-		icon: 'file:mailgun.png',
+		icon: 'file:mailgun.svg',
 		group: ['output'],
 		version: 1,
 		description: 'Sends an Email via Mailgun',
diff --git a/packages/nodes-base/nodes/Mailgun/mailgun.png b/packages/nodes-base/nodes/Mailgun/mailgun.png
deleted file mode 100644
index dd5525aa42..0000000000
Binary files a/packages/nodes-base/nodes/Mailgun/mailgun.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Mailgun/mailgun.svg b/packages/nodes-base/nodes/Mailgun/mailgun.svg
new file mode 100644
index 0000000000..88267bf086
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailgun/mailgun.svg
@@ -0,0 +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.066 19.9c-6.7 0-12.13 5.433-12.13 12.1s5.443 12.1 12.13 12.1 12.13-5.433 12.13-12.1-5.443-12.1-12.13-12.1zM13.181 32c0-10.408 8.46-18.852 18.885-18.852s18.884 8.454 18.884 18.86c0 .72-.066 1.375-.13 2.03-.13 1.833 1.18 3.207 3.016 3.207 3.082 0 3.4-3.993 3.4-5.302 0-13.943-11.28-25.2-25.246-25.2S6.754 18.001 6.754 31.944s11.279 25.2 25.246 25.2c7.4 0 14.033-3.207 18.7-8.248l5.18 4.32A31.928 31.928 0 0132 63.886c-17.705.002-32-14.334-32-31.942C0 14.27 14.36 0 32 0c17.705 0 32 14.336 32 31.944 0 7.07-3.4 12.83-10.164 12.83-3.016 0-4.787-1.375-5.836-2.88-3.344 5.368-9.246 8.902-16.066 8.902-10.295.065-18.754-8.38-18.754-18.786zm18.885-5.564c3.082 0 5.574 2.487 5.574 5.498 0 3.077-2.492 5.564-5.574 5.564s-5.574-2.477-5.574-5.554c.066-3 2.492-5.498 5.574-5.498z" stroke="none" fill="#c02126" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index c3fe7d14d6..c29f66d0df 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -101,7 +101,7 @@ export class Mandrill implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mandrill',
 		name: 'mandrill',
-		icon: 'file:mandrill.png',
+		icon: 'file:mandrill.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Mandrill/mandrill.png b/packages/nodes-base/nodes/Mandrill/mandrill.png
deleted file mode 100644
index 6e3fd16a65..0000000000
Binary files a/packages/nodes-base/nodes/Mandrill/mandrill.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Mandrill/mandrill.svg b/packages/nodes-base/nodes/Mandrill/mandrill.svg
new file mode 100644
index 0000000000..fb88f6f302
--- /dev/null
+++ b/packages/nodes-base/nodes/Mandrill/mandrill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 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="M32.05 27.487L13.287 0v23.53l10.65 15.72 8.114-11.765" fill="#1a1918"/><path d="M32.05 27.487l8.013 11.867 10.65-15.518V0L32.05 27.487" fill="#ed9d4a"/><path d="M31.95 27.487l-8.013 11.765 8.013 11.765 8.013-11.765-8.013-11.765" fill="#ba7730"/><path d="M0 51.12h13.287V23.633L0 4.058V51.12" fill="#4cb2d4"/><path d="M0 0v4.057L13.287 23.53V0H0" fill="#1c82ad"/><path d="M50.713 23.836V51.12H64V4.362L50.713 23.836" fill="#c02439"/><path d="M64 0H50.713v23.734L64 4.26V0" fill="#8f212f"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index bed9eff1b4..70355430f2 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -12,7 +12,7 @@ import {
 } from 'n8n-core';
 
 import * as _ from 'lodash';
-import * as uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 
 interface MessageResponse {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 6afe17aae2..0574c1fe9d 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -32,7 +32,7 @@ export class MicrosoftOneDrive implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Microsoft OneDrive',
 		name: 'microsoftOneDrive',
-		icon: 'file:oneDrive.png',
+		icon: 'file:oneDrive.svg',
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.png b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.png
deleted file mode 100644
index 44f3f594ff..0000000000
Binary files a/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
new file mode 100644
index 0000000000..915d439ed2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/oneDrive.svg
@@ -0,0 +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"><g stroke="none"><path d="M6.667 0Q0 0 0 6.667v66.667Q0 80 6.667 80h66.667Q80 80 80 73.333V6.667Q80 0 73.333 0z" fill="#094ab2"/><path d="M60.256 42.023c2.87.405 4.965 2.975 4.832 5.929 0 2.594-1.421 5.655-4.832 5.655H32.574c-5.306 0-7.232-3.706-7.232-7.524 0-6.444 6.979-6.621 6.979-6.621s.569-6.992 6.664-8.41c3.806-1.113 7.875.477 9.98 3.899a8.205 8.205 0 017.058-.258c2.812 1.257 4.518 4.212 4.232 7.33z"/><path d="M23.583 45.605c0-7.082 7.412-8.139 7.412-8.139.707-4.108 3.699-7.435 7.682-8.54 4.021-1.286 8.404.189 10.856 3.653a6.3 6.3 0 013.635-.737c-.513-4.177-3.247-7.736-7.126-9.277-5.141-2.153-11.058.026-13.618 5.015a8.403 8.403 0 00-8.126-.16c-3.181 1.763-5.002 5.282-4.619 8.924-3.675.323-6.438 3.523-6.254 7.242.114 3.817 3.139 6.892 6.92 7.034h4.65a9.084 9.084 0 01-1.413-5.015z" fill="#f9f9f9"/><path d="M.84 2.69l77.753 75.816A4.39 4.39 0 0080 75.279V4.398A4.392 4.392 0 0075.612 0H4.885A4.39 4.39 0 00.84 2.69z" fill-opacity=".19"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
new file mode 100644
index 0000000000..d98e01f497
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -0,0 +1,76 @@
+import {
+	OptionsWithUri
+} from 'request';
+
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+export async function microsoftApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: IDataObject = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}, option: IDataObject = { json: true }) {
+	const options: OptionsWithUri = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body,
+		qs,
+		uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`,
+	};
+	try {
+		Object.assign(options, option);
+		if (Object.keys(qs).length === 0) {
+			delete options.qs;
+		}
+		if (Object.keys(body).length === 0) {
+			delete options.body;
+		}
+		//@ts-ignore
+		return await this.helpers.requestOAuth2.call(this, 'microsoftToDoOAuth2Api', options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+export async function microsoftApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: IDataObject = {}, query: IDataObject = {}) {
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	let uri: string | undefined;
+	query['$top'] = 100;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
+		uri = responseData['@odata.nextLink'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['@odata.nextLink'] !== undefined
+	);
+
+	return returnData;
+}
+
+export async function microsoftApiRequestAllItemsSkip(this: IExecuteFunctions, propertyName: string, method: string, endpoint: string, body: IDataObject = {}, query: IDataObject = {}) {
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+	query['$top'] = 100;
+	query['$skip'] = 0;
+
+	do {
+		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
+		query['$skip'] += query['$top'];
+		returnData.push.apply(returnData, responseData[propertyName]);
+	} while (
+		responseData['value'].length !== 0
+	);
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/LinkedResourceDescription.ts b/packages/nodes-base/nodes/Microsoft/ToDo/LinkedResourceDescription.ts
new file mode 100644
index 0000000000..ddccc8666d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/LinkedResourceDescription.ts
@@ -0,0 +1,282 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const linkedResourceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'linkedResource',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const linkedResourceFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                       linkedResource:ALL                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Task List ID',
+		name: 'taskListId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTaskLists',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'delete',
+					'get',
+					'getAll',
+					'update',
+				],
+				resource: [
+					'linkedResource',
+				],
+			},
+		},
+		required: true,
+		default: '',
+	},
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'delete',
+					'get',
+					'getAll',
+					'update',
+				],
+				resource: [
+					'linkedResource',
+				],
+			},
+		},
+		required: true,
+		default: '',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                           linkedResource:create                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'displayName',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'linkedResource',
+				],
+			},
+		},
+		description: 'Field indicating title of the linked entity.',
+	},
+	{
+		displayName: 'Application Name',
+		name: 'applicationName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'linkedResource',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'App name of the source that is sending the linked entity.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'linkedResource',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'External ID',
+				name: 'externalId',
+				type: 'string',
+				default: '',
+				description: 'ID of the object that is associated with this task on the third-party/partner system.',
+			},
+			{
+				displayName: 'Web URL',
+				name: 'webUrl',
+				type: 'string',
+				default: '',
+				description: 'Deeplink to the linked entity.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                           linkedResource:get/delete/update                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Linked Resource ID',
+		name: 'linkedResourceId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'linkedResource',
+				],
+				operation: [
+					'delete',
+					'get',
+					'update',
+				],
+			},
+		},
+		default: '',
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                           linkedResource:getAll                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'linkedResource',
+				],
+				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: [
+					'linkedResource',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                           linkedResource:update                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'linkedResource',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Application Name',
+				name: 'applicationName',
+				type: 'string',
+				default: '',
+				description: 'App name of the source that is sending the linked entity.',
+			},
+			{
+				displayName: 'Name',
+				name: 'displayName',
+				type: 'string',
+				default: '',
+				description: 'Field indicating title of the linked entity.',
+			},
+			{
+				displayName: 'External ID',
+				name: 'externalId',
+				type: 'string',
+				default: '',
+				description: 'ID of the object that is associated with this task on the third-party/partner system.',
+			},
+			{
+				displayName: 'Web URL',
+				name: 'webUrl',
+				type: 'string',
+				default: '',
+				description: 'Deeplink to the linked entity.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/ListDescription.ts b/packages/nodes-base/nodes/Microsoft/ToDo/ListDescription.ts
new file mode 100644
index 0000000000..4bc175d92e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/ListDescription.ts
@@ -0,0 +1,155 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const listOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'list',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const listFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List Name',
+		name: 'displayName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'List display name.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:get/delete/update                     */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'listId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+					'get',
+					'update',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The identifier of the list, unique in the user\'s mailbox.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'list',
+				],
+				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: [
+					'list',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 list:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'New List Name',
+		name: 'displayName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'list',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'List display name.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json
new file mode 100644
index 0000000000..622cee8751
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.json
@@ -0,0 +1,25 @@
+{
+	"node": "n8n-nodes-base.microsoftToDo",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Productivity"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/microsoft"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.microsoftToDo/"
+			}
+		],
+		"generic": [
+		]
+	},
+	"alias": [
+		"Todo"
+	]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
new file mode 100644
index 0000000000..da31021a0e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -0,0 +1,334 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import {
+	microsoftApiRequest,
+	microsoftApiRequestAllItems,
+} from './GenericFunctions';
+
+import {
+	linkedResourceFields,
+	linkedResourceOperations,
+} from './LinkedResourceDescription';
+
+import {
+	taskFields,
+	taskOperations,
+} from './TaskDescription';
+
+import {
+	listFields,
+	listOperations,
+} from './ListDescription';
+
+import * as moment from 'moment-timezone';
+
+export class MicrosoftToDo implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft To Do',
+		name: 'microsoftToDo',
+		icon: 'file:todo.svg',
+		group: ['input'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Microsoft To Do API.',
+		defaults: {
+			name: 'Microsoft To Do',
+			color: '#0078D7',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'microsoftToDoOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Linked Resource',
+						value: 'linkedResource',
+					},
+					{
+						name: 'List',
+						value: 'list',
+					},
+					{
+						name: 'Task',
+						value: 'task',
+					},
+				],
+				default: 'task',
+				description: 'The resource to operate on.',
+			},
+			...linkedResourceOperations,
+			...linkedResourceFields,
+			...taskOperations,
+			...taskFields,
+			...listOperations,
+			...listFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			// Get all the team's channels to display them to user so that he can
+			// select them easily
+			async getTaskLists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const lists = await microsoftApiRequestAllItems.call(this, 'value', 'GET', '/todo/lists');
+				for (const list of lists) {
+					returnData.push({
+						name: list.displayName as string,
+						value: list.id as string,
+					});
+				}
+				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 timezone = this.getTimezone();
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		for (let i = 0; i < length; i++) {
+			try {
+
+				if (resource === 'linkedResource') {
+					// https://docs.microsoft.com/en-us/graph/api/todotask-post-linkedresources?view=graph-rest-1.0&tabs=http
+					if (operation === 'create') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const body: IDataObject = {
+							applicationName: this.getNodeParameter('applicationName', i) as string,
+							displayName: this.getNodeParameter('displayName', i) as string,
+							...this.getNodeParameter('additionalFields', i) as IDataObject[],
+						};
+
+						responseData = await microsoftApiRequest.call(this, 'POST', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources`, body, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/linkedresource-delete?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'delete') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const linkedResourceId = this.getNodeParameter('linkedResourceId', i) as string;
+
+						responseData = await microsoftApiRequest.call(this, 'DELETE', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources/${linkedResourceId}`, undefined, qs);
+						responseData = { success: true };
+
+						// https://docs.microsoft.com/en-us/graph/api/linkedresource-get?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'get') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const linkedResourceId = this.getNodeParameter('linkedResourceId', i) as string;
+
+						responseData = await microsoftApiRequest.call(this, 'GET', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources/${linkedResourceId}`, undefined, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/todotask-list-linkedresources?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'getAll') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+						if (returnAll === true) {
+							responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources`, undefined, qs);
+						} else {
+							qs['$top'] = this.getNodeParameter('limit', i) as number;
+							responseData = await microsoftApiRequest.call(this, 'GET', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources`, undefined, qs);
+							responseData = responseData.value;
+						}
+
+						// https://docs.microsoft.com/en-us/graph/api/linkedresource-update?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'update') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const linkedResourceId = this.getNodeParameter('linkedResourceId', i) as string;
+
+						const body: IDataObject = {
+							...this.getNodeParameter('updateFields', i) as IDataObject[],
+						};
+
+						responseData = await microsoftApiRequest.call(this, 'PATCH', `/todo/lists/${taskListId}/tasks/${taskId}/linkedResources/${linkedResourceId}`, body, qs);
+
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
+					}
+				} else if (resource === 'task') {
+
+					// https://docs.microsoft.com/en-us/graph/api/todotasklist-post-tasks?view=graph-rest-1.0&tabs=http
+					if (operation === 'create') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const body: IDataObject = {
+							title: this.getNodeParameter('title', i) as string,
+							...this.getNodeParameter('additionalFields', i) as IDataObject[],
+						};
+
+						if (body.content) {
+							body.body = {
+								content: body.content,
+								contentType: 'html',
+							};
+						}
+
+						if (body.dueDateTime) {
+							body.dueDateTime = {
+								dateTime: moment.tz(body.dueDateTime, timezone).format(),
+								timeZone: timezone,
+							};
+						}
+
+						responseData = await microsoftApiRequest.call(this, 'POST', `/todo/lists/${taskListId}/tasks`, body, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/todotask-delete?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'delete') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+
+						responseData = await microsoftApiRequest.call(this, 'DELETE', `/todo/lists/${taskListId}/tasks/${taskId}`, undefined, qs);
+						responseData = { success: true };
+
+						// https://docs.microsoft.com/en-us/graph/api/todotask-get?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'get') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+
+						responseData = await microsoftApiRequest.call(this, 'GET', `/todo/lists/${taskListId}/tasks/${taskId}`, undefined, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/todotasklist-list-tasks?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'getAll') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+						if (returnAll === true) {
+							responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/todo/lists/${taskListId}/tasks/`, undefined, qs);
+						} else {
+							qs['$top'] = this.getNodeParameter('limit', i) as number;
+							responseData = await microsoftApiRequest.call(this, 'GET', `/todo/lists/${taskListId}/tasks/`, undefined, qs);
+							responseData = responseData.value;
+						}
+
+						// https://docs.microsoft.com/en-us/graph/api/todotask-update?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'update') {
+
+						const taskListId = this.getNodeParameter('taskListId', i) as string;
+						const taskId = this.getNodeParameter('taskId', i) as string;
+						const body: IDataObject = {
+							...this.getNodeParameter('updateFields', i) as IDataObject[],
+						};
+
+						if (body.content) {
+							body.body = {
+								content: body.content,
+								contentType: 'html',
+							};
+						}
+
+						if (body.dueDateTime) {
+							body.dueDateTime = {
+								dateTime: moment.tz(body.dueDateTime, timezone).format(),
+								timeZone: timezone,
+							};
+						}
+
+						responseData = await microsoftApiRequest.call(this, 'PATCH', `/todo/lists/${taskListId}/tasks/${taskId}`, body, qs);
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
+					}
+
+				} else if (resource === 'list') {
+
+					// https://docs.microsoft.com/en-us/graph/api/todo-post-lists?view=graph-rest-1.0&tabs=http
+					if (operation === 'create') {
+
+						const body = {
+							displayName: this.getNodeParameter('displayName', i) as string,
+						};
+
+						responseData = await microsoftApiRequest.call(this, 'POST', '/todo/lists/', body, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/todotasklist-delete?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'delete') {
+
+						const listId = this.getNodeParameter('listId', i) as string;
+						responseData = await microsoftApiRequest.call(this, 'DELETE', `/todo/lists/${listId}`, undefined, qs);
+						responseData = { success: true };
+
+						//https://docs.microsoft.com/en-us/graph/api/todotasklist-get?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'get') {
+
+						const listId = this.getNodeParameter('listId', i) as string;
+						responseData = await microsoftApiRequest.call(this, 'GET', `/todo/lists/${listId}`, undefined, qs);
+
+						// https://docs.microsoft.com/en-us/graph/api/todo-list-lists?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						if (returnAll === true) {
+							responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', '/todo/lists', undefined, qs);
+						} else {
+							qs['$top'] = this.getNodeParameter('limit', i) as number;
+							responseData = await microsoftApiRequest.call(this, 'GET', '/todo/lists', undefined, qs);
+							responseData = responseData.value;
+						}
+
+						// https://docs.microsoft.com/en-us/graph/api/todotasklist-update?view=graph-rest-1.0&tabs=http
+					} else if (operation === 'update') {
+
+						const listId = this.getNodeParameter('listId', i) as string;
+						const body = {
+							displayName: this.getNodeParameter('displayName', i) as string,
+						};
+
+						responseData = await microsoftApiRequest.call(this, 'PATCH', `/todo/lists/${listId}`, body, qs);
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
+				}
+				throw error;
+			}
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts b/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts
new file mode 100644
index 0000000000..cd6609a3fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/TaskDescription.ts
@@ -0,0 +1,354 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const taskOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const taskFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                 task:create                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'taskListId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTaskLists',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'task',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The identifier of the list, unique in the user\'s mailbox.',
+	},
+	{
+		displayName: 'Subject',
+		name: 'title',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+				],
+				resource: [
+					'task',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'A brief description of the task.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content of the task.',
+			},
+			{
+				displayName: 'Due',
+				name: 'dueDateTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The date in the specified time zone that the task is to be finished.',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'low',
+					},
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'High',
+						value: 'high',
+					},
+				],
+				default: 'normal',
+				description: 'The importance of the task.',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Not started',
+						value: 'notStarted',
+					},
+					{
+						name: 'In progress',
+						value: 'inProgress',
+					},
+					{
+						name: 'Completed',
+						value: 'completed',
+					},
+					{
+						name: 'Waiting On Others',
+						value: 'waitingOnOthers',
+					},
+					{
+						name: 'Deferred',
+						value: 'deferred',
+					},
+				],
+				default: 'notStarted',
+				description: 'Indicates the state or progress of the task.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 task:get/delete/update/getAll              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'List ID',
+		name: 'taskListId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTaskLists',
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+					'get',
+					'getAll',
+					'update',
+				],
+				resource: [
+					'task',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The identifier of the list, unique in the user\'s mailbox.',
+	},
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+					'get',
+					'update',
+				],
+				resource: [
+					'task',
+				],
+			},
+		},
+		required: true,
+		default: '',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 task:getAll                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				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: [
+					'task',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 task:update                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Content',
+				name: 'content',
+				type: 'string',
+				default: '',
+				description: 'The content of the task.',
+			},
+			{
+				displayName: 'Due Date Time',
+				name: 'dueDateTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The date in the specified time zone that the task is to be finished.',
+			},
+			{
+				displayName: 'Importance',
+				name: 'importance',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 'low',
+					},
+					{
+						name: 'Normal',
+						value: 'normal',
+					},
+					{
+						name: 'High',
+						value: 'high',
+					},
+				],
+				default: 'normal',
+				description: 'The importance of the task.',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Not started',
+						value: 'notStarted',
+					},
+					{
+						name: 'In progress',
+						value: 'inProgress',
+					},
+					{
+						name: 'Completed',
+						value: 'completed',
+					},
+					{
+						name: 'Waiting On Others',
+						value: 'waitingOnOthers',
+					},
+					{
+						name: 'Deferred',
+						value: 'deferred',
+					},
+				],
+				default: 'notStarted',
+				description: 'Indicates the state or progress of the task.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'title',
+				type: 'string',
+				default: '',
+				description: 'A brief description of the task.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg b/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
new file mode 100644
index 0000000000..b97f166e23
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/todo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.713 7.854L.394 11.172a1.17 1.17 0 000 1.655L5.367 17.8l4.974-4.974-4.974-4.972a1.169 1.169 0 00-1.654 0z" fill="#185abd"/><path d="M23.606 6.2l-3.318-3.32a1.17 1.17 0 00-1.655 0l-4.146 4.146L9.513 12l-4.146 4.146a1.17 1.17 0 000 1.655l3.319 3.318a1.17 1.17 0 001.655 0l4.146-4.146L19.46 12l4.146-4.146a1.17 1.17 0 000-1.654z" fill="#41a5ee"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 0e587ae4ad..fd1de1af07 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -15,7 +15,7 @@ export class MySql implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'MySQL',
 		name: 'mySql',
-		icon: 'file:mysql.png',
+		icon: 'file:mysql.svg',
 		group: ['input'],
 		version: 1,
 		description: 'Get, add and update data in MySQL.',
@@ -288,7 +288,7 @@ export class MySql implements INodeType {
 
 			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);
diff --git a/packages/nodes-base/nodes/MySql/mysql.png b/packages/nodes-base/nodes/MySql/mysql.png
deleted file mode 100644
index 26645e2f38..0000000000
Binary files a/packages/nodes-base/nodes/MySql/mysql.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/MySql/mysql.svg b/packages/nodes-base/nodes/MySql/mysql.svg
new file mode 100644
index 0000000000..aa7836e3a3
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/mysql.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 81 80" 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="M73.689 60.737c-4.353-.109-7.726.327-10.556 1.524-.816.326-2.122.327-2.231 1.36.436.436.49 1.143.871 1.741.653 1.088 1.795 2.557 2.829 3.319 1.142.87 2.285 1.741 3.482 2.503 2.122 1.306 4.516 2.068 6.584 3.373 1.197.761 2.394 1.741 3.591 2.557.599.435.979 1.142 1.741 1.415v-.163c-.381-.49-.49-1.197-.87-1.741-.544-.544-1.088-1.034-1.632-1.578-1.578-2.122-3.537-3.972-5.659-5.495-1.741-1.197-5.55-2.829-6.257-4.843l-.109-.109c1.197-.109 2.612-.544 3.754-.871 1.85-.49 3.537-.381 5.441-.87a47.87 47.87 0 002.612-.762v-.489c-.979-.98-1.687-2.285-2.72-3.21-2.775-2.395-5.822-4.734-8.978-6.692-1.687-1.088-3.863-1.796-5.659-2.721-.653-.327-1.741-.49-2.122-1.034-.98-1.197-1.524-2.775-2.231-4.19-1.577-2.993-3.101-6.311-4.462-9.467-.979-2.122-1.578-4.244-2.775-6.203-5.604-9.25-11.698-14.854-21.057-20.35-2.013-1.142-4.407-1.632-6.964-2.231l-4.081-.218c-.87-.381-1.741-1.415-2.503-1.904C10.627 1.43 2.629-2.813.343 2.791c-1.469 3.536 2.177 7.018 3.428 8.814.925 1.251 2.122 2.666 2.775 4.081.381.924.489 1.904.87 2.884.871 2.394 1.687 5.06 2.829 7.291.599 1.142 1.251 2.34 2.013 3.373.435.598 1.197.871 1.36 1.85-.762 1.088-.816 2.721-1.252 4.081-1.959 6.148-1.197 13.766 1.578 18.282.87 1.36 2.938 4.353 5.713 3.21 2.448-.979 1.904-4.081 2.612-6.801.164-.653.055-1.088.381-1.523v.109l2.231 4.516c1.687 2.666 4.625 5.441 7.073 7.291 1.306.979 2.34 2.666 3.972 3.265v-.164h-.109c-.327-.49-.816-.707-1.251-1.088-.979-.979-2.068-2.176-2.829-3.265-2.285-3.047-4.299-6.42-6.094-9.903-.87-1.687-1.632-3.537-2.34-5.223-.327-.653-.327-1.632-.871-1.959-.816 1.197-2.013 2.231-2.612 3.7-1.033 2.34-1.142 5.223-1.523 8.216-.217.055-.109 0-.218.109-1.741-.436-2.34-2.231-2.993-3.754-1.632-3.863-1.904-10.066-.489-14.527.381-1.143 2.013-4.734 1.36-5.822-.326-1.034-1.415-1.632-2.013-2.448-.707-1.034-1.469-2.34-1.959-3.482-1.306-3.047-1.959-6.42-3.373-9.468-.653-1.415-1.795-2.884-2.721-4.189-1.031-1.471-2.174-2.505-2.99-4.246-.272-.598-.653-1.578-.218-2.231.109-.435.326-.598.762-.707.707-.599 2.721.163 3.428.489 2.013.816 3.7 1.578 5.387 2.721.762.544 1.578 1.578 2.557 1.85h1.143c1.741.381 3.7.109 5.332.598 2.884.925 5.495 2.285 7.835 3.754 7.128 4.516 13.004 10.937 16.976 18.608.653 1.251.925 2.394 1.523 3.7 1.143 2.666 2.557 5.387 3.7 7.998 1.142 2.557 2.231 5.169 3.863 7.291.816 1.142 4.081 1.741 5.55 2.34 1.088.489 2.775.925 3.754 1.523 1.85 1.142 3.7 2.448 5.441 3.7.871.653 3.591 2.013 3.754 3.101zM18.19 13.455a8.61 8.61 0 00-2.231.272v.109h.109c.436.87 1.197 1.469 1.741 2.231l1.252 2.612.109-.109c.762-.544 1.143-1.415 1.143-2.721-.327-.381-.381-.762-.653-1.143-.326-.544-1.034-.816-1.469-1.252z" stroke="none" fill="#00546b" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
index 5ef0485fb9..3a868247e7 100644
--- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
@@ -339,6 +339,20 @@ export const databasePageFields = [
 						default: false,
 						description: 'Weather or not you want to define a date range.',
 					},
+					{
+						displayName: 'Include Time',
+						name: 'includeTime',
+						displayOptions: {
+							show: {
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'boolean',
+						default: true,
+						description: 'Weather or not to include the time in the date.',
+					},
 					{
 						displayName: 'Date',
 						name: 'date',
@@ -685,6 +699,20 @@ export const databasePageFields = [
 						default: false,
 						description: 'Weather or not you want to define a date range.',
 					},
+					{
+						displayName: 'Include Time',
+						name: 'includeTime',
+						displayOptions: {
+							show: {
+								type: [
+									'date',
+								],
+							},
+						},
+						type: 'boolean',
+						default: true,
+						description: 'Weather or not to include the time in the date.',
+					},
 					{
 						displayName: 'Date',
 						name: 'date',
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index de91bc3083..91664ae935 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -24,6 +24,8 @@ import {
 
 import * as moment from 'moment-timezone';
 
+import { validate as uuidValidate } from 'uuid';
+
 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 {
@@ -244,9 +246,15 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
 			};
 			break;
 		case 'multi_select':
+			const multiSelectValue = value.multiSelectValue;
 			result = {
+				type: 'multi_select',
 				// tslint:disable-next-line: no-any
-				type: 'multi_select', multi_select: value.multiSelectValue.filter((id: any) => id !== null).map((option: string) => ({ id: option })),
+				multi_select: (Array.isArray(multiSelectValue) ? multiSelectValue : multiSelectValue.split(',').map((v: string) => v.trim()))
+					// tslint:disable-next-line: no-any
+					.filter((value: any) => value !== null)
+					.map((option: string) =>
+						((!uuidValidate(option)) ? { name: option } : { id: option })),
 			};
 			break;
 		case 'email':
@@ -270,15 +278,14 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
 			};
 			break;
 		case 'date':
-			//&& value.dateStart !== 'Invalid date' && value.dateEnd !== 'Invalid date'
+			const format = getDateFormat(value.includeTime);
 			if (value.range === true) {
 				result = {
-					type: 'date', date: { start: moment.tz(value.dateStart, timezone).utc().format(), end: moment.tz(value.dateEnd, timezone).utc().format() },
+					type: 'date', date: { start: moment.tz(value.dateStart, timezone).format(format), end: moment.tz(value.dateEnd, timezone).format(format) },
 				};
-				//if (value.date !== 'Invalid date')
 			} else {
 				result = {
-					type: 'date', date: { start: moment.tz(value.date, timezone).utc().format(), end: null },
+					type: 'date', date: { start: moment.tz(value.date, timezone).format(format), end: null },
 				};
 			}
 			break;
@@ -287,6 +294,13 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
 	return result;
 }
 
+function getDateFormat(includeTime: boolean) {
+	if (includeTime === false) {
+		return 'yyyy-MM-DD';
+	}
+	return '';
+}
+
 function getNameAndType(key: string) {
 	const [name, type] = key.split('|');
 	return {
@@ -314,7 +328,11 @@ 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`];
+
+		let valuePropertyName = key === 'last_edited_time'
+			? value[camelCase(key)]
+			: 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)) {
diff --git a/packages/nodes-base/nodes/Notion/Notion.node.ts b/packages/nodes-base/nodes/Notion/Notion.node.ts
index 5ae5325d77..ee6992a64b 100644
--- a/packages/nodes-base/nodes/Notion/Notion.node.ts
+++ b/packages/nodes-base/nodes/Notion/Notion.node.ts
@@ -47,6 +47,7 @@ import {
 	databasePageFields,
 	databasePageOperations,
 } from './DatabasePageDescription';
+import { getServers } from 'dns';
 
 export class Notion implements INodeType {
 	description: INodeTypeDescription = {
@@ -158,7 +159,7 @@ export class Notion implements INodeType {
 				const databases = await notionApiRequestAllItems.call(this, 'results', 'POST', `/search`, body);
 				for (const database of databases) {
 					returnData.push({
-						name: database.title[0].plain_text,
+						name: database.title[0]?.plain_text || database.id,
 						value: database.id,
 					});
 				}
@@ -215,8 +216,16 @@ export class Notion implements INodeType {
 				const resource = this.getCurrentNodeParameter('resource') as string;
 				const operation = this.getCurrentNodeParameter('operation') as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				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 }));
+				if (resource === 'databasePage') {
+					if (['multi_select', 'select'].includes(type) && operation === 'getAll') {
+						return (properties[name][type].options)
+							.map((option: IDataObject) => ({ name: option.name, value: option.name }));
+					} else if (['multi_select'].includes(type) && ['create', 'update'].includes(operation)) {
+						return (properties[name][type].options)
+							.map((option: IDataObject) => ({ name: option.name, value: option.name }));
+					}
+				}
+				return (properties[name][type].options).map((option: IDataObject) => ({ name: option.name, value: option.id }));
 			},
 			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
diff --git a/packages/nodes-base/nodes/Notion/notion.svg b/packages/nodes-base/nodes/Notion/notion.svg
index 2fd319930d..8cf8adc1e7 100644
--- a/packages/nodes-base/nodes/Notion/notion.svg
+++ b/packages/nodes-base/nodes/Notion/notion.svg
@@ -1 +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
+<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="12 0.19 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.934L358.186 335.22V198.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/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 8d62b8fc6f..0526a7c2ba 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -51,7 +51,7 @@ export class PagerDuty implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'PagerDuty',
 		name: 'pagerDuty',
-		icon: 'file:pagerDuty.png',
+		icon: 'file:pagerDuty.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/PagerDuty/pagerDuty.png b/packages/nodes-base/nodes/PagerDuty/pagerDuty.png
deleted file mode 100644
index a54f906409..0000000000
Binary files a/packages/nodes-base/nodes/PagerDuty/pagerDuty.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg b/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
new file mode 100644
index 0000000000..f43bdae4cb
--- /dev/null
+++ b/packages/nodes-base/nodes/PagerDuty/pagerDuty.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 56" 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="M6.704 54.434H0v-33.65c0-3.455 1.418-5.544 2.604-6.704 2.63-2.58 6.2-2.656 6.782-2.656h10.546c3.765 0 5.93 1.52 7.117 2.8 2.346 2.553 2.372 5.853 2.32 6.73v12.687c0 3.662-1.496 5.828-2.733 6.988-2.553 2.398-5.93 2.45-6.73 2.424H6.704zm13.46-18.102c.36 0 1.367-.103 1.908-.62.413-.387.62-1.083.62-2.1v-13.02c0-.36-.077-1.315-.593-1.857-.5-.516-1.444-.62-2.166-.62h-10.6c-2.63 0-2.63 1.985-2.63 2.656v15.55zM57.296 0H64v33.677c0 3.455-1.418 5.544-2.604 6.704-2.63 2.58-6.2 2.656-6.782 2.656H44.068c-3.765 0-5.93-1.52-7.117-2.8-2.346-2.553-2.372-5.853-2.32-6.73v-12.67c0-3.662 1.496-5.828 2.733-6.988 2.553-2.398 5.93-2.45 6.73-2.424h13.202zm-13.46 18.117c-.36 0-1.367.103-1.908.62-.413.387-.62 1.083-.62 2.1v13.02c0 .36.077 1.315.593 1.857.5.516 1.444.62 2.166.62h10.598c2.656-.026 2.656-2 2.656-2.682V18.117z" stroke="none" fill="#25c151" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index 2352a7689e..fae5a70ad7 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -98,7 +98,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
 			additionalData: responseData.additional_data,
 			data: responseData.data,
 		};
-	} catch(error) {
+	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index cc95485ab7..1bd42494fb 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -48,7 +48,7 @@ export class Pipedrive implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Pipedrive',
 		name: 'pipedrive',
-		icon: 'file:pipedrive.png',
+		icon: 'file:pipedrive.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
@@ -223,6 +223,11 @@ export class Pipedrive implements INodeType {
 						value: 'getAll',
 						description: 'Get data of all deals',
 					},
+					{
+						name: 'Search',
+						value: 'search',
+						description: 'Search a deal',
+					},
 					{
 						name: 'Update',
 						value: 'update',
@@ -530,6 +535,13 @@ export class Pipedrive implements INodeType {
 						default: 0,
 						description: 'ID of the deal this activity will be associated with',
 					},
+					{
+						displayName: 'Due Date',
+						name: 'due_date',
+						type: 'dateTime',
+						default: '',
+						description: 'Due Date to activity be done YYYY-MM-DD',
+					},
 					{
 						displayName: 'Note',
 						name: 'note',
@@ -544,8 +556,11 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
 						description: 'ID of the organization this activity will be associated with',
 					},
 					{
@@ -558,9 +573,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'User ID',
 						name: 'user_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getUserIds',
+						},
+						default: '',
+						description: 'ID of the active user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
 					},
 					{
 						displayName: 'Custom Properties',
@@ -642,7 +660,6 @@ export class Pipedrive implements INodeType {
 				required: true,
 				description: 'ID of the activity to get.',
 			},
-
 			// ----------------------------------
 			//         activity:update
 			// ----------------------------------
@@ -688,6 +705,13 @@ export class Pipedrive implements INodeType {
 						default: 0,
 						description: 'ID of the deal this activity will be associated with',
 					},
+					{
+						displayName: 'Due Date',
+						name: 'due_date',
+						type: 'dateTime',
+						default: '',
+						description: 'Due Date to activity be done YYYY-MM-DD',
+					},
 					{
 						displayName: 'Done',
 						name: 'done',
@@ -720,8 +744,11 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
 						description: 'ID of the organization this activity will be associated with',
 					},
 					{
@@ -749,9 +776,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'User ID',
 						name: 'user_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getUserIds',
+						},
+						default: '',
+						description: 'ID of the active user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
 					},
 					{
 						displayName: 'Custom Properties',
@@ -858,7 +888,10 @@ export class Pipedrive implements INodeType {
 									{
 										displayName: 'Property Name',
 										name: 'name',
-										type: 'string',
+										type: 'options',
+										typeOptions: {
+											loadOptionsMethod: 'getDealCustomFields',
+										},
 										default: '',
 										description: 'Name of the property to set.',
 									},
@@ -892,8 +925,11 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
 						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
@@ -917,9 +953,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Stage ID',
 						name: 'stage_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the stage this deal will be placed in a pipeline. If omitted, the deal will be placed in the first stage of the default pipeline.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getStageIds',
+						},
+						default: '',
+						description: 'ID of the stage this deal will be placed in a pipeline. If omitted, the deal will be placed in the first stage of the default pipeline. (PIPELINE > STAGE)',
 					},
 					{
 						displayName: 'Status',
@@ -949,9 +988,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'User ID',
 						name: 'user_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the user who will be marked as the owner of this deal. If omitted, the authorized user ID will be used.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getUserIds',
+						},
+						default: '',
+						description: 'ID of the active user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
 					},
 					{
 						displayName: 'Value',
@@ -1109,9 +1151,12 @@ export class Pipedrive implements INodeType {
 									{
 										displayName: 'Property Name',
 										name: 'name',
-										type: 'string',
+										type: 'options',
+										typeOptions: {
+											loadOptionsMethod: 'getDealCustomFields',
+										},
 										default: '',
-										description: 'Name of the property to set.',
+										description: 'Name of the custom field to set.',
 									},
 									{
 										displayName: 'Property Value',
@@ -1124,6 +1169,16 @@ export class Pipedrive implements INodeType {
 							},
 						],
 					},
+					{
+						displayName: 'User ID',
+						name: 'user_id',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getUserIds',
+						},
+						default: '',
+						description: 'ID of the active user whom the activity will be assigned to. If omitted, the activity will be assigned to the authorized user.',
+					},
 					{
 						displayName: 'Label',
 						name: 'label',
@@ -1143,8 +1198,11 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
 						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
@@ -1168,9 +1226,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Stage ID',
 						name: 'stage_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the stage this deal will be placed in a pipeline. If omitted, the deal will be placed in the first stage of the default pipeline.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getStageIds',
+						},
+						default: '',
+						description: 'ID of the stage this deal will be placed in a pipeline. If omitted, the deal will be placed in the first stage of the default pipeline. (PIPELINE > STAGE)',
 					},
 					{
 						displayName: 'Status',
@@ -1230,7 +1291,164 @@ export class Pipedrive implements INodeType {
 					},
 				],
 			},
-
+			// ----------------------------------
+			//         deal:search
+			// ----------------------------------
+			{
+				displayName: 'Term',
+				name: 'term',
+				type: 'string',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'search',
+						],
+						resource: [
+							'deal',
+						],
+					},
+				},
+				default: '',
+				description: 'The search term to look for. Minimum 2 characters (or 1 if using exact_match).',
+			},
+			{
+				displayName: 'Exact Match',
+				name: 'exactMatch',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						operation: [
+							'search',
+						],
+						resource: [
+							'deal',
+						],
+					},
+				},
+				default: false,
+				description: 'When enabled, only full exact matches against the given term are returned. It is not case sensitive.',
+			},
+			{
+				displayName: 'Return All',
+				name: 'returnAll',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						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: {
+						operation: [
+							'search',
+						],
+						returnAll: [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					minValue: 1,
+					maxValue: 500,
+				},
+				default: 100,
+				description: 'How many results to return.',
+			}, {
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: [
+							'search',
+						],
+						resource: [
+							'deal',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Include Fields',
+						name: 'includeFields',
+						type: 'string',
+						default: '',
+						description: 'Supports including optional fields in the results which are not provided by default. Example: deal.cc_email',
+					},
+					{
+						displayName: 'Organization ID',
+						name: 'organizationId',
+						type: 'string',
+						default: '',
+						description: 'Will filter Deals by the provided Organization ID.',
+					},
+					{
+						displayName: 'Person ID',
+						name: 'personId',
+						type: 'string',
+						default: '',
+						description: 'Will filter Deals by the provided Person ID.',
+					},
+					{
+						displayName: 'Search Fields',
+						name: 'fields',
+						type: 'multiOptions',
+						options: [
+							{
+								name: 'Custom Fields',
+								value: 'custom_fields',
+							},
+							{
+								name: 'Notes',
+								value: 'notes',
+							},
+							{
+								name: 'Title',
+								value: 'title',
+							},
+						],
+						default: [
+							'custom_fields',
+							'notes',
+							'title',
+						],
+						description: 'A comma-separated string array. The fields to perform the search from. Defaults to all of them.',
+					},
+					{
+						displayName: 'Status',
+						name: 'status',
+						type: 'options',
+						options: [
+							{
+								name: 'Open',
+								value: 'open',
+							},
+							{
+								name: 'Won',
+								value: 'won',
+							},
+							{
+								name: 'Lost',
+								value: 'lost',
+							},
+						],
+						default: 'open',
+						description: 'The status of the deal. If not provided it will automatically be set to "open".',
+					},
+				],
+			},
 
 
 			// ----------------------------------
@@ -1294,9 +1512,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this file will be associated with.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
+						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
 						displayName: 'Person ID',
@@ -1429,47 +1650,50 @@ export class Pipedrive implements INodeType {
 				},
 				description: 'The content of the note to create',
 			},
-			{
-				displayName: 'Additional Fields',
-				name: 'additionalFields',
-				type: 'collection',
-				placeholder: 'Add Field',
-				displayOptions: {
-					show: {
-						operation: [
-							'create',
-							'getAll',
-						],
-						resource: [
-							'note',
-						],
-					},
-				},
-				default: {},
-				options: [
-					{
-						displayName: 'Deal ID',
-						name: 'deal_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the deal this note will be associated with',
-					},
-					{
-						displayName: 'Organization ID',
-						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this note will be associated with.',
-					},
-					{
-						displayName: 'Person ID',
-						name: 'person_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the person this note will be associated with.',
-					},
-				],
-			},
+			// {
+			// 	displayName: 'Additional Fields',
+			// 	name: 'additionalFields',
+			// 	type: 'collection',
+			// 	placeholder: 'Add Field',
+			// 	displayOptions: {
+			// 		show: {
+			// 			operation: [
+			// 				'create',
+			// 				'getAll',
+			// 			],
+			// 			resource: [
+			// 				'note',
+			// 			],
+			// 		},
+			// 	},
+			// 	default: {},
+			// 	options: [
+			// 		{
+			// 			displayName: 'Deal ID',
+			// 			name: 'deal_id',
+			// 			type: 'number',
+			// 			default: 0,
+			// 			description: 'ID of the deal this note will be associated with',
+			// 		},
+			// 		{
+			// 			displayName: 'Organization ID',
+			// 			name: 'org_id',
+			// 			type: 'options',
+			// 			typeOptions: {
+			// 				loadOptionsMethod: 'getOrganizationIds',
+			// 			},
+			// 			default: '',
+			// 			description: 'ID of the organization this deal will be associated with.',
+			// 		},
+			// 		{
+			// 			displayName: 'Person ID',
+			// 			name: 'person_id',
+			// 			type: 'number',
+			// 			default: 0,
+			// 			description: 'ID of the person this note will be associated with.',
+			// 		},
+			// 	],
+			// },
 
 			// ----------------------------------
 			//         note:delete
@@ -1573,9 +1797,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this note will be associated with.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
+						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
 						displayName: 'Person ID',
@@ -1913,9 +2140,12 @@ export class Pipedrive implements INodeType {
 									{
 										displayName: 'Property Name',
 										name: 'name',
-										type: 'string',
+										type: 'options',
+										typeOptions: {
+											loadOptionsMethod: 'getPersonCustomFields',
+										},
 										default: '',
-										description: 'Name of the property to set.',
+										description: 'Name of the custom field to set.',
 									},
 									{
 										displayName: 'Property Value',
@@ -1950,9 +2180,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this person will belong to.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
+						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
 						displayName: 'Phone',
@@ -2085,9 +2318,12 @@ export class Pipedrive implements INodeType {
 									{
 										displayName: 'Property Name',
 										name: 'name',
-										type: 'string',
+										type: 'options',
+										typeOptions: {
+											loadOptionsMethod: 'getPersonCustomFields',
+										},
 										default: '',
-										description: 'Name of the property to set.',
+										description: 'Name of the custom field to set.',
 									},
 									{
 										displayName: 'Property Value',
@@ -2129,9 +2365,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this person will belong to.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
+						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
 						displayName: 'Phone',
@@ -2220,7 +2459,6 @@ export class Pipedrive implements INodeType {
 					show: {
 						operation: [
 							'getAll',
-							'search',
 						],
 					},
 				},
@@ -2235,7 +2473,6 @@ export class Pipedrive implements INodeType {
 					show: {
 						operation: [
 							'getAll',
-							'search',
 						],
 						returnAll: [
 							false,
@@ -2397,9 +2634,12 @@ export class Pipedrive implements INodeType {
 					{
 						displayName: 'Organization ID',
 						name: 'org_id',
-						type: 'number',
-						default: 0,
-						description: 'ID of the organization this note will be associated with.',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getOrganizationIds',
+						},
+						default: '',
+						description: 'ID of the organization this deal will be associated with.',
 					},
 					{
 						displayName: 'Person ID',
@@ -2410,11 +2650,243 @@ export class Pipedrive implements INodeType {
 					},
 				],
 			},
+			// ----------------------------------
+			//         activity:getAll
+			// ----------------------------------
+			{
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				placeholder: 'Add Field',
+				displayOptions: {
+					show: {
+						operation: [
+							'getAll',
+						],
+						resource: [
+							'activity',
+						],
+					},
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Done',
+						name: 'done',
+						type: 'boolean',
+						default: false,
+						description: 'Whether the Activity is done or not. 0 = Not done, 1 = Done. If omitted returns both Done and Not done activities.',
+					},
+					{
+						displayName: 'End Date',
+						name: 'end_date',
+						type: 'dateTime',
+						default: '',
+						description: 'Use the Activity due date where you wish to stop fetching Activities from. Insert due date in YYYY-MM-DD format.',
+					},
+					{
+						displayName: 'Filter ID ',
+						name: 'filterId',
+						type: 'string',
+						default: '',
+						description: 'The ID of the Filter to use (will narrow down results if used together with user_id parameter)',
+					},
+					{
+						displayName: 'Star Date',
+						name: 'start_date',
+						type: 'dateTime',
+						default: '',
+						description: 'Use the Activity due date where you wish to begin fetching Activities from. Insert due date in YYYY-MM-DD format.',
+					},
+					{
+						displayName: 'Type',
+						name: 'type',
+						type: 'multiOptions',
+						typeOptions: {
+							loadOptionsMethod: 'getActivityTypes',
+						},
+						default: [],
+						description: 'Type of the Activity.',
+					},
+					{
+						displayName: 'User ID',
+						name: 'user_id',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getUserIds',
+						},
+						default: '',
+						description: 'The ID of the User whose Activities will be fetched. If omitted, the User associated with the API token will be used. If 0, Activities for all company Users will be fetched based on the permission sets.',
+					},
+				],
+			},
 		],
 	};
 
 	methods = {
 		loadOptions: {
+			// Get all Organizations to display them to user so that he can
+			// select them easily
+			async getActivityTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/activityTypes', {});
+				for (const activity of data) {
+					returnData.push({
+						name: activity.name,
+						value: activity.key_string,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all Organizations to display them to user so that he can
+			// select them easily
+			async getOrganizationIds(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/organizations', {});
+				for (const org of data) {
+					returnData.push({
+						name: org.name,
+						value: org.id,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all Organizations to display them to user so that he can
+			// select them easily
+			async getUserIds(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/users', {});
+				for (const user of data) {
+					if (user.active_flag === true) {
+						returnData.push({
+							name: user.name,
+							value: user.id,
+						});
+					}
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all Stages to display them to user so that he can
+			// select them easily
+			async getStageIds(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/stages', {});
+				for (const stage of data) {
+					returnData.push({
+						name: `${stage.pipeline_name} > ${stage.name}`,
+						value: stage.id,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the Organization Custom Fields to display them to user so that he can
+			// select them easily
+			async getOrganizationCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/organizationFields', {});
+				for (const field of data) {
+					if (field.key.length === 40) {
+						returnData.push({
+							name: field.name,
+							value: field.key,
+						});
+					}
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the Deal Custom Fields to display them to user so that he can
+			// select them easily
+			async getDealCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/dealFields', {});
+				for (const field of data) {
+					if (field.key.length === 40) {
+						returnData.push({
+							name: field.name,
+							value: field.key,
+						});
+					}
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the Person Custom Fields to display them to user so that he can
+			// select them easily
+			async getPersonCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await pipedriveApiRequest.call(this, 'GET', '/personFields', {});
+				for (const field of data) {
+					if (field.key.length === 40) {
+						returnData.push({
+							name: field.name,
+							value: field.key,
+						});
+					}
+				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
+				return returnData;
+			},
 			// Get all the filters to display them to user so that he can
 			// select them easily
 			async getFilters(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
@@ -2428,6 +2900,15 @@ export class Pipedrive implements INodeType {
 						value: filterId,
 					});
 				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
 				return returnData;
 			},
 			// Get all the person labels to display them to user so that he can
@@ -2448,6 +2929,15 @@ export class Pipedrive implements INodeType {
 						}
 					}
 				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
 				if (operation === 'update') {
 					returnData.push({
 						name: 'No Label',
@@ -2474,6 +2964,15 @@ export class Pipedrive implements INodeType {
 						}
 					}
 				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
 				if (operation === 'update') {
 					returnData.push({
 						name: 'No Label',
@@ -2500,6 +2999,15 @@ export class Pipedrive implements INodeType {
 						}
 					}
 				}
+
+				returnData.sort((a, b) => {
+					const aName = a.name.toLowerCase();
+					const bName = b.name.toLowerCase();
+					if (aName < bName) { return -1; }
+					if (aName > bName) { return 1; }
+					return 0;
+				});
+
 				if (operation === 'update') {
 					returnData.push({
 						name: 'No Label',
@@ -2606,6 +3114,13 @@ export class Pipedrive implements INodeType {
 						qs.limit = this.getNodeParameter('limit', i) as number;
 					}
 
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					addAdditionalFields(qs, additionalFields);
+
+					if (qs.type) {
+						qs.type = (qs.type as string[]).join(',');
+					}
+
 					endpoint = `/activities`;
 
 				} else if (operation === 'update') {
@@ -2695,6 +3210,43 @@ export class Pipedrive implements INodeType {
 					if (body.label === 'null') {
 						body.label = null;
 					}
+				} else if (operation === 'search') {
+					// ----------------------------------
+					//         deal:search
+					// ----------------------------------
+
+					requestMethod = 'GET';
+
+					qs.term = this.getNodeParameter('term', i) as string;
+					returnAll = this.getNodeParameter('returnAll', i) as boolean;
+					qs.exact_match = this.getNodeParameter('exactMatch', i) as boolean;
+					if (returnAll === false) {
+						qs.limit = this.getNodeParameter('limit', i) as number;
+					}
+
+					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+					if (additionalFields.fields) {
+						qs.fields = (additionalFields.fields as string[]).join(',');
+					}
+
+					if (additionalFields.organizationId) {
+						qs.organization_id = parseInt(additionalFields.organizationId as string, 10);
+					}
+
+					if (additionalFields.includeFields) {
+						qs.include_fields = additionalFields.includeFields as string;
+					}
+
+					if (additionalFields.personId) {
+						qs.person_id = parseInt(additionalFields.personId as string, 10);
+					}
+					if (additionalFields.status) {
+						qs.status = additionalFields.status as string;
+					}
+
+					endpoint = `/deals/search`;
+
 				}
 			} else if (resource === 'file') {
 				if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index eb06c7aa9d..eeadedf403 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -40,7 +40,7 @@ export class PipedriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Pipedrive Trigger',
 		name: 'pipedriveTrigger',
-		icon: 'file:pipedrive.png',
+		icon: 'file:pipedrive.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Starts the workflow when Pipedrive events occur.',
diff --git a/packages/nodes-base/nodes/Pipedrive/pipedrive.png b/packages/nodes-base/nodes/Pipedrive/pipedrive.png
deleted file mode 100644
index 11de0090ff..0000000000
Binary files a/packages/nodes-base/nodes/Pipedrive/pipedrive.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Pipedrive/pipedrive.svg b/packages/nodes-base/nodes/Pipedrive/pipedrive.svg
new file mode 100644
index 0000000000..281d3fd12e
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/pipedrive.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="a" maskUnits="userSpaceOnUse" x="0" y="0" width="32" height="32" fill="#26292C"><path d="M2.737 0h26.526A2.737 2.737 0 0132 2.737v26.526A2.737 2.737 0 0129.263 32H2.737A2.737 2.737 0 010 29.263V2.737A2.737 2.737 0 012.737 0z"/></mask><g mask="url(#a)" fill="#26292C"><path d="M2.737 0h26.526A2.737 2.737 0 0132 2.737v26.526A2.737 2.737 0 0129.263 32H2.737A2.737 2.737 0 010 29.263V2.737A2.737 2.737 0 012.737 0z"/></g><mask id="b" maskUnits="userSpaceOnUse" x="7" y="4" width="18" height="24" fill="#26292C"><path d="M13.335 13.177c0 2.142 1.087 4.454 3.48 4.454 1.773 0 3.567-1.385 3.567-4.486 0-2.719-1.41-4.544-3.509-4.544-1.71 0-3.538 1.202-3.538 4.576zm4.38-8.545c4.29 0 7.174 3.397 7.174 8.454 0 4.977-3.038 8.452-7.381 8.452-2.071 0-3.398-.887-4.091-1.53.005.153.008.324.008.506v6.75H8.982V9.28c0-.262-.084-.344-.343-.344H7.111V4.997h3.728c1.717 0 2.156.874 2.24 1.547.697-.78 2.141-1.912 4.637-1.912z"/></mask><g mask="url(#b)" fill="#26292C"><path d="M13.335 13.177c0 2.142 1.087 4.454 3.48 4.454 1.773 0 3.567-1.385 3.567-4.486 0-2.719-1.41-4.544-3.509-4.544-1.71 0-3.538 1.202-3.538 4.576zm4.38-8.545c4.29 0 7.174 3.397 7.174 8.454 0 4.977-3.038 8.452-7.381 8.452-2.071 0-3.398-.887-4.091-1.53.005.153.008.324.008.506v6.75H8.982V9.28c0-.262-.084-.344-.343-.344H7.111V4.997h3.728c1.717 0 2.156.874 2.24 1.547.697-.78 2.141-1.912 4.637-1.912z" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index c549bfab14..30880f3f8d 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -15,7 +15,7 @@ export class Postgres implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Postgres',
 		name: 'postgres',
-		icon: 'file:postgres.png',
+		icon: 'file:postgres.svg',
 		group: ['input'],
 		version: 1,
 		description: 'Gets, add and update data in Postgres.',
diff --git a/packages/nodes-base/nodes/Postgres/postgres.png b/packages/nodes-base/nodes/Postgres/postgres.png
deleted file mode 100644
index 4cc4096293..0000000000
Binary files a/packages/nodes-base/nodes/Postgres/postgres.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Postgres/postgres.svg b/packages/nodes-base/nodes/Postgres/postgres.svg
new file mode 100644
index 0000000000..9f4598c180
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/postgres.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 79 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"><g stroke="none" fill-rule="nonzero"><path d="M77.391 47.922c-.466-1.412-1.688-2.396-3.268-2.632-.745-.111-1.598-.064-2.608.144-1.76.363-3.065.501-4.018.528 3.596-6.072 6.521-12.997 8.204-19.515 2.722-10.54 1.268-15.341-.432-17.513C70.77 3.185 64.206.097 56.287.002c-4.224-.052-7.933.782-9.867 1.382a36.738 36.738 0 00-5.77-.528c-3.809-.061-7.174.77-10.05 2.476a45.934 45.934 0 00-7.098-1.782C16.561.411 10.968 1.299 6.876 4.19 1.922 7.689-.375 13.77.05 22.262c.135 2.696 1.643 10.9 4.018 18.68 1.365 4.472 2.82 8.185 4.326 11.038 2.135 4.046 4.419 6.428 6.984 7.284 1.438.479 4.049.814 6.797-1.473a5.94 5.94 0 001.429 1.23c.783.494 1.74.897 2.696 1.136 3.446.862 6.674.646 9.427-.561l.041 1.362.06 1.899c.163 4.064.44 7.223 1.259 9.434.045.122.105.307.169.503.409 1.251 1.092 3.346 2.83 4.987 1.8 1.699 3.978 2.22 5.972 2.22 1 0 1.955-.131 2.792-.311 2.984-.639 6.373-1.614 8.824-5.104 2.318-3.3 3.444-8.27 3.648-16.101l.074-.634.048-.414.546.048.141.01c3.039.138 6.755-.506 9.037-1.566 1.803-.837 7.582-3.888 6.221-8.007" fill="#000"/><path d="M72.195 48.723c-9.036 1.864-9.657-1.195-9.657-1.195 9.541-14.157 13.529-32.127 10.087-36.525C63.235-.994 46.981 4.68 46.71 4.827l-.087.016c-1.785-.371-3.783-.591-6.029-.628-4.089-.067-7.19 1.072-9.544 2.857 0 0-28.995-11.945-27.647 15.023.287 5.737 8.223 43.41 17.689 32.031 3.46-4.161 6.803-7.679 6.803-7.679 1.66 1.103 3.648 1.666 5.732 1.463l.162-.137a6.336 6.336 0 00.065 1.62c-2.439 2.725-1.722 3.203-6.597 4.206-4.933 1.017-2.035 2.826-.143 3.299 2.294.574 7.6 1.386 11.185-3.633l-.143.573c.956.765 1.626 4.978 1.514 8.797s-.188 6.441.565 8.489 1.503 6.656 7.912 5.282c5.355-1.148 8.13-4.121 8.516-9.081.274-3.526.894-3.005.933-6.158l.497-1.493c.573-4.78.091-6.322 3.39-5.605l.802.07c2.428.11 5.606-.391 7.471-1.257 4.016-1.864 6.398-4.976 2.438-4.158" fill="#336791"/><path d="M32.747 24.66c-.814-.113-1.552-.008-1.925.274a.702.702 0 00-.292.47c-.047.336.188.707.333.898.409.542 1.006.915 1.598.997a1.86 1.86 0 00.256.018c.986 0 1.883-.768 1.962-1.335.099-.71-.932-1.183-1.931-1.322m26.975.022c-.078-.556-1.068-.715-2.007-.584s-1.848.554-1.772 1.112c.061.434.844 1.174 1.771 1.174.078 0 .157-.005.237-.016.619-.086 1.073-.479 1.288-.705.329-.345.518-.73.484-.98m15.477 23.828c-.345-1.042-1.453-1.377-3.296-.997-5.471 1.129-7.43.347-8.073-.127 4.252-6.478 7.75-14.308 9.637-21.614.894-3.461 1.388-6.675 1.428-9.294.045-2.876-.445-4.988-1.455-6.279-4.072-5.203-10.048-7.994-17.283-8.07-4.973-.056-9.175 1.217-9.99 1.575a24.866 24.866 0 00-5.622-.722c-3.734-.06-6.961.834-9.633 2.655a43.02 43.02 0 00-7.828-2.052c-6.342-1.021-11.381-.248-14.978 2.3-4.291 3.04-6.272 8.475-5.888 16.152.129 2.583 1.601 10.529 3.923 18.139 3.057 10.016 6.38 15.686 9.877 16.852a4.42 4.42 0 001.402.232c1.276 0 2.839-.575 4.466-2.531a160.99 160.99 0 016.156-6.966 9.91 9.91 0 004.429 1.191l.01.121c-.31.368-.564.69-.781.965-1.07 1.358-1.293 1.641-4.738 2.351-.98.202-3.582.738-3.62 2.563-.041 1.993 3.076 2.83 3.431 2.919 1.238.31 2.43.463 3.568.463 2.766 0 5.2-.909 7.145-2.668-.06 7.106.236 14.107 1.089 16.241.699 1.746 2.406 6.014 7.798 6.014.791 0 1.662-.092 2.62-.297 5.627-1.207 8.071-3.694 9.016-9.177.506-2.93 1.374-9.928 1.782-13.682.862.269 1.971.392 3.17.392 2.501 0 5.387-.531 7.197-1.372 2.033-.944 5.702-3.261 5.037-5.274zM61.8 23.147c-.019 1.108-.171 2.114-.333 3.164-.174 1.129-.354 2.297-.399 3.715-.045 1.379.128 2.814.294 4.2.337 2.801.682 5.685-.655 8.531a11.064 11.064 0 01-.592-1.218c-.166-.403-.527-1.05-1.027-1.946-1.944-3.487-6.497-11.652-4.167-14.984.694-.992 2.456-2.011 6.879-1.463zM56.439 4.374c6.482.143 11.609 2.568 15.24 7.207 2.784 3.558-.282 19.749-9.158 33.716l-.269-.339-.112-.14c2.294-3.788 1.845-7.536 1.446-10.859-.164-1.364-.319-2.652-.28-3.861.041-1.283.21-2.382.374-3.446.202-1.311.407-2.667.35-4.265a1.77 1.77 0 00.037-.601c-.144-1.533-1.894-6.12-5.462-10.273-1.951-2.271-4.797-4.813-8.682-6.527a29.288 29.288 0 016.515-.612zM20.167 53.298c-1.793 2.155-3.031 1.742-3.438 1.607-2.653-.885-5.73-6.491-8.444-15.382-2.348-7.693-3.72-15.428-3.829-17.597-.343-6.86 1.32-11.641 4.943-14.21 5.896-4.181 15.589-1.679 19.484-.409l-.17.163c-6.391 6.455-6.24 17.483-6.224 18.157a21.6 21.6 0 00.051 1.135c.11 1.855.315 5.307-.232 9.217-.508 3.633.612 7.189 3.072 9.756.255.266.521.515.795.75a164.06 164.06 0 00-6.008 6.814zm6.83-9.113c-1.983-2.069-2.884-4.947-2.471-7.896.577-4.13.364-7.727.25-9.659l-.039-.694c.934-.828 5.261-3.146 8.346-2.439 1.408.323 2.266 1.281 2.623 2.931 1.846 8.539.244 12.098-1.043 14.957-.265.589-.516 1.146-.73 1.722l-.166.445c-.42 1.126-.811 2.173-1.053 3.167-2.108-.006-4.159-.907-5.718-2.534zm.324 11.516a4.98 4.98 0 01-1.494-.642c.271-.128.754-.301 1.591-.474 4.052-.834 4.678-1.423 6.045-3.158.313-.398.669-.849 1.16-1.398.733-.821 1.068-.682 1.676-.43.493.204.972.821 1.167 1.501.092.321.195.93-.143 1.404-2.855 3.997-7.015 3.946-10.003 3.198zm21.207 19.735c-4.957 1.062-6.713-1.467-7.869-4.359-.747-1.867-1.113-10.285-.853-19.582a1.135 1.135 0 00-.048-.356 4.64 4.64 0 00-.139-.657c-.387-1.353-1.331-2.484-2.462-2.953-.45-.186-1.275-.528-2.267-.274.212-.871.578-1.855.976-2.921l.167-.448c.188-.505.423-1.029.673-1.583 1.347-2.992 3.192-7.091 1.19-16.35-.75-3.468-3.254-5.161-7.05-4.768-2.276.235-4.358 1.154-5.396 1.68-.223.113-.428.222-.618.329.29-3.494 1.385-10.024 5.481-14.156 2.579-2.601 6.014-3.886 10.199-3.817 8.246.135 13.534 4.367 16.518 7.893 2.571 3.039 3.964 6.1 4.52 7.751-4.179-.425-7.022.4-8.463 2.46-3.135 4.481 1.715 13.178 4.046 17.358.427.766.796 1.428.912 1.709.759 1.839 1.742 3.067 2.459 3.964.22.275.433.541.596.774-1.266.365-3.539 1.208-3.332 5.422-.167 2.115-1.356 12.016-1.959 15.514-.797 4.621-2.497 6.343-7.279 7.368zm20.693-23.68c-1.294.601-3.46 1.052-5.518 1.148-2.273.107-3.43-.255-3.702-.477-.128-2.626.85-2.901 1.884-3.191.163-.046.321-.09.474-.144a4.17 4.17 0 00.313.23c1.827 1.206 5.085 1.336 9.685.386l.05-.01c-.62.58-1.682 1.359-3.187 2.058z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index a4db2f278e..19fc013f7c 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -7,6 +7,7 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 	NodeApiError,
 	NodeOperationError,
 } from 'n8n-workflow';
@@ -331,7 +332,7 @@ export class RabbitMQ implements INodeType {
 				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(queuePromises);
 
-				promisesResponses.forEach((response: IDataObject) => {
+				promisesResponses.forEach((response: JsonObject) => {
 					if (response!.status !== 'fulfilled') {
 
 						if (this.continueOnFail() !== true) {
@@ -396,7 +397,7 @@ export class RabbitMQ implements INodeType {
 				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(exchangePromises);
 
-				promisesResponses.forEach((response: IDataObject) => {
+				promisesResponses.forEach((response: JsonObject) => {
 					if (response!.status !== 'fulfilled') {
 
 						if (this.continueOnFail() !== true) {
diff --git a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
index 8399018e2d..6b03793360 100644
--- a/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AccountDescription.ts
@@ -25,6 +25,11 @@ export const accountOperations = [
 				value: 'create',
 				description: 'Create an account',
 			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new account, or update the current one if it already exists (upsert)',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -61,6 +66,48 @@ export const accountFields = [
 	/* -------------------------------------------------------------------------- */
 	/*                                account:create                              */
 	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Match Against',
+		name: 'externalId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getExternalIdFields',
+			loadOptionsDependsOn: [
+				'resource',
+			],
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `The field to check to see if the account already exists`,
+	},
+	{
+		displayName: 'Value to Match',
+		name: 'externalIdValue',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `If this value exists in the 'match against' field, update the account. Otherwise create a new one`,
+	},
 	{
 		displayName: 'Name',
 		name: 'name',
@@ -74,6 +121,7 @@ export const accountFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -92,6 +140,7 @@ export const accountFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
diff --git a/packages/nodes-base/nodes/Salesforce/AccountInterface.ts b/packages/nodes-base/nodes/Salesforce/AccountInterface.ts
index af0468d93d..eb5bde59fc 100644
--- a/packages/nodes-base/nodes/Salesforce/AccountInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/AccountInterface.ts
@@ -1,4 +1,6 @@
 export interface IAccount {
+	// tslint:disable-next-line: no-any
+	[key: string]: any;
 	Name?: string;
 	Fax?: string;
 	Type?: string;
diff --git a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
index 9ea5454ef1..fc2ed3509a 100644
--- a/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/AttachmentDescription.ts
@@ -1,4 +1,6 @@
-import { INodeProperties } from 'n8n-workflow';
+import { 
+	INodeProperties,
+} from 'n8n-workflow';
 
 export const attachmentOperations = [
 	{
diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index 68a9db7462..3ec78b6e11 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -30,6 +30,11 @@ export const contactOperations = [
 				value: 'create',
 				description: 'Create a contact',
 			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new contact, or update the current one if it already exists (upsert)',
+			},
 			{
 				name: 'Delete',
 				value: 'delete',
@@ -66,6 +71,48 @@ export const contactFields = [
 	/* -------------------------------------------------------------------------- */
 	/*                                contact:create                              */
 	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Match Against',
+		name: 'externalId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getExternalIdFields',
+			loadOptionsDependsOn: [
+				'resource',
+			],
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `The field to check to see if the contact already exists`,
+	},
+	{
+		displayName: 'Value to Match',
+		name: 'externalIdValue',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `If this value exists in the 'match against' field, update the contact. Otherwise create a new one`,
+	},
 	{
 		displayName: 'Last Name',
 		name: 'lastname',
@@ -79,6 +126,7 @@ export const contactFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -97,6 +145,7 @@ export const contactFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -642,7 +691,7 @@ export const contactFields = [
 	},
 
 	/* -------------------------------------------------------------------------- */
-	/*                                  contact:get                                  */
+	/*                                  contact:get                               */
 	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
diff --git a/packages/nodes-base/nodes/Salesforce/ContactInterface.ts b/packages/nodes-base/nodes/Salesforce/ContactInterface.ts
index 2a3a9784bc..bb02d3b9de 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactInterface.ts
@@ -1,4 +1,6 @@
 export interface IContact {
+	// tslint:disable-next-line: no-any
+	[key: string]: any;
 	LastName?: string;
 	Fax?: string;
 	Email?: string;
diff --git a/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts b/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts
index 1e55cf54a3..35f6c7f32e 100644
--- a/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/CustomObjectDescription.ts
@@ -20,6 +20,11 @@ export const customObjectOperations = [
 				value: 'create',
 				description: 'Create a custom object record',
 			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
 			{
 				name: 'Get',
 				value: 'get',
@@ -67,11 +72,54 @@ export const customObjectFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
 		description: 'Name of the custom object.',
 	},
+	{
+		displayName: 'Match Against',
+		name: 'externalId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getExternalIdFields',
+			loadOptionsDependsOn: [
+				'customObject',
+			],
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `The field to check to see if the object already exists`,
+	},
+	{
+		displayName: 'Value to Match',
+		name: 'externalIdValue',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'customObject',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `If this value exists in the 'match against' field, update the object. Otherwise create a new one`,
+	},
 	{
 		displayName: 'Fields',
 		name: 'customFieldsUi',
@@ -87,6 +135,7 @@ export const customObjectFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 2bb553dfa1..cff54682c1 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -30,6 +30,11 @@ export const leadOperations = [
 				value: 'create',
 				description: 'Create a lead',
 			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new lead, or update the current one if it already exists (upsert)',
+			},
 			{
 				name: 'Delete',
 				value: 'delete',
@@ -66,6 +71,48 @@ export const leadFields = [
 	/* -------------------------------------------------------------------------- */
 	/*                                lead:create                                 */
 	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Match Against',
+		name: 'externalId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getExternalIdFields',
+			loadOptionsDependsOn: [
+				'resource',
+			],
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `The field to check to see if the lead already exists`,
+	},
+	{
+		displayName: 'Value to Match',
+		name: 'externalIdValue',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `If this value exists in the 'match against' field, update the lead. Otherwise create a new one`,
+	},
 	{
 		displayName: 'Company',
 		name: 'company',
@@ -79,6 +126,7 @@ export const leadFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -97,6 +145,7 @@ export const leadFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -115,6 +164,7 @@ export const leadFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
diff --git a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
index 02196961ed..2c84fc5852 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
@@ -1,4 +1,6 @@
 export interface ILead {
+	// tslint:disable-next-line: no-any
+	[key:  string]: any;
 	Company?: string;
 	LastName?: string;
 	Email?: string;
diff --git a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
index 4a693954f6..95373a84b2 100644
--- a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
@@ -25,6 +25,11 @@ export const opportunityOperations = [
 				value: 'create',
 				description: 'Create an opportunity',
 			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new opportunity, or update the current one if it already exists (upsert)',
+			},
 			{
 				name: 'Delete',
 				value: 'delete',
@@ -61,6 +66,48 @@ export const opportunityFields = [
 	/* -------------------------------------------------------------------------- */
 	/*                                opportunity:create                          */
 	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Match Against',
+		name: 'externalId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getExternalIdFields',
+			loadOptionsDependsOn: [
+				'resource',
+			],
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'opportunity',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `The field to check to see if the opportunity already exists`,
+	},
+	{
+		displayName: 'Value to Match',
+		name: 'externalIdValue',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'opportunity',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		description: `If this value exists in the 'match against' field, update the opportunity. Otherwise create a new one`,
+	},
 	{
 		displayName: 'Name',
 		name: 'name',
@@ -74,6 +121,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -92,6 +140,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -113,6 +162,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
@@ -131,6 +181,7 @@ export const opportunityFields = [
 				],
 				operation: [
 					'create',
+					'upsert',
 				],
 			},
 		},
diff --git a/packages/nodes-base/nodes/Salesforce/OpportunityInterface.ts b/packages/nodes-base/nodes/Salesforce/OpportunityInterface.ts
index 4155587820..011068fa62 100644
--- a/packages/nodes-base/nodes/Salesforce/OpportunityInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/OpportunityInterface.ts
@@ -1,4 +1,6 @@
 export interface IOpportunity {
+	// tslint:disable-next-line: no-any
+	[key: string]: any;
 	Name?: string;
 	StageName?: string;
 	CloseDate?: string;
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index dee9fffe5b..9afccd687f 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -390,7 +390,7 @@ export class Salesforce implements INodeType {
 			},
 			// Get all the lead custom fields to display them to user so that he can
 			// select them easily
-			async getCustomFields(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
@@ -409,6 +409,26 @@ export class Salesforce implements INodeType {
 				sortOptions(returnData);
 				return returnData;
 			},
+			// Get all the external id fields to display them to user so that he can
+			// select them easily
+			async getExternalIdFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				let resource = this.getCurrentNodeParameter('resource') as string;
+				resource = (resource === 'customObject') ? this.getCurrentNodeParameter('customObject') as string : resource;
+				const { fields } = await salesforceApiRequest.call(this, 'GET', `/sobjects/${resource}/describe`);
+				for (const field of fields) {
+					if (field.externalId === true || field.idLookup === true) {
+						const fieldName = field.label;
+						const fieldId = field.name;
+						returnData.push({
+							name: fieldName,
+							value: fieldId,
+						});
+					}
+				}
+				sortOptions(returnData);
+				return returnData;
+			},
 			// Get all the accounts to display them to user so that he can
 			// select them easily
 			async getAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
@@ -932,7 +952,7 @@ export class Salesforce implements INodeType {
 		for (let i = 0; i < items.length; i++) {
 			if (resource === 'lead') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/post-lead
-				if (operation === 'create') {
+				if (operation === 'create' || operation === 'upsert') {
 					const company = this.getNodeParameter('company', i) as string;
 					const lastname = this.getNodeParameter('lastname', i) as string;
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
@@ -1015,7 +1035,18 @@ export class Salesforce implements INodeType {
 							}
 						}
 					}
-					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/lead', body);
+					let endpoint = '/sobjects/lead';
+					let method = 'POST';
+					if (operation === 'upsert') {
+						method = 'PATCH';
+						const externalId = this.getNodeParameter('externalId', 0) as string;
+						const externalIdValue = this.getNodeParameter('externalIdValue', i) as string;
+						endpoint = `/sobjects/lead/${externalId}/${externalIdValue}`;
+						if (body[externalId] !== undefined) {
+							delete body[externalId];
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, method, endpoint, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/patch-lead-id
 				if (operation === 'update') {
@@ -1180,9 +1211,9 @@ export class Salesforce implements INodeType {
 			}
 			if (resource === 'contact') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/post-contact
-				if (operation === 'create') {
-					const lastname = this.getNodeParameter('lastname', i) as string;
+				if (operation === 'create' || operation === 'upsert') {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const lastname = this.getNodeParameter('lastname', i) as string;
 					const body: IContact = {
 						LastName: lastname,
 					};
@@ -1285,7 +1316,18 @@ export class Salesforce implements INodeType {
 							}
 						}
 					}
-					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/contact', body);
+					let endpoint = '/sobjects/contact';
+					let method = 'POST';
+					if (operation === 'upsert') {
+						method = 'PATCH';
+						const externalId = this.getNodeParameter('externalId', 0) as string;
+						const externalIdValue = this.getNodeParameter('externalIdValue', i) as string;
+						endpoint = `/sobjects/contact/${externalId}/${externalIdValue}`;
+						if (body[externalId] !== undefined) {
+							delete body[externalId];
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, method, endpoint, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/patch-contact-id
 				if (operation === 'update') {
@@ -1463,11 +1505,12 @@ export class Salesforce implements INodeType {
 					if (options.isPrivate !== undefined) {
 						body.IsPrivate = options.isPrivate as boolean;
 					}
+
 					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/note', body);
 				}
 			}
 			if (resource === 'customObject') {
-				if (operation === 'create') {
+				if (operation === 'create' || operation === 'upsert') {
 					const customObject = this.getNodeParameter('customObject', i) as string;
 					const customFieldsUi = this.getNodeParameter('customFieldsUi', i) as IDataObject;
 					const body: IDataObject = {};
@@ -1480,7 +1523,18 @@ export class Salesforce implements INodeType {
 							}
 						}
 					}
-					responseData = await salesforceApiRequest.call(this, 'POST', `/sobjects/${customObject}`, body);
+					let endpoint = `/sobjects/${customObject}`;
+					let method = 'POST';
+					if (operation === 'upsert') {
+						method = 'PATCH';
+						const externalId = this.getNodeParameter('externalId', 0) as string;
+						const externalIdValue = this.getNodeParameter('externalIdValue', i) as string;
+						endpoint = `/sobjects/${customObject}/${externalId}/${externalIdValue}`;
+						if (body[externalId] !== undefined) {
+							delete body[externalId];
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, method, endpoint, body);
 				}
 				if (operation === 'update') {
 					const recordId = this.getNodeParameter('recordId', i) as string;
@@ -1532,7 +1586,7 @@ export class Salesforce implements INodeType {
 			}
 			if (resource === 'opportunity') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/post-opportunity
-				if (operation === 'create') {
+				if (operation === 'create' || operation === 'upsert') {
 					const name = this.getNodeParameter('name', i) as string;
 					const closeDate = this.getNodeParameter('closeDate', i) as string;
 					const stageName = this.getNodeParameter('stageName', i) as string;
@@ -1584,7 +1638,18 @@ export class Salesforce implements INodeType {
 							}
 						}
 					}
-					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/opportunity', body);
+					let endpoint = '/sobjects/opportunity';
+					let method = 'POST';
+					if (operation === 'upsert') {
+						method = 'PATCH';
+						const externalId = this.getNodeParameter('externalId', 0) as string;
+						const externalIdValue = this.getNodeParameter('externalIdValue', i) as string;
+						endpoint = `/sobjects/opportunity/${externalId}/${externalIdValue}`;
+						if (body[externalId] !== undefined) {
+							delete body[externalId];
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, method, endpoint, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/post-opportunity
 				if (operation === 'update') {
@@ -1702,9 +1767,9 @@ export class Salesforce implements INodeType {
 			}
 			if (resource === 'account') {
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/post-account
-				if (operation === 'create') {
-					const name = this.getNodeParameter('name', i) as string;
+				if (operation === 'create' || operation === 'upsert') {
 					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+					const name = this.getNodeParameter('name', i) as string;
 					const body: IAccount = {
 						Name: name,
 					};
@@ -1789,7 +1854,18 @@ export class Salesforce implements INodeType {
 							}
 						}
 					}
-					responseData = await salesforceApiRequest.call(this, 'POST', '/sobjects/account', body);
+					let endpoint = '/sobjects/account';
+					let method = 'POST';
+					if (operation === 'upsert') {
+						method = 'PATCH';
+						const externalId = this.getNodeParameter('externalId', 0) as string;
+						const externalIdValue = this.getNodeParameter('externalIdValue', i) as string;
+						endpoint = `/sobjects/account/${externalId}/${externalIdValue}`;
+						if (body[externalId] !== undefined) {
+							delete body[externalId];
+						}
+					}
+					responseData = await salesforceApiRequest.call(this, method, endpoint, body);
 				}
 				//https://developer.salesforce.com/docs/api-explorer/sobject/Account/patch-account-id
 				if (operation === 'update') {
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index f769c583b2..eea1ef5481 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -37,13 +37,13 @@ import {
 	ITrack,
 } from './TrackInterface';
 
-import * as uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 export class Segment implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Segment',
 		name: 'segment',
-		icon: 'file:segment.png',
+		icon: 'file:segment.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Segment/segment.png b/packages/nodes-base/nodes/Segment/segment.png
deleted file mode 100644
index 102a9326c4..0000000000
Binary files a/packages/nodes-base/nodes/Segment/segment.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Segment/segment.svg b/packages/nodes-base/nodes/Segment/segment.svg
new file mode 100644
index 0000000000..05ce1a787a
--- /dev/null
+++ b/packages/nodes-base/nodes/Segment/segment.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 61" 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="M39.875 40.567H3.073C1.383 40.567 0 39.184 0 37.493s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073z" fill="#99cfac"/><path d="M32.038 59.39c-2.996 0-5.993-.461-8.836-1.306-1.613-.538-2.535-2.228-1.998-3.842s2.228-2.535 3.842-1.998a23.73 23.73 0 006.992 1.076c10.449 0 19.515-6.684 22.511-16.672.461-1.614 2.228-2.535 3.842-2.074s2.535 2.228 2.074 3.842C56.547 50.939 45.176 59.39 32.038 59.39z" fill="#49b881"/><path d="M60.927 24.971H24.125c-1.69 0-3.073-1.383-3.073-3.073s1.383-3.073 3.073-3.073h36.802c1.69 0 3.073 1.383 3.073 3.073s-1.383 3.073-3.073 3.073z" fill="#99cfac"/><path d="M6.531 24.97c-.307 0-.615-.077-.922-.154-1.613-.461-2.535-2.228-2.074-3.841C7.453 8.451 18.824 0 32.039 0c2.996 0 5.993.461 8.835 1.306 1.613.538 2.535 2.228 1.998 3.842s-2.228 2.535-3.842 1.998a23.73 23.73 0 00-6.992-1.076c-10.449 0-19.515 6.684-22.511 16.672-.461 1.383-1.69 2.228-2.996 2.228z" fill="#49b881"/><g fill="#99cfac"><use xlink:href="#C"/><use xlink:href="#C" x="-36.495" y="39.03"/></g></g></symbol><defs><path id="C" d="M47.174 10.218c0-1.703 1.371-3.073 3.073-3.073s3.073 1.371 3.073 3.073-1.371 3.073-3.073 3.073-3.073-1.371-3.073-3.073z"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index a289021f7f..a97fffb48e 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -43,7 +43,7 @@ export class Shopify implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Shopify',
 		name: 'shopify',
-		icon: 'file:shopify.png',
+		icon: 'file:shopify.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index 75d8f674aa..fe999a8f9a 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -22,7 +22,7 @@ export class ShopifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Shopify Trigger',
 		name: 'shopifyTrigger',
-		icon: 'file:shopify.png',
+		icon: 'file:shopify.svg',
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["event"]}}',
diff --git a/packages/nodes-base/nodes/Shopify/shopify.png b/packages/nodes-base/nodes/Shopify/shopify.png
deleted file mode 100644
index d9c35b3dbe..0000000000
Binary files a/packages/nodes-base/nodes/Shopify/shopify.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Shopify/shopify.svg b/packages/nodes-base/nodes/Shopify/shopify.svg
new file mode 100644
index 0000000000..bf03ea8778
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/shopify.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 58 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="M49.255 12.484a.633.633 0 00-.564-.527c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77c-.34-.376-1.092-.266-1.376-.188-.037 0-.752.225-1.922.605-1.137-3.3-3.15-6.306-6.696-6.306h-.303C28.438.605 27.194 0 26.144 0c-8.256.037-12.2 10.333-13.434 15.594l-5.77 1.77c-1.77.564-1.835.605-2.073 2.293L0 57.175 36.468 64l19.763-4.26c0-.037-6.94-46.897-6.976-47.255zM34.431 8.86c-.917.303-1.963.605-3.1.945v-.68a15.03 15.03 0 00-.752-4.999c1.848.284 3.1 2.357 3.843 4.733zm-6.068-4.298c.603 1.778.883 3.65.826 5.527v.34l-6.375 1.963c1.248-4.66 3.55-6.962 5.55-7.83zm-2.45-2.293a1.94 1.94 0 011.055.339c-2.66 1.238-5.472 4.366-6.678 10.627l-5.045 1.546C16.668 10.03 19.988 2.26 25.91 2.26z" fill="#95bf47"/><path d="M48.691 11.957c-.225-.037-5.17-.376-5.17-.376l-3.77-3.77a.753.753 0 00-.527-.225L36.472 64l19.763-4.26-6.98-47.218a.68.68 0 00-.564-.564z" fill="#5e8e3e"/><path d="M29.758 22.9l-2.454 7.242a11.36 11.36 0 00-4.752-1.133c-3.848 0-4.036 2.412-4.036 3.018 0 3.298 8.636 4.564 8.636 12.333 0 6.1-3.885 10.03-9.1 10.03-6.26 0-9.467-3.885-9.467-3.885l1.665-5.55s3.28 2.83 6.073 2.83a2.47 2.47 0 002.564-2.49c0-4.34-7.1-4.527-7.1-11.618 0-5.962 4.298-11.77 12.934-11.77 3.394.05 5.018 1 5.018 1z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index 3a7cfeb260..cc8e753329 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -22,7 +22,7 @@ export class Snowflake implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Snowflake',
 		name: 'snowflake',
-		icon: 'file:snowflake.png',
+		icon: 'file:snowflake.svg',
 		group: ['input'],
 		version: 1,
 		description: 'Get, add and update data in Snowflake.',
diff --git a/packages/nodes-base/nodes/Snowflake/snowflake.png b/packages/nodes-base/nodes/Snowflake/snowflake.png
deleted file mode 100644
index 6d149707dd..0000000000
Binary files a/packages/nodes-base/nodes/Snowflake/snowflake.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Snowflake/snowflake.svg b/packages/nodes-base/nodes/Snowflake/snowflake.svg
new file mode 100644
index 0000000000..be59081ae9
--- /dev/null
+++ b/packages/nodes-base/nodes/Snowflake/snowflake.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 63 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="M8.645 15.304l13.008 7.8a3.72 3.72 0 004.589-.601 4.01 4.01 0 001.227-2.908V3.962a3.81 3.81 0 00-1.861-3.42 3.81 3.81 0 00-3.893 0 3.81 3.81 0 00-1.861 3.42v8.896l-7.387-4.43a3.79 3.79 0 00-2.922-.4 3.712 3.712 0 00-2.3 1.844 4.052 4.052 0 001.4 5.422m31.27 7.8l13.008-7.8a4.056 4.056 0 001.4-5.424 3.75 3.75 0 00-5.22-1.452l-7.3 4.37v-8.84A3.81 3.81 0 0039.94.534a3.81 3.81 0 00-3.889 0 3.81 3.81 0 00-1.863 3.414v15.323a4.08 4.08 0 00.494 2.367 3.745 3.745 0 002.3 1.844 3.71 3.71 0 002.922-.4m-11.567 8.894c.013-.25.108-.5.272-.68l1.52-1.58a1.06 1.06 0 01.658-.282h.057a1.05 1.05 0 01.656.282l1.52 1.58a1.12 1.12 0 01.272.681v.06a1.13 1.13 0 01-.272.683L31.5 34.3a1.04 1.04 0 01-.656.284h-.057a1.043 1.043 0 01-.658-.284l-1.52-1.58a1.13 1.13 0 01-.272-.683zm-4.604-.65v1.364a1.54 1.54 0 00.372.93l5.16 5.357a1.42 1.42 0 00.895.386h1.312a1.42 1.42 0 00.895-.386l5.16-5.357a1.54 1.54 0 00.372-.93v-1.364a1.54 1.54 0 00-.372-.93l-5.16-5.357a1.42 1.42 0 00-.895-.386H30.16a1.42 1.42 0 00-.895.386l-5.16 5.367a1.55 1.55 0 00-.372.93m-21.818-3.71l7.365 4.417-7.365 4.413A4.06 4.06 0 00.516 41.88a3.75 3.75 0 002.3 1.844 3.746 3.746 0 002.922-.392l13.008-7.8a4.113 4.113 0 001.9-3.492 4.16 4.16 0 00-1.9-3.492l-13.008-7.8a3.79 3.79 0 00-2.922-.4 3.712 3.712 0 00-2.3 1.844 4.053 4.053 0 001.4 5.422m38.995 4.442a4 4 0 001.91 3.477l13 7.8a3.745 3.745 0 005.22-1.451 4.05 4.05 0 00-1.4-5.424l-7.356-4.414 7.365-4.417a4.054 4.054 0 001.4-5.422 3.74 3.74 0 00-2.3-1.844 3.704 3.704 0 00-2.92.4l-13 7.8a4 4 0 00-1.91 3.507m-16.655 8.446a3.7 3.7 0 00-2.611.464l-13.008 7.8a4.055 4.055 0 00-1.4 5.422 3.743 3.743 0 002.3 1.843 3.75 3.75 0 002.922-.392l7.387-4.43v8.83a3.81 3.81 0 005.755 3.425 3.81 3.81 0 001.858-3.425V44.406a3.91 3.91 0 00-3.205-3.903m28.66 8.276l-13.008-7.8a3.75 3.75 0 00-2.922-.392 3.74 3.74 0 00-2.3 1.843 4.09 4.09 0 00-.494 2.37v15.25a3.81 3.81 0 005.755 3.425 3.81 3.81 0 001.859-3.425v-8.764l7.287 4.37a3.79 3.79 0 002.922.4 3.712 3.712 0 002.3-1.844c1.057-1.9.44-4.28-1.4-5.422" stroke="none" fill="#29b5e8" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 696e1fff33..972c321b49 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -40,10 +40,10 @@ export class Spotify implements INodeType {
 			},
 		],
 		properties: [
-			// ----------------------------------------------------------
+			// ----------------------------------------------------------------
 			//         Resource to Operate on
-			//		   Player, Album, Artisits, Playlists, Tracks
-			// ----------------------------------------------------------
+			//         Album, Artist, Library, My Data, Player, Playlist, Track
+			// ----------------------------------------------------------------
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -61,6 +61,10 @@ export class Spotify implements INodeType {
 						name: 'Library',
 						value: 'library',
 					},
+					{
+						name: 'My Data',
+						value: 'myData',
+					},
 					{
 						name: 'Player',
 						value: 'player',
@@ -77,9 +81,10 @@ export class Spotify implements INodeType {
 				default: 'player',
 				description: 'The resource to operate on.',
 			},
+
 			// --------------------------------------------------------------------------------------------------------
 			//         Player Operations
-			//		   Pause, Play, Get Recently Played, Get Currently Playing, Next Song, Previous Song, Add to Queue
+			//         Pause, Play, Get Recently Played, Get Currently Playing, Next Song, Previous Song, Add to Queue
 			// --------------------------------------------------------------------------------------------------------
 			{
 				displayName: 'Operation',
@@ -170,9 +175,10 @@ export class Spotify implements INodeType {
 				placeholder: 'spotify:track:0xE4LEFzSNGsz1F6kvXsHU',
 				description: `Enter a track URI or ID.`,
 			},
+
 			// -----------------------------------------------
 			//         Album Operations
-			//		   Get an Album, Get an Album's Tracks
+			//         Get an Album, Get an Album's Tracks
 			// -----------------------------------------------
 			{
 				displayName: 'Operation',
@@ -225,9 +231,10 @@ export class Spotify implements INodeType {
 				placeholder: 'spotify:album:1YZ3k65Mqw3G8FzYlW1mmp',
 				description: `The album's Spotify URI or ID.`,
 			},
+
 			// -------------------------------------------------------------------------------------------------------------
 			//         Artist Operations
-			//		   Get an Artist, Get an Artist's Related Artists, Get an Artist's Top Tracks, Get an Artist's Albums
+			//         Get an Artist, Get an Artist's Related Artists, Get an Artist's Top Tracks, Get an Artist's Albums
 			// -------------------------------------------------------------------------------------------------------------
 			{
 				displayName: 'Operation',
@@ -300,9 +307,10 @@ export class Spotify implements INodeType {
 				placeholder: 'US',
 				description: `Top tracks in which country? Enter the postal abbriviation.`,
 			},
+
 			// -------------------------------------------------------------------------------------------------------------
 			//         Playlist Operations
-			//		   Get a Playlist, Get a Playlist's Tracks, Add/Remove a Song from a Playlist, Get a User's Playlists
+			//         Get a Playlist, Get a Playlist's Tracks, Add/Remove a Song from a Playlist, Get a User's Playlists
 			// -------------------------------------------------------------------------------------------------------------
 			{
 				displayName: 'Operation',
@@ -478,7 +486,7 @@ export class Spotify implements INodeType {
 
 			// -----------------------------------------------------
 			//         Track Operations
-			//		   Get a Track, Get a Track's Audio Features
+			//         Get a Track, Get a Track's Audio Features
 			// -----------------------------------------------------
 			{
 				displayName: 'Operation',
@@ -522,10 +530,11 @@ export class Spotify implements INodeType {
 				placeholder: 'spotify:track:0xE4LEFzSNGsz1F6kvXsHU',
 				description: `The track's Spotify URI or ID.`,
 			},
-			// --------------------------------------------------------------------------------------------------------
+
+			// -----------------------------------------------------
 			//         Library Operations
-			//		   Get liked tracks
-			// --------------------------------------------------------------------------------------------------------
+			//         Get liked tracks
+			// -----------------------------------------------------
 			{
 				displayName: 'Operation',
 				name: 'operation',
@@ -546,6 +555,32 @@ export class Spotify implements INodeType {
 				],
 				default: 'getLikedTracks',
 			},
+
+			// ---------------------------------------
+			//         My Data Operations
+			//         Get Followed Artists
+			// ---------------------------------------
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'myData',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Get Following Artists',
+						value: 'getFollowingArtists',
+						description: 'Get your followed artists.',
+					},
+				],
+				default: 'getFollowingArtists',
+				description: 'The operation to perform.',
+			},
 			{
 				displayName: 'Return All',
 				name: 'returnAll',
@@ -558,6 +593,7 @@ export class Spotify implements INodeType {
 							'album',
 							'artist',
 							'library',
+							'myData',
 							'playlist',
 						],
 						operation: [
@@ -566,6 +602,7 @@ export class Spotify implements INodeType {
 							'getUserPlaylists',
 							'getNewReleases',
 							'getLikedTracks',
+							'getFollowingArtists',
 						],
 					},
 				},
@@ -612,9 +649,11 @@ export class Spotify implements INodeType {
 				displayOptions: {
 					show: {
 						resource: [
+							'myData',
 							'player',
 						],
 						operation: [
+							'getFollowingArtists',
 							'recentlyPlayed',
 						],
 					},
@@ -1046,6 +1085,25 @@ export class Spotify implements INodeType {
 						responseData = responseData.items;
 					}
 				}
+			} else if (resource === 'myData') {
+
+				if (operation === 'getFollowingArtists') {
+					requestMethod = 'GET';
+
+					endpoint = `/me/following`;
+
+					propertyName = 'artists.items';
+
+					if (!returnAll) {
+						const limit = this.getNodeParameter('limit', i) as number;
+						qs = {
+							type: 'artist',
+							limit,
+						};
+						responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
+						responseData = responseData.artists.items;
+					}
+				}
 			}
 
 			if (returnAll) {
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index f29208c0ee..58829d9aea 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -20,7 +20,7 @@ export class StripeTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Stripe Trigger',
 		name: 'stripeTrigger',
-		icon: 'file:stripe.png',
+		icon: 'file:stripe.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Stripe events via webhooks',
diff --git a/packages/nodes-base/nodes/Stripe/stripe.png b/packages/nodes-base/nodes/Stripe/stripe.png
deleted file mode 100644
index e5efefad6e..0000000000
Binary files a/packages/nodes-base/nodes/Stripe/stripe.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Stripe/stripe.svg b/packages/nodes-base/nodes/Stripe/stripe.svg
new file mode 100644
index 0000000000..063b3994a4
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/stripe.svg
@@ -0,0 +1 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="54 -80 360 360"><style>.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635bff}</style><path class="st0" d="M414 113.4c0-25.6-12.4-45.8-36.1-45.8-23.8 0-38.2 20.2-38.2 45.6 0 30.1 17 45.3 41.4 45.3 11.9 0 20.9-2.7 27.7-6.5v-20c-6.8 3.4-14.6 5.5-24.5 5.5-9.7 0-18.3-3.4-19.4-15.2h48.9c0-1.3.2-6.5.2-8.9zm-49.4-9.5c0-11.3 6.9-16 13.2-16 6.1 0 12.6 4.7 12.6 16h-25.8zM301.1 67.6c-9.8 0-16.1 4.6-19.6 7.8l-1.3-6.2h-22v116.6l25-5.3.1-28.3c3.6 2.6 8.9 6.3 17.7 6.3 17.9 0 34.2-14.4 34.2-46.1-.1-29-16.6-44.8-34.1-44.8zm-6 68.9c-5.9 0-9.4-2.1-11.8-4.7l-.1-37.1c2.6-2.9 6.2-4.9 11.9-4.9 9.1 0 15.4 10.2 15.4 23.3 0 13.4-6.2 23.4-15.4 23.4zM223.8 61.7l25.1-5.4V36l-25.1 5.3zM223.8 69.3h25.1v87.5h-25.1zM196.9 76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7 15.9-6.3 19-5.2v-23c-3.2-1.2-14.9-3.4-20.8 7.4zM146.9 47.6l-24.4 5.2-.1 80.1c0 14.8 11.1 25.7 25.9 25.7 8.2 0 14.2-1.5 17.5-3.3V135c-3.2 1.3-19 5.9-19-8.9V90.6h19V69.3h-19l.1-21.7zM79.3 94.7c0-3.9 3.2-5.4 8.5-5.4 7.6 0 17.2 2.3 24.8 6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6C67.5 67.6 54 78.2 54 95.9c0 27.6 38 23.2 38 35.1 0 4.6-4 6.1-9.6 6.1-8.3 0-18.9-3.4-27.3-8v23.8c9.3 4 18.7 5.7 27.3 5.7 20.8 0 35.1-10.3 35.1-28.2-.1-29.8-38.2-24.5-38.2-35.7z"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 309779b028..8aa2b3dac1 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -37,7 +37,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SurveyMonkey Trigger',
 		name: 'surveyMonkeyTrigger',
-		icon: 'file:surveyMonkey.png',
+		icon: 'file:surveyMonkey.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Starts the workflow when Survey Monkey events occur.',
diff --git a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.png b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.png
deleted file mode 100644
index e5337accd6..0000000000
Binary files a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
new file mode 100644
index 0000000000..9d6409a2f1
--- /dev/null
+++ b/packages/nodes-base/nodes/SurveyMonkey/surveyMonkey.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M53.05 42.178a2.081 2.081 0 01-1.394-.537c.125-1.085.209-2.181.223-3.297a2.096 2.096 0 011.17-.362 2.1 2.1 0 011.482 3.583 2.093 2.093 0 01-1.481.613m-46.1 0a2.093 2.093 0 01-2.09-2.094c0-1.16.94-2.104 2.09-2.104.433 0 .837.14 1.171.364.014 1.116.098 2.212.223 3.297a2.086 2.086 0 01-1.394.537m45.963-9.21c-.588 0-1.153.08-1.695.212-2.083-8.268-8.85-14.665-17.302-16.178-.377-.07-.718-.118-1.102-.167.063-2.072.16-4.466 3.197-6.62L35.53 9s-5.916 1.845-6.602 6.926c-.296-1.383-3.054-3.112-4.42-3.44l-.68 1.099s1.812.91 2.252 3.417c-8.45 1.515-15.215 7.912-17.298 16.178a7.137 7.137 0 00-1.696-.211C3.18 32.969 0 36.152 0 40.084 0 44.008 3.18 47.2 7.086 47.2c.915 0 1.788-.184 2.59-.498A21.849 21.849 0 0011.979 51l5.882-3.98-.05-.066c-1.556-2.007-2.508-4.962-2.667-7.904-.177-3.242.612-6.464 2.677-8.358 4.254-3.634 8.886-1.978 11.789 1.507h.78c2.903-3.485 7.535-5.141 11.79-1.507 2.064 1.894 2.853 5.116 2.677 8.36-.16 2.94-1.112 5.895-2.668 7.903l-.05.064L48.02 51a21.88 21.88 0 002.303-4.3 7.08 7.08 0 002.589.499c3.907 0 7.087-3.19 7.087-7.115 0-3.933-3.18-7.117-7.087-7.117" fill="#00BF6F" fill-rule="evenodd"/></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 0486a881b8..8144d21550 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><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
+<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><use xlink:href="#O" fill="#333"/><use xlink:href="#O" fill-opacity="0" stroke="#000" stroke-opacity="0"/><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/Todoist/Todoist.node.ts b/packages/nodes-base/nodes/Todoist/Todoist.node.ts
index 4bb77324b7..39732d0d50 100644
--- a/packages/nodes-base/nodes/Todoist/Todoist.node.ts
+++ b/packages/nodes-base/nodes/Todoist/Todoist.node.ts
@@ -17,6 +17,7 @@ import {
 
 interface IBodyCreateTask {
 	content: string;
+	description?: string;
 	project_id?: number;
 	section_id?: number;
 	parent?: number;
@@ -34,7 +35,7 @@ export class Todoist implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Todoist',
 		name: 'todoist',
-		icon: 'file:todoist.png',
+		icon: 'file:todoist.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
@@ -248,6 +249,13 @@ export class Todoist implements INodeType {
 					},
 				},
 				options: [
+					{
+						displayName: 'Description',
+						name: 'description',
+						type: 'string',
+						default: '',
+						description: 'A description for the task.',
+					},
 					{
 						displayName: 'Due Date Time',
 						name: 'dueDateTime',
@@ -483,6 +491,10 @@ export class Todoist implements INodeType {
 						priority: (options.priority!) ? parseInt(options.priority as string, 10) : 1,
 					};
 
+					if (options.description) {
+						body.description = options.description as string;
+					}
+
 					if (options.dueDateTime) {
 						body.due_datetime = options.dueDateTime as string;
 					}
diff --git a/packages/nodes-base/nodes/Todoist/todoist.png b/packages/nodes-base/nodes/Todoist/todoist.png
deleted file mode 100644
index 63ac5b456e..0000000000
Binary files a/packages/nodes-base/nodes/Todoist/todoist.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Todoist/todoist.svg b/packages/nodes-base/nodes/Todoist/todoist.svg
new file mode 100644
index 0000000000..61dcc2ea7c
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/todoist.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M52.5 0h-45C3.364.01.013 3.36 0 7.5v45C0 56.625 3.374 60 7.5 60h45c4.126 0 7.5-3.375 7.5-7.5v-45C60 3.375 56.626 0 52.5 0" fill="#E44332"/><path d="M12.121 29.582c1-.673 22.469-15.055 22.96-15.388.49-.329.518-1.341-.036-1.707-.55-.365-1.593-1.056-1.98-1.321a1.592 1.592 0 00-1.771.025A26390.6 26390.6 0 0112.062 24.06c-.737.486-1.642.494-2.373 0L0 17.507v5.57c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.007" fill="#FFF"/><path d="M12.121 39.128c1-.673 22.469-15.055 22.96-15.389.49-.329.518-1.34-.036-1.707-.55-.364-1.593-1.055-1.98-1.32a1.592 1.592 0 00-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.494-2.373 0L0 27.052v5.57c2.356 1.602 8.222 5.576 9.642 6.512.848.556 1.66.543 2.481-.006" fill="#FFF"/><path d="M12.121 48.674c1-.673 22.469-15.056 22.96-15.39.49-.328.518-1.34-.036-1.707-.55-.363-1.593-1.055-1.98-1.32a1.592 1.592 0 00-1.771.024c-.275.185-18.62 12.467-19.232 12.87-.737.486-1.642.495-2.373 0L0 36.598v5.571c2.356 1.601 8.222 5.576 9.642 6.512.848.555 1.66.543 2.481-.006" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index 3b3dd135ad..7eeb1bff86 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -17,7 +17,7 @@ export class Twilio implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Twilio',
 		name: 'twilio',
-		icon: 'file:twilio.png',
+		icon: 'file:twilio.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Twilio/twilio.png b/packages/nodes-base/nodes/Twilio/twilio.png
deleted file mode 100644
index 767d5a8407..0000000000
Binary files a/packages/nodes-base/nodes/Twilio/twilio.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Twilio/twilio.svg b/packages/nodes-base/nodes/Twilio/twilio.svg
new file mode 100644
index 0000000000..5055f6372f
--- /dev/null
+++ b/packages/nodes-base/nodes/Twilio/twilio.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 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="#e31e26" fill-rule="nonzero"><path d="M31.953 0C14.337 0 0 14.337 0 31.953s14.337 31.953 31.953 31.953C49.663 64 64 49.663 64 31.953S49.663 0 31.953 0zm0 55.567c-12.931 0-23.52-10.589-23.52-23.614 0-12.931 10.589-23.52 23.52-23.52 13.025 0 23.614 10.589 23.614 23.52 0 13.025-10.589 23.614-23.614 23.614z"/><use xlink:href="#C"/><use xlink:href="#C" y="15.93"/><path d="M17.335 39.918a6.64 6.64 0 016.653-6.653 6.653 6.653 0 110 13.306 6.64 6.64 0 01-6.653-6.653zm0-15.93a6.64 6.64 0 016.653-6.653 6.64 6.64 0 016.653 6.653 6.64 6.64 0 01-6.653 6.653 6.64 6.64 0 01-6.653-6.653z"/></g></symbol><defs><path id="C" d="M33.265 23.988a6.64 6.64 0 1113.306 0 6.64 6.64 0 11-13.306 0z"/></defs></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 93ad3ae0b7..232cb4bf1a 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -37,7 +37,7 @@ import {
 	commentFields,
 	commentOperations
 } from './CommentDescription';
-import uuid = require('uuid');
+import { v4 as uuid } from 'uuid';
 import * as moment from 'moment';
 
 export class Twist implements INodeType {
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index 8a9298a660..3ade4eca82 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -38,7 +38,7 @@ export class Twitter implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Twitter ',
 		name: 'twitter',
-		icon: 'file:twitter.png',
+		icon: 'file:twitter.svg',
 		group: ['input', 'output'],
 		version: 1,
 		description: 'Consume Twitter API',
diff --git a/packages/nodes-base/nodes/Twitter/twitter.png b/packages/nodes-base/nodes/Twitter/twitter.png
deleted file mode 100644
index 6f4436e441..0000000000
Binary files a/packages/nodes-base/nodes/Twitter/twitter.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Twitter/twitter.svg b/packages/nodes-base/nodes/Twitter/twitter.svg
new file mode 100644
index 0000000000..59c4d9b6b0
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/twitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 257 210" 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="M80.507 208.013c96.604 0 149.442-80.036 149.442-149.442 0-2.274 0-4.537-.153-6.8A106.874 106.874 0 00256 24.595a104.84 104.84 0 01-30.167 8.264 52.709 52.709 0 0023.091-29.05 105.26 105.26 0 01-33.352 12.748C199.291-.754 173.422-4.991 152.469 6.223s-31.777 35.088-26.404 58.238A149.117 149.117 0 0117.818 9.583c-13.941 23.999-6.821 54.7 16.26 70.113a52.13 52.13 0 01-23.838-6.574v.665c.007 25.002 17.631 46.537 42.138 51.487a52.44 52.44 0 01-23.716.901c6.881 21.396 26.599 36.053 49.07 36.475a105.39 105.39 0 01-65.229 22.528A106.844 106.844 0 010 184.42a148.695 148.695 0 0080.507 23.552" stroke="none" fill="#1da1f2" fill-rule="nonzero"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 4dd3327a6e..5cd9cac97a 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,
+	JsonObject,
 	NodeApiError,
 } from 'n8n-workflow';
 
@@ -200,7 +201,7 @@ export class TypeformTrigger implements INodeType {
 			(bodyData.form_response as IDataObject).definition === undefined ||
 			(bodyData.form_response as IDataObject).answers === undefined
 		) {
-			throw new NodeApiError(this.getNode(), bodyData, { message: 'Expected definition/answers data is missing!' });
+			throw new NodeApiError(this.getNode(), bodyData as JsonObject, { message: 'Expected definition/answers data is missing!' });
 		}
 
 		const answers = (bodyData.form_response as IDataObject).answers as ITypeformAnswer[];
diff --git a/packages/nodes-base/nodes/UptimeRobot/uptimerobot.svg b/packages/nodes-base/nodes/UptimeRobot/uptimerobot.svg
index c9bbdf55af..87117972f8 100644
--- a/packages/nodes-base/nodes/UptimeRobot/uptimerobot.svg
+++ b/packages/nodes-base/nodes/UptimeRobot/uptimerobot.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="256" cy="256" r="256" fill="#2A8C00"/>
-    <circle cx="256.5" cy="256.5" r="141.5" fill="#20201F" stroke="#FFFFFF" stroke-width="20"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><g fill="none" fill-rule="evenodd"><circle cx="256" cy="256" r="256" fill="#2A8C00"/><circle cx="256.5" cy="256.5" r="141.5" fill="#20201F" stroke="#FFF" stroke-width="20"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index dfdf1e7beb..90f8146478 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -41,7 +41,7 @@ import {
 
 import * as moment from 'moment-timezone';
 
-import * as uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 
 export class Wise implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 500bec3a42..76fc12ad23 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -71,8 +71,8 @@ export class ZohoCrm implements INodeType {
 		name: 'zohoCrm',
 		icon: 'file:zoho.svg',
 		group: ['transform'],
-		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		version: 1,
 		description: 'Consume the Zoho API',
 		defaults: {
 			name: 'Zoho',
diff --git a/packages/nodes-base/nodes/Zoho/zoho.svg b/packages/nodes-base/nodes/Zoho/zoho.svg
index 23f76d2e59..203761c270 100644
--- a/packages/nodes-base/nodes/Zoho/zoho.svg
+++ b/packages/nodes-base/nodes/Zoho/zoho.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#E" x=".5" y=".5"/><defs><linearGradient x1="50.00%" y1="1.43%" x2="50.00%" y2="96.98%" id="A"><stop stop-color="#ffe513" offset=".5618%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="B"><stop stop-color="#008cd2" offset=".5618%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50.00%" y1="27.78%" x2="50.00%" y2="97.53%" id="C"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.20%" id="D"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="E" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#A)"/><path d="M96.246 20.009a8.84 8.84 0 0 0-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64c0 1.287.221 2.494.664 3.62a8.95 8.95 0 0 0 1.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#B)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 0 0-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 0 0-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 0 0 1.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#C)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 0 0-2.775-1.911c-1.086-.463-2.172-.684-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744-1.146.503-2.132 1.187-2.976 2.091-.845.885-1.528 1.971-2.051 3.218-.523 1.227-.804 2.474-.865 3.7v.422a9.24 9.24 0 0 0 .563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 0 0 3.258.684h.02c1.106 0 2.212-.241 3.298-.704 1.146-.503 2.152-1.207 2.996-2.111.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362c.02-1.106-.161-2.192-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 0 1-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64.644-.362 1.307-.523 1.971-.523.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#D)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183.181-.623.282-1.247.322-1.87.02-.181.02-.342.02-.503a7.4 7.4 0 0 0-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724-.302.281-.442.643-.442 1.046a2.07 2.07 0 0 0 .02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 0 1-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585-.462.885-.764 1.729-.945 2.594a7.23 7.23 0 0 0-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 0 0 .523-1.106c0-.121-.02-.241-.04-.362-.04-.261-.141-.503-.322-.704z"/></g></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index d0661cc9d7..29d1511c51 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -63,7 +63,7 @@ export class Zoom implements INodeType {
 			name: 'Zoom',
 			color: '#0B6CF9',
 		},
-		icon: 'file:zoom.png',
+		icon: 'file:zoom.svg',
 		inputs: ['main'],
 		outputs: ['main'],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zoom/zoom.png b/packages/nodes-base/nodes/Zoom/zoom.png
deleted file mode 100644
index dfc72331eb..0000000000
Binary files a/packages/nodes-base/nodes/Zoom/zoom.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/Zoom/zoom.svg b/packages/nodes-base/nodes/Zoom/zoom.svg
new file mode 100644
index 0000000000..6120c91378
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoom/zoom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 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 32C0 14.272 14.272 0 32 0s32 14.272 32 32-14.272 32-32 32S0 49.728 0 32z"/><path d="M3.137 32A28.8 28.8 0 0132 3.137 28.8 28.8 0 0160.862 32 28.8 28.8 0 0132 60.862 28.8 28.8 0 013.137 32z" fill="#4a8cff"/><path d="M40.784 28.254l8.157-5.961c.712-.58 1.255-.445 1.255.627v18.177c0 1.205-.678 1.067-1.255.627l-8.157-5.961zm-27.608-5.289v13.553a5.55 5.55 0 005.575 5.522h19.765a1.01 1.01 0 001.013-1.004V27.483a5.55 5.55 0 00-5.575-5.522H14.189a1.01 1.01 0 00-1.013 1.004z"/></g></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ce223bff36..821f45bb3e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.119.1",
+  "version": "0.121.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -88,6 +88,7 @@
       "dist/credentials/GetResponseOAuth2Api.credentials.js",
       "dist/credentials/GhostAdminApi.credentials.js",
       "dist/credentials/GhostContentApi.credentials.js",
+      "dist/credentials/GitPassword.credentials.js",
       "dist/credentials/GithubApi.credentials.js",
       "dist/credentials/GithubOAuth2Api.credentials.js",
       "dist/credentials/GitlabApi.credentials.js",
@@ -159,6 +160,7 @@
       "dist/credentials/MicrosoftOutlookOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftSql.credentials.js",
       "dist/credentials/MicrosoftTeamsOAuth2Api.credentials.js",
+      "dist/credentials/MicrosoftToDoOAuth2Api.credentials.js",
       "dist/credentials/MindeeReceiptApi.credentials.js",
       "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
@@ -368,6 +370,7 @@
       "dist/nodes/GetResponse/GetResponse.node.js",
       "dist/nodes/GetResponse/GetResponseTrigger.node.js",
       "dist/nodes/Ghost/Ghost.node.js",
+      "dist/nodes/Git/Git.node.js",
       "dist/nodes/Github/Github.node.js",
       "dist/nodes/Github/GithubTrigger.node.js",
       "dist/nodes/Gitlab/Gitlab.node.js",
@@ -443,6 +446,7 @@
       "dist/nodes/Microsoft/Outlook/MicrosoftOutlook.node.js",
       "dist/nodes/Microsoft/Sql/MicrosoftSql.node.js",
       "dist/nodes/Microsoft/Teams/MicrosoftTeams.node.js",
+      "dist/nodes/Microsoft/ToDo/MicrosoftToDo.node.js",
       "dist/nodes/Mindee/Mindee.node.js",
       "dist/nodes/MoveBinaryData.node.js",
       "dist/nodes/Mocean/Mocean.node.js",
@@ -595,11 +599,11 @@
     "@types/request-promise-native": "~1.0.15",
     "@types/ssh2-sftp-client": "^5.1.0",
     "@types/tmp": "^0.2.0",
-    "@types/uuid": "^3.4.6",
+    "@types/uuid": "^8.3.0",
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.60.0",
+    "n8n-workflow": "~0.61.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -608,7 +612,7 @@
     "@types/lossless-json": "^1.0.0",
     "@types/promise-ftp": "^1.3.4",
     "@types/snowflake-sdk": "^1.5.1",
-    "amqplib": "^0.7.1",
+    "amqplib": "^0.8.0",
     "aws4": "^1.8.0",
     "basic-auth": "^2.0.1",
     "change-case": "^4.1.1",
@@ -633,12 +637,12 @@
     "mailparser": "^3.2.0",
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
-    "mongodb": "3.6.6",
+    "mongodb": "^3.6.9",
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "node-ssh": "^11.0.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.73.0",
+    "n8n-core": "~0.74.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",
     "pg": "^8.3.0",
@@ -648,12 +652,13 @@
     "request": "^2.88.2",
     "rhea": "^1.0.11",
     "rss-parser": "^3.7.0",
+    "simple-git": "^2.36.2",
     "snowflake-sdk": "^1.5.3",
     "ssh2-sftp-client": "^5.2.1",
     "tmp-promise": "^3.0.2",
-    "uuid": "^3.4.0",
+    "uuid": "^8.3.0",
     "vm2": "^3.6.10",
-    "xlsx": "^0.16.7",
+    "xlsx": "^0.17.0",
     "xml2js": "^0.4.23"
   },
   "jest": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 684877a480..97d6466f47 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.60.0",
+  "version": "0.61.1",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index b25d3a94d6..b42d035a12 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -223,7 +223,7 @@ export interface IExecuteFunctions {
 	getTimezone(): string;
 	getWorkflow(): IWorkflowMetadata;
 	prepareOutputData(outputData: INodeExecutionData[], outputIndex?: number): Promise<INodeExecutionData[][]>;
-	sendMessageToUI(message: string): void;
+	sendMessageToUI(message: any): void; // tslint:disable-line:no-any
 	helpers: {
 		[key: string]: (...args: any[]) => any //tslint:disable-line:no-any
 	};
@@ -745,7 +745,7 @@ export interface IWorkflowExecuteAdditionalData {
 	httpResponse?: express.Response;
 	httpRequest?: express.Request;
 	restApiUrl: string;
-	sendMessageToUI?: (source: string, message: string) => void;
+	sendMessageToUI?: (source: string, message: any) => void; // tslint:disable-line:no-any
 	timezone: string;
 	webhookBaseUrl: string;
 	webhookTestBaseUrl: string;
@@ -776,10 +776,11 @@ export interface ILogger {
 	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[];
-}
 
 export interface IStatusCodeMessages {
 	[key: string]: string;
 }
+
+export type JsonValue = string | number | boolean | null | JsonObject | JsonValue[];
+
+export type JsonObject = { [key: string]: JsonValue };
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
index ef4ac30b0f..069f26857d 100644
--- a/packages/workflow/src/NodeErrors.ts
+++ b/packages/workflow/src/NodeErrors.ts
@@ -1,4 +1,4 @@
-import { INode, IRawErrorObject, IStatusCodeMessages} from '.';
+import { INode, IStatusCodeMessages, JsonObject} from '.';
 import { parseString } from 'xml2js';
 
 /**
@@ -46,11 +46,11 @@ const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
  */
 abstract class NodeError extends Error {
 	description: string | null | undefined;
-	cause: Error | IRawErrorObject;
+	cause: Error | JsonObject;
 	node: INode;
 	timestamp: number;
 
-	constructor(node: INode, error: Error | IRawErrorObject) {
+	constructor(node: INode, error: Error | JsonObject) {
 		super();
 		this.name = this.constructor.name;
 		this.cause = error;
@@ -72,7 +72,9 @@ abstract class NodeError extends Error {
 	 * (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)
+	 *    with each object as a starting point), or
+	 * (3) if it is an object, it traverses the object and nested ones recursively
+	 * 		based on the `potentialKeys` and returns a string if found.
 	 *
 	 * 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
@@ -83,15 +85,15 @@ abstract class NodeError extends Error {
 	 * Otherwise, if all the paths have been exhausted and no value is eligible, `null` is
 	 * returned.
 	 *
-	 * @param {IRawErrorObject} error
+	 * @param {JsonObject} error
 	 * @param {string[]} potentialKeys
 	 * @param {string[]} traversalKeys
 	 * @returns {string | null}
 	 */
 	protected findProperty(
-		error: IRawErrorObject,
+		error: JsonObject,
 		potentialKeys: string[],
-		traversalKeys: string[],
+		traversalKeys: string[] = [],
 	): string | null {
 		for(const key of potentialKeys) {
 			if (error[key]) {
@@ -103,7 +105,7 @@ abstract class NodeError extends 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 this.findProperty(error, potentialKeys);
 							}
 							return null;
 						})
@@ -114,12 +116,18 @@ abstract class NodeError extends Error {
 					}
 					return resolvedErrors.join(' | ');
 				}
+				if (this.isTraversableObject(error[key])) {
+					const property = this.findProperty(error[key] as JsonObject, potentialKeys);
+					if (property) {
+						return property;
+					}
+				}
 			}
 		}
 
 		for (const key of traversalKeys) {
 			if (this.isTraversableObject(error[key])) {
-				const property = this.findProperty(error[key] as IRawErrorObject, potentialKeys, traversalKeys);
+				const property = this.findProperty(error[key] as JsonObject, potentialKeys, traversalKeys);
 				if (property) {
 					return property;
 				}
@@ -132,9 +140,33 @@ abstract class NodeError extends Error {
 	/**
 	 * 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
+	protected isTraversableObject(value: any): value is JsonObject { // tslint:disable-line:no-any
 		return value && typeof value === 'object' && !Array.isArray(value) && !!Object.keys(value).length;
 	}
+
+	/**
+	 * Remove circular references from objects.
+	 */
+	 protected removeCircularRefs(obj: JsonObject, seen = new Set()) {
+		seen.add(obj);
+		Object.entries(obj).forEach(([key, value]) => {
+			if (this.isTraversableObject(value)) {
+				seen.has(value) ? obj[key] = { circularReference: true } : this.removeCircularRefs(value, seen);
+				return;
+			}
+			if (Array.isArray(value)) {
+				value.forEach((val, index) => {
+					if (seen.has(val)) {
+						value[index] = { circularReference: true };
+						return;
+					}
+					if (this.isTraversableObject(val)) {
+						this.removeCircularRefs(val, seen);
+					}
+				});
+			}
+		});
+	}
 }
 
 /**
@@ -178,10 +210,13 @@ export class NodeApiError extends NodeError {
 
 	constructor(
 		node: INode,
-		error: IRawErrorObject,
+		error: JsonObject,
 		{ message, description, httpCode, parseXml }: { message?: string, description?: string, httpCode?: string, parseXml?: boolean } = {},
 	) {
 		super(node, error);
+		if (error.error) { // only for request library error
+			this.removeCircularRefs(error.error as JsonObject);
+		}
 		if (message) {
 			this.message = message;
 			this.description = description;
@@ -215,7 +250,6 @@ export class NodeApiError extends NodeError {
 	 * @returns {void}
 	 */
 	private setMessage() {
-
 		if (!this.httpCode) {
 			this.httpCode = null;
 			this.message = UNKNOWN_ERROR_MESSAGE;