diff --git a/.eslintrc.json b/.eslintrc.json
index 3230815..e92b6b9 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -193,11 +193,13 @@
         "react/jsx-pascal-case": "warn",
         "react/jsx-uses-react": "warn",
         "react/jsx-uses-vars": "warn",
-        "react/no-danger": "warn",
+        "react/jsx-no-comment-textnodes": "warn",
+        "react/jsx-wrap-multilines": "warn",
         "react/no-deprecated": "warn",
         "react/no-did-mount-set-state": "warn",
         "react/no-did-update-set-state": "warn",
         "react/no-direct-mutation-state": "warn",
+        "react/require-render-return": "warn",
         "react/no-is-mounted": "warn",
         "react/no-multi-comp": "warn",
         "react/no-string-refs": "warn",
@@ -205,9 +207,7 @@
         "react/prefer-es6-class": "warn",
         "react/prop-types": "warn",
         "react/react-in-jsx-scope": "warn",
-        "react/require-extension": "warn",
         "react/self-closing-comp": "warn",
-        "react/sort-comp": ["warn", {"order": ["lifecycle", "render", "everything-else"]}],
-        "react/wrap-multilines": "warn"
+        "react/sort-comp": ["warn", {"order": ["lifecycle", "render", "everything-else"]}]
     }
 }
diff --git a/package.json b/package.json
index 12ec388..ddc325d 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "css-loader": "^0.23.0",
     "enzyme": "^2.2.0",
     "eslint": "^3.1.1",
-    "eslint-plugin-react": "^5.0.0",
+    "eslint-plugin-react": "^6.0.0",
     "exports-loader": "^0.6.3",
     "extract-text-webpack-plugin": "^1.0.0",
     "file-loader": "^0.9.0",
@@ -69,7 +69,7 @@
     "karma-sourcemap-loader": "*",
     "karma-webpack": "^1.5.1",
     "loader-utils": "^0.2.15",
-    "mocha": "^2.2.5",
+    "mocha": "^3.0.2",
     "node-sass": "^3.4.2",
     "phantomjs-prebuilt": "^2.0.0",
     "postcss-import": "^8.1.2",
@@ -77,6 +77,7 @@
     "postcss-scss": "^0.1.8",
     "postcss-url": "SleepWalker/postcss-url#switch-to-async-api",
     "raw-loader": "^0.5.1",
+    "react-addons-perf": "^15.3.0",
     "react-addons-test-utils": "^15.0.2",
     "redux-devtools": "^3.3.1",
     "redux-devtools-dock-monitor": "^1.1.1",
diff --git a/src/index.js b/src/index.js
index ddf658b..82a173e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -74,4 +74,7 @@ if (process.env.NODE_ENV !== 'production') {
     window.testOAuth = () => location.href = '/oauth2/v1/ely?client_id=ely&redirect_uri=http%3A%2F%2Fely.by&response_type=code&scope=minecraft_server_session';
     window.testOAuthStatic = () => location.href = '/oauth2/v1/ely?client_id=ely&redirect_uri=static_page_with_code&response_type=code&scope=minecraft_server_session';
     window.testOAuthStaticCode = () => location.href = '/oauth2/v1/ely?client_id=ely&redirect_uri=static_page&response_type=code&scope=minecraft_server_session';
+
+    // expose Perf
+    window.Perf = require('react-addons-perf');
 }