diff --git a/commitlint.config.js b/commitlint.config.js
index b2845a5397..818ce0fcbc 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -11,6 +11,7 @@ module.exports = {
                 'feat',
                 'fix',
                 'docs',
+                'switched',
                 'style',
                 'refactor',
                 'perf',
diff --git a/package-lock.json b/package-lock.json
index f56a0dfa70..c63252f30a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7022,9 +7022,8 @@
       "dev": true
     },
     "cz-conventional-changelog": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-3.1.0.tgz",
-      "integrity": "sha512-SCwPPOF+7qMh1DZkJhrwaxCvZzPaz2E9BwQzcZwBuHlpcJj9zzz7K5vADQRhHuxStaHZFSLbDlZEdcls4bKu7Q==",
+      "version": "git+https://github.com/Lundalogik/cz-conventional-changelog.git#3d4c0e6e7a2e266e0d9dd0cc78b5b82b3266e968",
+      "from": "git+https://github.com/Lundalogik/cz-conventional-changelog.git",
       "dev": true,
       "requires": {
         "@commitlint/load": ">6.1.1",
diff --git a/package.json b/package.json
index 6090ae0edc..e3affc5ac8 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,8 @@
     "@commitlint/config-conventional": "8.3.4",
     "@lundalogik/lime-icons8": "https://npm.pkg.github.com/download/@lundalogik/lime-icons8/2.1.0/96ebb4a7165fc618dba53568ab04db5fb9803a58d19e936965415e14dd224256",
     "@semantic-release/changelog": "5.0.0",
-    "@semantic-release/git": "7.0.18",
     "@semantic-release/exec": "4.0.0",
+    "@semantic-release/git": "7.0.18",
     "@stencil/core": "1.8.11",
     "@stencil/sass": "1.1.1",
     "@types/chart.js": "2.9.15",
@@ -63,7 +63,7 @@
     "@types/react": "16.9.24",
     "commitizen": "4.0.3",
     "cross-env": "7.0.0",
-    "cz-conventional-changelog": "3.1.0",
+    "cz-conventional-changelog": "git+https://github.com/Lundalogik/cz-conventional-changelog.git",
     "docz": "1.3.2",
     "docz-theme-default": "1.2.0",
     "eslint": "6.8.0",
@@ -107,7 +107,13 @@
   },
   "config": {
     "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
+      "path": "./node_modules/cz-conventional-changelog",
+      "additionalTypes": {
+        "switched": {
+          "description": "Not-yet-released functionality hidden behind a feature switch",
+          "title": "Not Released (feature switched)"
+        }
+      }
     }
   },
   "greenkeeper": {