diff --git a/package.json b/package.json
index 61dea0b26f..002cd55acd 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,10 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "eslint": "^2.13.1",
-    "eslint-config-finn": "1.0.0-alpha.8",
-    "eslint-plugin-react": "^4.3.0",
+    "eslint": "^3.4.0",
+    "eslint-config-finn": "1.0.0-alpha.9",
+    "eslint-config-finn-react": "^1.0.0-alpha.2",
+    "eslint-plugin-react": "^6.2.0",
     "lerna": "2.0.0-beta.20",
     "nsp": "^2.3.2"
   }
diff --git a/packages/unleash-frontend/public/.eslintrc b/packages/unleash-frontend/public/.eslintrc
index 779f8de2b0..4358e2e45e 100644
--- a/packages/unleash-frontend/public/.eslintrc
+++ b/packages/unleash-frontend/public/.eslintrc
@@ -2,7 +2,7 @@
     "extends": [
         "finn",
         "finn/es6",
-        "finn/react"
+        "finn-react"
     ],
     "env": {
         "browser": true,
diff --git a/packages/unleash-frontend/public/js/components/ErrorMessages.ui.jsx b/packages/unleash-frontend/public/js/components/ErrorMessages.ui.jsx
index 0c2830e9d8..005068ab4b 100644
--- a/packages/unleash-frontend/public/js/components/ErrorMessages.ui.jsx
+++ b/packages/unleash-frontend/public/js/components/ErrorMessages.ui.jsx
@@ -17,8 +17,7 @@ const ErrorMessages = React.createClass({
                             <div className="media centerify">
                                 <div className="imgExt">
                                     <a onClick={this.props.onClearErrors}
-                                        className="icon-kryss1 linkblock sharp">
-                                    </a>
+                                        className="icon-kryss1 linkblock sharp" />
                                 </div>
                                 <div className="bd">
                                     <ul>{errorNodes}</ul>
diff --git a/packages/unleash-frontend/public/js/components/feature/ArchiveFeatureComponent.jsx b/packages/unleash-frontend/public/js/components/feature/ArchiveFeatureComponent.jsx
index ee1464d415..88ed129ac2 100644
--- a/packages/unleash-frontend/public/js/components/feature/ArchiveFeatureComponent.jsx
+++ b/packages/unleash-frontend/public/js/components/feature/ArchiveFeatureComponent.jsx
@@ -17,7 +17,7 @@ const ArchiveFeatureComponent = React.createClass({
                     <thead>
                         <tr>
                             <th>Name</th>
-                            <th></th>
+                            <th />
                         </tr>
                     </thead>
                     <tbody>
@@ -37,7 +37,7 @@ const ArchiveFeatureComponent = React.createClass({
             </td>
             <td className="rightify" width="150">
                 <button onClick={this.onRevive.bind(this, f)} title="Revive feature toggle">
-                    <span className="icon-svar"></span>
+                    <span className="icon-svar" />
                 </button>
             </td>
         </tr>);
diff --git a/packages/unleash-frontend/public/js/components/feature/Feature.jsx b/packages/unleash-frontend/public/js/components/feature/Feature.jsx
index d25a077052..224f17fd7d 100644
--- a/packages/unleash-frontend/public/js/components/feature/Feature.jsx
+++ b/packages/unleash-frontend/public/js/components/feature/Feature.jsx
@@ -59,8 +59,7 @@ const Feature = React.createClass({
                 <tr className={this.state.editMode ? 'edit bg-lilac-xlt' : ''}>
                     <td width="20">
                         <span className=
-                        {this.props.feature.enabled ? 'toggle-active' : 'toggle-inactive'} title="Status">
-                        </span>
+                        {this.props.feature.enabled ? 'toggle-active' : 'toggle-inactive'} title="Status" />
                     </td>
                     <td>
                         {this.props.feature.name} <br />
diff --git a/packages/unleash-frontend/public/js/components/feature/FeatureList.jsx b/packages/unleash-frontend/public/js/components/feature/FeatureList.jsx
index 88717240ae..d111e57df4 100644
--- a/packages/unleash-frontend/public/js/components/feature/FeatureList.jsx
+++ b/packages/unleash-frontend/public/js/components/feature/FeatureList.jsx
@@ -51,10 +51,10 @@ const FeatureList = React.createClass({
                 <table className="outerborder man">
                     <thead>
                         <tr>
-                            <th></th>
+                            <th />
                             <th>Name</th>
                             <th className="hide-lt480">Strategy</th>
-                            <th></th>
+                            <th />
                         </tr>
                     </thead>
                     <tbody>
diff --git a/packages/unleash-frontend/public/js/components/log/LogEntryList.jsx b/packages/unleash-frontend/public/js/components/log/LogEntryList.jsx
index 22ded86a6a..e6f621872c 100644
--- a/packages/unleash-frontend/public/js/components/log/LogEntryList.jsx
+++ b/packages/unleash-frontend/public/js/components/log/LogEntryList.jsx
@@ -25,8 +25,7 @@ const LogEntryList = React.createClass({
                         type="checkbox"
                         className="mlm"
                         value={this.state.fullEvents}
-                        onChange={this.toggleFullEvents}>
-                    </input>
+                        onChange={this.toggleFullEvents} />
                 </label>
 
                 <table className="outerborder zebra-striped">