diff --git a/packages/strapi-admin/files/admin/src/app.js b/packages/strapi-admin/files/admin/src/app.js
index 1590943ca3..9027ef4050 100644
--- a/packages/strapi-admin/files/admin/src/app.js
+++ b/packages/strapi-admin/files/admin/src/app.js
@@ -110,7 +110,7 @@ const registerPlugin = (plugin) => {
 
   // Create a new prefixed route for each plugin routes
   if (formattedPlugin && formattedPlugin.routes) {
-    formattedPlugin.routes.forEach(route => {
+    formattedPlugin.routes.forEach((route) => {
       pluginsRoute.childRoutes.push({
         path: `/plugins/${formattedPlugin.id}${route.path}`,
         name: `plugins_${formattedPlugin.id}_${route.name}`,
diff --git a/packages/strapi-admin/files/admin/src/components/LeftMenuLink/index.js b/packages/strapi-admin/files/admin/src/components/LeftMenuLink/index.js
index 8fa5767320..8036e178a5 100644
--- a/packages/strapi-admin/files/admin/src/components/LeftMenuLink/index.js
+++ b/packages/strapi-admin/files/admin/src/components/LeftMenuLink/index.js
@@ -29,9 +29,9 @@ class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer
 }
 
 LeftMenuLink.propTypes = {
-  destination: React.PropTypes.string,
-  icon: React.PropTypes.string,
-  label: React.PropTypes.string,
+  destination: React.PropTypes.string.isRequired.isRequired,
+  icon: React.PropTypes.string.isRequired.isRequired,
+  label: React.PropTypes.string.isRequired.isRequired,
 };
 
 export default LeftMenuLink;
diff --git a/packages/strapi-admin/files/admin/src/components/LeftMenuLinkContainer/index.js b/packages/strapi-admin/files/admin/src/components/LeftMenuLinkContainer/index.js
index 29ea2767a2..354130f24f 100644
--- a/packages/strapi-admin/files/admin/src/components/LeftMenuLinkContainer/index.js
+++ b/packages/strapi-admin/files/admin/src/components/LeftMenuLinkContainer/index.js
@@ -88,7 +88,7 @@ class LeftMenuLinkContainer extends React.Component { // eslint-disable-line rea
 }
 
 LeftMenuLinkContainer.propTypes = {
-  plugins: React.PropTypes.object,
+  plugins: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default LeftMenuLinkContainer;
diff --git a/packages/strapi-admin/files/admin/src/components/Notification/index.js b/packages/strapi-admin/files/admin/src/components/Notification/index.js
index 5632836082..df163cc740 100644
--- a/packages/strapi-admin/files/admin/src/components/Notification/index.js
+++ b/packages/strapi-admin/files/admin/src/components/Notification/index.js
@@ -54,8 +54,8 @@ class Notification extends React.Component { // eslint-disable-line react/prefer
 }
 
 Notification.propTypes = {
-  notification: React.PropTypes.object,
-  onHideNotification: React.PropTypes.func,
+  notification: React.PropTypes.object.isRequired.isRequired,
+  onHideNotification: React.PropTypes.func.isRequired.isRequired,
 };
 
 export default Notification;
diff --git a/packages/strapi-admin/files/admin/src/components/NotificationsContainer/index.js b/packages/strapi-admin/files/admin/src/components/NotificationsContainer/index.js
index 77e70573f0..1b05584521 100644
--- a/packages/strapi-admin/files/admin/src/components/NotificationsContainer/index.js
+++ b/packages/strapi-admin/files/admin/src/components/NotificationsContainer/index.js
@@ -38,8 +38,8 @@ class NotificationsContainer extends React.Component { // eslint-disable-line re
 }
 
 NotificationsContainer.propTypes = {
-  notifications: React.PropTypes.object,
-  onHideNotification: React.PropTypes.func,
+  notifications: React.PropTypes.object.isRequired.isRequired,
+  onHideNotification: React.PropTypes.func.isRequired.isRequired,
 };
 
 export default NotificationsContainer;
diff --git a/packages/strapi-admin/files/admin/src/components/Plugin/index.js b/packages/strapi-admin/files/admin/src/components/Plugin/index.js
index d722bc4622..b7fa0088e4 100644
--- a/packages/strapi-admin/files/admin/src/components/Plugin/index.js
+++ b/packages/strapi-admin/files/admin/src/components/Plugin/index.js
@@ -23,8 +23,8 @@ class Plugin extends React.Component { // eslint-disable-line react/prefer-state
 }
 
 Plugin.propTypes = {
-  description: React.PropTypes.object,
-  title: React.PropTypes.object,
+  description: React.PropTypes.object.isRequired.isRequired,
+  title: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default Plugin;
diff --git a/packages/strapi-admin/files/admin/src/components/PluginHeader/index.js b/packages/strapi-admin/files/admin/src/components/PluginHeader/index.js
index 01779c340b..66835b50b9 100644
--- a/packages/strapi-admin/files/admin/src/components/PluginHeader/index.js
+++ b/packages/strapi-admin/files/admin/src/components/PluginHeader/index.js
@@ -31,9 +31,9 @@ class PluginHeader extends React.Component { // eslint-disable-line react/prefer
 }
 
 PluginHeader.propTypes = {
-  actions: React.PropTypes.array,
-  description: React.PropTypes.object,
-  title: React.PropTypes.object,
+  actions: React.PropTypes.array.isRequired.isRequired,
+  description: React.PropTypes.object.isRequired.isRequired,
+  title: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default PluginHeader;
diff --git a/packages/strapi-admin/files/admin/src/components/PluginHeaderActions/index.js b/packages/strapi-admin/files/admin/src/components/PluginHeaderActions/index.js
index 5b85f6739c..a3ea2b07ef 100644
--- a/packages/strapi-admin/files/admin/src/components/PluginHeaderActions/index.js
+++ b/packages/strapi-admin/files/admin/src/components/PluginHeaderActions/index.js
@@ -11,9 +11,9 @@ import styles from './styles.scss';
 
 class PluginHeaderActions extends React.Component { // eslint-disable-line react/prefer-stateless-function
   render() {
-    const actions = this.props.actions && this.props.actions.map((action, i) => (
+    const actions = this.props.actions && this.props.actions.map((action) => (
       <button
-        key={i}
+        key={action.label}
         className={`btn ${action.class} ${styles.btn}`}
         onClick={action.onClick}
         disabled={action.disabled}
@@ -33,7 +33,7 @@ class PluginHeaderActions extends React.Component { // eslint-disable-line react
 }
 
 PluginHeaderActions.propTypes = {
-  actions: React.PropTypes.array,
+  actions: React.PropTypes.array.isRequired.isRequired,
 };
 
 export default PluginHeaderActions;
diff --git a/packages/strapi-admin/files/admin/src/components/PluginHeaderTitle/index.js b/packages/strapi-admin/files/admin/src/components/PluginHeaderTitle/index.js
index c8976282cd..e9f1ce9daa 100644
--- a/packages/strapi-admin/files/admin/src/components/PluginHeaderTitle/index.js
+++ b/packages/strapi-admin/files/admin/src/components/PluginHeaderTitle/index.js
@@ -25,8 +25,8 @@ class PluginHeaderTitle extends React.Component { // eslint-disable-line react/p
 }
 
 PluginHeaderTitle.propTypes = {
-  description: React.PropTypes.object,
-  title: React.PropTypes.object,
+  description: React.PropTypes.object.isRequired.isRequired,
+  title: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default PluginHeaderTitle;
diff --git a/packages/strapi-admin/files/admin/src/components/Toggle/index.js b/packages/strapi-admin/files/admin/src/components/Toggle/index.js
index 1c8f9ac591..9f49b3c74a 100644
--- a/packages/strapi-admin/files/admin/src/components/Toggle/index.js
+++ b/packages/strapi-admin/files/admin/src/components/Toggle/index.js
@@ -10,7 +10,7 @@ import ToggleOption from 'components/ToggleOption';
 
 import styles from './styles.scss';
 
-function Toggle(props) {  // eslint-disable-line react/prefer-stateless-function
+function Toggle(props) { // eslint-disable-line react/prefer-stateless-function
   let content = (<option>--</option>);
 
   // If we have items, render them
@@ -28,9 +28,9 @@ function Toggle(props) {  // eslint-disable-line react/prefer-stateless-function
 }
 
 Toggle.propTypes = {
-  messages: React.PropTypes.object,
-  onToggle: React.PropTypes.func,
-  values: React.PropTypes.array,
+  messages: React.PropTypes.object.isRequired.isRequired,
+  onToggle: React.PropTypes.func.isRequired.isRequired,
+  values: React.PropTypes.array.isRequired.isRequired,
 };
 
 export default Toggle;
diff --git a/packages/strapi-admin/files/admin/src/components/ToggleOption/index.js b/packages/strapi-admin/files/admin/src/components/ToggleOption/index.js
index 6fa63b5420..193b80ee74 100644
--- a/packages/strapi-admin/files/admin/src/components/ToggleOption/index.js
+++ b/packages/strapi-admin/files/admin/src/components/ToggleOption/index.js
@@ -16,10 +16,10 @@ const ToggleOption = ({ value, message, intl }) => (
 ToggleOption.propTypes = {
   intl: intlShape.isRequired,
   message: React.PropTypes.oneOfType([
-    React.PropTypes.object,
-    React.PropTypes.string,
-  ]),
-  value: React.PropTypes.string.isRequired,
+    React.PropTypes.object.isRequired,
+    React.PropTypes.string.isRequired,
+  ]).isRequired,
+  value: React.PropTypes.string.isRequired.isRequired,
 };
 
 export default injectIntl(ToggleOption);
diff --git a/packages/strapi-admin/files/admin/src/containers/App/index.js b/packages/strapi-admin/files/admin/src/containers/App/index.js
index 3bce5ade71..1c1fda6826 100644
--- a/packages/strapi-admin/files/admin/src/containers/App/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/App/index.js
@@ -37,13 +37,13 @@ export class App extends React.Component { // eslint-disable-line react/prefer-s
 }
 
 App.contextTypes = {
-  router: React.PropTypes.object.isRequired,
+  router: React.PropTypes.object.isRequired.isRequired.isRequired,
 };
 
 App.propTypes = {
-  children: React.PropTypes.node,
-  notifications: React.PropTypes.object,
-  onHideNotification: React.PropTypes.func,
+  children: React.PropTypes.node.isRequired.isRequired,
+  notifications: React.PropTypes.object.isRequired.isRequired,
+  onHideNotification: React.PropTypes.func.isRequired.isRequired,
 };
 
 const mapStateToProps = createStructuredSelector({
diff --git a/packages/strapi-admin/files/admin/src/containers/App/selectors.js b/packages/strapi-admin/files/admin/src/containers/App/selectors.js
index b9d95256fa..304f5947b7 100644
--- a/packages/strapi-admin/files/admin/src/containers/App/selectors.js
+++ b/packages/strapi-admin/files/admin/src/containers/App/selectors.js
@@ -20,7 +20,7 @@ const selectLocationState = () => {
 /**
  * Direct selector to the languageToggle state domain
  */
-const selectApp = () => state => state.get('app');
+const selectApp = () => (state) => state.get('app');
 
 /**
  * Select the language locale
diff --git a/packages/strapi-admin/files/admin/src/containers/Content/index.js b/packages/strapi-admin/files/admin/src/containers/Content/index.js
index 9f1bc8a5c2..4a2a0f031a 100644
--- a/packages/strapi-admin/files/admin/src/containers/Content/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/Content/index.js
@@ -13,10 +13,6 @@ import { selectPlugins } from 'containers/App/selectors';
 import styles from './styles.scss';
 
 export class Content extends React.Component { // eslint-disable-line react/prefer-stateless-function
-  static propTypes = {
-    children: React.PropTypes.node,
-  };
-
   render() {
     return (
       <div className={styles.content}>
@@ -27,6 +23,7 @@ export class Content extends React.Component { // eslint-disable-line react/pref
 }
 
 Content.propTypes = {
+  children: React.PropTypes.node.isRequired.isRequired,
 };
 
 const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/files/admin/src/containers/HomePage/index.js b/packages/strapi-admin/files/admin/src/containers/HomePage/index.js
index c50be64433..b6b1a4713d 100644
--- a/packages/strapi-admin/files/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/HomePage/index.js
@@ -35,7 +35,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
 }
 
 HomePage.propTypes = {
-  plugins: React.PropTypes.object,
+  plugins: React.PropTypes.object.isRequired.isRequired,
 };
 
 const mapStateToProps = createStructuredSelector({
diff --git a/packages/strapi-admin/files/admin/src/containers/LanguageProvider/index.js b/packages/strapi-admin/files/admin/src/containers/LanguageProvider/index.js
index 0b32a81205..ecf4f78f5a 100644
--- a/packages/strapi-admin/files/admin/src/containers/LanguageProvider/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/LanguageProvider/index.js
@@ -23,9 +23,9 @@ export class LanguageProvider extends React.Component { // eslint-disable-line r
 }
 
 LanguageProvider.propTypes = {
-  children: React.PropTypes.element.isRequired,
-  locale: React.PropTypes.string,
-  messages: React.PropTypes.object,
+  children: React.PropTypes.element.isRequired.isRequired.isRequired,
+  locale: React.PropTypes.string.isRequired.isRequired,
+  messages: React.PropTypes.object.isRequired.isRequired,
 };
 
 
diff --git a/packages/strapi-admin/files/admin/src/containers/LanguageProvider/selectors.js b/packages/strapi-admin/files/admin/src/containers/LanguageProvider/selectors.js
index 95b922d967..c43816f5ff 100644
--- a/packages/strapi-admin/files/admin/src/containers/LanguageProvider/selectors.js
+++ b/packages/strapi-admin/files/admin/src/containers/LanguageProvider/selectors.js
@@ -3,7 +3,7 @@ import { createSelector } from 'reselect';
 /**
  * Direct selector to the languageToggle state domain
  */
-const selectLanguage = () => state => state.get('language');
+const selectLanguage = () => (state) => state.get('language');
 
 /**
  * Select the language locale
diff --git a/packages/strapi-admin/files/admin/src/containers/LeftMenu/index.js b/packages/strapi-admin/files/admin/src/containers/LeftMenu/index.js
index ad00034e98..70ae8d4feb 100644
--- a/packages/strapi-admin/files/admin/src/containers/LeftMenu/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/LeftMenu/index.js
@@ -26,7 +26,7 @@ export class LeftMenu extends React.Component { // eslint-disable-line react/pre
 }
 
 LeftMenu.propTypes = {
-  plugins: React.PropTypes.object,
+  plugins: React.PropTypes.object.isRequired.isRequired,
 };
 
 function mapDispatchToProps(dispatch) {
diff --git a/packages/strapi-admin/files/admin/src/containers/LocaleToggle/index.js b/packages/strapi-admin/files/admin/src/containers/LocaleToggle/index.js
index 9bbd0d16a5..d277f46c42 100644
--- a/packages/strapi-admin/files/admin/src/containers/LocaleToggle/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/LocaleToggle/index.js
@@ -18,7 +18,7 @@ import styles from './styles.scss';
 export class LocaleToggle extends React.Component { // eslint-disable-line
   render() {
     const messages = {};
-    languages.forEach(locale => { messages[locale] = locale.toUpperCase(); });
+    languages.forEach((locale) => { messages[locale] = locale.toUpperCase(); });
 
     return (
       <div className={styles.localeToggle}>
@@ -29,7 +29,7 @@ export class LocaleToggle extends React.Component { // eslint-disable-line
 }
 
 LocaleToggle.propTypes = {
-  onLocaleToggle: React.PropTypes.func,
+  onLocaleToggle: React.PropTypes.func.isRequired.isRequired,
 };
 
 const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/files/admin/src/containers/NotificationProvider/index.js b/packages/strapi-admin/files/admin/src/containers/NotificationProvider/index.js
index a059c8bbfa..7608c52c64 100644
--- a/packages/strapi-admin/files/admin/src/containers/NotificationProvider/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/NotificationProvider/index.js
@@ -20,7 +20,7 @@ export class NotificationProvider extends React.Component { // eslint-disable-li
 }
 
 NotificationProvider.propTypes = {
-  children: React.PropTypes.object,
+  children: React.PropTypes.object.isRequired.isRequired,
 };
 
 const mapStateToProps = selectNotificationProvider();
diff --git a/packages/strapi-admin/files/admin/src/containers/PluginPage/index.js b/packages/strapi-admin/files/admin/src/containers/PluginPage/index.js
index 827cb82e34..49e0dbd06e 100644
--- a/packages/strapi-admin/files/admin/src/containers/PluginPage/index.js
+++ b/packages/strapi-admin/files/admin/src/containers/PluginPage/index.js
@@ -17,9 +17,9 @@ const exposedComponents = {
 
 export class PluginPage extends React.Component { // eslint-disable-line react/prefer-stateless-function
   render() {
-    const containers = this.props.plugins.valueSeq().map((plugin, i) => {
+    const containers = this.props.plugins.valueSeq().map((plugin) => {
       const Elem = plugin.get('mainComponent');
-      return <Elem key={i} {...this.props} exposedComponents={exposedComponents}></Elem>;
+      return <Elem key={plugin.id} {...this.props} exposedComponents={exposedComponents}></Elem>;
     });
 
     return (
@@ -37,11 +37,11 @@ export class PluginPage extends React.Component { // eslint-disable-line react/p
 }
 
 PluginPage.contextTypes = {
-  router: React.PropTypes.object.isRequired,
+  router: React.PropTypes.object.isRequired.isRequired.isRequired,
 };
 
 PluginPage.propTypes = {
-  plugins: React.PropTypes.object,
+  plugins: React.PropTypes.object.isRequired.isRequired,
 };
 
 const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/files/package.json b/packages/strapi-admin/files/package.json
index f074880897..994f2e67c0 100644
--- a/packages/strapi-admin/files/package.json
+++ b/packages/strapi-admin/files/package.json
@@ -27,16 +27,16 @@
   },
   "devDependencies": {
     "cross-env": "^3.1.3",
-    "eslint": "^3.9.0",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-config-airbnb-base": "^9.0.0",
+    "eslint": "^4.4.1",
+    "eslint-config-airbnb": "^15.1.0",
+    "eslint-config-airbnb-base": "^11.3.1",
     "eslint-config-prettier": "^2.3.0",
-    "eslint-import-resolver-webpack": "^0.6.0",
+    "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-import": "^2.0.1",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.4.1",
-    "eslint-plugin-redux-saga": "^0.1.5",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.2.1",
+    "eslint-plugin-redux-saga": "^0.4.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "html-loader": "^0.4.3",
     "html-webpack-plugin": "^2.22.0",
diff --git a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json b/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json
index 5e43445483..ce19848793 100644
--- a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json
+++ b/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json
@@ -2,7 +2,8 @@
   "parser": "babel-eslint",
   "extends": [
     "airbnb",
-    "prettier"
+    "prettier",
+    "eslint:recommended"
   ],
   "env": {
     "browser": true,
@@ -16,9 +17,10 @@
     "jsx-a11y"
   ],
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 7,
     "sourceType": "module",
     "ecmaFeatures": {
+      "impliedStrict": true,
       "jsx": true
     }
   },
@@ -56,11 +58,13 @@
     ],
     "jsx-a11y/aria-props": 2,
     "jsx-a11y/heading-has-content": 0,
-    "jsx-a11y/href-no-hash": 2,
     "jsx-a11y/label-has-for": 2,
     "jsx-a11y/mouse-events-have-key-events": 2,
     "jsx-a11y/role-has-required-aria-props": 2,
     "jsx-a11y/role-supports-aria-props": 2,
+    "jsx-a11y/href-no-hash": "off",
+    "jsx-a11y/anchor-is-valid": ["warn", { "aspects": ["invalidHref"] }],
+    "jsx-a11y/no-noninteractive-element-interactions": 0,
     "max-len": 0,
     "newline-per-chained-call": 0,
     "no-console": 1,
@@ -82,7 +86,9 @@
     "require-yield": 0,
     "react/no-unescaped-entities": 0,
     "react/prefer-stateless-function": 0,
-    "react/sort-prop-types": 2
+    "react/sort-prop-types": 2,
+    "no-undef": 0,
+    "react/no-array-index-key": 0
   },
   "settings": {
     "import/resolver": {
diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.dev.babel.js b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.dev.babel.js
index fedf2995ed..07870b1071 100644
--- a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.dev.babel.js
+++ b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.dev.babel.js
@@ -92,8 +92,8 @@ module.exports = require('./webpack.base.babel')({
     [
       require.resolve('babel-preset-latest'),
       {
-        "es2015": {
-          "modules": false,
+        es2015: {
+          modules: false,
         },
       },
     ],
diff --git a/packages/strapi-helper-plugin/lib/src/app.js b/packages/strapi-helper-plugin/lib/src/app.js
index baca8880c0..d02d12efb3 100644
--- a/packages/strapi-helper-plugin/lib/src/app.js
+++ b/packages/strapi-helper-plugin/lib/src/app.js
@@ -49,7 +49,7 @@ function Comp(props) {
 
 // Add contextTypes to get access to the admin router
 Comp.contextTypes = {
-  router: React.PropTypes.object.isRequired,
+  router: React.PropTypes.object.isRequired.isRequired,
 };
 
 // Hot reloadable translation json files
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index ddebd9d116..491382cd96 100644
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -57,16 +57,16 @@
     "cross-env": "3.1.3",
     "css-loader": "0.25.0",
     "enzyme": "2.5.1",
-    "eslint": "3.9.0",
-    "eslint-config-airbnb": "12.0.0",
-    "eslint-config-airbnb-base": "9.0.0",
-    "eslint-config-prettier": "2.3.0",
-    "eslint-import-resolver-webpack": "0.6.0",
-    "eslint-plugin-babel": "^4.1.1",
-    "eslint-plugin-import": "2.0.1",
-    "eslint-plugin-jsx-a11y": "2.2.3",
-    "eslint-plugin-react": "6.4.1",
-    "eslint-plugin-redux-saga": "0.1.5",
+    "eslint": "^4.4.1",
+    "eslint-config-airbnb": "^15.1.0",
+    "eslint-config-airbnb-base": "^11.3.1",
+    "eslint-config-prettier": "^2.3.0",
+    "eslint-import-resolver-webpack": "^0.8.3",
+    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.2.1",
+    "eslint-plugin-redux-saga": "^0.4.0",
     "eventsource-polyfill": "0.9.6",
     "expect": "1.20.2",
     "expect-jsx": "2.6.0",
@@ -123,4 +123,4 @@
     "webpack-hot-middleware": "2.13.1",
     "whatwg-fetch": "1.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js
index 762ffeaccd..e4ef408f5b 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js
@@ -24,7 +24,7 @@ Container.propTypes = {
   children: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.array,
-  ]),
+  ]).isRequired,
 };
 
 export default Container;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
index 49f55d1196..21f0021760 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
@@ -104,7 +104,11 @@ class EditForm extends React.Component {
 
     return (
       <div key={attributeKey} className="form-group">
-        <label htmlFor={attributeKey}>{attributeValue.label || attributeKey}</label>
+        <label // eslint-disable-line jsx-a11y/label-has-for
+          htmlFor={attributeKey}
+        >
+          {attributeValue.label || attributeKey}
+        </label>
         {description}
         {input}
       </div>
@@ -139,7 +143,7 @@ EditForm.propTypes = {
   record: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   schema: React.PropTypes.object.isRequired,
   setRecordAttribute: React.PropTypes.func.isRequired,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelation/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelation/index.js
index f3ce03e09a..a3ab84c8ce 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelation/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelation/index.js
@@ -70,7 +70,11 @@ class EditFormRelation extends React.Component { // eslint-disable-line react/pr
 
     return (
       <div className="form-group">
-        <label htmlFor={this.props.relation.label}>{this.props.relation.label}</label>
+        <label // eslint-disable-line jsx-a11y/label-has-for
+          htmlFor={this.props.relation.label}
+        >
+          {this.props.relation.label}
+        </label>
         {description}
         <Select.Async
           onChange={this.onChange}
@@ -87,7 +91,7 @@ EditFormRelation.propTypes = {
   record: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   relation: React.PropTypes.object.isRequired,
   setRecordAttribute: React.PropTypes.func.isRequired,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js
index 99b7596320..eafc2865ec 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js
@@ -35,15 +35,15 @@ EditFormRelations.propTypes = {
   currentModelName: React.PropTypes.oneOfType([
     React.PropTypes.bool,
     React.PropTypes.string,
-  ]),
+  ]).isRequired,
   record: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   schema: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   setRecordAttribute: React.PropTypes.func.isRequired,
 };
 
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js
index ec3b683be4..6677a63b2f 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/Pagination/index.js
@@ -241,7 +241,7 @@ Pagination.propTypes = {
   count: React.PropTypes.oneOfType([
     React.PropTypes.number,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   currentPage: React.PropTypes.number.isRequired,
   limit: React.PropTypes.number.isRequired,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js
index 21c1f7be1d..d15097cef8 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/TableFooter/index.js
@@ -42,7 +42,7 @@ TableFooter.propTypes = {
   count: React.PropTypes.oneOfType([
     React.PropTypes.number,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   currentPage: React.PropTypes.number.isRequired,
   limit: React.PropTypes.number.isRequired,
   onLimitChange: React.PropTypes.func.isRequired,
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/App/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/App/index.js
index 7a48cd8f4c..3f024aa78c 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/App/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/App/index.js
@@ -58,7 +58,7 @@ App.contextTypes = {
 App.propTypes = {
   children: React.PropTypes.node.isRequired,
   exposedComponents: React.PropTypes.object.isRequired,
-  loading: React.PropTypes.bool,
+  loading: React.PropTypes.bool.isRequired,
   loadModels: React.PropTypes.func.isRequired,
   updateSchema: React.PropTypes.func.isRequired,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
index 0a262d3ee6..696f3fb3e2 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
@@ -135,7 +135,7 @@ Edit.propTypes = {
   currentModelName: React.PropTypes.oneOfType([
     React.PropTypes.bool,
     React.PropTypes.string,
-  ]),
+  ]).isRequired,
   deleteRecord: React.PropTypes.func.isRequired,
   deleting: React.PropTypes.bool.isRequired,
   editing: React.PropTypes.bool.isRequired,
@@ -147,12 +147,12 @@ Edit.propTypes = {
   record: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   routeParams: React.PropTypes.object.isRequired,
   schema: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   setCurrentModelName: React.PropTypes.func.isRequired,
   setInitialState: React.PropTypes.func.isRequired,
   setIsCreating: React.PropTypes.func.isRequired,
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
index 84ebe6fd1c..8b2e24fc7c 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
@@ -162,11 +162,11 @@ List.propTypes = {
   count: React.PropTypes.oneOfType([
     React.PropTypes.number,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   currentModelName: React.PropTypes.oneOfType([
     React.PropTypes.string,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   currentPage: React.PropTypes.number.isRequired,
   exposedComponents: React.PropTypes.object.isRequired,
   history: React.PropTypes.object.isRequired,
@@ -178,18 +178,19 @@ List.propTypes = {
   models: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   onLimitChange: React.PropTypes.func.isRequired,
+  params: React.PropTypes.object.isRequired,
   records: React.PropTypes.oneOfType([
     React.PropTypes.array,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   route: React.PropTypes.object.isRequired,
   routeParams: React.PropTypes.object.isRequired,
   schema: React.PropTypes.oneOfType([
     React.PropTypes.object,
     React.PropTypes.bool,
-  ]),
+  ]).isRequired,
   setCurrentModelName: React.PropTypes.func.isRequired,
   sort: React.PropTypes.string.isRequired,
 };
diff --git a/packages/strapi-plugin-content-manager/admin/src/utils/schema.js b/packages/strapi-plugin-content-manager/admin/src/utils/schema.js
index e5c9bf0ee9..b17c6de18f 100644
--- a/packages/strapi-plugin-content-manager/admin/src/utils/schema.js
+++ b/packages/strapi-plugin-content-manager/admin/src/utils/schema.js
@@ -33,15 +33,15 @@ const generateSchema = (models) => {
 
     // Model relations
     schemaModel.relations = _.mapValues(_.pickBy(model.attributes, attribute =>
-        attribute.model
-      ), (value, attribute) => ({
-        columnName: attribute,
-        model: value.model,
-        attribute,
-        label: _.upperFirst(attribute),
-        description: '',
-        displayedAttribute: _.findKey(models[value.model].attributes, { type: 'string' }) || 'id',
-      })
+      attribute.model
+    ), (value, attribute) => ({
+      columnName: attribute,
+      model: value.model,
+      attribute,
+      label: _.upperFirst(attribute),
+      descripion: '',
+      displayedAttribute: _.findKey(models[value.model].attributes, { type: 'string' }) || 'id',
+    })
     );
 
     // Set the formatted model to the schema
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 31ac5e9cd1..fb7a48f778 100644
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -48,16 +48,16 @@
   },
   "devDependencies": {
     "cross-env": "^3.1.3",
-    "eslint": "^3.9.0",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-config-airbnb-base": "^9.0.0",
+    "eslint": "^4.4.1",
+    "eslint-config-airbnb": "^15.1.0",
+    "eslint-config-airbnb-base": "^11.3.1",
     "eslint-config-prettier": "^2.3.0",
-    "eslint-import-resolver-webpack": "^0.6.0",
+    "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-import": "^2.0.1",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.4.1",
-    "eslint-plugin-redux-saga": "^0.1.5",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.2.1",
+    "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.5.0",
     "prettier": "^1.5.3",
     "rimraf": "^2.5.4",
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/Button/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/Button/index.js
index b5cbd7d9e6..8a6bb52aae 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/Button/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/Button/index.js
@@ -22,11 +22,11 @@ class Button extends React.Component {
 }
 
 Button.propTypes = {
-  addShape: React.PropTypes.bool,
-  buttonBackground: React.PropTypes.string,
-  buttonSize: React.PropTypes.string,
-  handlei18n: React.PropTypes.bool,
-  label: React.PropTypes.string.isRequired,
+  addShape: React.PropTypes.bool.isRequired,
+  buttonBackground: React.PropTypes.string.isRequired,
+  buttonSize: React.PropTypes.string.isRequired,
+  handlei18n: React.PropTypes.bool.isRequired,
+  label: React.PropTypes.string.isRequired.isRequired,
 };
 
 export default Button;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/ContentHeader/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/ContentHeader/index.js
index c2f4f1f489..0d4c5f3495 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/ContentHeader/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/ContentHeader/index.js
@@ -22,8 +22,8 @@ class ContentHeader extends React.Component { // eslint-disable-line react/prefe
 }
 
 ContentHeader.propTypes = {
-  description: React.PropTypes.string,
-  name: React.PropTypes.string,
+  description: React.PropTypes.string.isRequired,
+  name: React.PropTypes.string.isRequired,
 };
 
 export default ContentHeader;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/EditForm/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/EditForm/index.js
index c8207a73d3..4a64d992c3 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/EditForm/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/EditForm/index.js
@@ -56,13 +56,13 @@ class EditForm extends React.Component { // eslint-disable-line react/prefer-sta
 }
 
 EditForm.propTypes = {
-  cancelAction: React.PropTypes.bool,
-  formErrors: React.PropTypes.array,
-  handleCancel: React.PropTypes.func,
-  handleChange: React.PropTypes.func.isRequired,
-  handleSubmit: React.PropTypes.func,
-  sections: React.PropTypes.array,
-  values: React.PropTypes.object,
+  cancelAction: React.PropTypes.bool.isRequired,
+  formErrors: React.PropTypes.array.isRequired,
+  handleCancel: React.PropTypes.func.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  handleSubmit: React.PropTypes.func.isRequired,
+  sections: React.PropTypes.array.isRequired,
+  values: React.PropTypes.object.isRequired,
 };
 
 export default EditForm;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSection/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSection/index.js
index feebd7192d..2746be74b6 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSection/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSection/index.js
@@ -56,13 +56,13 @@ class EditFormSection extends React.Component { // eslint-disable-line react/pre
 }
 
 EditFormSection.propTypes = {
-  formErrors: React.PropTypes.array,
-  handleChange: React.PropTypes.func,
-  renderInput: React.PropTypes.func,
-  section: React.PropTypes.object,
-  showNestedForm: React.PropTypes.bool,
-  styles: React.PropTypes.object,
-  values: React.PropTypes.object,
+  formErrors: React.PropTypes.array.isRequired,
+  handleChange: React.PropTypes.func.isRequired,
+  renderInput: React.PropTypes.func.isRequired,
+  section: React.PropTypes.object.isRequired,
+  showNestedForm: React.PropTypes.bool.isRequired,
+  styles: React.PropTypes.object.isRequired,
+  values: React.PropTypes.object.isRequired,
 };
 
 export default WithFormSection(EditFormSection); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionNested/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionNested/index.js
index 4967d767ec..b86ed7b700 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionNested/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionNested/index.js
@@ -47,7 +47,7 @@ class EditFormSectionNested extends React.Component { // eslint-disable-line rea
               this.setState({ showNestedForm: false });
             }
           }
-        })
+        });
       }
     });
   }
@@ -81,15 +81,16 @@ class EditFormSectionNested extends React.Component { // eslint-disable-line rea
 }
 
 EditFormSectionNested.propTypes = {
-  formErrors: React.PropTypes.array,
-  handleChange: React.PropTypes.func,
-  renderInput: React.PropTypes.func,
+  formErrors: React.PropTypes.array.isRequired,
+  handleChange: React.PropTypes.func.isRequired,
+  renderInput: React.PropTypes.func.isRequired,
   section: React.PropTypes.oneOfType([
-    React.PropTypes.array,
-    React.PropTypes.object,
-  ]),
-  styles: React.PropTypes.object,
-  values: React.PropTypes.object,
+    React.PropTypes.array.isRequired,
+    React.PropTypes.object.isRequired,
+  ]).isRequired,
+  styles: React.PropTypes.object.isRequired,
+  value: React.PropTypes.object.isRequired,
+  values: React.PropTypes.object.isRequired,
 };
 
 export default WithFormSection(EditFormSectionNested); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionSubNested/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionSubNested/index.js
index 96e0cb67ac..8547a99dfa 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionSubNested/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/EditFormSectionSubNested/index.js
@@ -24,12 +24,12 @@ class EditFormSectionSubNested extends React.Component { // eslint-disable-line
 }
 
 EditFormSectionSubNested.propTypes = {
-  renderInput: React.PropTypes.func,
+  renderInput: React.PropTypes.func.isRequired,
   section: React.PropTypes.oneOfType([
-    React.PropTypes.array,
-    React.PropTypes.object,
-  ]),
-  styles: React.PropTypes.object,
+    React.PropTypes.array.isRequired,
+    React.PropTypes.object.isRequired,
+  ]).isRequired,
+  styles: React.PropTypes.object.isRequired,
 };
 
 export default WithFormSection(EditFormSectionSubNested); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/HeaderNav/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/HeaderNav/index.js
index d3f1a63ba1..61fd107788 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/HeaderNav/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/HeaderNav/index.js
@@ -48,8 +48,8 @@ class HeaderNav extends React.Component { // eslint-disable-line react/prefer-st
 }
 
 HeaderNav.propTypes = {
-  links: React.PropTypes.array,
-  path: React.PropTypes.string,
-  renderListComponent: React.PropTypes.bool,
+  links: React.PropTypes.array.isRequired,
+  path: React.PropTypes.string.isRequired,
+  renderListComponent: React.PropTypes.bool.isRequired,
 }
 export default HeaderNav;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputEnum/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputEnum/index.js
index 55e4cb4f66..d822467273 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputEnum/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputEnum/index.js
@@ -44,12 +44,12 @@ class InputEnum extends React.Component { // eslint-disable-line react/prefer-st
 }
 
 InputEnum.propTypes = {
-  customBootstrapClass: React.PropTypes.string,
-  handleChange: React.PropTypes.func.isRequired,
-  name: React.PropTypes.string,
-  selectOptions: React.PropTypes.array,
-  target: React.PropTypes.string,
-  value: React.PropTypes.any,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  name: React.PropTypes.string.isRequired,
+  selectOptions: React.PropTypes.array.isRequired,
+  target: React.PropTypes.string.isRequired,
+  value: React.PropTypes.any.isRequired,
 }
 
 export default InputEnum;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputNumber/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputNumber/index.js
index db37184369..7bcf86a56a 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputNumber/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputNumber/index.js
@@ -127,18 +127,21 @@ class InputNumber extends React.Component { // eslint-disable-line react/prefer-
     const bootStrapClassDanger = !this.props.deactivateErrorHighlight && !isEmpty(this.state.errors) ? 'has-danger' : '';
     const placeholder = this.props.placeholder || this.props.name;
 
-    const input = placeholder ? this.renderFormattedInput(handleBlur, inputValue, placeholder)
-      : <input
-        type="number"
-        name={this.props.target}
-        id={this.props.name}
-        value={inputValue}
-        onBlur={handleBlur}
-        onChange={this.props.handleChange}
-        onFocus={this.props.handleFocus}
-        className={`form-control ${this.state.errors? 'form-control-danger' : ''}`}
-        placeholder={placeholder}
-      />;
+    const input = placeholder
+      ? this.renderFormattedInput(handleBlur, inputValue, placeholder)
+      : (
+        <input
+          type="number"
+          name={this.props.target}
+          id={this.props.name}
+          value={inputValue}
+          onBlur={handleBlur}
+          onChange={this.props.handleChange}
+          onFocus={this.props.handleFocus}
+          className={`form-control ${this.state.errors? 'form-control-danger' : ''}`}
+          placeholder={placeholder}
+        />
+      );
 
     const requiredClass = this.props.validations.required && this.props.addRequiredInputDesign ? this.props.styles.requiredClass : '';
 
@@ -154,27 +157,27 @@ class InputNumber extends React.Component { // eslint-disable-line react/prefer-
 }
 
 InputNumber.propTypes = {
-  addRequiredInputDesign: React.PropTypes.bool,
-  customBootstrapClass: React.PropTypes.string,
-  deactivateErrorHighlight: React.PropTypes.bool,
+  addRequiredInputDesign: React.PropTypes.bool.isRequired,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  deactivateErrorHighlight: React.PropTypes.bool.isRequired,
   errors: React.PropTypes.oneOfType([
-    React.PropTypes.bool,
-    React.PropTypes.array,
-  ]),
-  handleBlur: React.PropTypes.func,
-  handleChange: React.PropTypes.func.isRequired,
-  handleFocus: React.PropTypes.func,
-  inputDescription: React.PropTypes.string,
-  name: React.PropTypes.string.isRequired,
-  noErrorsDescription: React.PropTypes.bool,
-  placeholder: React.PropTypes.string,
-  styles: React.PropTypes.object,
-  target: React.PropTypes.string.isRequired,
-  validations: React.PropTypes.object.isRequired,
+    React.PropTypes.bool.isRequired,
+    React.PropTypes.array.isRequired,
+  ]).isRequired,
+  handleBlur: React.PropTypes.func.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  handleFocus: React.PropTypes.func.isRequired,
+  inputDescription: React.PropTypes.string.isRequired,
+  name: React.PropTypes.string.isRequired.isRequired,
+  noErrorsDescription: React.PropTypes.bool.isRequired,
+  placeholder: React.PropTypes.string.isRequired,
+  styles: React.PropTypes.object.isRequired,
+  target: React.PropTypes.string.isRequired.isRequired,
+  validations: React.PropTypes.object.isRequired.isRequired,
   value: React.PropTypes.oneOfType([
-    React.PropTypes.number.isRequired,
-    React.PropTypes.string.isRequired,
-  ]),
+    React.PropTypes.number.isRequired.isRequired,
+    React.PropTypes.string.isRequired.isRequired,
+  ]).isRequired,
 }
 
 export default WithInput(InputNumber); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputPassword/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputPassword/index.js
index f758047393..d450839bd0 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputPassword/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputPassword/index.js
@@ -144,20 +144,20 @@ class InputPassword extends React.Component { // eslint-disable-line react/prefe
 }
 
 InputPassword.propTypes = {
-  customBootstrapClass: React.PropTypes.string,
-  deactivateErrorHighlight: React.PropTypes.bool,
-  errors: React.PropTypes.array,
-  handleBlur: React.PropTypes.func,
-  handleChange: React.PropTypes.func.isRequired,
-  handleFocus: React.PropTypes.func,
-  inputDescription: React.PropTypes.string,
-  name: React.PropTypes.string.isRequired,
-  noErrorsDescription: React.PropTypes.bool,
-  placeholder: React.PropTypes.string,
-  styles: React.PropTypes.object,
-  target: React.PropTypes.string.isRequired,
-  validations: React.PropTypes.object.isRequired,
-  value: React.PropTypes.string,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  deactivateErrorHighlight: React.PropTypes.bool.isRequired,
+  errors: React.PropTypes.array.isRequired,
+  handleBlur: React.PropTypes.func.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  handleFocus: React.PropTypes.func.isRequired,
+  inputDescription: React.PropTypes.string.isRequired,
+  name: React.PropTypes.string.isRequired.isRequired,
+  noErrorsDescription: React.PropTypes.bool.isRequired,
+  placeholder: React.PropTypes.string.isRequired,
+  styles: React.PropTypes.object.isRequired,
+  target: React.PropTypes.string.isRequired.isRequired,
+  validations: React.PropTypes.object.isRequired.isRequired,
+  value: React.PropTypes.string.isRequired,
 };
 
 export default WithInput(InputPassword); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputSelect/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputSelect/index.js
index 23f6da3629..aab2ab632d 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputSelect/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputSelect/index.js
@@ -50,17 +50,17 @@ class InputSelect extends React.Component { // eslint-disable-line react/prefer-
 }
 
 InputSelect.propTypes = {
-  addRequiredInputDesign: React.PropTypes.bool,
-  customBootstrapClass: React.PropTypes.string,
-  handleChange: React.PropTypes.func.isRequired,
-  name: React.PropTypes.string.isRequired,
+  addRequiredInputDesign: React.PropTypes.bool.isRequired,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  name: React.PropTypes.string.isRequired.isRequired,
   selectOptions: React.PropTypes.oneOfType([
-    React.PropTypes.array,
-    React.PropTypes.object, // TODO remove
-  ]),
-  target: React.PropTypes.string,
-  validations: React.PropTypes.object,
-  value: React.PropTypes.string,
+    React.PropTypes.array.isRequired,
+    React.PropTypes.object.isRequired, // TODO remove
+  ]).isRequired,
+  target: React.PropTypes.string.isRequired,
+  validations: React.PropTypes.object.isRequired,
+  value: React.PropTypes.string.isRequired,
 };
 
 export default InputSelect;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputText/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputText/index.js
index 56693c7037..c6969d953f 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputText/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputText/index.js
@@ -148,18 +148,21 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
     const label = this.props.name ? <label htmlFor={this.props.name}><FormattedMessage id={`settings-manager.${this.props.name}`} /></label> : '';
     const spacer = !this.props.name ? {marginTop: '2.4rem'} : {marginTop: ''};
 
-    const input = placeholder ? this.renderFormattedInput(handleBlur, inputValue, placeholder)
-      : <input
-        name={this.props.target}
-        id={this.props.name}
-        onBlur={handleBlur}
-        onFocus={this.props.handleFocus}
-        onChange={this.props.handleChange}
-        value={inputValue}
-        type="text"
-        className={`form-control ${this.state.errors? 'form-control-danger' : ''}`}
-        placeholder={placeholder}
-      />;
+    const input = placeholder
+      ? this.renderFormattedInput(handleBlur, inputValue, placeholder)
+      : (
+        <input
+          name={this.props.target}
+          id={this.props.name}
+          onBlur={handleBlur}
+          onFocus={this.props.handleFocus}
+          onChange={this.props.handleChange}
+          value={inputValue}
+          type="text"
+          className={`form-control ${this.state.errors? 'form-control-danger' : ''}`}
+          placeholder={placeholder}
+        />
+      );
 
 
     const requiredClass = this.props.validations.required && this.props.addRequiredInputDesign ? this.props.styles.requiredClass : '';
@@ -176,21 +179,21 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
 }
 
 InputText.propTypes = {
-  addRequiredInputDesign: React.PropTypes.bool,
-  customBootstrapClass: React.PropTypes.string,
-  deactivateErrorHighlight: React.PropTypes.bool,
-  errors: React.PropTypes.array,
-  handleBlur: React.PropTypes.func,
-  handleChange: React.PropTypes.func.isRequired,
-  handleFocus: React.PropTypes.func,
-  inputDescription: React.PropTypes.string,
-  name: React.PropTypes.string.isRequired,
-  noErrorsDescription: React.PropTypes.bool,
-  placeholder: React.PropTypes.string,
-  styles: React.PropTypes.object,
-  target: React.PropTypes.string,
-  validations: React.PropTypes.object.isRequired,
-  value: React.PropTypes.string,
+  addRequiredInputDesign: React.PropTypes.bool.isRequired,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  deactivateErrorHighlight: React.PropTypes.bool.isRequired,
+  errors: React.PropTypes.array.isRequired,
+  handleBlur: React.PropTypes.func.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  handleFocus: React.PropTypes.func.isRequired,
+  inputDescription: React.PropTypes.string.isRequired,
+  name: React.PropTypes.string.isRequired.isRequired,
+  noErrorsDescription: React.PropTypes.bool.isRequired,
+  placeholder: React.PropTypes.string.isRequired,
+  styles: React.PropTypes.object.isRequired,
+  target: React.PropTypes.string.isRequired,
+  validations: React.PropTypes.object.isRequired.isRequired,
+  value: React.PropTypes.string.isRequired,
 }
 
 export default WithInput(InputText); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/InputToggle/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/InputToggle/index.js
index c284d24db4..1577dcb2c2 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/InputToggle/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/InputToggle/index.js
@@ -72,12 +72,12 @@ class InputToggle extends React.Component { // eslint-disable-line react/prefer-
 }
 
 InputToggle.propTypes = {
-  customBootstrapClass: React.PropTypes.string,
-  handleChange: React.PropTypes.func.isRequired,
-  hiddenLabel: React.PropTypes.bool,
-  isChecked: React.PropTypes.bool,
-  name: React.PropTypes.string,
-  target: React.PropTypes.string.isRequired,
+  customBootstrapClass: React.PropTypes.string.isRequired,
+  handleChange: React.PropTypes.func.isRequired.isRequired,
+  hiddenLabel: React.PropTypes.bool.isRequired,
+  isChecked: React.PropTypes.bool.isRequired,
+  name: React.PropTypes.string.isRequired,
+  target: React.PropTypes.string.isRequired.isRequired,
 }
 
 export default InputToggle;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/List/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/List/index.js
index bf60a80e30..fff8d54f85 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/List/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/List/index.js
@@ -51,14 +51,17 @@ class List extends React.Component { // eslint-disable-line react/prefer-statele
   }
 
   render() {
-    const button = this.props.noListButtonPopUp ? '' :
-      <ButtonPrimaryHotline
-        buttonBackground={'secondaryAddType'}
-        label={this.props.listButtonLabel}
-        handlei18n={this.props.handlei18n}
-        addShape
-        onClick={this.toggle}
-      />;
+    const button = this.props.noListButtonPopUp
+      ? ''
+      : (
+        <ButtonPrimaryHotline
+          buttonBackground={'secondaryAddType'}
+          label={this.props.listButtonLabel}
+          handlei18n={this.props.handlei18n}
+          addShape
+          onClick={this.toggle}
+        />
+      );
 
     const addListTitleMarginTop = this.props.addListTitleMarginTop ? styles.paddedTopList : '';
 
@@ -128,22 +131,23 @@ class List extends React.Component { // eslint-disable-line react/prefer-statele
 }
 
 List.propTypes = {
-  actionBeforeOpenPopUp: React.PropTypes.func,
-  addListTitleMarginTop: React.PropTypes.bool,
-  error: React.PropTypes.bool,
-  handlei18n: React.PropTypes.bool,
-  handleListPopUpSubmit: React.PropTypes.func,
-  listButtonLabel: React.PropTypes.string,
-  listItems: React.PropTypes.array,
+  actionBeforeOpenPopUp: React.PropTypes.func.isRequired,
+  addListTitleMarginTop: React.PropTypes.bool.isRequired,
+  error: React.PropTypes.bool.isRequired,
+  formErrors: React.PropTypes.array.isRequired,
+  handlei18n: React.PropTypes.bool.isRequired,
+  handleListPopUpSubmit: React.PropTypes.func.isRequired,
+  listButtonLabel: React.PropTypes.string.isRequired,
+  listItems: React.PropTypes.array.isRequired,
   listTitle: React.PropTypes.oneOfType([
-    React.PropTypes.string,
-    React.PropTypes.object,
-  ]),
-  noListButtonPopUp: React.PropTypes.bool,
+    React.PropTypes.string.isRequired,
+    React.PropTypes.object.isRequired,
+  ]).isRequired,
+  noListButtonPopUp: React.PropTypes.bool.isRequired,
   renderRow: React.PropTypes.oneOfType([
-    React.PropTypes.bool,
-    React.PropTypes.func,
-  ]),
+    React.PropTypes.bool.isRequired,
+    React.PropTypes.func.isRequired,
+  ]).isRequired,
 }
 
 export default List;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenu/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenu/index.js
index 6b72ebc957..4cdd33db4e 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenu/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenu/index.js
@@ -22,9 +22,9 @@ class PluginLeftMenu extends React.Component { // eslint-disable-line react/pref
 }
 
 PluginLeftMenu.propTypes = {
-  environments: React.PropTypes.array,
-  envParams: React.PropTypes.string,
-  sections: React.PropTypes.array.isRequired,
+  environments: React.PropTypes.array.isRequired,
+  envParams: React.PropTypes.string.isRequired,
+  sections: React.PropTypes.array.isRequired.isRequired,
 };
 
 export default PluginLeftMenu;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuLink/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuLink/index.js
index 730c043dee..f95b791902 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuLink/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuLink/index.js
@@ -46,10 +46,10 @@ class PluginLeftMenuLink extends React.Component { // eslint-disable-line react/
 }
 
 PluginLeftMenuLink.propTypes = {
-  environments: React.PropTypes.array,
-  environmentsRequired: React.PropTypes.bool,
-  envParams: React.PropTypes.string,
-  link: React.PropTypes.object.isRequired,
+  environments: React.PropTypes.array.isRequired,
+  environmentsRequired: React.PropTypes.bool.isRequired,
+  envParams: React.PropTypes.string.isRequired,
+  link: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default PluginLeftMenuLink;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuSection/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuSection/index.js
index 852be08203..38851fa8da 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuSection/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/PluginLeftMenuSection/index.js
@@ -38,9 +38,9 @@ class PluginLeftMenuSection extends React.Component { // eslint-disable-line rea
 }
 
 PluginLeftMenuSection.propTypes = {
-  environments: React.PropTypes.array,
-  envParams: React.PropTypes.string,
-  section: React.PropTypes.object.isRequired,
+  environments: React.PropTypes.array.isRequired,
+  envParams: React.PropTypes.string.isRequired,
+  section: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default PluginLeftMenuSection;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/index.js
index 2b20140dff..c05ae0f553 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpForm/index.js
@@ -41,12 +41,12 @@ class PopUpForm extends React.Component { // eslint-disable-line react/prefer-st
 }
 
 PopUpForm.propTypes = {
-  renderInput: React.PropTypes.func.isRequired,
+  renderInput: React.PropTypes.func.isRequired.isRequired,
   renderPopUpForm: React.PropTypes.oneOfType([
-    React.PropTypes.func,
-    React.PropTypes.bool,
-  ]),
-  sections: React.PropTypes.array,
+    React.PropTypes.func.isRequired,
+    React.PropTypes.bool.isRequired,
+  ]).isRequired,
+  sections: React.PropTypes.array.isRequired,
 };
 
 export default WithFormSection(PopUpForm); // eslint-disable-line new-cap
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/index.js
index 80f2f4ca5d..49c5975706 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/PopUpWarning/index.js
@@ -68,13 +68,13 @@ class PopUpWarning extends React.Component { // eslint-disable-line react/prefer
 }
 
 PopUpWarning.propTypes = {
-  dangerMessage: React.PropTypes.string,
-  handleConfirm: React.PropTypes.func,
-  handleConfirmDanger: React.PropTypes.func,
-  isOpen: React.PropTypes.bool.isRequired,
-  showDanger: React.PropTypes.bool,
-  toggleModal: React.PropTypes.func.isRequired,
-  warningMessage: React.PropTypes.string,
+  dangerMessage: React.PropTypes.string.isRequired,
+  handleConfirm: React.PropTypes.func.isRequired,
+  handleConfirmDanger: React.PropTypes.func.isRequired,
+  isOpen: React.PropTypes.bool.isRequired.isRequired,
+  showDanger: React.PropTypes.bool.isRequired,
+  toggleModal: React.PropTypes.func.isRequired.isRequired,
+  warningMessage: React.PropTypes.string.isRequired,
 }
 
 export default PopUpWarning;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/RowDatabase/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/RowDatabase/index.js
index 374b535b52..c0cec65f0d 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/RowDatabase/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/RowDatabase/index.js
@@ -119,11 +119,12 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
 }
 
 RowDatabase.propTypes = {
-  data: React.PropTypes.object.isRequired,
-  error: React.PropTypes.bool,
-  getDatabase: React.PropTypes.func,
-  handleDatabaseDelete: React.PropTypes.func,
-  handleSubmit: React.PropTypes.func,
-}
+  data: React.PropTypes.object.isRequired.isRequired,
+  error: React.PropTypes.bool.isRequired,
+  formErrors: React.PropTypes.array.isRequired,
+  getDatabase: React.PropTypes.func.isRequired,
+  handleDatabaseDelete: React.PropTypes.func.isRequired,
+  handleSubmit: React.PropTypes.func.isRequired,
+};
 
 export default RowDatabase;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/RowLanguage/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/RowLanguage/index.js
index cc8a7d66c4..afe4e7f37d 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/RowLanguage/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/RowLanguage/index.js
@@ -38,23 +38,27 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
     // apply i18n
     const languageDisplay = isObject(languageObject) ? <FormattedMessage {...{ id: `settings-manager.${languageObject.name}` }} /> : '';
 
-    const languageLabel = this.props.active ?
-      <FormattedMessage id="settings-manager.list.languages.default.languages">
-        {(message) => (
+    const languageLabel = this.props.active
+      ? (
+        <FormattedMessage id="settings-manager.list.languages.default.languages">
+          {(message) => (
 
-          <div className={this.props.liStyles.italicText} >
-            {message}
-          </div>
-        )}
-      </FormattedMessage> :
-      // set the span's id with the language name to retrieve it
+            <div className={this.props.liStyles.italicText} >
+              {message}
+            </div>
+          )}
+        </FormattedMessage>
+      )
+      : (
+        // set the span's id with the language name to retrieve it
         <FormattedMessage id="settings-manager.list.languages.set.languages">
           {(message) => (
             <button className={this.props.liStyles.normal} onClick={this.props.changeDefaultLanguage} id={this.props.name}>
               {message}
             </button>
           )}
-        </FormattedMessage>;
+        </FormattedMessage>
+      );
 
     return (
       <li>
@@ -84,12 +88,12 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
 }
 
 RowLanguage.propTypes = {
-  active: React.PropTypes.bool,
-  changeDefaultLanguage: React.PropTypes.func.isRequired,
-  handleLanguageDelete: React.PropTypes.func.isRequired,
-  listLanguages: React.PropTypes.object.isRequired,
-  liStyles: React.PropTypes.object,
-  name: React.PropTypes.string.isRequired,
+  active: React.PropTypes.bool.isRequired,
+  changeDefaultLanguage: React.PropTypes.func.isRequired.isRequired,
+  handleLanguageDelete: React.PropTypes.func.isRequired.isRequired,
+  listLanguages: React.PropTypes.object.isRequired.isRequired,
+  liStyles: React.PropTypes.object.isRequired,
+  name: React.PropTypes.string.isRequired.isRequired,
 };
 
 export default RowLanguage;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/SelectOptionLanguage/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/SelectOptionLanguage/index.js
index 93cbb9ef80..cbb5c2d17a 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/SelectOptionLanguage/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/SelectOptionLanguage/index.js
@@ -39,10 +39,10 @@ class SelectOptionLanguage extends React.Component { // eslint-disable-line reac
 }
 
 SelectOptionLanguage.propTypes = {
-  isFocused: React.PropTypes.bool,
-  onFocus: React.PropTypes.func,
-  onSelect: React.PropTypes.func,
-  option: React.PropTypes.object.isRequired,
+  isFocused: React.PropTypes.bool.isRequired,
+  onFocus: React.PropTypes.func.isRequired,
+  onSelect: React.PropTypes.func.isRequired,
+  option: React.PropTypes.object.isRequired.isRequired,
 };
 
 export default SelectOptionLanguage;
diff --git a/packages/strapi-plugin-settings-manager/admin/src/components/WithFormSection/index.js b/packages/strapi-plugin-settings-manager/admin/src/components/WithFormSection/index.js
index 138c5c825f..79dc6604a6 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/components/WithFormSection/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/components/WithFormSection/index.js
@@ -19,15 +19,15 @@ import styles from './styles.scss';
 
 const WithFormSection = (InnerComponent) => class extends React.Component {
   static propTypes = {
-    addRequiredInputDesign: React.PropTypes.bool,
-    cancelAction: React.PropTypes.bool,
-    formErrors: React.PropTypes.array,
-    handleChange: React.PropTypes.func.isRequired,
+    addRequiredInputDesign: React.PropTypes.bool.isRequired,
+    cancelAction: React.PropTypes.bool.isRequired,
+    formErrors: React.PropTypes.array.isRequired,
+    handleChange: React.PropTypes.func.isRequired.isRequired,
     section: React.PropTypes.oneOfType([
-      React.PropTypes.object,
-      React.PropTypes.array,
-    ]),
-    values: React.PropTypes.object,
+      React.PropTypes.object.isRequired,
+      React.PropTypes.array.isRequired,
+    ]).isRequired,
+    values: React.PropTypes.object.isRequired,
   }
 
   constructor(props) {
diff --git a/packages/strapi-plugin-settings-manager/admin/src/containers/App/index.js b/packages/strapi-plugin-settings-manager/admin/src/containers/App/index.js
index 2878ab47f3..660124f3fb 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/containers/App/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/containers/App/index.js
@@ -50,18 +50,18 @@ class App extends React.Component {
 }
 
 App.contextTypes = {
-  router: React.PropTypes.object.isRequired,
+  router: React.PropTypes.object.isRequired.isRequired,
 };
 
 App.propTypes = {
-  children: React.PropTypes.node.isRequired,
-  environments: React.PropTypes.array,
-  environmentsFetch: React.PropTypes.func,
-  exposedComponents: React.PropTypes.object.isRequired,
-  loading: React.PropTypes.bool,
-  menuFetch: React.PropTypes.func,
-  params: React.PropTypes.object,
-  sections: React.PropTypes.array.isRequired,
+  children: React.PropTypes.node.isRequired.isRequired,
+  environments: React.PropTypes.array.isRequired,
+  environmentsFetch: React.PropTypes.func.isRequired,
+  exposedComponents: React.PropTypes.object.isRequired.isRequired,
+  loading: React.PropTypes.bool.isRequired,
+  menuFetch: React.PropTypes.func.isRequired,
+  params: React.PropTypes.object.isRequired,
+  sections: React.PropTypes.array.isRequired.isRequired,
 };
 
 export function mapDispatchToProps(dispatch) {
@@ -72,7 +72,7 @@ export function mapDispatchToProps(dispatch) {
     },
     dispatch
   );
-};
+}
 
 const mapStateToProps = createStructuredSelector({
   sections: makeSelectSections(),
diff --git a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
index 79c057e6e7..61b2c068e1 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
@@ -430,9 +430,9 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
   }
 
   setDefaultConnectionDb = () => {
-    const value = this.state.toggleDefaultConnection ?
-      this.props.home.addDatabaseSection.sections[1].items[0].value
-        : this.props.home.modifiedData[this.props.home.dbNameTarget];
+    const value = this.state.toggleDefaultConnection
+      ? this.props.home.addDatabaseSection.sections[1].items[0].value
+      : this.props.home.modifiedData[this.props.home.dbNameTarget];
     const target = { name: 'database.defaultConnection', value };
     this.handleChange({target});
     this.setState({ toggleDefaultConnection: !this.state.toggleDefaultConnection });
@@ -507,26 +507,26 @@ function mapDispatchToProps(dispatch) {
 }
 
 HomePage.propTypes = {
-  cancelChanges: React.PropTypes.func,
-  changeDefaultLanguage: React.PropTypes.func,
-  changeInput: React.PropTypes.func,
-  configFetch: React.PropTypes.func.isRequired,
-  databaseDelete: React.PropTypes.func,
-  databaseEdit: React.PropTypes.func,
-  databasesFetch: React.PropTypes.func,
-  editSettings: React.PropTypes.func,
-  emptyDbModifiedData: React.PropTypes.func,
-  environments: React.PropTypes.array,
-  home: React.PropTypes.object,
-  languageDelete: React.PropTypes.func,
-  languagesFetch: React.PropTypes.func,
-  location: React.PropTypes.object,
-  menuSections: React.PropTypes.array,
-  newDatabasePost: React.PropTypes.func,
-  newLanguagePost: React.PropTypes.func,
-  params: React.PropTypes.object.isRequired,
-  setErrors: React.PropTypes.func,
-  specificDatabaseFetch: React.PropTypes.func,
+  cancelChanges: React.PropTypes.func.isRequired,
+  changeDefaultLanguage: React.PropTypes.func.isRequired,
+  changeInput: React.PropTypes.func.isRequired,
+  configFetch: React.PropTypes.func.isRequired.isRequired,
+  databaseDelete: React.PropTypes.func.isRequired,
+  databaseEdit: React.PropTypes.func.isRequired,
+  databasesFetch: React.PropTypes.func.isRequired,
+  editSettings: React.PropTypes.func.isRequired,
+  emptyDbModifiedData: React.PropTypes.func.isRequired,
+  environments: React.PropTypes.array.isRequired,
+  home: React.PropTypes.object.isRequired,
+  languageDelete: React.PropTypes.func.isRequired,
+  languagesFetch: React.PropTypes.func.isRequired,
+  location: React.PropTypes.object.isRequired,
+  menuSections: React.PropTypes.array.isRequired,
+  newDatabasePost: React.PropTypes.func.isRequired,
+  newLanguagePost: React.PropTypes.func.isRequired,
+  params: React.PropTypes.object.isRequired.isRequired,
+  setErrors: React.PropTypes.func.isRequired,
+  specificDatabaseFetch: React.PropTypes.func.isRequired,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(HomePage);
diff --git a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/reducer.js b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/reducer.js
index 47fc0a4c62..26e5ba4543 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/reducer.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/reducer.js
@@ -60,9 +60,9 @@ function homePageReducer(state = initialState, action) {
       return state.updateIn(['modifiedData', action.key], () => action.value);
     case CANCEL_CHANGES:
       return state
-      .set('modifiedData', state.get('initialData'))
-      .set('formErrors', [])
-      .set('cancelAction', !state.get('cancelAction'));
+        .set('modifiedData', state.get('initialData'))
+        .set('formErrors', [])
+        .set('cancelAction', !state.get('cancelAction'));
     case DATABASES_FETCH_SUCCEEDED:
       return state
         .set('configsDisplay', OrderedMap(action.configsDisplay))
@@ -123,10 +123,10 @@ function homePageReducer(state = initialState, action) {
     case EMPTY_DB_MODIFIED_DATA:
       const defaultDbConnection = state.getIn(['modifiedData', 'database.defaultConnection']);
       return state
-      .set('modifiedData', Map())
-      .set('dbNameTarget', 'database.connections.${name}.name') // eslint-disable-line no-template-curly-in-string
-      .set('formErrors', [])
-      .setIn(['modifiedData', 'database.defaultConnection'], defaultDbConnection);
+        .set('modifiedData', Map())
+        .set('dbNameTarget', 'database.connections.${name}.name') // eslint-disable-line no-template-curly-in-string
+        .set('formErrors', [])
+        .setIn(['modifiedData', 'database.defaultConnection'], defaultDbConnection);
     case NEW_LANGUAGE_POST:
       const sections = state.getIn(['configsDisplay', 'sections']);
       sections.push({ active: false, name: state.getIn(['modifiedData', 'language.defaultLocale']) });
diff --git a/packages/strapi-plugin-settings-manager/admin/src/utils/sendUpdatedParams.js b/packages/strapi-plugin-settings-manager/admin/src/utils/sendUpdatedParams.js
index 5b6c7dced9..40bf1caab3 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/utils/sendUpdatedParams.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/utils/sendUpdatedParams.js
@@ -9,9 +9,9 @@ export default function sendUpdatedParams() {
       body[key] = value;
     }
     else if (key === 'security.xframe.value.nested' && prevSettings['security.xframe.value.nested'] !== this.props.home.modifiedData['security.xframe.value.nested'] && this.props.home.modifiedData['security.xframe.value'] === 'ALLOW-FROM') {
-      const xFrameValue = includes(this.props.home.modifiedData['security.xframe.value.nested'], 'ALLOW-FROM') ?
-      `ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`
-       : `ALLOW-FROM.ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`;
+      const xFrameValue = includes(this.props.home.modifiedData['security.xframe.value.nested'], 'ALLOW-FROM')
+        ? `ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`
+        : `ALLOW-FROM.ALLOW-FROM ${this.props.home.modifiedData['security.xframe.value.nested']}`;
 
       body['security.xframe.value'] = xFrameValue;
     }
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 628ba8ae8a..310b083a05 100644
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -34,16 +34,16 @@
   },
   "devDependencies": {
     "cross-env": "^3.1.3",
-    "eslint": "^3.9.0",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-config-airbnb-base": "^9.0.0",
+    "eslint": "^4.4.1",
+    "eslint-config-airbnb": "^15.1.0",
+    "eslint-config-airbnb-base": "^11.3.1",
     "eslint-config-prettier": "^2.3.0",
-    "eslint-import-resolver-webpack": "^0.6.0",
+    "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-import": "^2.0.1",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.4.1",
-    "eslint-plugin-redux-saga": "^0.1.5",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.2.1",
+    "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.5.0",
     "prettier": "^1.5.3",
     "rimraf": "^2.5.4",