diff --git a/.jscs.json b/.jscs.json
index 440737e1f2a9..0dfd34127ceb 100644
--- a/.jscs.json
+++ b/.jscs.json
@@ -1,6 +1,6 @@
 {
   "disallowKeywords": ["with"],
   "disallowTrailingWhitespace": true,
-  "requireRightStickedOperators": ["!"],
-  "requireLeftStickedOperators": [","]
+  "disallowSpaceAfterPrefixUnaryOperators": ["!"],
+  "disallowSpaceBeforeBinaryOperators": [","]
 }
diff --git a/.jscs.json.todo b/.jscs.json.todo
index 1fb8c28d9018..614b9c8ebcb7 100644
--- a/.jscs.json.todo
+++ b/.jscs.json.todo
@@ -6,8 +6,8 @@
 {
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
-  "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-  "disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+  "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
+  "requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
   "disallowImplicitTypeConversion": ["string"],
   "disallowMultipleLineBreaks": true,
   "disallowKeywordsOnNewLine": ["else"],
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 344de51bcb3b..2c9c9f49cd01 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -543,9 +543,6 @@
             "figures": {
               "version": "1.3.3"
             },
-            "lodash": {
-              "version": "2.4.1"
-            },
             "mute-stream": {
               "version": "0.0.4"
             },
@@ -656,9 +653,6 @@
                     }
                   }
                 },
-                "lodash": {
-                  "version": "2.4.1"
-                },
                 "mute-stream": {
                   "version": "0.0.4"
                 },
@@ -1241,9 +1235,6 @@
             }
           }
         },
-        "lodash": {
-          "version": "2.4.1"
-        },
         "q": {
           "version": "0.9.7"
         },
@@ -1441,9 +1432,6 @@
             }
           }
         },
