diff --git a/README.md b/README.md
index 3295a97fa..65c11b59f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+This package has been moved to https://github.com/react-navigation/react-navigation/tree/master/packages/stack
+
+---
+
 # React Navigation Stack
 
 [![Build Status][build-badge]][build]
diff --git a/example/package.json b/example/package.json
index bbe65ed7e..c31bbcb31 100644
--- a/example/package.json
+++ b/example/package.json
@@ -17,7 +17,7 @@
     "react": "16.9.0",
     "react-dom": "16.9.0",
     "react-native": "0.61.4",
-    "react-native-gesture-handler": "~1.5.0",
+    "react-native-gesture-handler": "^1.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
     "react-native-maps": "0.26.1",
     "react-native-paper": "^2.15.2",
@@ -26,7 +26,7 @@
     "react-native-unimodules": "^0.7.0-rc.1",
     "react-native-web": "^0.11.4",
     "react-native-webview": "7.4.3",
-    "react-navigation": "^4.0.10",
+    "react-navigation": "^4.1.1",
     "react-navigation-drawer": "^2.2.2",
     "react-navigation-tabs": "^2.5.5"
   },
diff --git a/example/yarn.lock b/example/yarn.lock
index 1cf51c637..e31aac3ba 100644
--- a/example/yarn.lock
+++ b/example/yarn.lock
@@ -1291,6 +1291,13 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@egjs/hammerjs@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
 "@expo/bunyan@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-3.0.2.tgz#775680bd479a8b79ada4a5676936a58eef1579c9"
@@ -1813,24 +1820,23 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.5.tgz#25421be6cd943a4b1660b62cfbcd45be8891462c"
   integrity sha512-Lj1DzfCmW0f4HnmHtEuX8Yy2f7cnUA8r5KGGUuDDGtQt1so6QJkKeUmsnLo2zYDtsF8due6hvIL06Vdo5xxuLQ==
 
-"@react-navigation/core@^3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d"
-  integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==
+"@react-navigation/core@^3.5.2":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.2.tgz#3a3d147b8419e5839e0f2ad4dea086bd2d307fe3"
+  integrity sha512-HgKXci1h74aETgm5CXMBoIWG8R7VZG1eUUHYb3BdxwekdiZjW1P/srjiXzsCqFGlsESnVIOIkzT4DqI9J752Bw==
   dependencies:
     hoist-non-react-statics "^3.3.0"
     path-to-regexp "^1.7.0"
     query-string "^6.4.2"
     react-is "^16.8.6"
 
-"@react-navigation/native@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.6.2.tgz#3634697b6350cc5189657ae4551f2d52b57fbbf0"
-  integrity sha512-Cybeou6N82ZeRmgnGlu+wzlV3z5BZQR2dmYaNFV1TNLUGHqtvv8E7oNw9uYcz9Ox5LFbiX+FdNTn2d6ZPlK0kg==
+"@react-navigation/native@^3.6.5":
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.6.5.tgz#97b0b9a48f059a0704e3527f40fb034720ef363d"
+  integrity sha512-ttEmnokFVf09CvrkzlPIdfA693KfYcRxTYf9OZwp0Ll6El27UYjJD4arwGc+zvlohjTErCdba6CAKV702Wv28w==
   dependencies:
-    hoist-non-react-statics "^3.0.1"
-    react-native-safe-area-view "^0.14.1"
-    react-native-screens "^1.0.0 || ^1.0.0-alpha"
+    hoist-non-react-statics "^3.3.2"
+    react-native-safe-area-view "^0.14.8"
 
 "@segment/loosely-validate-event@^2.0.0":
   version "2.0.0"
@@ -1916,6 +1922,11 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/hammerjs@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
+  integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
+
 "@types/http-proxy-middleware@*":
   version "0.19.3"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03"
@@ -6110,10 +6121,11 @@ gzip-size@5.1.1, gzip-size@^5.0.0:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
-hammerjs@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
+"hammerjs@https://github.com/naver/hammer.js.git":
+  version "2.0.17-snapshot"
+  resolved "https://github.com/naver/hammer.js.git#54bc698b25edd6e1b76ca975ebaced5ce0467d51"
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
 
 handle-thing@^2.0.0:
   version "2.0.0"
@@ -6260,13 +6272,20 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
   integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
     react-is "^16.7.0"
 
+hoist-non-react-statics@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
+  dependencies:
+    react-is "^16.7.0"
+
 hoopy@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -9958,12 +9977,13 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-native-gesture-handler@~1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.5.2.tgz#281111550bf1eee10b7feba5278d142169892731"
-  integrity sha512-Xp03dq4XYVTD0xmWx4DW4eX+ox1NQLjHmbykspTdS5FCNIVIOekVXRLFCw1698/v8dYUHApNo6K3s3BCD8fqPA==
+react-native-gesture-handler@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.5.5.tgz#513d6d65c4e24efd6d69be0006c7cd3bc9045358"
+  integrity sha512-viypCSRpo064BdpkVL2FnPLZiEK3piJ1WZxydFXgeZj+avJxd6VnTFoh9+IDFk2M0Eadoy6D1ZV1TqBMGHtqGg==
   dependencies:
-    hammerjs "^2.0.8"
+    "@egjs/hammerjs" "^2.0.17"
+    hammerjs "https://github.com/naver/hammer.js.git"
     hoist-non-react-statics "^2.3.1"
     invariant "^2.2.4"
     prop-types "^15.7.2"
