diff --git a/.stylelintrc b/.stylelintrc
index c3c9662..00f9050 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -4,7 +4,7 @@
   ],
   "rules": {
     "at-rule-empty-line-before": ["always", {
-      "except": ["blockless-group", "first-nested"],
+      "except": ["first-nested", "blockless-after-same-name-blockless"],
       "ignore": ["after-comment"]
     }],
     "block-closing-brace-newline-after": "always",
@@ -27,7 +27,6 @@
     "declaration-bang-space-before": "always",
     "declaration-block-no-duplicate-properties": true,
     "declaration-block-no-shorthand-property-overrides": true,
-    "declaration-block-properties-order": "alphabetical",
     "declaration-block-semicolon-newline-after": "always-multi-line",
     "declaration-block-semicolon-space-after": "always-single-line",
     "declaration-block-semicolon-space-before": "never",
@@ -37,6 +36,7 @@
     "declaration-colon-space-after": "always-single-line",
     "declaration-colon-space-before": "never",
     "declaration-no-important": true,
+    "font-family-no-duplicate-names" : true,
     "font-family-name-quotes": "always-where-recommended",
     "font-weight-notation": "numeric",
     "function-calc-no-unspaced-operator": true,
@@ -58,25 +58,21 @@
     "max-nesting-depth": 3,
     "media-feature-colon-space-after": "always",
     "media-feature-colon-space-before": "never",
-    "media-feature-no-missing-punctuation": true,
     "media-feature-range-operator-space-after": "always",
     "media-feature-range-operator-space-before": "always",
     "media-query-list-comma-newline-after": "always-multi-line",
     "media-query-list-comma-space-after": "always-single-line",
     "media-query-list-comma-space-before": "never",
-    "media-query-parentheses-space-inside": "never",
     "no-descending-specificity": true,
     "no-duplicate-selectors": true,
     "no-eol-whitespace": true,
     "no-invalid-double-slash-comments": true,
-    "no-missing-eof-newline": true,
     "no-unknown-animations": true,
     "number-leading-zero": "never",
     "number-max-precision": 2,
     "number-no-trailing-zeros": true,
-    "rule-non-nested-empty-line-before": ["always", {
-      "ignore": ["after-comment"]
-    }],
+    "property-no-unknown": true,
+    "rule-empty-line-before" : "always",
     "scss/at-import-no-partial-leading-underscore": true,
     "scss/selector-no-redundant-nesting-selector": true,
     "selector-combinator-space-after": "always",
@@ -86,15 +82,18 @@
     "selector-list-comma-space-after": "always-single-line",
     "selector-list-comma-space-before": "never",
     "selector-max-specificity": "0,4,0",
-    "selector-no-id": true,
-    "selector-no-type": true,
-    "selector-no-universal": true,
+    "selector-max-type": 2,
+    "selector-no-qualifying-type": [true, {
+      "ignore": "attribute"
+    }],
+    "selector-max-id": 0,
     "selector-no-vendor-prefix": true,
     "selector-pseudo-element-colon-notation": "double",
     "selector-type-case": "lower",
+    "shorthand-property-no-redundant-values": true,
     "string-no-newline": true,
     "string-quotes": "double",
-    "time-no-imperceptible": true,
+    "unit-no-unknown" : true,
     "value-list-comma-newline-after": "always-multi-line",
     "value-list-comma-newline-before": "never-multi-line",
     "value-list-comma-space-after": "always-single-line",
diff --git a/package.json b/package.json
index fe8f8f3..9e91df5 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "gulp-imagemin": "^3.0.1",
     "gulp-phpunit": "^0.14.0",
     "gulp-plumber": "^1.1.0",
-    "gulp-postcss": "^6.1.1",
+    "gulp-postcss": "^7.0.0",
     "gulp-sass": "^2.3.1",
     "gulp-sort": "^2.0.0",
     "gulp-sourcemaps": "^1.6.0",
@@ -91,7 +91,7 @@
     "react-transform-hmr": "^1.0.4",
     "require-dir": "^0.3.0",
     "sinon": "^1.17.4",
-    "stylelint": "^6.5.1",
+    "stylelint": "^8.2.0",
     "stylelint-scss": "^1.0.0",
     "susy": "^2.2.12",
     "uglifyify": "^3.0.1",