-        "lodash": {
-          "version": "2.4.1"
-        },
         "minimatch": {
           "version": "0.3.0",
           "dependencies": {
@@ -2190,9 +2178,6 @@
         "jshint": {
           "version": "2.5.6",
           "dependencies": {
-            "shelljs": {
-              "version": "0.3.0"
-            },
             "underscore": {
               "version": "1.6.0"
             },
@@ -2294,45 +2279,48 @@
       "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
       "resolved": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7"
     },
-    "grunt-jscs-checker": {
-      "version": "0.4.4",
+    "grunt-jscs": {
+      "version": "0.7.1",
       "dependencies": {
         "hooker": {
           "version": "0.2.3"
         },
         "jscs": {
-          "version": "1.4.5",
+          "version": "1.6.2",
           "dependencies": {
             "colors": {
               "version": "0.6.2"
             },
             "commander": {
-              "version": "2.2.0"
+              "version": "2.3.0"
             },
             "esprima": {
-              "version": "1.1.1"
+              "version": "1.2.2"
+            },
+            "exit": {
+              "version": "0.1.2"
             },
             "glob": {
-              "version": "3.2.11",
+              "version": "4.0.6",
               "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.4"
+                },
                 "inherits": {
                   "version": "2.0.1"
                 },
-                "minimatch": {
-                  "version": "0.3.0",
+                "once": {
+                  "version": "1.3.1",
                   "dependencies": {
-                    "lru-cache": {
-                      "version": "2.5.0"
-                    },
-                    "sigmund": {
-                      "version": "1.0.0"
+                    "wrappy": {
+                      "version": "1.0.1"
                     }
                   }
                 }
               }
             },
             "minimatch": {
-              "version": "0.2.14",
+              "version": "1.0.0",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0"
@@ -2343,132 +2331,51 @@
               }
             },
             "strip-json-comments": {
-              "version": "0.1.3"
-            },
-            "vow": {
-              "version": "0.3.13"
+              "version": "1.0.1"
             },
             "vow-fs": {
-              "version": "0.2.3",
+              "version": "0.3.2",
               "dependencies": {
                 "node-uuid": {
                   "version": "1.4.0"
                 },
+                "vow": {
+                  "version": "0.4.4"
+                },
                 "vow-queue": {
-                  "version": "0.0.2"
-                }
-              }
-            },
-            "xmlbuilder": {
-              "version": "2.2.1",
-              "dependencies": {
-                "lodash-node": {
-                  "version": "2.4.1"
-                }
-              }
-            }
-          }
-        },
-        "lodash.assign": {
-          "version": "2.4.1",
-          "dependencies": {
-            "lodash._basecreatecallback": {
-              "version": "2.4.1",
-              "dependencies": {
-                "lodash.bind": {
-                  "version": "2.4.1",
+                  "version": "0.3.1"
+                },
+                "glob": {
+                  "version": "3.2.8",
                   "dependencies": {
-                    "lodash._createwrapper": {
-                      "version": "2.4.1",
+                    "minimatch": {
+                      "version": "0.2.14",
                       "dependencies": {
-                        "lodash._basebind": {
-                          "version": "2.4.1",
-                          "dependencies": {
-                            "lodash._basecreate": {
-                              "version": "2.4.1",
-                              "dependencies": {
-                                "lodash._isnative": {
-                                  "version": "2.4.1"
-                                },
-                                "lodash.noop": {
-                                  "version": "2.4.1"
-                                }
-                              }
-                            },
-                            "lodash.isobject": {
-                              "version": "2.4.1"
-                            }
-                          }
-                        },
-                        "lodash._basecreatewrapper": {
-                          "version": "2.4.1",
-                          "dependencies": {
-                            "lodash._basecreate": {
-                              "version": "2.4.1",
-                              "dependencies": {
-                                "lodash._isnative": {
-                                  "version": "2.4.1"
-                                },
-                                "lodash.noop": {
-                                  "version": "2.4.1"
-                                }
-                              }
-                            },
-                            "lodash.isobject": {
-                              "version": "2.4.1"
-                            }
-                          }
+                        "lru-cache": {
+                          "version": "2.5.0"
                         },
-                        "lodash.isfunction": {
-                          "version": "2.4.1"
+                        "sigmund": {
+                          "version": "1.0.0"
                         }
                       }
                     },
-                    "lodash._slice": {
-                      "version": "2.4.1"
-                    }
-                  }
-                },
-                "lodash.identity": {
-                  "version": "2.4.1"
-                },
-                "lodash._setbinddata": {
-                  "version": "2.4.1",
-                  "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1"
-                    },
-                    "lodash.noop": {
-                      "version": "2.4.1"
-                    }
-                  }
-                },
-                "lodash.support": {
-                  "version": "2.4.1",
-                  "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1"
+                    "inherits": {
+                      "version": "2.0.1"
                     }
                   }
                 }
               }
             },
-            "lodash.keys": {
-              "version": "2.4.1",
+            "xmlbuilder": {
+              "version": "2.4.4",
               "dependencies": {
-                "lodash._isnative": {
-                  "version": "2.4.1"
-                },
-                "lodash.isobject": {
-                  "version": "2.4.1"
-                },
-                "lodash._shimkeys": {
+                "lodash-node": {
                   "version": "2.4.1"
                 }
               }
             },
-            "lodash._objecttypes": {
-              "version": "2.4.1"
+            "supports-color": {
+              "version": "1.1.0"
             }
           }
         },
@@ -2592,9 +2499,6 @@
                       }
                     }
                   }
-                },
-                "lodash": {
-                  "version": "2.4.1"
                 }
               }
             },
@@ -2737,9 +2641,6 @@
             "graceful-fs": {
               "version": "3.0.2"
             },
-            "lodash": {
-              "version": "2.4.1"
-            },
             "mkdirp": {
               "version": "0.5.0",
               "dependencies": {
@@ -3656,9 +3557,6 @@
           "dependencies": {
             "clone-stats": {
               "version": "0.0.1"
-            },
-            "lodash": {
-              "version": "2.4.1"
             }
           }
         },
@@ -3776,9 +3674,6 @@
         "dateformat": {
           "version": "1.0.8"
         },
-        "lodash": {
-          "version": "2.4.1"
-        },
         "lodash._reinterpolate": {
           "version": "2.4.1"
         },
@@ -4183,9 +4078,6 @@
         "colors": {
           "version": "0.6.2"
         },
-        "lodash": {
-          "version": "2.4.1"
-        },
         "mime": {
           "version": "1.2.11"
         },
@@ -5007,9 +4899,6 @@
         "q": {
           "version": "1.0.0"
         },
-        "lodash": {
-          "version": "2.4.1"
-        },
         "source-map-support": {
           "version": "0.2.7",
           "dependencies": {
diff --git a/package.json b/package.json
index ffc1a9e28947..ecc7d1a57fd9 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-ddescribe-iit": "~0.0.1",
     "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
-    "grunt-jscs-checker": "~0.4.0",
+    "grunt-jscs": "~0.7.1",
     "grunt-merge-conflict": "~0.0.1",
     "grunt-parallel": "~0.3.1",
     "grunt-shell": "~1.1.1",