@@ -10007,14 +10027,21 @@ react-native-safe-area-view@^0.12.0:
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.6:
+react-native-safe-area-view@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.6.tgz#9a9d37d9f8f3887d60c4076eae7b5d2319539446"
   integrity sha512-dbzuvaeHFV1VBpyMaC0gtJ2BqFt6ls/405A0t78YN1sXiTrVr3ki86Ysct8mzifWqLdvWzcWagE5wfMtdxnqoA==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-react-native-screens@1.0.0-alpha.23, "react-native-screens@^1.0.0 || ^1.0.0-alpha":
+react-native-safe-area-view@^0.14.8:
+  version "0.14.8"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
+  integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+
+react-native-screens@1.0.0-alpha.23:
   version "1.0.0-alpha.23"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0"
   integrity sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==
@@ -10129,13 +10156,13 @@ react-navigation-tabs@^2.5.5:
     react-native-safe-area-view "^0.14.6"
     react-native-tab-view "^2.9.0"
 
-react-navigation@^4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.10.tgz#ddf41134600689d6ba99e35dd22ba1f664f91e5c"
-  integrity sha512-7PqvmsdQ7HIyxPUMYbd9Uq//VoMdniEOLAOSvIhb/ExtbAt/1INSjUF+RiMWOMCWLTCNvNPRvTz7xy7qwWureg==
+react-navigation@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.1.1.tgz#670a1712e945e454fe9cafa424e685c2f1f30832"
+  integrity sha512-HEzPOsndrKnxTf0+gsi1N/0GKbwu8KSTOveL7ptJLG7XNXHBXVvp4lbaS3PVPe2IaiXbXCC+y3VJ8dH50wHR4g==
   dependencies:
-    "@react-navigation/core" "^3.5.1"
-    "@react-navigation/native" "^3.6.2"
+    "@react-navigation/core" "^3.5.2"
+    "@react-navigation/native" "^3.6.5"
 
 react-refresh@^0.4.0:
   version "0.4.2"
diff --git a/package.json b/package.json
index 77be4f8d2..a2be24424 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-stack",
-  "version": "2.0.16",
+  "version": "2.1.1",
   "description": "Stack navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -50,7 +50,7 @@
     "@expo/vector-icons": "^10.0.6",
     "@react-native-community/bob": "^0.7.0",
     "@react-native-community/masked-view": "^0.1.5",
-    "@react-navigation/stack": "^5.0.0-alpha.62",
+    "@react-navigation/stack": "^5.0.0-alpha.71",
     "@release-it/conventional-changelog": "^1.1.0",
     "@types/color": "^3.0.1",
     "@types/jest": "^24.0.25",
@@ -67,10 +67,10 @@
     "react": "~16.9.0",
     "react-dom": "~16.9.0",
     "react-native": "~0.61.4",
-    "react-native-gesture-handler": "^1.5.3",
+    "react-native-gesture-handler": "^1.5.5",
     "react-native-safe-area-context": "^0.6.2",
     "react-native-screens": "^2.0.0-alpha.22",
-    "react-navigation": "^4.0.10",
+    "react-navigation": "^4.1.1",
     "react-test-renderer": "~16.9.0",
     "release-it": "^12.4.3",
     "scheduler": "^0.18.0",
diff --git a/scripts/stack.patch b/scripts/stack.patch
index eb20cb840..a4b2c38ea 100644
--- a/scripts/stack.patch
+++ b/scripts/stack.patch
@@ -1,6 +1,6 @@
 diff -Naur node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
---- node_modules/@react-navigation/stack/src/index.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/index.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/index.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/index.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -3,11 +3,6 @@
  import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
  import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -28,7 +28,7 @@ diff -Naur node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.t
    StackHeaderTitleProps,
    StackCardInterpolatedStyle,
 diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
---- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-01-23 12:34:48.000000000 +0100
+--- node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-02-05 09:47:09.000000000 +0100
 +++ src/vendor/navigators/createStackNavigator.tsx	1970-01-01 01:00:00.000000000 +0100
 @@ -1,81 +0,0 @@
 -import * as React from 'react';
@@ -113,9 +113,9 @@ diff -Naur node_modules/@react-navigation/stack/src/navigators/createStackNaviga
 -  typeof StackNavigator
 ->(StackNavigator);
 diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
