diff --git a/components/DropDownMenu/DropDownModal.js b/components/DropDownMenu/DropDownModal.js
index 6898e991..fc8f333d 100644
--- a/components/DropDownMenu/DropDownModal.js
+++ b/components/DropDownMenu/DropDownModal.js
@@ -8,6 +8,7 @@ import {
   LayoutAnimation,
   Dimensions,
 } from 'react-native';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import { Button } from '../Button';
diff --git a/components/GridRow.js b/components/GridRow.js
index 44742341..19a9f7b2 100644
--- a/components/GridRow.js
+++ b/components/GridRow.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Children } from 'react';
 import { View as RNView } from 'react-native';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import { View } from './View';
diff --git a/components/HorizontalPager/Page.js b/components/HorizontalPager/Page.js
index 75414940..7a40c576 100644
--- a/components/HorizontalPager/Page.js
+++ b/components/HorizontalPager/Page.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import { View } from '../../index';
 
diff --git a/components/ImageGalleryOverlay.js b/components/ImageGalleryOverlay.js
index fde23726..90bf0340 100644
--- a/components/ImageGalleryOverlay.js
+++ b/components/ImageGalleryOverlay.js
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import {
   ScrollView,
 } from 'react-native';
+import PropTypes from 'prop-types';
 
 import { connectStyle } from '@shoutem/theme';
 import { connectAnimation } from '@shoutem/animation';
diff --git a/components/ImagePreview.js b/components/ImagePreview.js
index b82b67e8..2b94c887 100644
--- a/components/ImagePreview.js
+++ b/components/ImagePreview.js
@@ -6,6 +6,7 @@ import {
   Image,
   TouchableOpacity,
 } from 'react-native';
+import PropTypes from 'prop-types';
 
 import Icon from 'react-native-vector-icons/MaterialIcons';
 
