diff --git a/@commitlint/prompt/package.json b/@commitlint/prompt/package.json
index 526c5c98b2..e2fd129de7 100644
--- a/@commitlint/prompt/package.json
+++ b/@commitlint/prompt/package.json
@@ -63,7 +63,7 @@
     "babel-cli": "6.26.0",
     "babel-preset-commitlint": "^7.1.2",
     "babel-register": "6.26.0",
-    "commitizen": "2.9.6",
+    "commitizen": "3.0.4",
     "concurrently": "3.5.1",
     "cross-env": "5.1.1",
     "xo": "0.20.3"
diff --git a/@commitlint/rules/src/body-tense.js b/@commitlint/rules/src/body-tense.js
deleted file mode 100644
index a5a5681420..0000000000
--- a/@commitlint/rules/src/body-tense.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default (parsed, when, value) => {
-	return [
-		false,
-		`rules.body-tense is deprecated. Received [${when}, [${value.join(', ')}]]`
-	];
-};
diff --git a/@commitlint/rules/src/body-tense.test.js b/@commitlint/rules/src/body-tense.test.js
deleted file mode 100644
index 358f3484a9..0000000000
--- a/@commitlint/rules/src/body-tense.test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import test from 'ava';
-import parse from '@commitlint/parse';
-import bodyTense from './body-tense';
-
-test('returns deprecation warning', async t => {
-	const actual = bodyTense(await parse('test: \n'), 'always', [
-		'present-imperative'
-	]);
-	t.deepEqual(actual, [
-		false,
-		'rules.body-tense is deprecated. Received [always, [present-imperative]]'
-	]);
-});
diff --git a/@commitlint/rules/src/footer-tense.js b/@commitlint/rules/src/footer-tense.js
deleted file mode 100644
index 3b74a40afa..0000000000
--- a/@commitlint/rules/src/footer-tense.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default (parsed, when, value) => {
-	return [
-		false,
-		`rules.footer-tense is deprecated. Received [${when}, [${value.join(
-			', '
-		)}]]`
-	];
-};
diff --git a/@commitlint/rules/src/footer-tense.test.js b/@commitlint/rules/src/footer-tense.test.js
deleted file mode 100644
index b97ffd24af..0000000000
--- a/@commitlint/rules/src/footer-tense.test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import test from 'ava';
-import parse from '@commitlint/parse';
-import footerTense from './footer-tense';
-
-test('returns deprecation warning', async t => {
-	const actual = footerTense(await parse('test: subject\nbody'), 'always', [
-		'present-imperative'
-	]);
-	t.deepEqual(actual, [
-		false,
-		'rules.footer-tense is deprecated. Received [always, [present-imperative]]'
-	]);
-});
diff --git a/@commitlint/rules/src/index.js b/@commitlint/rules/src/index.js
index b21ed391f0..4cf3561442 100644
--- a/@commitlint/rules/src/index.js
+++ b/@commitlint/rules/src/index.js
@@ -5,16 +5,13 @@ export default {
 	'body-max-length': require('./body-max-length'),
 	'body-max-line-length': require('./body-max-line-length'),
 	'body-min-length': require('./body-min-length'),
-	'body-tense': require('./body-tense'),
 	'footer-empty': require('./footer-empty'),
 	'footer-leading-blank': require('./footer-leading-blank'),
 	'footer-max-length': require('./footer-max-length'),
 	'footer-max-line-length': require('./footer-max-line-length'),
 	'footer-min-length': require('./footer-min-length'),
-	'footer-tense': require('./footer-tense'),
 	'header-max-length': require('./header-max-length'),
 	'header-min-length': require('./header-min-length'),
-	lang: require('./lang'),
 	'references-empty': require('./references-empty'),
 	'scope-case': require('./scope-case'),
 	'scope-empty': require('./scope-empty'),
@@ -27,7 +24,6 @@ export default {
 	'subject-full-stop': require('./subject-full-stop'),
 	'subject-max-length': require('./subject-max-length'),
 	'subject-min-length': require('./subject-min-length'),
-	'subject-tense': require('./subject-tense'),
 	'type-case': require('./type-case'),
 	'type-empty': require('./type-empty'),
 	'type-enum': require('./type-enum'),
diff --git a/@commitlint/rules/src/lang.js b/@commitlint/rules/src/lang.js
deleted file mode 100644
index 02ee5a76d5..0000000000
--- a/@commitlint/rules/src/lang.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default (parsed, when, value) => {
-	return [false, `rules.lang is deprecated. Received [${when}, ${value}]`];
-};
diff --git a/@commitlint/rules/src/lang.test.js b/@commitlint/rules/src/lang.test.js
deleted file mode 100644
index bb6970b205..0000000000
--- a/@commitlint/rules/src/lang.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import test from 'ava';
-import parse from '@commitlint/parse';
-import check from './lang';
-
-test('returns a deprecation warning', async t => {
-	const actual = check(
-		await parse('(): this is a serious subject'),
-		'always',
-		'eng'
-	);
-	t.deepEqual(actual, [
-		false,
-		'rules.lang is deprecated. Received [always, eng]'
-	]);
-});
diff --git a/@commitlint/rules/src/subject-empty.js b/@commitlint/rules/src/subject-empty.js
index 26fe375668..707947f2a3 100644
--- a/@commitlint/rules/src/subject-empty.js
+++ b/@commitlint/rules/src/subject-empty.js
@@ -7,6 +7,6 @@ export default (parsed, when) => {
 
 	return [
 		negated ? notEmpty : !notEmpty,
-		message(['message', negated ? 'may not' : 'must', 'be empty'])
+		message(['subject', negated ? 'may not' : 'must', 'be empty'])
 	];
 };
diff --git a/@commitlint/rules/src/subject-full-stop.js b/@commitlint/rules/src/subject-full-stop.js
index b410f509f0..010a8f4c54 100644
--- a/@commitlint/rules/src/subject-full-stop.js
+++ b/@commitlint/rules/src/subject-full-stop.js
@@ -12,6 +12,6 @@ export default (parsed, when, value) => {
 
 	return [
 		negated ? !hasStop : hasStop,
-		message(['message', negated ? 'may not' : 'must', 'end with full stop'])
+		message(['subject', negated ? 'may not' : 'must', 'end with full stop'])
 	];
 };
diff --git a/@commitlint/rules/src/subject-max-length.js b/@commitlint/rules/src/subject-max-length.js
index 2a810bed73..ba0f03e49c 100644
--- a/@commitlint/rules/src/subject-max-length.js
+++ b/@commitlint/rules/src/subject-max-length.js
@@ -9,6 +9,6 @@ export default (parsed, when, value) => {
 
 	return [
 		maxLength(input, value),
-		`footer must not be longer than ${value} characters`
+		`subject must not be longer than ${value} characters`
 	];
 };
diff --git a/@commitlint/rules/src/subject-tense.js b/@commitlint/rules/src/subject-tense.js
deleted file mode 100644
index 68ea82cba6..0000000000
--- a/@commitlint/rules/src/subject-tense.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default (parsed, when, value) => {
-	return [
-		false,
-		`rules.subject-tense is deprecated. Received [${when}, [${value.join(
-			', '
-		)}]]`
-	];
-};
diff --git a/@commitlint/rules/src/subject-tense.test.js b/@commitlint/rules/src/subject-tense.test.js
deleted file mode 100644
index 9e537a9e21..0000000000
--- a/@commitlint/rules/src/subject-tense.test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import test from 'ava';
-import parse from '@commitlint/parse';
-import subjectTense from './subject-tense';
-
-test('returns deprecation warning', async t => {
-	const actual = subjectTense(await parse('test: '), 'always', [
-		'present-imperative'
-	]);
-	t.deepEqual(actual, [
-		false,
-		'rules.subject-tense is deprecated. Received [always, [present-imperative]]'
-	]);
-});
diff --git a/README.md b/README.md
index ecbdd82e71..da21c41e75 100644
--- a/README.md
+++ b/README.md
@@ -62,8 +62,8 @@ To lint commits before they are created you can use Husky's 'commit-msg' hook:
 
 **Detailed Setup instructions**
 
-* [Local setup](http://marionebl.github.io/commitlint/#/guides-local-setup) - Lint messages on commit with husky
-* [CI setup](http://marionebl.github.io/commitlint/#/guides-ci-setup) - Lint messages during CI builds
+* [Local setup](https://marionebl.github.io/commitlint/#/guides-local-setup) - Lint messages on commit with husky
+* [CI setup](https://marionebl.github.io/commitlint/#/guides-ci-setup) - Lint messages during CI builds
 
 
 ## CLI
@@ -180,5 +180,5 @@ npx yarn run publish
 
 [10]: https://img.shields.io/npm/v/@commitlint/cli/next.svg?style=flat-square
 
-[11]: http://devtoolscommunity.herokuapp.com/badge.svg?style=flat-square
-[12]: http://devtoolscommunity.herokuapp.com
+[11]: https://devtoolscommunity.herokuapp.com/badge.svg?style=flat-square
+[12]: https://devtoolscommunity.herokuapp.com
diff --git a/package.json b/package.json
index 73e4687600..b120145691 100644
--- a/package.json
+++ b/package.json
@@ -6,14 +6,13 @@
   "license": "MIT",
   "scripts": {
     "build": "lerna run build --stream --parallel --include-filtered-dependencies",
+    "watch": "lerna run watch --stream --parallel --include-filtered-dependencies",
     "clean": "npx lerna clean --yes && npx lerna run clean --stream --parallel --include-filtered-dependencies",
     "commit": "node @commitlint/prompt-cli/cli.js",
-    "commitmsg": "node @commitlint/cli/lib/cli.js -E GIT_PARAMS",
     "deps": "lerna run deps",
     "pkg": "lerna run pkg",
     "docs": "docsify serve docs",
     "lint": "lerna run lint",
-    "precommit": "lint-staged",
     "publish": "lerna publish --conventional-commits",
     "reinstall": "yarn clean && yarn install",
     "start": "lerna run start --stream --parallel --include-filtered-dependencies",
@@ -92,7 +91,7 @@
     "@marionebl/sander": "0.6.1"
   },
   "devDependencies": {
-    "docsify-cli": "4.2.0",
+    "docsify-cli": "4.2.1",
     "eslint": "4.18.1",
     "eslint-config-prettier": "2.9.0",
     "husky": "1.1.2",
@@ -101,5 +100,11 @@
     "npx": "9.7.1",
     "prettier": "1.10.2",
     "xo": "0.20.3"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "node @commitlint/cli/lib/cli.js -E HUSKY_GIT_PARAMS",
+      "pre-commit": "lint-staged"
+    }
   }
 }