---- node_modules/@react-navigation/stack/src/types.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/types.tsx	2020-01-23 12:43:56.000000000 +0100
-@@ -8,13 +8,28 @@
+--- node_modules/@react-navigation/stack/src/types.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/types.tsx	2020-02-05 09:56:54.000000000 +0100
+@@ -7,13 +7,28 @@
  } from 'react-native';
  import { EdgeInsets } from 'react-native-safe-area-context';
  import {
@@ -150,7 +150,7 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
  
  export type StackNavigationEventMap = {
    /**
-@@ -27,42 +42,29 @@
+@@ -26,42 +41,29 @@
    transitionEnd: { data: { closing: boolean } };
  };
  
@@ -214,7 +214,7 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
  };
  
  export type Layout = { width: number; height: number };
-@@ -238,24 +240,27 @@
+@@ -237,24 +239,27 @@
    /**
     * Navigation prop for the header.
     */
@@ -249,7 +249,7 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
  export type StackNavigationOptions = StackHeaderOptions &
    Partial<TransitionPreset> & {
      /**
-@@ -328,6 +333,8 @@
+@@ -332,6 +337,8 @@
        bottom?: number;
        left?: number;
      };
@@ -259,8 +259,8 @@ diff -Naur node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.t
  
  export type StackNavigationConfig = {
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
---- node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/Header.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/Header.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -1,11 +1,13 @@
  import * as React from 'react';
 -import { StackActions } from '@react-navigation/routers';
@@ -329,8 +329,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/
 +
 +export default Header;
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
---- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/HeaderBackButton.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -8,9 +8,9 @@
    StyleSheet,
    LayoutChangeEvent,
@@ -343,8 +343,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackButto
  
  type Props = StackHeaderLeftButtonProps;
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
---- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackground.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/HeaderBackground.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -1,6 +1,6 @@
  import * as React from 'react';
  import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -354,9 +354,9 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderBackgroun
  type Props = ViewProps & {
    children?: React.ReactNode;
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
---- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/HeaderContainer.tsx	2020-01-23 12:43:56.000000000 +0100
-@@ -1,11 +1,7 @@
+--- node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/HeaderContainer.tsx	2020-02-05 09:56:54.000000000 +0100
+@@ -1,10 +1,6 @@
  import * as React from 'react';
  import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 -import {
@@ -364,13 +364,11 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
 -  Route,
 -  ParamListBase,
 -} from '@react-navigation/native';
--import { StackNavigationState } from '@react-navigation/routers';
 +import { NavigationContext } from 'react-navigation';
-+import { NavigationState as StackNavigationState } from 'react-navigation';
  import { EdgeInsets } from 'react-native-safe-area-context';
  
  import Header from './Header';
-@@ -16,6 +12,7 @@
+@@ -15,6 +11,7 @@
    forSlideRight,
  } from '../../TransitionConfigs/HeaderStyleInterpolators';
  import {
@@ -378,7 +376,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
    Layout,
    Scene,
    StackHeaderStyleInterpolator,
-@@ -99,9 +96,7 @@
+@@ -98,9 +95,7 @@
            insets,
            scene,
            previous,
@@ -390,8 +388,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderContainer
              mode === 'float'
                ? isHeaderStatic
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
---- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/HeaderSegment.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/HeaderSegment.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -8,7 +8,7 @@
    ViewStyle,
  } from 'react-native';
@@ -411,8 +409,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.t
  };
  
 diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
---- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Header/HeaderTitle.tsx	2020-01-23 12:43:56.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Header/HeaderTitle.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -1,6 +1,6 @@
  import * as React from 'react';
  import { Animated, StyleSheet, Platform, TextProps } from 'react-native';
@@ -422,26 +420,33 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx
  type Props = TextProps & {
    tintColor?: string;
 diff -Naur node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
---- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Stack/Card.tsx	2020-01-23 12:43:56.000000000 +0100
-@@ -485,7 +485,7 @@
-                   pointerEvents="none"
-                 />
+--- node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Stack/Card.tsx	2020-02-05 09:56:54.000000000 +0100
+@@ -133,7 +133,7 @@
+ 
+   private interactionHandle: number | undefined;
+ 
+-  private pendingGestureCallback: number | undefined;
++  private pendingGestureCallback: any;
+ 
+   private animate = ({
+     closing,
+@@ -507,7 +507,7 @@
                ) : null}
--              <View ref={this.content} style={[styles.content, contentStyle]}>
-+              <View ref={this.content} style={[styles.content, contentStyle] as any}>
+               <View
+                 ref={this.contentRef}
+-                style={[styles.content, contentStyle]}
++                style={[styles.content, contentStyle] as any}
+               >
                  <StackGestureRefContext.Provider value={this.gestureRef}>
                    <CardAnimationContext.Provider value={animationContext}>
-                     {children}
 diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
---- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Stack/CardContainer.tsx	2020-01-23 12:43:56.000000000 +0100
-@@ -1,11 +1,17 @@
+--- node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Stack/CardContainer.tsx	2020-02-05 09:57:48.000000000 +0100
+@@ -1,10 +1,16 @@
  import * as React from 'react';
  import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
--import { StackNavigationState } from '@react-navigation/routers';
 -import { Route, useTheme } from '@react-navigation/native';
-+import { NavigationState as StackNavigationState } from 'react-navigation';
  import { Props as HeaderContainerProps } from '../Header/HeaderContainer';
  import Card from './Card';
  import HeaderHeightContext from '../../utils/HeaderHeightContext';
@@ -457,7 +462,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.ts
  
  type Props = TransitionPreset & {
    index: number;
-@@ -158,7 +164,7 @@
+@@ -180,7 +186,7 @@
            ? { marginTop: headerHeight }
            : null
        }
@@ -467,8 +472,8 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardContainer.ts
      >
        <View style={styles.container}>
 diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
---- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Stack/CardStack.tsx	2020-01-23 12:44:26.000000000 +0100
+--- node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Stack/CardStack.tsx	2020-02-05 09:56:54.000000000 +0100
 @@ -11,8 +11,7 @@
  import { EdgeInsets } from 'react-native-safe-area-context';
  // eslint-disable-next-line import/no-unresolved
@@ -487,7 +492,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx sr
    Layout,
    StackHeaderMode,
    StackCardMode,
-@@ -96,7 +96,7 @@
+@@ -104,7 +104,7 @@
      <View
        collapsable={!enabled}
        removeClippedSubviews={Platform.OS !== 'ios' && enabled}
@@ -497,23 +502,24 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx sr
      />
    );
 diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
---- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-01-23 12:34:48.000000000 +0100
-+++ src/vendor/views/Stack/StackView.tsx	2020-01-23 12:43:56.000000000 +0100
-@@ -1,8 +1,11 @@
+--- node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-02-05 09:47:09.000000000 +0100
++++ src/vendor/views/Stack/StackView.tsx	2020-02-05 09:56:54.000000000 +0100
+@@ -1,9 +1,11 @@
  import * as React from 'react';
- import { Platform } from 'react-native';
+ import { View, Platform, StyleSheet } from 'react-native';
  import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context';
+-import { GestureHandlerRootView } from 'react-native-gesture-handler';
 -import { Route } from '@react-navigation/native';
 -import { StackActions, StackNavigationState } from '@react-navigation/routers';
-+import {
-+  StackActions,
-+  NavigationState as StackNavigationState,
-+  SceneView,
-+} from 'react-navigation';
++import { GestureHandlerRootView } from 'react-native-gesture-handler'; import {
++   StackActions,
++   NavigationState as StackNavigationState,
++   SceneView,
++ } from 'react-navigation';
  
  import CardStack from './CardStack';
  import KeyboardManager from '../KeyboardManager';
-@@ -11,6 +14,7 @@
+@@ -12,6 +14,7 @@
  } from '../Header/HeaderContainer';
  import SafeAreaProviderCompat from '../SafeAreaProviderCompat';
  import {
@@ -521,7 +527,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx sr
    StackNavigationHelpers,
    StackNavigationConfig,
    StackDescriptorMap,
-@@ -20,6 +24,7 @@
+@@ -21,6 +24,7 @@
    state: StackNavigationState;
    navigation: StackNavigationHelpers;
    descriptors: StackDescriptorMap;
@@ -529,7 +535,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx sr
  };
  
  type State = {
-@@ -257,14 +262,31 @@
+@@ -287,14 +291,31 @@
        return null;
      }
  
@@ -562,7 +568,7 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx sr
      this.setState(state => ({
        routes: state.replacingRouteKeys.length
          ? state.routes.filter(r => !state.replacingRouteKeys.includes(r.key))
-@@ -282,10 +304,15 @@
+@@ -312,12 +333,17 @@
        // If a route exists in state, trigger a pop
        // This will happen in when the route was closed from the card component
        // e.g. When the close animation triggered from a gesture ends
@@ -570,19 +576,22 @@ diff -Naur node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx sr
 -        ...StackActions.pop(),
 -        source: route.key,
 -        target: state.key,
+-      });
 +      // @ts-ignore
 +      navigation.dispatch(StackActions.pop({ key: route.key }));
-+    } else {
+     } else {
 +      // While closing route we need to point to the previous one assuming that
 +      // this previous one in routes array
 +      const index = this.state.routes.findIndex(r => r.key === route.key);
 +
 +      this.handleTransitionComplete({
 +        route: this.state.routes[Math.max(index - 1, 0)],
-       });
-     }
- 
-@@ -300,22 +327,26 @@
++      });
++
+       // We need to clean up any state tracking the route and pop it immediately
+       this.setState(state => ({
+         routes: state.routes.filter(r => r.key !== route.key),
+@@ -334,22 +360,26 @@
    private handleTransitionStart = (
      { route }: { route: Route<string> },
      closing: boolean
diff --git a/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap b/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
index 0d1fee956..a2f66fd71 100644
--- a/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
+++ b/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
@@ -1,7 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Nested navigators renders succesfully as direct child 1`] = `
-Array [
+<View
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+>
   <View
     collapsable={true}
     onLayout={[Function]}
@@ -170,195 +176,188 @@ Array [
                     }
                   >
                     <View
-                      collapsable={true}
-                      onLayout={[Function]}
-                      removeClippedSubviews={false}
                       style={
-                        Array [
-                          Object {
-                            "flex": 1,
-                            "overflow": "hidden",
-                          },
-                          Object {
-                            "overflow": "hidden",
-                          },
-                        ]
+                        Object {
+                          "flex": 1,
+                        }
                       }
                     >
                       <View
-                        pointerEvents="box-none"
+                        collapsable={true}
+                        onLayout={[Function]}
+                        removeClippedSubviews={false}
                         style={
-                          Object {
-                            "bottom": 0,
-                            "left": 0,
-                            "overflow": "hidden",
-                            "position": "absolute",
-                            "right": 0,
-                            "top": 0,
-                            "transform": Array [
-                              Object {
-                                "translateY": 0,
-                              },
-                            ],
-                          }
+                          Array [
+                            Object {
+                              "flex": 1,
+                              "overflow": "hidden",
+                            },
+                            Object {
+                              "overflow": "hidden",
+                            },
+                          ]
                         }
                       >
                         <View
-                          accessibilityElementsHidden={false}
-                          closing={false}
-                          gestureVelocityImpact={0.3}
-                          importantForAccessibility="auto"
-                          onClose={[Function]}
-                          onGestureBegin={[Function]}
-                          onGestureCanceled={[Function]}
-                          onOpen={[Function]}
-                          onTransitionStart={[Function]}
                           pointerEvents="box-none"
                           style={
                             Object {
                               "bottom": 0,
                               "left": 0,
+                              "overflow": "hidden",
                               "position": "absolute",
                               "right": 0,
                               "top": 0,
-                            }
-                          }
-                          transitionSpec={
-                            Object {
-                              "close": Object {
-                                "animation": "spring",
-                                "config": Object {
-                                  "damping": 500,
-                                  "mass": 3,
-                                  "overshootClamping": true,
-                                  "restDisplacementThreshold": 0.01,
-                                  "restSpeedThreshold": 0.01,
-                                  "stiffness": 1000,
-                                },
-                              },
-                              "open": Object {
-                                "animation": "spring",
-                                "config": Object {
-                                  "damping": 500,
-                                  "mass": 3,
-                                  "overshootClamping": true,
-                                  "restDisplacementThreshold": 0.01,
-                                  "restSpeedThreshold": 0.01,
-                                  "stiffness": 1000,
+                              "transform": Array [
+                                Object {
+                                  "translateY": 0,
                                 },
-                              },
+                              ],
                             }
                           }
                         >
                           <View
+                            accessibilityElementsHidden={false}
+                            closing={false}
+                            gestureVelocityImpact={0.3}
+                            importantForAccessibility="auto"
+                            onClose={[Function]}
+                            onGestureBegin={[Function]}
+                            onGestureCanceled={[Function]}
+                            onOpen={[Function]}
+                            onTransitionStart={[Function]}
                             pointerEvents="box-none"
                             style={
                               Object {
-                                "flex": 1,
-                                "marginTop": 44,
+                                "bottom": 0,
+                                "left": 0,
+                                "position": "absolute",
+                                "right": 0,
+                                "top": 0,
+                              }
+                            }
+                            transitionSpec={
+                              Object {
+                                "close": Object {
+                                  "animation": "spring",
+                                  "config": Object {
+                                    "damping": 500,
+                                    "mass": 3,
+                                    "overshootClamping": true,
+                                    "restDisplacementThreshold": 0.01,
+                                    "restSpeedThreshold": 0.01,
+                                    "stiffness": 1000,
+                                  },
+                                },
+                                "open": Object {
+                                  "animation": "spring",
+                                  "config": Object {
+                                    "damping": 500,
+                                    "mass": 3,
+                                    "overshootClamping": true,
+                                    "restDisplacementThreshold": 0.01,
+                                    "restSpeedThreshold": 0.01,
+                                    "stiffness": 1000,
+                                  },
+                                },
                               }
                             }
                           >
-                            <PanGestureHandler
-                              enabled={false}
-                              hitSlop={
+                            <View
+                              pointerEvents="box-none"
+                              style={
                                 Object {
-                                  "right": -700,
+                                  "flex": 1,
+                                  "marginTop": 44,
                                 }
                               }
-                              maxDeltaY={20}
-                              minOffsetX={5}
-                              onHandlerStateChange={[Function]}
                             >
-                              <View
-                                style={
+                              <PanGestureHandler
+                                enabled={false}
+                                hitSlop={
                                   Object {
-                                    "flex": 1,
-                                    "transform": Array [
-                                      Object {
-                                        "translateX": 0,
-                                      },
-                                      Object {
-                                        "translateX": 0,
-                                      },
-                                    ],
+                                    "right": -700,
                                   }
                                 }
+                                maxDeltaY={20}
+                                minOffsetX={5}
+                                onHandlerStateChange={[Function]}
                               >
                                 <View
-                                  pointerEvents="none"
                                   style={
                                     Object {
-                                      "backgroundColor": "#fff",
-                                      "bottom": 0,
-                                      "left": 0,
-                                      "position": "absolute",
-                                      "shadowColor": "#000",
-                                      "shadowOffset": Object {
-                                        "height": 1,
-                                        "width": -1,
-                                      },
-                                      "shadowOpacity": 0.3,
-                                      "shadowRadius": 5,
-                                      "top": 0,
-                                      "width": 3,
-                                    }
-                                  }
-                                />
-                                <View
-                                  style={
-                                    Array [
-                                      Object {
-                                        "flex": 1,
-                                        "overflow": "hidden",
-                                      },
-                                      Array [
+                                      "flex": 1,
+                                      "transform": Array [
                                         Object {
-                                          "backgroundColor": "rgb(242, 242, 242)",
+                                          "translateX": 0,
+                                        },
+                                        Object {
+                                          "translateX": 0,
                                         },
-                                        undefined,
                                       ],
-                                    ]
+                                    }
                                   }
                                 >
                                   <View
+                                    pointerEvents="none"
                                     style={
                                       Object {
-                                        "flex": 1,
-                                        "flexDirection": "column-reverse",
+                                        "backgroundColor": "#fff",
+                                        "bottom": 0,
+                                        "left": 0,
+                                        "position": "absolute",
+                                        "shadowColor": "#000",
+                                        "shadowOffset": Object {
+                                          "height": 1,
+                                          "width": -1,
+                                        },
+                                        "shadowOpacity": 0.3,
+                                        "shadowRadius": 5,
+                                        "top": 0,
+                                        "width": 3,
                                       }
                                     }
+                                  />
+                                  <View
+                                    style={
+                                      Array [
+                                        Object {
+                                          "flex": 1,
+                                          "overflow": "hidden",
+                                        },
+                                        Array [
+                                          Object {
+                                            "backgroundColor": "rgb(242, 242, 242)",
+                                          },
+                                          undefined,
+                                        ],
+                                      ]
+                                    }
                                   >
                                     <View
                                       style={
                                         Object {
                                           "flex": 1,
+                                          "flexDirection": "column-reverse",
                                         }
                                       }
-                                    />
+                                    >
+                                      <View
+                                        style={
+                                          Object {
+                                            "flex": 1,
+                                          }
+                                        }
+                                      />
+                                    </View>
                                   </View>
                                 </View>
-                              </View>
-                            </PanGestureHandler>
+                              </PanGestureHandler>
+                            </View>
                           </View>
                         </View>
                       </View>
-                    </View>
-                    <View
-                      pointerEvents="box-none"
-                      style={
-                        Object {
-                          "left": 0,
-                          "position": "absolute",
-                          "right": 0,
-                          "top": 0,
-                        }
-                      }
-                    >
                       <View
-                        accessibilityElementsHidden={false}
-                        importantForAccessibility="auto"
-                        onLayout={[Function]}
                         pointerEvents="box-none"
                         style={
                           Object {
@@ -370,88 +369,104 @@ Array [
                         }
                       >
                         <View
-                          pointerEvents="none"
+                          accessibilityElementsHidden={false}
+                          importantForAccessibility="auto"
+                          onLayout={[Function]}
+                          pointerEvents="box-none"
                           style={
                             Object {
-                              "bottom": 0,
                               "left": 0,
-                              "opacity": 1,
                               "position": "absolute",
                               "right": 0,
                               "top": 0,
                             }
                           }
-                        >
-                          <View
-                            style={
-                              Object {
-                                "backgroundColor": "#fff",
-                                "borderBottomColor": "#a7a7aa",
-                                "flex": 1,
-                                "shadowColor": "#a7a7aa",
-                                "shadowOffset": Object {
-                                  "height": 0.5,
-                                  "width": 0,
-                                },
-                                "shadowOpacity": 0.85,
-                                "shadowRadius": 0,
-                              }
-                            }
-                          />
-                        </View>
-                        <View
-                          pointerEvents="box-none"
-                          style={
-                            Object {
-                              "height": 44,
-                              "maxHeight": undefined,
-                              "minHeight": undefined,
-                              "opacity": undefined,
-                              "transform": undefined,
-                            }
-                          }
                         >
                           <View
                             pointerEvents="none"
                             style={
                               Object {
-                                "height": 0,
+                                "bottom": 0,
+                                "left": 0,
+                                "opacity": 1,
+                                "position": "absolute",
+                                "right": 0,
+                                "top": 0,
                               }
                             }
-                          />
+                          >
+                            <View
+                              style={
+                                Object {
+                                  "backgroundColor": "#fff",
+                                  "borderBottomColor": "#a7a7aa",
+                                  "flex": 1,
+                                  "shadowColor": "#a7a7aa",
+                                  "shadowOffset": Object {
+                                    "height": 0.5,
+                                    "width": 0,
+                                  },
+                                  "shadowOpacity": 0.85,
+                                  "shadowRadius": 0,
+                                }
+                              }
+                            />
+                          </View>
                           <View
                             pointerEvents="box-none"
                             style={
                               Object {
-                                "alignItems": "center",
-                                "flex": 1,
-                                "flexDirection": "row",
-                                "justifyContent": "center",
+                                "height": 44,
+                                "maxHeight": undefined,
+                                "minHeight": undefined,
+                                "opacity": undefined,
+                                "transform": undefined,
                               }
                             }
                           >
+                            <View
+                              pointerEvents="none"
+                              style={
+                                Object {
+                                  "height": 0,
+                                }
+                              }
+                            />
                             <View
                               pointerEvents="box-none"
                               style={
                                 Object {
-                                  "marginHorizontal": 18,
-                                  "opacity": 1,
+                                  "alignItems": "center",
+                                  "flex": 1,
+                                  "flexDirection": "row",
+                                  "justifyContent": "center",
                                 }
                               }
                             >
-                              <Text
-                                numberOfLines={1}
-                                onLayout={[Function]}
+                              <View
+                                pointerEvents="box-none"
                                 style={
                                   Object {
-                                    "color": "rgba(0, 0, 0, 0.9)",
-                                    "fontSize": 17,
-                                    "fontWeight": "600",
+                                    "marginHorizontal": 18,
+                                    "opacity": 1,
                                   }
                                 }
                               >
-                                Home
-                              </Text>
+                                <Text
+                                  accessibilityRole="header"
+                                  numberOfLines={1}
+                                  onLayout={[Function]}
+                                  style={
+                                    Object {
+                                      "color": "rgba(0, 0, 0, 0.9)",
+                                      "fontSize": 17,
+                                      "fontWeight": "600",
+                                    }
+                                  }
+                                >
+                                  Home
+                                </Text>
+                              </View>
                             </View>
                           </View>
                         </View>
@@ -465,7 +480,7 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
+  </View>
   <View
     pointerEvents="box-none"
     style={
@@ -562,6 +577,7 @@ Array [
             }
           >
             <Text
+              accessibilityRole="header"
               numberOfLines={1}
               onLayout={[Function]}
               style={
@@ -578,8 +594,8 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
-]
+  </View>
+</View>
 `;
 
 exports[`Nested navigators throw when trying to pass navigation prop 1`] = `"No \\"routes\\" found in navigation state. Did you try to pass the navigation prop of a React component to a Navigator child? See https://reactnavigation.org/docs/en/custom-navigators.html#navigator-navigation-prop"`;
diff --git a/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap b/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
index b9dd0ec34..ec9fd3123 100644
--- a/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
+++ b/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
@@ -1,7 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`StackNavigator applies correct values when headerRight is present 1`] = `
-Array [
+<View
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+>
   <View
     collapsable={true}
     onLayout={[Function]}
@@ -176,7 +182,7 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
+  </View>
   <View
     pointerEvents="box-none"
     style={
@@ -274,6 +280,7 @@ Array [
             }
           >
             <Text
+              accessibilityRole="header"
               numberOfLines={1}
               onLayout={[Function]}
               style={
@@ -306,12 +313,18 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
-]
+  </View>
+</View>
 `;
 
 exports[`StackNavigator renders successfully 1`] = `
-Array [
+<View
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+>
   <View
     collapsable={true}
     onLayout={[Function]}
@@ -486,7 +499,7 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
+  </View>
   <View
     pointerEvents="box-none"
     style={
@@ -584,6 +597,7 @@ Array [
             }
           >
             <Text
+              accessibilityRole="header"
               numberOfLines={1}
               onLayout={[Function]}
               style={
@@ -600,6 +614,6 @@ Array [
         </View>
       </View>
     </View>
-  </View>,
-]
+  </View>
+</View>
 `;
diff --git a/tsconfig.json b/tsconfig.json
index 869005ba7..e57710d1f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "react-navigation": ["react-navigation"],
+      "react-navigation": ["./node_modules/react-navigation"],
       "react-navigation-stack": ["./src/index"],
       "react-native-gesture-handler": ["react-native-gesture-handler", "example/node_modules/react-native-gesture-handler/react-native-gesture-handler"],
       "@react-native-community/masked-view": ["@react-native-community/masked-view"],
diff --git a/yarn.lock b/yarn.lock
index 839c5102c..f08d0eb59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -909,6 +909,13 @@
   dependencies:
     find-up "^4.0.0"
 
+"@egjs/hammerjs@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
 "@expo/vector-icons@^10.0.6":
   version "10.0.6"
   resolved "https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-10.0.6.tgz#5718953ff0b97827d11dae5787976fa8ce5caaed"
@@ -1359,49 +1366,49 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.5.tgz#25421be6cd943a4b1660b62cfbcd45be8891462c"
   integrity sha512-Lj1DzfCmW0f4HnmHtEuX8Yy2f7cnUA8r5KGGUuDDGtQt1so6QJkKeUmsnLo2zYDtsF8due6hvIL06Vdo5xxuLQ==
 
-"@react-navigation/core@^3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d"
-  integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==
+"@react-navigation/core@^3.5.2":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.2.tgz#3a3d147b8419e5839e0f2ad4dea086bd2d307fe3"
+  integrity sha512-HgKXci1h74aETgm5CXMBoIWG8R7VZG1eUUHYb3BdxwekdiZjW1P/srjiXzsCqFGlsESnVIOIkzT4DqI9J752Bw==
   dependencies:
     hoist-non-react-statics "^3.3.0"
     path-to-regexp "^1.7.0"
     query-string "^6.4.2"
     react-is "^16.8.6"
 
-"@react-navigation/core@^5.0.0-alpha.36":
-  version "5.0.0-alpha.36"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.0.0-alpha.36.tgz#6047cfd2e73aea802800eab68f068764ff3f8d4d"
-  integrity sha512-VfuUd46N/e4Oe7/cKywy1IIRetXQH9NP58QhxznmMOAG/XCIsD5+EA/nIY0NdRem57A3gnrgVxK83h6/g8mZVw==
+"@react-navigation/core@^5.0.0-alpha.43":
+  version "5.0.0-alpha.43"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-5.0.0-alpha.43.tgz#f6e928ca845bf4faa03adc5c462b183cae3d5d4a"
+  integrity sha512-2CO5dFJW7CQFXX2y1Y1HVOGPQi4/8+5sPJWOZPCkhIVgjseeEqWJC+nJ6bbRVEE+Jxkc1ya6A8p+oBZ/GxF34g==
   dependencies:
     escape-string-regexp "^2.0.0"
     query-string "^6.9.0"
+    react-is "^16.12.0"
     shortid "^2.2.15"
     use-subscription "^1.3.0"
 
-"@react-navigation/native@^3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.6.2.tgz#3634697b6350cc5189657ae4551f2d52b57fbbf0"
-  integrity sha512-Cybeou6N82ZeRmgnGlu+wzlV3z5BZQR2dmYaNFV1TNLUGHqtvv8E7oNw9uYcz9Ox5LFbiX+FdNTn2d6ZPlK0kg==
+"@react-navigation/native@^3.6.5":
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.6.5.tgz#97b0b9a48f059a0704e3527f40fb034720ef363d"
+  integrity sha512-ttEmnokFVf09CvrkzlPIdfA693KfYcRxTYf9OZwp0Ll6El27UYjJD4arwGc+zvlohjTErCdba6CAKV702Wv28w==
   dependencies:
-    hoist-non-react-statics "^3.0.1"
-    react-native-safe-area-view "^0.14.1"
-    react-native-screens "^1.0.0 || ^1.0.0-alpha"
+    hoist-non-react-statics "^3.3.2"
+    react-native-safe-area-view "^0.14.8"
 
-"@react-navigation/routers@^5.0.0-alpha.26":
-  version "5.0.0-alpha.26"
-  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.0.0-alpha.26.tgz#139c097c55e556c11dcd96e78409165080c3a75b"
-  integrity sha512-y/Z4dseD0gCrrWA/Frz4+2k2ZMUjXfIdw+Jd+qhXEkcOTGb6NoGujgZndozHsBYZ7zuUwURKhf6vE3lVulAldA==
+"@react-navigation/routers@^5.0.0-alpha.33":
+  version "5.0.0-alpha.33"
+  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.0.0-alpha.33.tgz#268f57ef8a760a27f33e58ae7aaec553e846deac"
+  integrity sha512-EGGleaJSMzoOKScjrWO9n67SY6uvQbkt6bgTQR5v8Y3/IxDwxThE7bli3Xk+VfbI/Y/MXnJn7HufylT/vu0jhg==
   dependencies:
-    "@react-navigation/core" "^5.0.0-alpha.36"
+    "@react-navigation/core" "^5.0.0-alpha.43"
     shortid "^2.2.15"
 
-"@react-navigation/stack@^5.0.0-alpha.62":
-  version "5.0.0-alpha.62"
-  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.0.0-alpha.62.tgz#fea465ddfe70c150de1d9e03e82ae3e30a572419"
-  integrity sha512-Bo6y3dD1DODBVLw9Xqcim+nXKHE/mCBmpdeCgFi+3VX5QS2bm+NotbRHz8AQNI8d4w6qWQs8EairfcxlTr11NA==
+"@react-navigation/stack@^5.0.0-alpha.71":
+  version "5.0.0-alpha.71"
+  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.0.0-alpha.71.tgz#364191a852a40ae89e6153f317c34785198e51c3"
+  integrity sha512-dq2GmsfuDgTuI1OM7ysthHXeaw++Jzzok4NiXbHy7kvAiiFr1h2sUfTkhUBrz1xmli5aq/ohRA/N006vMbj5mA==
   dependencies:
-    "@react-navigation/routers" "^5.0.0-alpha.26"
+    "@react-navigation/routers" "^5.0.0-alpha.33"
     color "^3.1.2"
     react-native-iphone-x-helper "^1.2.1"
 
@@ -1499,6 +1506,11 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/hammerjs@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
+  integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -4426,10 +4438,11 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-hammerjs@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
+"hammerjs@https://github.com/naver/hammer.js.git":
+  version "2.0.17-snapshot"
+  resolved "https://github.com/naver/hammer.js.git#54bc698b25edd6e1b76ca975ebaced5ce0467d51"
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
 
 handlebars@^4.1.0, handlebars@^4.1.2:
   version "4.1.2"
@@ -4533,13 +4546,20 @@ hoist-non-react-statics@^2.3.1:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
   integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
     react-is "^16.7.0"
 
+hoist-non-react-statics@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
+  dependencies:
+    react-is "^16.7.0"
+
 hosted-git-info@^2.1.4:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
@@ -7579,22 +7599,23 @@ react-dom@~16.9.0:
     prop-types "^15.6.2"
     scheduler "^0.15.0"
 
+react-is@^16.12.0, react-is@^16.9.0:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
+  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+
 react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-react-is@^16.9.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
-
-react-native-gesture-handler@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.5.3.tgz#191b44701fab7ba54c27a2438cb5eaa252666e66"
-  integrity sha512-y2/jw0uHAQtEPR02PHAah6tdMymrVtZFoHqjlEWdhK807w2sgU5CySYINK/nOTczd+zB4GMX+9euA3VfbGJ5aA==
+react-native-gesture-handler@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.5.5.tgz#513d6d65c4e24efd6d69be0006c7cd3bc9045358"
+  integrity sha512-viypCSRpo064BdpkVL2FnPLZiEK3piJ1WZxydFXgeZj+avJxd6VnTFoh9+IDFk2M0Eadoy6D1ZV1TqBMGHtqGg==
   dependencies:
-    hammerjs "^2.0.8"
+    "@egjs/hammerjs" "^2.0.17"
+    hammerjs "https://github.com/naver/hammer.js.git"
     hoist-non-react-statics "^2.3.1"
     invariant "^2.2.4"
     prop-types "^15.7.2"
@@ -7609,18 +7630,13 @@ react-native-safe-area-context@^0.6.2:
   resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.6.2.tgz#d467ac8a953426bfbb6d8f417222b0dc3952be7a"
   integrity sha512-VtBW0JymVCwVt0TGxTv25Co3wtOv3Yb/K5pAUYkjKXNhWFDz5ZwUG/Yho/p0EkWYlFdroJcSqlvVFl2n3AU7SA==
 
-react-native-safe-area-view@^0.14.1:
-  version "0.14.6"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.6.tgz#9a9d37d9f8f3887d60c4076eae7b5d2319539446"
-  integrity sha512-dbzuvaeHFV1VBpyMaC0gtJ2BqFt6ls/405A0t78YN1sXiTrVr3ki86Ysct8mzifWqLdvWzcWagE5wfMtdxnqoA==
+react-native-safe-area-view@^0.14.8:
+  version "0.14.8"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
+  integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-"react-native-screens@^1.0.0 || ^1.0.0-alpha":
-  version "1.0.0-alpha.22"
-  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.22.tgz#7a120377b52aa9bbb94d0b8541a014026be9289b"
-  integrity sha512-kSyAt0AeVU6N7ZonfV6dP6iZF8B7Bce+tk3eujXhzBGsLg0VSLnU7uE9VqJF0xdQrHR91ZjGgVMieo/8df9KTA==
-
 react-native-screens@^2.0.0-alpha.22:
   version "2.0.0-alpha.22"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.22.tgz#67cde460153985e400e0280ed3a0e5be07b0dc5a"
@@ -7663,13 +7679,13 @@ react-native@~0.61.4:
     stacktrace-parser "^0.1.3"
     whatwg-fetch "^3.0.0"
 
-react-navigation@^4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.10.tgz#ddf41134600689d6ba99e35dd22ba1f664f91e5c"
-  integrity sha512-7PqvmsdQ7HIyxPUMYbd9Uq//VoMdniEOLAOSvIhb/ExtbAt/1INSjUF+RiMWOMCWLTCNvNPRvTz7xy7qwWureg==
+react-navigation@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.1.1.tgz#670a1712e945e454fe9cafa424e685c2f1f30832"
+  integrity sha512-HEzPOsndrKnxTf0+gsi1N/0GKbwu8KSTOveL7ptJLG7XNXHBXVvp4lbaS3PVPe2IaiXbXCC+y3VJ8dH50wHR4g==
   dependencies:
-    "@react-navigation/core" "^3.5.1"
-    "@react-navigation/native" "^3.6.2"
+    "@react-navigation/core" "^3.5.2"
+    "@react-navigation/native" "^3.6.5"
 
 react-proxy@^1.1.7:
   version "1.1.8"