diff --git a/client/modules/App/App.js b/client/modules/App/App.js
index 5598225d..61896cf7 100644
--- a/client/modules/App/App.js
+++ b/client/modules/App/App.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
 import DevTools from './components/DevTools';
+require('es6-promise').polyfill();
 
 class App extends React.Component {
   constructor(props, context) {
diff --git a/client/modules/IDE/components/Toolbar.js b/client/modules/IDE/components/Toolbar.js
index c7f8d00e..da289b1b 100644
--- a/client/modules/IDE/components/Toolbar.js
+++ b/client/modules/IDE/components/Toolbar.js
@@ -1,11 +1,10 @@
 import React, { PropTypes } from 'react';
-
-const Isvg = require('react-inlinesvg');
+const InlineSVG = require('react-inlinesvg');
 const playUrl = require('../../../images/play.svg');
 const logoUrl = require('../../../images/p5js-logo.svg');
 const stopUrl = require('../../../images/stop.svg');
 const preferencesUrl = require('../../../images/preferences.svg');
-const classNames = require('classnames');
+import classNames from 'classnames';
 
 function Toolbar(props) {
   let playButtonClass = classNames({
@@ -25,13 +24,13 @@ function Toolbar(props) {
     <div className="toolbar">
       <img className="toolbar__logo" src={logoUrl} alt="p5js Logo" />
       <button className={playButtonClass} onClick={props.startSketch} id="play-button">
-        <Isvg src={playUrl} alt="Play Sketch" />
+        <InlineSVG src={playUrl} alt="Play Sketch" />
       </button>
       <label htmlFor="play-button" className="toolbar__button-label">
         play
       </label>
       <button className={stopButtonClass} onClick={props.stopSketch} id="stop-button">
-        <Isvg src={stopUrl} alt="Stop Sketch" />
+        <InlineSVG src={stopUrl} alt="Stop Sketch" />
       </button>
       <label htmlFor="stop-button" className="toolbar__button-label">
         stop
@@ -59,7 +58,7 @@ function Toolbar(props) {
         onClick={props.openPreferences}
         id="preferences-button"
       >
-        <Isvg src={preferencesUrl} alt="Show Preferences" />
+        <InlineSVG src={preferencesUrl} alt="Show Preferences" />
       </button>
       <label htmlFor="preferences-button" className="toolbar__button-label">
         preferences
diff --git a/package.json b/package.json
index 4a367d2a..69180060 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "csslint": "^0.10.0",
     "dotenv": "^2.0.0",
     "dropzone": "^4.3.0",
+    "es6-promise": "^3.2.1",
     "escape-string-regexp": "^1.0.5",
     "eslint-loader": "^1.3.0",
     "express": "^4.13.4",