diff --git a/.babelrc b/.babelrc
index dfb31e1..c3a1dad 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,4 @@
 {
-  "stage": 0,
+  "presets": ["es2015", "stage-1", "react"],
+  "plugins": ["dev-expression"]
 }
diff --git a/demo/src/App.jsx b/demo/src/App.jsx
index fa9e0fe..a129848 100644
--- a/demo/src/App.jsx
+++ b/demo/src/App.jsx
@@ -16,8 +16,7 @@ var menuItems = [
   })
 ]
 
-@ThemeDecorator(ThemeManager.getMuiTheme(RawTheme))
-export default class App extends React.Component {
+class App extends React.Component {
 
   static contextTypes = {
     router: React.PropTypes.func
@@ -65,3 +64,5 @@ export default class App extends React.Component {
     )
   }
 }
+
+export default ThemeDecorator(ThemeManager.getMuiTheme(RawTheme))(App)
diff --git a/package.json b/package.json
index 6a95529..7878a51 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "lib-watch": "npm run lib && babel ./src --out-dir lib  --source-maps --source-maps --watch",
     "browser-build": "webpack --config webpack.browser.config.js",
     "publish-browser": "npm run browser-build && gh-pages --dist browser --branch browser",
-    "test": "mocha --compilers js:babel/register",
+    "test": "mocha --compilers js:babel-register",
     "test-debug": "node-debug _mocha --compilers js:babel/register"
   },
   "repository": {
@@ -34,17 +34,19 @@
   ],
   "homepage": "https://github.com/azazdeaz/react-gsap-enhancer",
   "devDependencies": {
-    "@azazdeaz/component-playground": "^1.0.1",
-    "babel": "^5.6.23",
-    "babel-core": "^5.8.12",
-    "babel-eslint": "^3.1.23",
-    "babel-loader": "^5.3.1",
+    "@azazdeaz/component-playground": "^2.0.1",
+    "babel-cli": "^6.6.5",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-dev-expression": "^0.2.1",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-1": "^6.5.0",
+    "babel-register": "^6.7.2",
     "chai": "^3.2.0",
     "chai-spies": "^0.7.0",
     "coveralls": "^2.11.4",
     "custom-drag": "0.0.3",
     "eslint": "^0.24.0",
-    "eslint-plugin-babel": "^1.1.0",
     "eslint-plugin-mocha": "^0.5.1",
     "eslint-plugin-react": "^2.6.4",
     "file-loader": "^0.8.4",
@@ -54,22 +56,22 @@
     "gulp-gh-pages": "^0.5.2",
     "gulp-util": "^3.0.6",
     "history": "^1.13.1",
-    "isparta": "^3.0.4",
     "lodash": "^3.10.1",
     "material-ui": "^0.13.2",
     "mocha": "^2.3.2",
     "node-libs-browser": "^0.5.2",
-    "radium": "^0.15.1",
     "raw-loader": "^0.5.1",
     "react": "^0.14.3",
     "react-addons-transition-group": "^0.14.7",
     "react-dom": "^0.14.3",
-    "react-matterkit": "0.0.34",
     "react-motion": "^0.2.7",
     "react-router": "^1.0.0",
     "react-tap-event-plugin": "^0.2.1",
     "redux": "^0.12.0",
     "webpack": "^1.10.5",
     "webpack-dev-server": "^1.10.1"
+  },
+  "dependencies": {
+    "radium": "^0.16.6"
   }
 }
diff --git a/test/attachRefs/test.js b/test/attachRefs/test.js
index 44bf395..c566831 100644
--- a/test/attachRefs/test.js
+++ b/test/attachRefs/test.js
@@ -1,7 +1,7 @@
 var React = require('react')
 var ReactDOM = require('react-dom')
 var assert = require('chai').assert
-var attachRefs = require('../../src/attachRefs')
+import attachRefs from '../../src/attachRefs'
 
 describe('attachRefs', () => {
   const oriFindDOMNode = ReactDOM.findDOMNode
diff --git a/test/controller/test.js b/test/controller/test.js
index 9ad6434..9434da9 100644
--- a/test/controller/test.js
+++ b/test/controller/test.js
@@ -4,7 +4,7 @@ var spies = require('chai-spies')
 chai.use(spies)
 chai.should()
 
-var Controller = require('../../src/Controller')
+import Controller from '../../src/Controller'
 
 function wrapWarn() {
   const ori = console.warn
@@ -16,17 +16,19 @@ function wrapWarn() {
 function createMockGSAPAnimation() {
   var mock = {}
   var paused = false
+  var reversed = false
   mock.time = chai.spy((v) => v === undefined ? 0 : mock)
   mock.pause = chai.spy(() => {
     paused = true
     return mock
   })
   mock.delay = chai.spy(() => 0)
-  mock.paused = chai.spy(() => paused)
   mock.invalidate = chai.spy(() => mock)
   mock.restart = chai.spy(() => mock)
   mock.kill = chai.spy(() => mock)
   mock.play = chai.spy(() => mock)
+  mock.paused = chai.spy(v => {if (v === undefined) return paused; else {paused = v; return mock;}})
+  mock.reversed = chai.spy(v => {if (v === undefined) return reversed; else {reversed = v; return mock;}})
   return mock
 }
 
@@ -143,7 +145,7 @@ describe('Controller', () => {
     controller.pause()
     gsapAnimation.pause.should.have.been.called.once()
     controller.attach()
-    gsapAnimation.pause.should.have.been.called.twice()
+    gsapAnimation.paused.should.have.been.called.with(true)
   })
 
   describe('replace animation source', () => {
diff --git a/test/gsap-enhancer/test.js b/test/gsap-enhancer/test.js
index 6003be3..6678b6b 100644
--- a/test/gsap-enhancer/test.js
+++ b/test/gsap-enhancer/test.js
@@ -1,6 +1,6 @@
 var React = require('react')
 var Component = React.Component
-var GSAP = require('../../src/gsap-enhancer')
+import GSAP from '../../src/gsap-enhancer'
 var chai = require('chai')
 var spies = require('chai-spies')
 var assert = chai.assert
diff --git a/test/target/test.js b/test/target/test.js
index 2bf7793..f9307e6 100644
--- a/test/target/test.js
+++ b/test/target/test.js
@@ -1,5 +1,5 @@
 var assert = require('chai').assert
-var createTarget = require('../../src/createTarget')
+import createTarget from '../../src/createTarget'
 
 function createFakeTree(rootDesign) {
   function create(design) {
diff --git a/test/utils/test.js b/test/utils/test.js
index d54f5d1..f85ca3e 100644
--- a/test/utils/test.js
+++ b/test/utils/test.js
@@ -1,10 +1,10 @@
-var FakeNode = require('./FakeNode')
-var {
+import FakeNode from './FakeNode'
+import {
   walkItemTree,
   reattachAll,
   restoreRenderedStyles,
   saveRenderedStyles
-} = require('../../src/utils')
+} from '../../src/utils'
 var chai = require('chai')
 var spies = require('chai-spies')
 var assert = chai.assert