diff --git a/.eslintrc b/.eslintrc
index b2c61e21..c10de0c1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -46,6 +46,7 @@ rules:
   # https://github.com/eslint/eslint/tree/master/docs/rules#best-practices
   no-fallthrough: 2
   no-redeclare: 2
+  no-constant-condition: 2
 
   # Stylistic Issues
   # https://github.com/eslint/eslint/tree/master/docs/rules#stylistic-issues
@@ -60,18 +61,17 @@ rules:
   object-curly-spacing: [1, "always"]
   quotes: [2, "single", "avoid-escape"]
   semi: 2
-  space-after-keywords: 2
+  keyword-spacing: 2
   space-before-blocks: [2, "always"]
   space-before-function-paren: [2, "never"]
   space-in-parens: [2, "never"]
   space-infix-ops: 2
-  space-return-throw-case: 2
   space-unary-ops: 2
 
   # ECMAScript 6
   # http://eslint.org/docs/rules/#ecmascript-6
   arrow-spacing: [2, {"before": true, "after": true}]
-  no-arrow-condition: 2
+  no-confusing-arrow: 2
   prefer-const: 2
 
   # Strict Mode