diff --git a/.stylelintrc.json b/.stylelintrc.json
index db05c713..12500818 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,5 +1,6 @@
 {
 	"extends": "stylelint-config-standard",
 	"font-family-name-quotes": "double-where-recommended",
-	"block-no-empty": false
+	"block-no-empty": false,
+	"ignoreFiles": ["./modules/default/alert/ns-default.css"]
 }
diff --git a/Gruntfile.js b/Gruntfile.js
index bd8b20ba..eb6fc7c2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,21 +23,6 @@ module.exports = function(grunt) {
 				"vendor/vendor.js"
 			]
 		},
-		stylelint: {
-			simple: {
-				options: {
-					fix: fix,
-					configFile: ".stylelintrc.json"
-				},
-				src: [
-					"css/main.css",
-					"modules/default/calendar/calendar.css",
-					"modules/default/clock/clock_styles.css",
-					"modules/default/currentweather/currentweather.css",
-					"modules/default/weatherforcast/weatherforcast.css"
-				]
-			}
-		},
 		jsonlint: {
 			main: {
 				src: [
@@ -92,7 +77,6 @@ module.exports = function(grunt) {
 		}
 	});
 	grunt.loadNpmTasks("grunt-eslint");
-	grunt.loadNpmTasks("grunt-stylelint");
 	grunt.loadNpmTasks("grunt-jsonlint");
 	grunt.loadNpmTasks("grunt-markdownlint");
 
diff --git a/package.json b/package.json
index 8b162650..f94f000d 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,10 @@
     "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
     "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
     "test:lint": "grunt --env=test",
+    "test:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
     "config:check": "node tests/configs/check_config.js",
     "lint": "grunt --env=lint",
+    "lint:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
     "lint:yaml": "yamllint .travis.yml"
   },
   "repository": {
@@ -45,7 +47,6 @@
     "grunt-eslint": "latest",
     "grunt-jsonlint": "latest",
     "grunt-markdownlint": "latest",
-    "grunt-stylelint": "latest",
     "http-auth": "^3.2.3",
     "jsdom": "^11.6.2",
     "mocha": "^7.0.0",