diff --git a/.stylelintrc b/.stylelintrc
index 5f32a858..cabb1fda 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -5,7 +5,7 @@
 	],
 	"rules": {
 		"at-rule-empty-line-before": ["always", {
-			"except": ["blockless-group", "first-nested"],
+			"except": ["blockless-after-blockless", "first-nested"],
 			"ignore": ["after-comment"]
 		}],
 		"block-closing-brace-newline-after": "always",
@@ -20,7 +20,7 @@
 		"color-no-invalid-hex": true,
 		"comment-empty-line-before": ["always", {
 			"except": ["first-nested"],
-			"ignore": ["stylelint-commands"]
+			"ignore": ["stylelint-command"]
 		}],
 		"comment-whitespace-inside": "always",
 		"declaration-bang-space-after": "never",
@@ -59,8 +59,9 @@
 			"ignore": ["consecutive-duplicates"]
 		}],
 		"declaration-block-no-shorthand-property-overrides": true,
-		"rule-non-nested-empty-line-before": ["always-multi-line", {
-			"ignore": ["after-comment"]
+		"rule-empty-line-before": ["always-multi-line", {
+			"except": ["first-nested"],
+			"ignore": ["after-comment"],
 		}],
 		"declaration-block-trailing-semicolon": "always",
 		"selector-combinator-space-after": "always",
diff --git a/package.json b/package.json
index fd83ddde..aca15d22 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "npm-run-all": "4.0.1",
     "nyc": "10.1.0",
     "socket.io-client": "1.7.2",
-    "stylelint": "7.7.1",
+    "stylelint": "7.8.0",
     "urijs": "1.16.1",
     "webpack": "1.14.0"
   }