diff --git a/package.json b/package.json
index c9b29f3..ebaf1ef 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "grunt-contrib-sass": "~0.7.3",
     "grunt-contrib-uglify": "~0.5.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-csscomb": "~2.0.1",
+    "grunt-csscomb": "~3.0.0-1",
     "grunt-html-validation": "~0.1.18",
     "grunt-jekyll": "~0.4.2",
     "grunt-jscs-checker": "~0.4.4",
diff --git a/sass/.csscomb.json b/sass/.csscomb.json
index 8456e41..f6575eb 100644
--- a/sass/.csscomb.json
+++ b/sass/.csscomb.json
@@ -1,16 +1,20 @@
 {
   "always-semicolon": true,
   "block-indent": 2,
-  "colon-space": [0, 1],
   "color-case": "lower",
   "color-shorthand": true,
-  "combinator-space": true,
   "element-case": "lower",
   "eof-newline": true,
   "leading-zero": false,
   "remove-empty-rulesets": true,
-  "rule-indent": 2,
-  "stick-brace": " ",
+  "space-after-colon": 1,
+  "space-after-combinator": 1,
+  "space-after-declaration": "\n",
+  "space-after-opening-brace": "\n",
+  "space-before-closing-brace": "\n",
+  "space-before-colon": 0,
+  "space-before-combinator": 1,
+  "space-before-opening-brace": 1,
   "strip-spaces": true,
   "unitless-zero": true,
   "vendor-prefix-align": true,