diff --git a/package.json b/package.json
index 342440d04..3e2dcae73 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "main": "index.js",
   "scripts": {
-    "test": "mocha --compilers js:babel-core/register --require react-native-mock/mock",
+    "test": "mocha --compilers js:babel-core/register --require @edtechfoundry/react-native-mock/mock",
     "test:watch": "npm run test -- --watch",
     "eslint": "eslint index.js src/ test/; exit 0;"
   },
@@ -37,17 +37,20 @@
   ],
   "dependencies": {
     "lodash.isequal": "^4.5.0",
-    "react": "^15.4.2",
+    "prop-types": "^15.6.0",
     "react-addons-pure-render-mixin": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-native-experimental-navigation": "https://github.com/EdtechFoundry/react-native-experimental-navigation.git#0.0.1",
+    "react-native-experimental-navigation": "https://github.com/EdtechFoundry/react-native-experimental-navigation.git#0.26.10-1.0.0",
     "react-native-tabs": "git://github.com/EdtechFoundry/react-native-tabs.git#c709af985dc51ef0732b1b2aee362c4231ecdeb1",
     "react-static-container": "1.0.1"
   },
   "devDependencies": {
+    "@edtechfoundry/react-native-mock": "^0.4.4",
     "babel-core": "^6.18.2",
     "babel-eslint": "^7.1.1",
+    "babel-jest": "19.0.0",
+    "babel-preset-es2015": "^6.22.0",
     "babel-preset-react-native": "^1.9.0",
+    "babel-preset-stage-0": "^6.22.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "enzyme": "^2.6.0",
@@ -57,18 +60,18 @@
     "eslint-plugin-jsx-a11y": "^2.2.3",
     "eslint-plugin-react": "^6.7.1",
     "expect": "^1.20.2",
+    "jest": "19.0.1",
     "mocha": "^3.2.0",
     "mocha-junit-reporter": "^1.12.1",
-    "react-native-mock": "0.2.0",
-    "sinon": "^1.17.6",
-    "babel-jest": "19.0.0",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-stage-0": "^6.22.0",
-    "jest": "19.0.1",
-    "react-test-renderer": "15.4.2"
+    "react": "^16.0.0",
+    "react-native": "^0.48.4",
+    "react-dom": "^16.0.0",
+    "react-test-renderer": "15.4.2",
+    "sinon": "^1.17.6"
   },
   "peerDependencies": {
-    "react-native": ">=0.42.0"
+    "react-native": ">=0.42.0",
+    "react": ">=15.5.0"
   },
   "jest": {
     "preset": "react-native"
diff --git a/src/DefaultRenderer.js b/src/DefaultRenderer.js
index 67c5a0158..1647eaca5 100644
--- a/src/DefaultRenderer.js
+++ b/src/DefaultRenderer.js
@@ -8,8 +8,8 @@
  */
 import React, {
   Component,
-  PropTypes,
 } from 'react';
+import PropTypes from 'prop-types';
 import {
   Animated,
   View,
diff --git a/src/Modal.js b/src/Modal.js
index cfcd22f67..73f6f051f 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -1,6 +1,4 @@
-import React, {
-  PropTypes,
-} from 'react';
+import PropTypes from 'prop-types';
 import {
   View,
 } from 'react-native';
diff --git a/src/NavBar.js b/src/NavBar.js
index a867a34dc..485154245 100644
--- a/src/NavBar.js
+++ b/src/NavBar.js
@@ -23,9 +23,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-import React, {
-  PropTypes,
-} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
   Platform,
   Animated,
diff --git a/src/Router.js b/src/Router.js
index f729462e6..539855ce6 100644
--- a/src/Router.js
+++ b/src/Router.js
@@ -8,8 +8,8 @@
  */
 import React, {
   Component,
-  PropTypes,
 } from 'react';
+import PropTypes from 'prop-types';
 import { BackHandler } from 'react-native';
 import NavigationExperimental from 'react-native-experimental-navigation';
 
diff --git a/src/Scene.js b/src/Scene.js
index 248edb7e1..c4bba43f5 100644
--- a/src/Scene.js
+++ b/src/Scene.js
@@ -6,7 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { View, Text } from 'react-native';
 
 export default class extends React.Component {
diff --git a/src/Switch.js b/src/Switch.js
index da4de8ba6..13b13d187 100644
--- a/src/Switch.js
+++ b/src/Switch.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import TabBar from './TabBar';
 import Actions from './Actions';
 
diff --git a/src/TabBar.js b/src/TabBar.js
index 0ee27614b..159754377 100644
--- a/src/TabBar.js
+++ b/src/TabBar.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import {
   Image,
   View,
diff --git a/src/TabbedView.js b/src/TabbedView.js
index 2c33ed324..08796e19a 100644
--- a/src/TabbedView.js
+++ b/src/TabbedView.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, StyleSheet } from 'react-native';
 import StaticContainer from 'react-static-container';