diff --git a/components/ListView.js b/components/ListView.js
index 1ea88b6e..dc60cf30 100644
--- a/components/ListView.js
+++ b/components/ListView.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import {
   View,
   ListView as RNListView,
diff --git a/components/NavigationBar/NavigationBar.js b/components/NavigationBar/NavigationBar.js
index 71fd1419..ee4d3042 100644
--- a/components/NavigationBar/NavigationBar.js
+++ b/components/NavigationBar/NavigationBar.js
@@ -6,6 +6,7 @@ import {
   Platform,
   View,
 } from 'react-native';
+import PropTypes from 'prop-types';
 
 import _ from 'lodash';
 
diff --git a/components/RichMedia.js b/components/RichMedia.js
index 57862018..91fbff38 100644
--- a/components/RichMedia.js
+++ b/components/RichMedia.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Html } from '../html';
 
 export default function RichMedia({ body }) {
diff --git a/components/ScrollView/ScrollDriverProvider.js b/components/ScrollView/ScrollDriverProvider.js
index cb9e4206..757c9b62 100644
--- a/components/ScrollView/ScrollDriverProvider.js
+++ b/components/ScrollView/ScrollDriverProvider.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component, Children } from 'react';
+import PropTypes from 'prop-types';
 import { DriverShape, ScrollDriver } from '@shoutem/animation';
 import * as _ from 'lodash';
 /**
diff --git a/components/ScrollView/ScrollView.js b/components/ScrollView/ScrollView.js
index eae22c35..90b83198 100644
--- a/components/ScrollView/ScrollView.js
+++ b/components/ScrollView/ScrollView.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Animated } from 'react-native';
 import { connectStyle } from '@shoutem/theme';
 import _ from 'lodash';
diff --git a/components/ShareButton.js b/components/ShareButton.js
index f345f797..5d05f779 100644
--- a/components/ShareButton.js
+++ b/components/ShareButton.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, {
   Component,
 } from 'react';
+import PropTypes from 'prop-types';
 
 import { Share, Platform } from 'react-native';
 
diff --git a/components/Spinner.js b/components/Spinner.js
index 05050c9d..8992a174 100644
--- a/components/Spinner.js
+++ b/components/Spinner.js
@@ -3,6 +3,7 @@ import React from 'react';
 import {
   ActivityIndicator,
 } from 'react-native';
+import PropTypes from 'prop-types';
 
 import { connectStyle } from '@shoutem/theme';
 
diff --git a/components/Switch.js b/components/Switch.js
index 1dd7d361..39fdb503 100644
--- a/components/Switch.js
+++ b/components/Switch.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, {
   Component,
 } from 'react';
+import PropTypes from 'prop-types';
 
 import { TouchableWithoutFeedback } from 'react-native';
 
diff --git a/components/TextInput.js b/components/TextInput.js
index 6a2cebbe..f5bf833e 100644
--- a/components/TextInput.js
+++ b/components/TextInput.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { TextInput as RNTextInput } from 'react-native';
+import PropTypes from 'prop-types';
 
 import { connectStyle } from '@shoutem/theme';
 import { connectAnimation } from '@shoutem/animation';
diff --git a/examples/RestaurantsApp/app/App.js b/examples/RestaurantsApp/app/App.js
index 1d3fb19b..7c277a5f 100644
--- a/examples/RestaurantsApp/app/App.js
+++ b/examples/RestaurantsApp/app/App.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import {
diff --git a/examples/RestaurantsApp/app/RestaurantDetails.js b/examples/RestaurantsApp/app/RestaurantDetails.js
index 8ce58745..cb5fea8c 100644
--- a/examples/RestaurantsApp/app/RestaurantDetails.js
+++ b/examples/RestaurantsApp/app/RestaurantDetails.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import {
   ScrollView,
   Icon,
diff --git a/examples/RestaurantsApp/app/RestaurantsList.js b/examples/RestaurantsApp/app/RestaurantsList.js
index 3ad74c8a..9ff46f02 100644
--- a/examples/RestaurantsApp/app/RestaurantsList.js
+++ b/examples/RestaurantsApp/app/RestaurantsList.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import {
   Image,
   ListView,
diff --git a/examples/components/Stage.js b/examples/components/Stage.js
index 88e573c3..f6cba46e 100644
--- a/examples/components/Stage.js
+++ b/examples/components/Stage.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import { View, Text } from 'react-native';
 
diff --git a/html/Html.js b/html/Html.js
index 9440a08d..8443dae3 100644
--- a/html/Html.js
+++ b/html/Html.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Platform, InteractionManager } from 'react-native';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import { View, Spinner } from '@shoutem/ui';
diff --git a/html/components/Gallery.js b/html/components/Gallery.js
index 8d777275..40ca3409 100644
--- a/html/components/Gallery.js
+++ b/html/components/Gallery.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import { InlineGallery } from '../../components/InlineGallery';
 
diff --git a/html/components/Image.js b/html/components/Image.js
index 3e484c3d..ddad2b84 100644
--- a/html/components/Image.js
+++ b/html/components/Image.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Image as RNImage } from 'react-native';
 import { connectStyle } from '@shoutem/theme';
 import _ from 'lodash';
diff --git a/html/elements/A.js b/html/elements/A.js
index 7f3db5be..c7dd73f1 100644
--- a/html/elements/A.js
+++ b/html/elements/A.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Linking } from 'react-native';
 import { connectStyle } from '@shoutem/theme';
 import _ from 'lodash';
diff --git a/html/elements/Inline.js b/html/elements/Inline.js
index ff2baa45..8bf25d4e 100644
--- a/html/elements/Inline.js
+++ b/html/elements/Inline.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import { View } from '../../components/View';
diff --git a/html/elements/Video.js b/html/elements/Video.js
index 68edf6a1..431ddffa 100644
--- a/html/elements/Video.js
+++ b/html/elements/Video.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { View } from '../../components/View';
 import { Video as UIVideo } from '../../components/Video';
 import Image from '../components/Image';
diff --git a/html/elements/list/Li.js b/html/elements/list/Li.js
index 7c72adac..63fcc625 100644
--- a/html/elements/list/Li.js
+++ b/html/elements/list/Li.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import { View } from '../../../components/View';
 import { ElementPropTypes } from '../../Html';
diff --git a/html/elements/list/Ol.js b/html/elements/list/Ol.js
index 473151ed..94ba8858 100644
--- a/html/elements/list/Ol.js
+++ b/html/elements/list/Ol.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import { View } from '../../../components/View';
 import { Text } from '../../../components/Text';
diff --git a/html/elements/list/Ul.js b/html/elements/list/Ul.js
index 371da32e..064e8df9 100644
--- a/html/elements/list/Ul.js
+++ b/html/elements/list/Ul.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Text } from '@shoutem/ui';
 
 import { View } from '../../../components/View';
diff --git a/navigation/CardStack.js b/navigation/CardStack.js
index 6166117d..20c0619d 100644
--- a/navigation/CardStack.js
+++ b/navigation/CardStack.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
 import {
   InteractionManager,
 } from 'react-native';
diff --git a/navigation/NavigationBar.js b/navigation/NavigationBar.js
index 3a48eb1f..aa762a30 100644
--- a/navigation/NavigationBar.js
+++ b/navigation/NavigationBar.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { DriverShape } from '@shoutem/animation';
 import { connectStyle } from '@shoutem/theme';
diff --git a/navigation/NavigationBarView.js b/navigation/NavigationBarView.js
index 89d55f19..ad8ab26b 100644
--- a/navigation/NavigationBarView.js
+++ b/navigation/NavigationBarView.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import tinyColor from 'tinycolor2';
 
diff --git a/navigation/SceneProvider.js b/navigation/SceneProvider.js
index 26554807..63b1d63c 100644
--- a/navigation/SceneProvider.js
+++ b/navigation/SceneProvider.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Children, Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Provides the current navigation scene to child components.
diff --git a/package.json b/package.json
index 796577bc..a03e7a1e 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,13 @@
     "@shoutem/animation": "~0.11.0",
     "@shoutem/theme": "~0.10.0",
     "babel-plugin-transform-decorators-legacy": "~1.3.4",
-    "buffer": "~4.5.1",
-    "events": "1.1.0",
+    "buffer": "^5.0.7",
+    "events": "^1.1.1",
     "html-entities": "~1.2.0",
     "htmlparser2": "~3.9.0",
-    "lodash": "~4.15.0",
-    "qs": "~4.0.0",
+    "lodash": "^4.17.4",
+    "prop-types": "^15.5.10",
+    "qs": "^6.5.1",
     "react-native-lightbox": "shoutem/react-native-lightbox#4e58b9b1aca166142d69b161ff511efc3358ff9f",
     "react-native-linear-gradient": "~2.2.0",
     "react-native-transformable-image": "shoutem/react-native-transformable-image#7d15395ec3857571711a12bc08f24f3a96ff1cde",
@@ -19,7 +20,7 @@
     "react-native-photo-view": "~1.4.0",
     "react-native-navigation-experimental-compat": "1.0.0",
     "stream": "0.0.2",
-    "tinycolor2": "~1.3.0"
+    "tinycolor2": "^1.4.1"
   },
   "peerDependencies": {
     "react": "^15.0.0",
@@ -27,14 +28,14 @@
   },
   "devDependencies": {
     "babel": "^6.3.26",
-    "babel-preset-react-native": "^1.9.0",
-    "chai": "^3.4.1",
+    "babel-preset-react-native": "^4.0.0",
+    "chai": "^4.1.2",
     "deep-freeze": "0.0.1",
     "enzyme": "^2.0.0-rc1",
-    "mocha": "^2.3.4",
+    "mocha": "^3.5.3",
     "react-addons-test-utils": "^15.3.1",
     "react-dom": "^15.3.1",
-    "react-native-mock": "^0.2.5"
+    "react-native-mock": "^0.3.1"
   },
   "scripts": {
     "test": "mocha -R spec --require test-utils/setup.js --require react-native-mock/mock.js --compilers js:babel-core/register $(find . -name '*.spec.js' ! -ipath '*node_modules*')"