diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000000..daf43364980
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,3 @@
+{
+	"extends": "react-app"
+}
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index c7418817439..00000000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-slate
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d3bcd32ed0..4d7db86ee0c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "homepage": "https://martijnhols.github.io/HolyPaladinAnalyzer/build/",
   "devDependencies": {
-    "react-scripts": "0.8.5"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "chartist": "^0.11.0",
diff --git a/src/App.test.js b/src/App.test.js
index b84af98d720..c7c44e0b8cf 100644
--- a/src/App.test.js
+++ b/src/App.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './App';
+import App from 'Main/App';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');
diff --git a/src/Main/App.js b/src/Main/App.js
index 57d6a555467..799c7667192 100644
--- a/src/Main/App.js
+++ b/src/Main/App.js
@@ -31,6 +31,9 @@ class App extends Component {
       resultTab: React.PropTypes.string,
     }),
   };
+  static defaultProps = {
+    params: {},
+  };
 
   get reportCode() {
     return this.props.params.reportCode;
diff --git a/src/Main/Mana.js b/src/Main/Mana.js
index 98c8c006bba..88567772ace 100644
--- a/src/Main/Mana.js
+++ b/src/Main/Mana.js
@@ -137,17 +137,17 @@ class Mana extends React.PureComponent {
         ...bosses.map((series, index) => ({
           className: `boss-health boss-${index} boss-${series.guid}`,
           name: `${series.name} Health`,
-          data: Object.values(series.data),
+          data: Object.keys(series.data).map(key => series.data[key]),
         })),
         {
           className: 'mana',
           name: 'Mana',
-          data: Object.values(manaBySecond),
+          data: Object.keys(manaBySecond).map(key => manaBySecond[key]),
         },
         {
           className: 'death',
           name: 'Deaths',
-          data: Object.values(deathsBySecond),
+          data: Object.keys(deathsBySecond).map(key => deathsBySecond[key]),
         }
       ],
     };
diff --git a/src/Parser/HolyPaladin/Modules/PaladinCore/BeaconTargets.js b/src/Parser/HolyPaladin/Modules/PaladinCore/BeaconTargets.js
index 6c4bd7294bc..0a91586304b 100644
--- a/src/Parser/HolyPaladin/Modules/PaladinCore/BeaconTargets.js
+++ b/src/Parser/HolyPaladin/Modules/PaladinCore/BeaconTargets.js
@@ -2,7 +2,7 @@ import Module from 'Parser/Core/Module';
 
 import { BEACON_TYPES } from '../../Constants';
 
-const BEACONS = Object.values(BEACON_TYPES);
+const BEACONS = Object.keys(BEACON_TYPES).map(key => BEACON_TYPES[key]);
 
 const debug = true;