diff --git a/README.md b/README.md
index 8ce4bed..a6e1ac7 100644
--- a/README.md
+++ b/README.md
@@ -1891,6 +1891,12 @@ grunt.initConfig( {
 
 ## Release History
 
+### 2.0.0
+- Removes watch configuration for JS & CSS. From now on plugins need to have their own `watch.js` file.
+- Adds Grunt config file watching.
+- Fixes Config/Shell PHPCS command
+- Excludes Artifact and WordPress SVN checkout from POT file generation to prevent duplicates.
+
 ### 1.6.2
 - Bump version of `grunt-contrib-compress` to add node 12 support.
 
diff --git a/config/makepot.js b/config/makepot.js
index 3f6fac9..f0c5bd6 100644
--- a/config/makepot.js
+++ b/config/makepot.js
@@ -11,7 +11,10 @@ module.exports = {
 				'last-translator': '<%= pkg.pot.lasttranslator %>'
 			},
 			type: 'wp-plugin',
-			exclude: []
+			exclude: [
+				"<%= files.artifact %>",
+				".wordpress-svn",
+			]
 		}
 	}
 };
diff --git a/config/shell.js b/config/shell.js
index 7342a4c..b166d6d 100644
--- a/config/shell.js
+++ b/config/shell.js
@@ -34,8 +34,8 @@ module.exports = function() {
 
 		phpcs: {
 			command: "if [[ -f \"./vendor/squizlabs/php_codesniffer/bin/phpcs\"]]; " +
-				"then php ./vendor/squizlabs/php_codesniffer/bin/phpcs " +
-				"else php ./vendor/squizlabs/php_codesniffer/scripts/phpcs " +
+				"then php ./vendor/squizlabs/php_codesniffer/bin/phpcs; " +
+				"else php ./vendor/squizlabs/php_codesniffer/scripts/phpcs; " +
 				"fi",
 		},
 	};
diff --git a/config/watch.js b/config/watch.js
index 15d3cff..d789354 100644
--- a/config/watch.js
+++ b/config/watch.js
@@ -3,20 +3,16 @@ module.exports = {
 	options: {
 		livereload: true,
 	},
-	js: {
+	grunt: {
+		options: {
+			reload: true,
+		},
 		files: [
-			"<%= files.js %>",
+			"<%= files.grunt %>",
+			"<%= files.config %>",
 		],
 		tasks: [
-			"build:js",
-		],
-	},
-	css: {
-		files: [
-			"<%= files.sass %>",
-		],
-		tasks: [
-			"build:css",
+			"eslint:grunt",
 		],
 	},
 };
diff --git a/package.json b/package.json
index 35e81a6..90f7eef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@yoast/grunt-plugin-tasks",
 	"description": "Custom Yoast grunt tasks",
-	"version": "1.7.2",
+	"version": "2.0.0",
 	"homepage": "https://github.com/Yoast/",
 	"repository": {
 		"type": "git",