diff --git a/commitlint.config.js b/commitlint.config.js
index d3a6161..cff7200 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,6 +1,8 @@
 module.exports = {
-  extends: ['@commitlint/config-angular'],
+  extends: ['@commitlint/config-conventional'],
   rules: {
-    'subject-case': 'sentence-case',
+    'scope-case': [0],
+    'subject-case': [2, 'always', 'sentence-case'],
+    'header-max-length': [0],
   },
 };
diff --git a/package-lock.json b/package-lock.json
index e8ac643..3f8565c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,22 +82,11 @@
         }
       }
     },
-    "@commitlint/config-angular": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@commitlint/config-angular/-/config-angular-5.1.1.tgz",
-      "integrity": "sha512-6tTIm/vIxetMsoARA3WLQVYpjr1JQxbshN+Ax1neIU0rz3weJEeSdG21n6nAPH1fBcsZ0kLALN7J4umFVuXTgw==",
-      "dev": true,
-      "requires": {
-        "@commitlint/config-angular-type-enum": "^5.1.1"
-      },
-      "dependencies": {
-        "@commitlint/config-angular-type-enum": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/@commitlint/config-angular-type-enum/-/config-angular-type-enum-5.1.1.tgz",
-          "integrity": "sha512-5DE9BRJHxPDtSNqz3C7QD5xBMQL8wII+r6EWSj8O888Ps66tVlHzwj4grF+fe4+wg1d03+n4eZE+4PaV6Ua1cQ==",
-          "dev": true
-        }
-      }
+    "@commitlint/config-conventional": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-6.1.3.tgz",
+      "integrity": "sha1-bAburgTFrHicNhjfTVKu2on/uBA=",
+      "dev": true
     },
     "@marionebl/sander": {
       "version": "0.6.1",
@@ -3143,8 +3132,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "2.1.0",
-            "pinkie-promise": "2.0.1"
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
         },
         "path-exists": {
@@ -3153,7 +3142,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "2.0.1"
+            "pinkie-promise": "^2.0.0"
           }
         },
         "pkg-dir": {
@@ -3162,7 +3151,7 @@
           "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
           "dev": true,
           "requires": {
-            "find-up": "1.1.2"
+            "find-up": "^1.0.0"
           }
         }
       }
@@ -3191,8 +3180,8 @@
           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
           "dev": true,
           "requires": {
-            "esutils": "2.0.2",
-            "isarray": "1.0.0"
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
           }
         },
         "resolve": {
@@ -7737,10 +7726,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
         "parse-json": {
@@ -7749,8 +7738,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         },
         "path-type": {
@@ -7759,7 +7748,7 @@
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         },
         "read-pkg": {
@@ -7768,9 +7757,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "3.0.0"
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
           }
         },
         "semver": {
diff --git a/package.json b/package.json
index 62d1ff9..7a9ce38 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^5.2.5",
-    "@commitlint/config-angular": "^5.1.1",
+    "@commitlint/config-conventional": "^6.1.3",
     "algoliasearch": "^3.27.1",
     "babel-cli": "^6.24.1",
     "babel-loader": "^7.1.1",