diff --git a/package.json b/package.json
index 82f8634d..6bc6dfcc 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,12 @@
   "description": "ReScript bindings for react-navigation.",
   "version": "5.1.3",
   "peerDependencies": {
-    "@react-navigation/native": "^5.0.0",
     "@react-navigation/bottom-tabs": "^5.0.0",
-    "@react-navigation/stack": "^5.0.0",
-    "@react-navigation/material-top-tabs": "^5.0.0",
-    "@react-navigation/material-bottom-tabs": "^5.0.0",
     "@react-navigation/drawer": "^5.0.0",
+    "@react-navigation/material-bottom-tabs": "^5.0.0",
+    "@react-navigation/material-top-tabs": "^5.0.0",
+    "@react-navigation/native": "^5.0.0",
+    "@react-navigation/stack": "^5.0.0",
     "@rescript/react": "^0.10.0",
     "rescript-react-native": "^0.64.3"
   },
@@ -35,21 +35,21 @@
     "format:most": "prettier --write \"**/*.{md,json,js,css}\"",
     "format:re": "find . -name \"*.re\" -or -name \"*.rei\" | grep -v \"node_modules\" | xargs bsrefmt --in-place",
     "format": "yarn format:most && yarn format:re",
-    "re:start": "bsb -make-world -w",
-    "re:build": "bsb -make-world",
-    "re:clean-build": "bsb -clean-world -make-world",
+    "re:start": "rescript -w",
+    "re:build": "rescript",
+    "re:clean-build": "rescript clean && rescript",
     "start": "yarn re:start",
     "build": "yarn re:build",
     "test": "yarn re:clean-build",
     "release": "npmpub"
   },
   "devDependencies": {
-    "bs-platform": "^9.0.0",
+    "@rescript/react": "^0.10.0",
     "husky": "^4.0.0",
     "lint-staged": "^10.0.0",
     "npmpub": "^5.0.0",
     "prettier": "^2.0.0",
-    "@rescript/react": "^0.10.0",
+    "rescript": "^9.1.2",
     "rescript-react-native": "^0.64.3"
   },
   "prettier": {
diff --git a/src/BottomTabs.re b/src/BottomTabs.re
deleted file mode 100644
index 46a29b1e..00000000
--- a/src/BottomTabs.re
+++ /dev/null
@@ -1,228 +0,0 @@
-open Core;
-
-type options;
-
-module BottomTabNavigationProp = (M: {
-                                    type params;
-                                    type options;
-                                  }) => {
-  include NavigationScreenProp(M);
-
-  type t = navigation;
-
-  [@bs.send] external jumpTo: (t, string) => unit = "jumpTo";
-  [@bs.send]
-  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo";
-};
-
-module Make = (M: {type params;}) => {
-  type nonrec route = route(M.params);
-  module Navigation =
-    BottomTabNavigationProp({
-      include M;
-      type nonrec options = options;
-    });
-
-  type animatedNode = ReactNative.Animated.Value.t;
-
-  type scene = {
-    index: int,
-    focused: bool,
-    tintColor: string,
-  };
-
-  type labelPositionArgs = {deviceOrientation: string};
-
-  class type virtual baseBottomTabBarOptions = {
-    pub keyboardHidesTabBar: option(bool);
-    pub activeBackgroundColor: option(string);
-    pub inactiveBackgroundColor: option(string);
-    pub allowFontScaling: option(bool);
-    pub showLabel: option(bool);
-    pub labelStyle: option(ReactNative.Style.t);
-    pub tabStyle: option(ReactNative.Style.t);
-    pub labelPosition: option(labelPositionArgs => string);
-    pub adaptive: option(bool);
-    pub style: option(ReactNative.Style.t);
-  };
-
-  class type virtual bottomTabBarOptions = {
-    as 'self;
-    constraint 'self = #baseBottomTabBarOptions;
-    pub activeTintColor: option(string);
-    pub inactiveTintColor: option(string);
-  };
-
-  type accessibilityRole = string;
-  type accessibilityStates = array(string);
-  type routeArgs = {route};
-  type renderIconArgs = {
-    route,
-    focused: bool,
-    tintColor: string,
-    horizontal: bool,
-  };
-  class type virtual bottomTabBarProps = {
-    as 'self;
-    constraint 'self = #baseBottomTabBarOptions;
-    pub state: navigationState(M.params);
-    pub navigation: navigation;
-    pub onTabPress: routeArgs => unit;
-    pub onTabLongPress: routeArgs => unit;
-    pub getAccessibilityLabel: routeArgs => Js.nullable(string);
-    pub getAccessibilityRole: routeArgs => Js.nullable(accessibilityRole);
-    pub getAccessibilityStates: routeArgs => Js.nullable(accessibilityStates);
-    pub getButtonComponent: routeArgs => Js.nullable(React.element);
-    //pub getLabelText: routeArgs => ...;
-    pub getTestID: routeArgs => Js.nullable(string);
-    pub renderIcon: renderIconArgs => React.element;
-    pub activeTintColor: string;
-    pub inactiveTintColor: string;
-  };
-
-  [@bs.obj]
-  external bottomTabBarOptions:
-    (
-      ~keyboardHidesTabBar: bool=?,
-      ~activeTintColor: string=?,
-      ~inactiveTintColor: string=?,
-      ~activeBackgroundColor: string=?,
-      ~inactiveBackgroundColor: string=?,
-      ~allowFontScaling: bool=?,
-      ~showLabel: bool=?,
-      ~showIcon: bool=?,
-      ~labelStyle: ReactNative.Style.t=?,
-      ~tabStyle: ReactNative.Style.t=?,
-      ~labelPosition: labelPositionArgs => string=?,
-      ~adaptive: bool=?,
-      ~style: ReactNative.Style.t=?,
-      unit
-    ) =>
-    bottomTabBarOptions;
-
-  type tabBarLabelArgs = {
-    focused: bool,
-    color: string,
-  };
-  type tabBarIconArgs = {
-    focused: bool,
-    color: string,
-    size: float,
-  };
-  [@bs.obj]
-  external options:
-    (
-      ~title: string=?,
-      //TODO: dynamic, missing static option: React.ReactNode
-      ~tabBarLabel: tabBarLabelArgs => React.element=?,
-      ~tabBarIcon: tabBarIconArgs => React.element=?,
-      ~tabBarAccessibilityLabel: string=?,
-      ~tabBarTestID: string=?,
-      ~tabBarVisible: bool=?,
-      ~tabBarButton: React.element=?,
-      ~unmountOnBlur: bool=?,
-      unit
-    ) =>
-    options;
-
-  type optionsProps = {
-    navigation,
-    route,
-  };
-
-  type optionsCallback = optionsProps => options;
-
-  type navigatorProps = {
-    initialRouteName: option(string),
-    screenOptions: option(optionsCallback),
-    backBehavior: option(string),
-    _lazy: option(bool),
-    tabBar: option(Js.t(bottomTabBarProps) => React.element),
-    tabBarOptions: option(bottomTabBarOptions),
-  };
-
-  type renderCallbackProp = {
-    navigation,
-    route,
-  };
-
-  type screenProps('params) = {
-    name: string,
-    options: option(optionsCallback),
-    initialParams: option('params),
-    component:
-      option(
-        React.component({
-          .
-          "navigation": navigation,
-          "route": route,
-        }),
-      ),
-    children: option(renderCallbackProp => React.element),
-  };
-
-  [@bs.module "@react-navigation/bottom-tabs"]
-  external make:
-    unit =>
-    {
-      .
-      "Navigator": navigatorProps => React.element,
-      "Screen": screenProps(M.params) => React.element,
-    } =
-    "createBottomTabNavigator";
-
-  let bottomTabs = make();
-
-  module Screen = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~component: React.component({
-                      .
-                      "navigation": navigation,
-                      "route": route,
-                    }),
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = bottomTabs##"Screen";
-  };
-
-  module ScreenWithCallback = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~children: renderCallbackProp => React.element,
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = bottomTabs##"Screen";
-  };
-
-  module Navigator = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~initialRouteName: string=?,
-        ~screenOptions: optionsCallback=?,
-        ~children: React.element,
-        ~backBehavior: [ | `initialRoute | `order | `history | `none]=?,
-        ~_lazy: bool=?,
-        ~tabBar: Js.t(bottomTabBarProps) => React.element=?,
-        ~tabBarOptions: bottomTabBarOptions=?,
-        ~key: string=?,
-        unit
-      ) =>
-      navigatorProps;
-
-    let make = bottomTabs##"Navigator";
-  };
-};
diff --git a/src/BottomTabs.res b/src/BottomTabs.res
new file mode 100644
index 00000000..ac9a3f2c
--- /dev/null
+++ b/src/BottomTabs.res
@@ -0,0 +1,206 @@
+open Core
+
+type options
+
+module BottomTabNavigationProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationScreenProp(M)
+
+  type t = navigation
+
+  @send external jumpTo: (t, string) => unit = "jumpTo"
+  @send
+  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo"
+}
+
+module Make = (
+  M: {
+    type params
+  },
+) => {
+  type route = route<M.params>
+  module Navigation = BottomTabNavigationProp({
+    include M
+    type options = options
+  })
+
+  type animatedNode = ReactNative.Animated.Value.t
+
+  type scene = {
+    index: int,
+    focused: bool,
+    tintColor: string,
+  }
+
+  type labelPositionArgs = {deviceOrientation: string}
+
+  type baseBottomTabBarOptions = {
+    "keyboardHidesTabBar": option<bool>,
+    "activeBackgroundColor": option<string>,
+    "inactiveBackgroundColor": option<string>,
+    "allowFontScaling": option<bool>,
+    "showLabel": option<bool>,
+    "labelStyle": option<ReactNative.Style.t>,
+    "tabStyle": option<ReactNative.Style.t>,
+    "labelPosition": option<labelPositionArgs => string>,
+    "adaptive": option<bool>,
+    "style": option<ReactNative.Style.t>,
+  }
+
+  type bottomTabBarOptions = {
+    ...baseBottomTabBarOptions,
+    "activeTintColor": option<string>,
+    "inactiveTintColor": option<string>,
+  }
+
+  @obj
+  external bottomTabBarOptions: (
+    ~keyboardHidesTabBar: bool=?,
+    ~activeTintColor: string=?,
+    ~inactiveTintColor: string=?,
+    ~activeBackgroundColor: string=?,
+    ~inactiveBackgroundColor: string=?,
+    ~allowFontScaling: bool=?,
+    ~showLabel: bool=?,
+    ~labelStyle: ReactNative.Style.t=?,
+    ~tabStyle: ReactNative.Style.t=?,
+    ~labelPosition: labelPositionArgs => string=?,
+    ~adaptive: bool=?,
+    ~style: ReactNative.Style.t=?,
+    unit,
+  ) => bottomTabBarOptions = ""
+
+  type accessibilityRole = string
+  type accessibilityStates = array<string>
+  type routeArgs = {route: route}
+  type renderIconArgs = {
+    route: route,
+    focused: bool,
+    tintColor: string,
+    horizontal: bool,
+  }
+
+  type bottomTabBarProps = {
+    ...baseBottomTabBarOptions,
+    "state": navigationState<M.params>,
+    "navigation": navigation,
+    "onTabPress": routeArgs => unit,
+    "onTabLongPress": routeArgs => unit,
+    "getAccessibilityLabel": routeArgs => Js.nullable<string>,
+    "getAccessibilityRole": routeArgs => Js.nullable<accessibilityRole>,
+    "getAccessibilityStates": routeArgs => Js.nullable<accessibilityStates>,
+    "getButtonComponent": routeArgs => Js.nullable<React.element>,
+    //"getLabelText" routeArgs => ...,
+    "getTestID": routeArgs => Js.nullable<string>,
+    "renderIcon": renderIconArgs => React.element,
+    "activeTintColor": string,
+    "inactiveTintColor": string,
+  }
+
+  type tabBarLabelArgs = {
+    focused: bool,
+    color: string,
+  }
+  type tabBarIconArgs = {
+    focused: bool,
+    color: string,
+    size: float,
+  }
+  @obj
+  external options: (
+    ~title: string=?,
+    ~tabBarLabel: //TODO: dynamic, missing static option: React.ReactNode
+    tabBarLabelArgs => React.element=?,
+    ~tabBarIcon: tabBarIconArgs => React.element=?,
+    ~tabBarAccessibilityLabel: string=?,
+    ~tabBarTestID: string=?,
+    ~tabBarVisible: bool=?,
+    ~tabBarButton: React.element=?,
+    ~unmountOnBlur: bool=?,
+    unit,
+  ) => options = ""
+
+  type optionsProps = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type optionsCallback = optionsProps => options
+
+  type navigatorProps = {
+    initialRouteName: option<string>,
+    screenOptions: option<optionsCallback>,
+    backBehavior: option<string>,
+    _lazy: option<bool>,
+    tabBar: option<bottomTabBarProps => React.element>,
+    tabBarOptions: option<bottomTabBarOptions>,
+  }
+
+  type renderCallbackProp = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type screenProps<'params> = {
+    name: string,
+    options: option<optionsCallback>,
+    initialParams: option<'params>,
+    component: option<React.component<{"navigation": navigation, "route": route}>>,
+    children: option<renderCallbackProp => React.element>,
+  }
+
+  @module("@react-navigation/bottom-tabs")
+  external make: unit => {
+    "Navigator": navigatorProps => React.element,
+    "Screen": screenProps<M.params> => React.element,
+  } = "createBottomTabNavigator"
+
+  let bottomTabs = make()
+
+  module Screen = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~component: React.component<{"navigation": navigation, "route": route}>,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = bottomTabs["Screen"]
+  }
+
+  module ScreenWithCallback = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~children: renderCallbackProp => React.element,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = bottomTabs["Screen"]
+  }
+
+  module Navigator = {
+    @obj
+    external makeProps: (
+      ~initialRouteName: string=?,
+      ~screenOptions: optionsCallback=?,
+      ~children: React.element,
+      ~backBehavior: [#initialRoute | #order | #history | #none]=?,
+      ~_lazy: bool=?,
+      ~tabBar: bottomTabBarProps => React.element=?,
+      ~tabBarOptions: bottomTabBarOptions=?,
+      ~key: string=?,
+      unit,
+    ) => navigatorProps = ""
+
+    let make = bottomTabs["Navigator"]
+  }
+}
diff --git a/src/Core.bs.js b/src/Core.bs.js
index 21c4115d..cd663764 100644
--- a/src/Core.bs.js
+++ b/src/Core.bs.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var Caml_option = require("bs-platform/lib/js/caml_option.js");
+var Caml_option = require("rescript/lib/js/caml_option.js");
 
 function NavigationHelpersCommon(M) {
   var navigateByKey = function (key, params, param) {
@@ -18,7 +18,7 @@ function NavigationHelpersCommon(M) {
       name: name
     };
     if (key !== undefined) {
-      tmp.key = Caml_option.valFromOption(key);
+      tmp.key = key;
     }
     if (params !== undefined) {
       tmp.params = Caml_option.valFromOption(params);
@@ -52,7 +52,7 @@ function NavigationScreenProp(M) {
       name: name
     };
     if (key !== undefined) {
-      tmp.key = Caml_option.valFromOption(key);
+      tmp.key = key;
     }
     if (params !== undefined) {
       tmp.params = Caml_option.valFromOption(params);
diff --git a/src/Core.re b/src/Core.re
deleted file mode 100644
index 145b7347..00000000
--- a/src/Core.re
+++ /dev/null
@@ -1,124 +0,0 @@
-type route('params) = {
-  key: string,
-  name: string,
-  params: option('params),
-  state: option(navigationState('params)),
-}
-and navigationState('params) = {
-  key: string,
-  index: int,
-  routeNames: array(string),
-  routes: array(route('params)),
-};
-
-type navigation;
-
-module NavigationHelpersCommon = (M: {type params;}) => {
-  type nonrec route = route(M.params);
-  [@bs.send]
-  external dispatch: (navigation, NavigationActions.action) => unit =
-    "dispatch";
-
-  [@bs.send] external navigate: (navigation, string) => unit = "navigate";
-  [@bs.send]
-  external navigateWithParams: (navigation, string, M.params) => unit =
-    "navigate";
-
-  type navigationParams;
-
-  [@bs.obj]
-  external navigateByKeyParams:
-    (~key: string, ~params: M.params=?, unit) => navigationParams;
-
-  [@bs.obj]
-  external navigateByNameParams:
-    (~name: string, ~key: string=?, ~params: M.params=?, unit) =>
-    navigationParams;
-
-  [@bs.send] external navigateBy: navigationParams => unit = "navigate";
-
-  let navigateByKey = (~key: string, ~params: option(M.params)=?, _) =>
-    navigateBy(navigateByKeyParams(~key, ~params?, ()));
-
-  let navigateByName =
-      (
-        ~name: string,
-        ~key: option(string)=?,
-        ~params: option(M.params)=?,
-        _,
-      ) =>
-    navigateBy(navigateByNameParams(~name, ~key?, ~params?, ()));
-
-  [@bs.send] external replace: (navigation, string) => unit = "replace";
-  [@bs.send]
-  external replaceWithParams: (navigation, string, M.params) => unit =
-    "replace";
-
-  [@bs.send]
-  external reset: (navigation, navigationState(M.params)) => unit = "reset";
-
-  [@bs.send]
-  external resetRoot: (navigation, navigationState(M.params)) => unit =
-    "resetRoot";
-
-  [@bs.send] external goBack: (navigation, unit) => unit = "goBack";
-  [@bs.send] external isFocused: (navigation, unit) => bool = "isFocused";
-  [@bs.send] external canGoBack: (navigation, unit) => bool = "canGoBack";
-};
-
-module EventConsumer = (M: {type params;}) => {
-  type eventListenerOptions('data) = {
-    [@bs.as "type"]
-    type_: string,
-    defaultPrevented: bool,
-    preventDefault: unit => unit,
-    data: option('data),
-  };
-  type eventListenerCallback('data) = eventListenerOptions('data) => unit;
-
-  type unsubscribe = unit => unit;
-
-  [@bs.send]
-  external addListener:
-    (
-      navigation,
-      [ | `focus | `blur | `tabPress],
-      eventListenerCallback('data)
-    ) =>
-    unsubscribe =
-    "addListener";
-  [@bs.send]
-  external removeListener:
-    (
-      navigation,
-      [ | `focus | `blur | `tabPress],
-      eventListenerCallback('data)
-    ) =>
-    unsubscribe =
-    "removeListener";
-};
-
-module NavigationScreenProp = (M: {
-                                 type params;
-                                 type options;
-                               }) => {
-  include NavigationHelpersCommon(M);
-  include EventConsumer(M);
-
-  [@bs.send] external setParams: (navigation, M.params) => unit = "setParams";
-  [@bs.send]
-  external setOptions: (navigation, M.options) => unit = "setOptions";
-
-  [@bs.send]
-  external isFirstRouteInParent: (navigation, unit) => bool =
-    "isFirstRouteInParent";
-
-  [@bs.send]
-  external dangerouslyGetParent: navigation => Js.nullable(navigation) =
-    "dangerouslyGetParent";
-
-  [@bs.send]
-  external dangerouslyGetState:
-    navigation => Js.nullable(navigationState('params)) =
-    "dangerouslyGetState";
-};
diff --git a/src/Core.res b/src/Core.res
new file mode 100644
index 00000000..d3077c32
--- /dev/null
+++ b/src/Core.res
@@ -0,0 +1,117 @@
+type rec route<'params> = {
+  key: string,
+  name: string,
+  params: option<'params>,
+  state: option<navigationState<'params>>,
+}
+and navigationState<'params> = {
+  key: string,
+  index: int,
+  routeNames: array<string>,
+  routes: array<route<'params>>,
+}
+
+type navigation
+
+module NavigationHelpersCommon = (
+  M: {
+    type params
+  },
+) => {
+  type route = route<M.params>
+  @send
+  external dispatch: (navigation, NavigationActions.action) => unit = "dispatch"
+
+  @send external navigate: (navigation, string) => unit = "navigate"
+  @send
+  external navigateWithParams: (navigation, string, M.params) => unit = "navigate"
+
+  type navigationParams
+
+  @obj
+  external navigateByKeyParams: (~key: string, ~params: M.params=?, unit) => navigationParams = ""
+
+  @obj
+  external navigateByNameParams: (
+    ~name: string,
+    ~key: string=?,
+    ~params: M.params=?,
+    unit,
+  ) => navigationParams = ""
+
+  @send external navigateBy: navigationParams => unit = "navigate"
+
+  let navigateByKey = (~key: string, ~params: option<M.params>=?, _) =>
+    navigateBy(navigateByKeyParams(~key, ~params?, ()))
+
+  let navigateByName = (~name: string, ~key: option<string>=?, ~params: option<M.params>=?, _) =>
+    navigateBy(navigateByNameParams(~name, ~key?, ~params?, ()))
+
+  @send external replace: (navigation, string) => unit = "replace"
+  @send
+  external replaceWithParams: (navigation, string, M.params) => unit = "replace"
+
+  @send
+  external reset: (navigation, navigationState<M.params>) => unit = "reset"
+
+  @send
+  external resetRoot: (navigation, navigationState<M.params>) => unit = "resetRoot"
+
+  @send external goBack: (navigation, unit) => unit = "goBack"
+  @send external isFocused: (navigation, unit) => bool = "isFocused"
+  @send external canGoBack: (navigation, unit) => bool = "canGoBack"
+}
+
+module EventConsumer = (
+  M: {
+    type params
+  },
+) => {
+  type eventListenerOptions<'data> = {
+    @as("type")
+    type_: string,
+    defaultPrevented: bool,
+    preventDefault: unit => unit,
+    data: option<'data>,
+  }
+  type eventListenerCallback<'data> = eventListenerOptions<'data> => unit
+
+  type unsubscribe = unit => unit
+
+  @send
+  external addListener: (
+    navigation,
+    [#focus | #blur | #tabPress],
+    eventListenerCallback<'data>,
+  ) => unsubscribe = "addListener"
+  @send
+  external removeListener: (
+    navigation,
+    [#focus | #blur | #tabPress],
+    eventListenerCallback<'data>,
+  ) => unsubscribe = "removeListener"
+}
+
+module NavigationScreenProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationHelpersCommon(M)
+  include EventConsumer(M)
+
+  @send external setParams: (navigation, M.params) => unit = "setParams"
+  @send
+  external setOptions: (navigation, M.options) => unit = "setOptions"
+
+  @send
+  external isFirstRouteInParent: (navigation, unit) => bool = "isFirstRouteInParent"
+
+  @send
+  external dangerouslyGetParent: navigation => Js.nullable<navigation> = "dangerouslyGetParent"
+
+  @send
+  external dangerouslyGetState: navigation => Js.nullable<navigationState<'params>> =
+    "dangerouslyGetState"
+}
diff --git a/src/Drawer.re b/src/Drawer.re
deleted file mode 100644
index 95b3d4af..00000000
--- a/src/Drawer.re
+++ /dev/null
@@ -1,167 +0,0 @@
-open Core;
-
-type options;
-
-module DrawerNavigationProp = (M: {
-                                 type params;
-                                 type options;
-                               }) => {
-  include NavigationScreenProp(M);
-
-  type t = navigation;
-
-  [@bs.send] external openDrawer: t => unit = "openDrawer";
-  [@bs.send] external closeDrawer: t => unit = "closeDrawer";
-  [@bs.send] external toggleDrawer: t => unit = "toggleDrawer";
-};
-
-module Make = (M: {type params;}) => {
-  module Navigation =
-    DrawerNavigationProp({
-      include M;
-      type nonrec options = options;
-    });
-
-  type animatedNode = ReactNative.Animated.Value.t;
-
-  type scene = {
-    route: route(M.params),
-    index: int,
-    focused: bool,
-    tintColor: option(string),
-  };
-
-  class type contentOptions = {
-    pub items: array(route(M.params));
-    pub activeItemKey: option(Js.nullable(string));
-    pub activeTintColor: option(string);
-    pub activeBackgroundColor: option(string);
-    pub inactiveTintColor: option(string);
-    pub inactiveBackgroundColor: option(string);
-    pub itemsContainerStyle: option(ReactNative.Style.t);
-    pub itemStyle: option(ReactNative.Style.t);
-    pub labelStyle: option(ReactNative.Style.t);
-    pub activeLabelStyle: option(ReactNative.Style.t);
-    pub inactiveLabelStyle: option(ReactNative.Style.t);
-    pub iconContainerStyle: option(ReactNative.Style.t);
-  };
-
-  class type virtual drawerNavigationItemsProps = {
-    as 'self;
-    constraint 'self = #contentOptions;
-    pub drawerPosition: string;
-    pub getLabel: scene => React.element;
-    pub renderIcon: scene => React.element;
-    pub onItemPress: scene => unit;
-  };
-
-  class type virtual contentComponentProps = {
-    as 'self;
-    constraint 'self = #drawerNavigationItemsProps;
-    pub navigation: navigation;
-    pub drawerOpenProgress: animatedNode;
-  };
-
-  [@bs.obj]
-  external options:
-    (
-      ~title: string=?,
-      ~drawerLabel: scene => React.element=?,
-      ~drawerIcon: scene => React.element=?,
-      ~drawerLockMode: [@bs.string] [
-                         | `unlocked
-                         | [@bs.as "locked-closed"] `lockedClosed
-                         | [@bs.as "locked-open"] `lockedOpen
-                       ]
-                         =?,
-      unit
-    ) =>
-    options;
-
-  type optionsProps = {
-    navigation,
-    route: route(M.params),
-  };
-
-  type optionsCallback = optionsProps => options;
-
-  type navigatorProps;
-
-  type screenProps;
-
-  [@bs.module "@react-navigation/drawer"]
-  external make:
-    unit =>
-    {
-      .
-      "Navigator": navigatorProps => React.element,
-      "Screen": screenProps => React.element,
-    } =
-    "createDrawerNavigator";
-
-  let stack = make();
-
-  module Screen = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~component: React.component({
-                      .
-                      "navigation": navigation,
-                      "route": route(M.params),
-                    }),
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps;
-    let make = stack##"Screen";
-  };
-
-  module Navigator = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~initialRouteName: string=?,
-        ~screenOptions: optionsCallback=?,
-        ~children: React.element,
-        ~backBehavior: [ | `initialRoute | `order | `history | `none]=?,
-        //DrawerNavigationConfig
-        ~drawerBackgroundColor: string=?,
-        ~drawerPosition: [ | `left | `right]=?,
-        ~drawerType: [ | `front | `back | `slide | `permanent]=?,
-        /*
-         ~drawerWidth: [@bs.unwrap] [
-                         | `Static(float)
-                         | `Dynamic(unit => float)
-                       ]
-
-                       */
-        ~drawerWidth: unit => float,
-        ~edgeWidth: float=?,
-        ~hideStatusBar: bool=?,
-        ~keyboardDismissMode: [@bs.string] [
-                                | [@bs.as "on-drag"] `onDrag
-                                | `none
-                              ]
-                                =?,
-        ~minSwipeDistance: float=?,
-        ~overlayColor: string=?,
-        ~statusBarAnimation: [ | `slide | `none | `fade]=?,
-        //TODO: ~gestureHandlerProps: React.ComponentProps<typeof PanGestureHandler>;
-        ~_lazy: bool=?,
-        ~unmountInactiveRoutes: bool=?,
-        ~drawerContent: React.component(Js.t(contentComponentProps))=?,
-        ~drawerContentOptions: Js.t(contentOptions)=?,
-        ~sceneContainerStyle: ReactNative.Style.t=?,
-        ~style: ReactNative.Style.t=?,
-        ~key: string=?,
-        unit
-      ) =>
-      navigatorProps;
-
-    let make = stack##"Navigator";
-  };
-};
diff --git a/src/Drawer.res b/src/Drawer.res
new file mode 100644
index 00000000..f2463933
--- /dev/null
+++ b/src/Drawer.res
@@ -0,0 +1,156 @@
+open Core
+
+type options
+
+module DrawerNavigationProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationScreenProp(M)
+
+  type t = navigation
+
+  @send external openDrawer: t => unit = "openDrawer"
+  @send external closeDrawer: t => unit = "closeDrawer"
+  @send external toggleDrawer: t => unit = "toggleDrawer"
+}
+
+module Make = (
+  M: {
+    type params
+  },
+) => {
+  module Navigation = DrawerNavigationProp({
+    include M
+    type options = options
+  })
+
+  type animatedNode = ReactNative.Animated.Value.t
+
+  type scene = {
+    route: route<M.params>,
+    index: int,
+    focused: bool,
+    tintColor: option<string>,
+  }
+
+  type contentOptions = {
+    "items": array<route<M.params>>,
+    "activeItemKey": option<Js.nullable<string>>,
+    "activeTintColor": option<string>,
+    "activeBackgroundColor": option<string>,
+    "inactiveTintColor": option<string>,
+    "inactiveBackgroundColor": option<string>,
+    "itemsContainerStyle": option<ReactNative.Style.t>,
+    "itemStyle": option<ReactNative.Style.t>,
+    "labelStyle": option<ReactNative.Style.t>,
+    "activeLabelStyle": option<ReactNative.Style.t>,
+    "inactiveLabelStyle": option<ReactNative.Style.t>,
+    "iconContainerStyle": option<ReactNative.Style.t>,
+  }
+
+  type drawerNavigationItemsProps = {
+    ...contentOptions,
+    "drawerPosition": string,
+    "getLabel": scene => React.element,
+    "renderIcon": scene => React.element,
+    "onItemPress": scene => unit,
+  }
+
+  type contentComponentProps = {
+    ...drawerNavigationItemsProps,
+    "navigation": navigation,
+    "drawerOpenProgress": animatedNode,
+  }
+
+  @obj
+  external options: (
+    ~title: string=?,
+    ~drawerLabel: scene => React.element=?,
+    ~drawerIcon: scene => React.element=?,
+    ~drawerLockMode: @string
+    [
+      | #unlocked
+      | @as("locked-closed") #lockedClosed
+      | @as("locked-open") #lockedOpen
+    ]=?,
+    unit,
+  ) => options = ""
+
+  type optionsProps = {
+    navigation: navigation,
+    route: route<M.params>,
+  }
+
+  type optionsCallback = optionsProps => options
+
+  type navigatorProps
+
+  type screenProps
+
+  @module("@react-navigation/drawer")
+  external make: unit => {
+    "Navigator": navigatorProps => React.element,
+    "Screen": screenProps => React.element,
+  } = "createDrawerNavigator"
+
+  let stack = make()
+
+  module Screen = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~component: React.component<{"navigation": navigation, "route": route<M.params>}>,
+      ~key: string=?,
+      unit,
+    ) => screenProps = ""
+    let make = stack["Screen"]
+  }
+
+  module Navigator = {
+    @obj
+    external makeProps: (
+      ~initialRouteName: string=?,
+      ~screenOptions: optionsCallback=?,
+      ~children: React.element,
+      ~backBehavior: [#initialRoute | #order | #history | #none]=?,
+      ~drawerBackgroundColor: //DrawerNavigationConfig
+      string=?,
+      ~drawerPosition: [#left | #right]=?,
+      ~drawerType: [#front | #back | #slide | #permanent]=?,
+      ~drawerWidth: /*
+         ~drawerWidth: [@bs.unwrap] [
+                         | `Static(float)
+                         | `Dynamic(unit => float)
+                       ]
+
+ */
+      unit => float,
+      ~edgeWidth: float=?,
+      ~hideStatusBar: bool=?,
+      ~keyboardDismissMode: @string
+      [
+        | @as("on-drag") #onDrag
+        | #none
+      ]=?,
+      ~minSwipeDistance: float=?,
+      ~overlayColor: string=?,
+      ~statusBarAnimation: [#slide | #none | #fade]=?,
+      ~_lazy: //TODO: ~gestureHandlerProps: React.ComponentProps<typeof PanGestureHandler>;
+      bool=?,
+      ~unmountInactiveRoutes: bool=?,
+      ~drawerContent: React.component<contentComponentProps>=?,
+      ~drawerContentOptions: contentOptions=?,
+      ~sceneContainerStyle: ReactNative.Style.t=?,
+      ~style: ReactNative.Style.t=?,
+      ~key: string=?,
+      unit,
+    ) => navigatorProps = ""
+
+    let make = stack["Navigator"]
+  }
+}
diff --git a/src/Example.re b/src/Example.re
deleted file mode 100644
index 0d8a100a..00000000
--- a/src/Example.re
+++ /dev/null
@@ -1,67 +0,0 @@
-// Uncomment this to compile this example outside of this repo
-// in this example it's not necessary (since we are running it in the module repo itself)
-// open ReactNavigation;
-module HomeScreen = {
-  open ReactNative;
-  [@react.component]
-  let make = (~navigation as _, ~route as _) =>
-    <Text> {j|Hello Reasonable Person!|j}->React.string </Text>;
-};
-
-module ModalScreen = {
-  open ReactNative;
-  [@react.component]
-  let make = (~navigation as _, ~route as _) =>
-    <Text> {j|Hello From Modal|j}->React.string </Text>;
-};
-
-module MainStackScreen = {
-  open ReactNative;
-  module StakeParams = {
-    type params = {name: string};
-  };
-  include Stack.Make(StakeParams);
-  [@react.component]
-  let make = (~navigation as _, ~route as _) =>
-    <Navigator>
-      <Screen
-        name="Home"
-        component=HomeScreen.make
-        options={props =>
-          options(
-            ~headerRight=
-              _ =>
-                <Button
-                  onPress={_ =>
-                    props.navigation->Navigation.navigate("MyModal")
-                  }
-                  title="Info"
-                  color="#f00"
-                />,
-            ~title=
-              switch (props.route.params) {
-              | Some(params) => params.name
-              | None => "Reason"
-              },
-            (),
-          )
-        }
-      />
-    </Navigator>;
-};
-
-module RootStackScreen = {
-  include Stack.Make({
-    type params = unit;
-  });
-  [@react.component]
-  let make = () =>
-    <Native.NavigationContainer>
-      <Navigator mode=`modal headerMode=`none>
-        <Screen name="Main" component=MainStackScreen.make />
-        <ScreenWithCallback name="MyModal">
-          {({navigation, route}) => <ModalScreen navigation route />}
-        </ScreenWithCallback>
-      </Navigator>
-    </Native.NavigationContainer>;
-};
diff --git a/src/Example.res b/src/Example.res
new file mode 100644
index 00000000..0c9ca81e
--- /dev/null
+++ b/src/Example.res
@@ -0,0 +1,61 @@
+// Uncomment this to compile this example outside of this repo
+// in this example it's not necessary (since we are running it in the module repo itself)
+// open ReactNavigation;
+module HomeScreen = {
+  open ReactNative
+  @react.component
+  let make = (~navigation as _, ~route as _) =>
+    <Text> {j`Hello Reasonable Person!`->React.string} </Text>
+}
+
+module ModalScreen = {
+  open ReactNative
+  @react.component
+  let make = (~navigation as _, ~route as _) => <Text> {j`Hello From Modal`->React.string} </Text>
+}
+
+module MainStackScreen = {
+  open ReactNative
+  module StakeParams = {
+    type params = {name: string}
+  }
+  include Stack.Make(StakeParams)
+  @react.component
+  let make = (~navigation as _, ~route as _) =>
+    <Navigator>
+      <Screen
+        name="Home"
+        component=HomeScreen.make
+        options={props =>
+          options(
+            ~headerRight=_ =>
+              <Button
+                onPress={_ => props.navigation->Navigation.navigate("MyModal")}
+                title="Info"
+                color="#f00"
+              />,
+            ~title=switch props.route.params {
+            | Some(params) => params.name
+            | None => "Reason"
+            },
+            (),
+          )}
+      />
+    </Navigator>
+}
+
+module RootStackScreen = {
+  include Stack.Make({
+    type params = unit
+  })
+  @react.component
+  let make = () =>
+    <Native.NavigationContainer>
+      <Navigator mode=#modal headerMode=#none>
+        <Screen name="Main" component=MainStackScreen.make />
+        <ScreenWithCallback name="MyModal">
+          {({navigation, route}) => <ModalScreen navigation route />}
+        </ScreenWithCallback>
+      </Navigator>
+    </Native.NavigationContainer>
+}
diff --git a/src/MaterialBottomTabs.re b/src/MaterialBottomTabs.re
deleted file mode 100644
index 3e839c01..00000000
--- a/src/MaterialBottomTabs.re
+++ /dev/null
@@ -1,170 +0,0 @@
-open Core;
-type layout = {
-  .
-  "width": float,
-  "height": float,
-};
-type options;
-
-module MaterialBottomTabNavigationProp = (M: {
-                                            type params;
-                                            type options;
-                                          }) => {
-  include NavigationScreenProp(M);
-
-  type t = navigation;
-
-  [@bs.send] external jumpTo: (t, string) => unit = "jumpTo";
-  [@bs.send]
-  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo";
-};
-
-module Make = (M: {type params;}) => {
-  type nonrec route = route(M.params);
-  module Navigation =
-    MaterialBottomTabNavigationProp({
-      include M;
-      type nonrec options = options;
-    });
-
-  type animatedNode = ReactNative.Animated.Value.t;
-
-  type scene = {
-    .
-    "route": route,
-    "focused": bool,
-    "tintColor": string,
-  };
-
-  type accessibilityRole = string;
-  type accessibilityStates = array(string);
-
-  module TabBarBadge = {
-    type t;
-    [@bs.val] [@bs.module "./Interop"]
-    external t:
-      ([@bs.unwrap] [ | `Bool(bool) | `Number(int) | `String(string)]) => t =
-      "identity";
-
-    let boolean = x => t(`Bool(x));
-    let number = x => t(`Number(x));
-    let string = x => t(`String(x));
-  };
-
-  [@bs.obj]
-  external options:
-    (
-      ~title: string=?,
-      ~tabBarColor: string=?,
-      ~tabBarLabel: string=?,
-      //TODO: dynamic, missing static option: React.ReactNode
-      ~tabBarIcon: scene => React.element=?,
-      ~tabBarBadge: TabBarBadge.t=?,
-      ~tabBarAccessibilityLabel: string=?,
-      ~tabBarTestID: string=?,
-      unit
-    ) =>
-    options;
-
-  type optionsProps = {
-    navigation,
-    route,
-  };
-
-  type optionsCallback = optionsProps => options;
-
-  type navigatorProps = {
-    initialRouteName: option(string),
-    screenOptions: option(optionsCallback),
-    backBehavior: option(string),
-    shifting: option(bool),
-    labeled: option(bool),
-    activeColor: option(string),
-    inactiveColor: option(string),
-    barStyle: option(ReactNative.Style.t),
-  };
-
-  type renderCallbackProp = {
-    navigation,
-    route,
-  };
-
-  type screenProps('params) = {
-    name: string,
-    options: option(optionsCallback),
-    initialParams: option('params),
-    component:
-      option(
-        React.component({
-          .
-          "navigation": navigation,
-          "route": route,
-        }),
-      ),
-    children: option(renderCallbackProp => React.element),
-  };
-
-  [@bs.module "@react-navigation/material-bottom-tabs"]
-  external make:
-    unit =>
-    {
-      .
-      "Navigator": navigatorProps => React.element,
-      "Screen": screenProps(M.params) => React.element,
-    } =
-    "createMaterialBottomTabNavigator";
-
-  let materialBottomTabs = make();
-
-  module Screen = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~component: React.component({. "navigation": navigation}),
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = materialBottomTabs##"Screen";
-  };
-
-  module ScreenWithCallback = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~children: renderCallbackProp => React.element,
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = materialBottomTabs##"Screen";
-  };
-
-  module Navigator = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~initialRouteName: string=?,
-        ~screenOptions: optionsCallback=?,
-        ~children: React.element,
-        ~backBehavior: [ | `initialRoute | `order | `history | `none]=?,
-        ~shifting: bool=?,
-        ~labeled: bool=?,
-        ~activeColor: string=?,
-        ~inactiveColor: string=?,
-        ~barStyle: ReactNative.Style.t=?,
-        //TODO: More? https://github.com/callstack/react-native-paper/blob/bd4296116d841ed355f3dbebb40cfbc3b87a79ff/src/components/BottomNavigation.tsx#L132-L196
-        ~key: string=?,
-        unit
-      ) =>
-      navigatorProps;
-
-    let make = materialBottomTabs##"Navigator";
-  };
-};
diff --git a/src/MaterialBottomTabs.res b/src/MaterialBottomTabs.res
new file mode 100644
index 00000000..172bc386
--- /dev/null
+++ b/src/MaterialBottomTabs.res
@@ -0,0 +1,145 @@
+open Core
+type layout = {"width": float, "height": float}
+type options
+
+module MaterialBottomTabNavigationProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationScreenProp(M)
+
+  type t = navigation
+
+  @send external jumpTo: (t, string) => unit = "jumpTo"
+  @send
+  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo"
+}
+
+module Make = (
+  M: {
+    type params
+  },
+) => {
+  type route = route<M.params>
+  module Navigation = MaterialBottomTabNavigationProp({
+    include M
+    type options = options
+  })
+
+  type animatedNode = ReactNative.Animated.Value.t
+
+  type scene = {"route": route, "focused": bool, "tintColor": string}
+
+  type accessibilityRole = string
+  type accessibilityStates = array<string>
+
+  module TabBarBadge = {
+    type t
+    @val @module("./Interop")
+    external t: @unwrap [#Bool(bool) | #Number(int) | #String(string)] => t = "identity"
+
+    let boolean = x => t(#Bool(x))
+    let number = x => t(#Number(x))
+    let string = x => t(#String(x))
+  }
+
+  @obj
+  external options: (
+    ~title: string=?,
+    ~tabBarColor: string=?,
+    ~tabBarLabel: string=?,
+    ~tabBarIcon: //TODO: dynamic, missing static option: React.ReactNode
+    scene => React.element=?,
+    ~tabBarBadge: TabBarBadge.t=?,
+    ~tabBarAccessibilityLabel: string=?,
+    ~tabBarTestID: string=?,
+    unit,
+  ) => options = ""
+
+  type optionsProps = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type optionsCallback = optionsProps => options
+
+  type navigatorProps = {
+    initialRouteName: option<string>,
+    screenOptions: option<optionsCallback>,
+    backBehavior: option<string>,
+    shifting: option<bool>,
+    labeled: option<bool>,
+    activeColor: option<string>,
+    inactiveColor: option<string>,
+    barStyle: option<ReactNative.Style.t>,
+  }
+
+  type renderCallbackProp = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type screenProps<'params> = {
+    name: string,
+    options: option<optionsCallback>,
+    initialParams: option<'params>,
+    component: option<React.component<{"navigation": navigation, "route": route}>>,
+    children: option<renderCallbackProp => React.element>,
+  }
+
+  @module("@react-navigation/material-bottom-tabs")
+  external make: unit => {
+    "Navigator": navigatorProps => React.element,
+    "Screen": screenProps<M.params> => React.element,
+  } = "createMaterialBottomTabNavigator"
+
+  let materialBottomTabs = make()
+
+  module Screen = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~component: React.component<{"navigation": navigation}>,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = materialBottomTabs["Screen"]
+  }
+
+  module ScreenWithCallback = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~children: renderCallbackProp => React.element,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = materialBottomTabs["Screen"]
+  }
+
+  module Navigator = {
+    @obj
+    external makeProps: (
+      ~initialRouteName: string=?,
+      ~screenOptions: optionsCallback=?,
+      ~children: React.element,
+      ~backBehavior: [#initialRoute | #order | #history | #none]=?,
+      ~shifting: bool=?,
+      ~labeled: bool=?,
+      ~activeColor: string=?,
+      ~inactiveColor: string=?,
+      ~barStyle: ReactNative.Style.t=?,
+      ~key: //TODO: More? https://github.com/callstack/react-native-paper/blob/bd4296116d841ed355f3dbebb40cfbc3b87a79ff/src/components/BottomNavigation.tsx#L132-L196
+      string=?,
+      unit,
+    ) => navigatorProps = ""
+
+    let make = materialBottomTabs["Navigator"]
+  }
+}
diff --git a/src/MaterialTopTabs.re b/src/MaterialTopTabs.re
deleted file mode 100644
index f9afd309..00000000
--- a/src/MaterialTopTabs.re
+++ /dev/null
@@ -1,268 +0,0 @@
-open Core;
-
-type layout = {
-  width: float,
-  height: float,
-};
-type options;
-
-module MaterialTopTabNavigationProp = (M: {
-                                         type params;
-                                         type options;
-                                       }) => {
-  include NavigationScreenProp(M);
-
-  type t = navigation;
-
-  [@bs.send] external jumpTo: (t, string) => unit = "jumpTo";
-  [@bs.send]
-  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo";
-};
-
-module Make = (M: {type params;}) => {
-  type nonrec route = route(M.params);
-  module Navigation =
-    MaterialTopTabNavigationProp({
-      include M;
-      type nonrec options = options;
-    });
-
-  type animatedNode = ReactNative.Animated.Value.t;
-
-  type scene = {
-    focused: bool,
-    color: string,
-  };
-
-  type descriptors;
-
-  class type virtual tabBar = {
-    pub scrollEnabled: option(bool);
-    //pub navigationState: navigationState(M.params);
-    //pub activeColor: option(string);
-    //pub inactiveColor: option(string);
-    pub pressColor: option(string);
-    pub pressOpacity: option(float);
-    //TODO: render: https://github.com/react-native-community/react-native-tab-view/blob/64e03bf14b0fac9c3bccd684bf31a04ecf19c50d/src/TabBar.tsx#L38-L51
-    pub tabStyle: option(ReactNative.Style.t);
-    pub indicatorStyle: option(ReactNative.Style.t);
-    pub labelStyle: option(ReactNative.Style.t);
-    pub style: option(ReactNative.Style.t);
-    pub renderIndicator: option(React.component({. "route": route}));
-  };
-
-  class type virtual materialTopTabBarOptions = {
-    as 'self;
-    constraint 'self = #tabBar;
-    pub activeTintColor: option(string);
-    pub inactiveTintColor: option(string);
-    pub iconStyle: option(ReactNative.Style.t);
-    pub showLabel: option(bool);
-    pub showIcon: option(bool);
-    pub allowFontScaling: option(bool);
-  };
-
-  type accessibilityRole = string;
-  type accessibilityStates = array(string);
-
-  type routeOptions = {route};
-
-  class type virtual materialTopTabBarProps = {
-    as 'self;
-    constraint 'self = #materialTopTabBarOptions;
-    pub state: navigationState(M.params);
-    pub navigation: navigation;
-    pub descriptors: descriptors;
-    // SceneRendererProps from react-native-tab-view
-    pub layout: layout;
-    pub position: animatedNode;
-    pub jumpTo: string => unit;
-  };
-
-  [@bs.obj]
-  external materialTopTabBarOptions:
-    (
-      ~activeTintColor: string=?,
-      ~inactiveTintColor: string=?,
-      ~iconStyle: ReactNative.Style.t=?,
-      ~showLabel: bool=?,
-      ~showIcon: bool=?,
-      ~allowFontScaling: bool=?,
-      ~scrollEnabled: bool=?,
-      ~pressColor: string=?,
-      ~pressOpacity: float=?,
-      ~tabStyle: ReactNative.Style.t=?,
-      ~indicatorStyle: ReactNative.Style.t=?,
-      ~labelStyle: ReactNative.Style.t=?,
-      ~style: ReactNative.Style.t=?,
-      ~renderIndicator: React.component({. "route": route})=?,
-      unit
-    ) =>
-    materialTopTabBarOptions;
-
-  [@bs.obj]
-  external options:
-    (
-      ~title: string=?,
-      //TODO: dynamic, missing static option: React.ReactNode
-      ~tabBarLabel: scene => React.element=?,
-      //TODO: dynamic, missing static option: React.ReactNode
-      ~tabBarIcon: scene => React.element=?,
-      ~tabBarAccessibilityLabel: string=?,
-      ~tabBarTestID: string=?,
-      unit
-    ) =>
-    options;
-
-  type optionsProps = {
-    navigation,
-    route,
-  };
-
-  type optionsCallback = optionsProps => options;
-
-  type navigatorProps = {
-    initialRouteName: option(string),
-    screenOptions: option(optionsCallback),
-    _lazy: option(bool),
-    lazyPreloadDistance: option(int),
-    lazyPlaceholder: option(React.component({. "route": route})),
-    tabBar: option(Js.t(materialTopTabBarProps) => React.element),
-    tabBarOptions: option(materialTopTabBarOptions),
-    tabBarPosition: option(string),
-    backBehavior: option(string),
-    removeClippedSubviews: option(bool),
-    keyboardDismissMode: option(string),
-    swipeEnabled: option(bool),
-    swipeVelocityImpact: option(float),
-    sceneContainerStyle: option(ReactNative.Style.t),
-    style: option(ReactNative.Style.t),
-  };
-
-  type renderCallbackProp = {
-    navigation,
-    route,
-  };
-
-  type screenProps('params) = {
-    name: string,
-    options: option(optionsCallback),
-    initialParams: option('params),
-    component:
-      option(
-        React.component({
-          .
-          "navigation": navigation,
-          "route": route,
-        }),
-      ),
-    children: option(renderCallbackProp => React.element),
-  };
-
-  [@bs.module "@react-navigation/material-top-tabs"]
-  external make:
-    unit =>
-    {
-      .
-      "Navigator": navigatorProps => React.element,
-      "Screen": screenProps(M.params) => React.element,
-    } =
-    "createMaterialTopTabNavigator";
-
-  let materialTopTabs = make();
-
-  module Screen = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~component: React.component({. "navigation": navigation}),
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = materialTopTabs##"Screen";
-  };
-
-  module ScreenWithCallback = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~children: renderCallbackProp => React.element,
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = materialTopTabs##"Screen";
-  };
-
-  module Navigator = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~initialRouteName: string=?,
-        ~screenOptions: optionsCallback=?,
-        ~children: React.element,
-        ~backBehavior: [ | `initialRoute | `order | `history | `none]=?,
-        ~_lazy: bool=?,
-        ~lazyPreloadDistance: int=?,
-        ~lazyPlaceholder: React.component({. "route": route})=?,
-        ~tabBar: Js.t(materialTopTabBarProps) => React.element=?,
-        ~tabBarOptions: materialTopTabBarOptions=?,
-        ~tabBarPosition: [ | `top | `bottom]=?,
-        ~removeClippedSubviews: bool=?,
-        ~keyboardDismissMode: [@bs.string] [
-                                | `auto
-                                | [@bs.as "on-drag"] `onDrag
-                                | `none
-                              ]
-                                =?,
-        ~swipeEnabled: bool=?,
-        ~swipeVelocityImpact: float=?,
-        ~sceneContainerStyle: ReactNative.Style.t=?,
-        ~style: ReactNative.Style.t=?,
-        ~key: string=?,
-        unit
-      ) =>
-      navigatorProps;
-
-    let make = materialTopTabs##"Navigator";
-  };
-
-  module MaterialTopTabBar = {
-    [@bs.module "@react-navigation/material-top-tabs"] [@react.component]
-    external make:
-      (
-        ~state: navigationState(M.params),
-        ~navigation: navigation,
-        ~descriptors: descriptors,
-        // SceneRendererProps from react-native-tab-view
-        ~layout: layout,
-        ~position: animatedNode,
-        ~jumpTo: string => unit,
-        // materialTopTabBarOptions
-        ~activeTintColor: string=?,
-        ~inactiveTintColor: string=?,
-        ~iconStyle: ReactNative.Style.t=?,
-        ~showLabel: bool=?,
-        ~showIcon: bool=?,
-        ~allowFontScaling: bool=?,
-        ~scrollEnabled: bool=?,
-        ~pressColor: string=?,
-        ~pressOpacity: float=?,
-        ~tabStyle: ReactNative.Style.t=?,
-        ~indicatorStyle: ReactNative.Style.t=?,
-        ~labelStyle: ReactNative.Style.t=?,
-        ~style: ReactNative.Style.t=?,
-        ~renderIndicator: React.component({. "route": route})=?,
-        unit
-      ) =>
-      React.element =
-      "MaterialTopTabBar";
-  };
-};
diff --git a/src/MaterialTopTabs.res b/src/MaterialTopTabs.res
new file mode 100644
index 00000000..c3d6c869
--- /dev/null
+++ b/src/MaterialTopTabs.res
@@ -0,0 +1,247 @@
+open Core
+
+type layout = {
+  width: float,
+  height: float,
+}
+type options
+
+module MaterialTopTabNavigationProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationScreenProp(M)
+
+  type t = navigation
+
+  @send external jumpTo: (t, string) => unit = "jumpTo"
+  @send
+  external jumpToWithParams: (t, string, M.params) => unit = "jumpTo"
+}
+
+module Make = (
+  M: {
+    type params
+  },
+) => {
+  type route = route<M.params>
+  module Navigation = MaterialTopTabNavigationProp({
+    include M
+    type options = options
+  })
+
+  type animatedNode = ReactNative.Animated.Value.t
+
+  type scene = {
+    focused: bool,
+    color: string,
+  }
+
+  type descriptors
+
+  type tabBar = {
+    "scrollEnabled": option<bool>,
+    //pub navigationState: navigationState(M.params);
+    //pub activeColor: option(string);
+    //pub inactiveColor: option(string);
+    "pressColor": option<string>,
+    "pressOpacity": option<float>,
+    //TODO: render: https://github.com/react-native-community/react-native-tab-view/blob/64e03bf14b0fac9c3bccd684bf31a04ecf19c50d/src/TabBar.tsx#L38-L51
+    "tabStyle": option<ReactNative.Style.t>,
+    "indicatorStyle": option<ReactNative.Style.t>,
+    "labelStyle": option<ReactNative.Style.t>,
+    "style": option<ReactNative.Style.t>,
+    "renderIndicator": option<React.component<{"route": route}>>,
+  }
+
+  type materialTopTabBarOptions = {
+    ...tabBar,
+    "activeTintColor": option<string>,
+    "inactiveTintColor": option<string>,
+    "iconStyle": option<ReactNative.Style.t>,
+    "showLabel": option<bool>,
+    "showIcon": option<bool>,
+    "allowFontScaling": option<bool>,
+  }
+
+  @obj
+  external materialTopTabBarOptions: (
+    ~activeTintColor: string=?,
+    ~inactiveTintColor: string=?,
+    ~iconStyle: ReactNative.Style.t=?,
+    ~showLabel: bool=?,
+    ~showIcon: bool=?,
+    ~allowFontScaling: bool=?,
+    ~scrollEnabled: bool=?,
+    ~pressColor: string=?,
+    ~pressOpacity: float=?,
+    ~tabStyle: ReactNative.Style.t=?,
+    ~indicatorStyle: ReactNative.Style.t=?,
+    ~labelStyle: ReactNative.Style.t=?,
+    ~style: ReactNative.Style.t=?,
+    ~renderIndicator: React.component<{"route": route}>=?,
+    unit,
+  ) => materialTopTabBarOptions = ""
+
+  type accessibilityRole = string
+  type accessibilityStates = array<string>
+
+  type routeOptions = {route: route}
+
+  type materialTopTabBarProps = {
+    ...materialTopTabBarOptions,
+    "state": navigationState<M.params>,
+    "navigation": navigation,
+    "descriptors": descriptors,
+    // SceneRendererProps from react-native-tab-view
+    "layout": layout,
+    "position": animatedNode,
+    "jumpTo": string => unit,
+  }
+
+  @obj
+  external options: (
+    ~title: string=?,
+    ~tabBarLabel: //TODO: dynamic, missing static option: React.ReactNode
+    scene => React.element=?,
+    ~tabBarIcon: //TODO: dynamic, missing static option: React.ReactNode
+    scene => React.element=?,
+    ~tabBarAccessibilityLabel: string=?,
+    ~tabBarTestID: string=?,
+    unit,
+  ) => options = ""
+
+  type optionsProps = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type optionsCallback = optionsProps => options
+
+  type navigatorProps = {
+    initialRouteName: option<string>,
+    screenOptions: option<optionsCallback>,
+    _lazy: option<bool>,
+    lazyPreloadDistance: option<int>,
+    lazyPlaceholder: option<React.component<{"route": route}>>,
+    tabBar: option<materialTopTabBarProps => React.element>,
+    tabBarOptions: option<materialTopTabBarOptions>,
+    tabBarPosition: option<string>,
+    backBehavior: option<string>,
+    removeClippedSubviews: option<bool>,
+    keyboardDismissMode: option<string>,
+    swipeEnabled: option<bool>,
+    swipeVelocityImpact: option<float>,
+    sceneContainerStyle: option<ReactNative.Style.t>,
+    style: option<ReactNative.Style.t>,
+  }
+
+  type renderCallbackProp = {
+    navigation: navigation,
+    route: route,
+  }
+
+  type screenProps<'params> = {
+    name: string,
+    options: option<optionsCallback>,
+    initialParams: option<'params>,
+    component: option<React.component<{"navigation": navigation, "route": route}>>,
+    children: option<renderCallbackProp => React.element>,
+  }
+
+  @module("@react-navigation/material-top-tabs")
+  external make: unit => {
+    "Navigator": navigatorProps => React.element,
+    "Screen": screenProps<M.params> => React.element,
+  } = "createMaterialTopTabNavigator"
+
+  let materialTopTabs = make()
+
+  module Screen = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~component: React.component<{"navigation": navigation}>,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = materialTopTabs["Screen"]
+  }
+
+  module ScreenWithCallback = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~children: renderCallbackProp => React.element,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = materialTopTabs["Screen"]
+  }
+
+  module Navigator = {
+    @obj
+    external makeProps: (
+      ~initialRouteName: string=?,
+      ~screenOptions: optionsCallback=?,
+      ~children: React.element,
+      ~backBehavior: [#initialRoute | #order | #history | #none]=?,
+      ~_lazy: bool=?,
+      ~lazyPreloadDistance: int=?,
+      ~lazyPlaceholder: React.component<{"route": route}>=?,
+      ~tabBar: materialTopTabBarProps => React.element=?,
+      ~tabBarOptions: materialTopTabBarOptions=?,
+      ~tabBarPosition: [#top | #bottom]=?,
+      ~removeClippedSubviews: bool=?,
+      ~keyboardDismissMode: @string
+      [
+        | #auto
+        | @as("on-drag") #onDrag
+        | #none
+      ]=?,
+      ~swipeEnabled: bool=?,
+      ~swipeVelocityImpact: float=?,
+      ~sceneContainerStyle: ReactNative.Style.t=?,
+      ~style: ReactNative.Style.t=?,
+      ~key: string=?,
+      unit,
+    ) => navigatorProps = ""
+
+    let make = materialTopTabs["Navigator"]
+  }
+
+  module MaterialTopTabBar = {
+    @module("@react-navigation/material-top-tabs") @react.component
+    external make: (
+      ~state: navigationState<M.params>,
+      ~navigation: navigation,
+      ~descriptors: descriptors,
+      ~layout: // SceneRendererProps from react-native-tab-view
+      layout,
+      ~position: animatedNode,
+      ~jumpTo: string => unit,
+      ~activeTintColor: // materialTopTabBarOptions
+      string=?,
+      ~inactiveTintColor: string=?,
+      ~iconStyle: ReactNative.Style.t=?,
+      ~showLabel: bool=?,
+      ~showIcon: bool=?,
+      ~allowFontScaling: bool=?,
+      ~scrollEnabled: bool=?,
+      ~pressColor: string=?,
+      ~pressOpacity: float=?,
+      ~tabStyle: ReactNative.Style.t=?,
+      ~indicatorStyle: ReactNative.Style.t=?,
+      ~labelStyle: ReactNative.Style.t=?,
+      ~style: ReactNative.Style.t=?,
+      ~renderIndicator: React.component<{"route": route}>=?,
+      unit,
+    ) => React.element = "MaterialTopTabBar"
+  }
+}
diff --git a/src/Native.re b/src/Native.res
similarity index 61%
rename from src/Native.re
rename to src/Native.res
index 40010873..0f3d72f1 100644
--- a/src/Native.re
+++ b/src/Native.res
@@ -99,95 +99,89 @@ type themeColors = {
   text: string,
   border: string,
   notification: string,
-};
+}
 type theme = {
   dark: bool,
   colors: themeColors,
-};
-[@bs.module "@react-navigation/native"]
-external defaultTheme: theme = "DefaultTheme";
-[@bs.module "@react-navigation/native"]
-external darkTheme: theme = "DarkTheme";
-[@bs.module "@react-navigation/native"]
-external useTheme: unit => theme = "useTheme";
+}
+@module("@react-navigation/native")
+external defaultTheme: theme = "DefaultTheme"
+@module("@react-navigation/native")
+external darkTheme: theme = "DarkTheme"
+@module("@react-navigation/native")
+external useTheme: unit => theme = "useTheme"
 
 module NavigationContainer = {
-  type state = Js.Json.t;
-  type navigationState = state => unit;
-
-  [@bs.module "@react-navigation/native"] [@react.component]
-  external make:
-    (
-      ~ref: ReactNative.Ref.t(Core.navigation)=?,
-      ~initialState: state=?,
-      ~onStateChange: navigationState=?,
-      ~onReady: unit => unit=?,
-      ~theme: theme=?,
-      ~children: React.element
-    ) =>
-    React.element =
-    "NavigationContainer";
-};
-
-[@bs.module "@react-navigation/native"]
-external useNavigation: unit => Js.nullable(Core.navigation) =
-  "useNavigation";
-
-[@bs.module "@react-navigation/native"]
-external useRoute: unit => Js.nullable(Core.route('params)) = "useRoute";
-
-[@bs.module "@react-navigation/native"]
-external useIsFocused: unit => bool = "useIsFocused";
-
-type focusCallback = unit => unit;
-[@bs.module "@react-navigation/native"]
-external useFocusEffect: focusCallback => unit = "useFocusEffect";
-
-[@bs.module "@react-navigation/native"]
-external useScrollToTop: React.ref('value) => unit = "useScrollToTop";
-
-type serverContainer('a) = {getCurrentOptions: option('a)};
+  type state = Js.Json.t
+  type navigationState = state => unit
+
+  @module("@react-navigation/native") @react.component
+  external make: (
+    ~ref: ReactNative.Ref.t<Core.navigation>=?,
+    ~initialState: state=?,
+    ~onStateChange: navigationState=?,
+    ~onReady: unit => unit=?,
+    ~theme: theme=?,
+    ~children: React.element,
+  ) => React.element = "NavigationContainer"
+}
+
+@module("@react-navigation/native")
+external useNavigation: unit => Js.nullable<Core.navigation> = "useNavigation"
+
+@module("@react-navigation/native")
+external useRoute: unit => Js.nullable<Core.route<'params>> = "useRoute"
+
+@module("@react-navigation/native")
+external useIsFocused: unit => bool = "useIsFocused"
+
+type focusCallback = unit => unit
+@module("@react-navigation/native")
+external useFocusEffect: focusCallback => unit = "useFocusEffect"
+
+@module("@react-navigation/native")
+external useScrollToTop: React.ref<'value> => unit = "useScrollToTop"
+
+type serverContainer<'a> = {getCurrentOptions: option<'a>}
 type location = {
   pathname: string,
   search: string,
-};
+}
 module ServerContainer = {
-  [@bs.module "@react-navigation/native"] [@react.component]
-  external make:
-    (
-      ~ref: ReactNative.Ref.t(serverContainer('a))=?,
-      ~location: location=?,
-      ~children: React.element
-    ) =>
-    React.element =
-    "ServerContainer";
-};
-
-[@bs.module "@react-navigation/native"]
-external useLinkTo: string => unit = "useLinkTo";
+  @module("@react-navigation/native") @react.component
+  external make: (
+    ~ref: ReactNative.Ref.t<serverContainer<'a>>=?,
+    ~location: location=?,
+    ~children: React.element,
+  ) => React.element = "ServerContainer"
+}
+
+@module("@react-navigation/native")
+external useLinkTo: string => unit = "useLinkTo"
 
 type linkPropsIn = {
   to_: string,
   action: unit => unit,
-};
+}
 type linkPropsOut = {
   href: string,
   accessibilityRole: string,
   onPress: unit => unit,
-};
+}
 
-[@bs.module "@react-navigation/native"]
-external useLinkProps: linkPropsIn => linkPropsOut = "useLinkProps";
+@module("@react-navigation/native")
+external useLinkProps: linkPropsIn => linkPropsOut = "useLinkProps"
 
-type linkBuilderOut('a) = (string, 'a) => string;
+type linkBuilderOut<'a> = (string, 'a) => string
 
-[@bs.module "@react-navigation/native"]
-external useLinkBuilder: unit => linkBuilderOut('a) = "useLinkBuilder";
+@module("@react-navigation/native")
+external useLinkBuilder: unit => linkBuilderOut<'a> = "useLinkBuilder"
 
 module Link = {
-  [@bs.module "@react-navigation/native"] [@react.component]
-  external make:
-    (~to_: string=?, ~action: unit => unit=?, ~children: React.element) =>
-    React.element =
-    "Link";
-};
+  @module("@react-navigation/native") @react.component
+  external make: (
+    ~to_: string=?,
+    ~action: unit => unit=?,
+    ~children: React.element,
+  ) => React.element = "Link"
+}
diff --git a/src/NavigationActions.re b/src/NavigationActions.re
deleted file mode 100644
index 369b8a9a..00000000
--- a/src/NavigationActions.re
+++ /dev/null
@@ -1,19 +0,0 @@
-type action;
-
-type navigateParams;
-
-[@bs.obj]
-external navigateParams:
-  (~routeName: string, ~params: Js.t({..})=?, unit) => navigateParams;
-
-type backParams;
-
-[@bs.obj]
-external backParams:
-  (~key: string=?, ~immediate: bool=?, unit) => navigateParams;
-
-[@bs.module "react-navigation"] [@bs.scope "NavigationActions"]
-external navigate: navigateParams => action = "navigate";
-
-[@bs.module "react-navigation"] [@bs.scope "NavigationActions"]
-external back: backParams => action = "back";
diff --git a/src/NavigationActions.res b/src/NavigationActions.res
new file mode 100644
index 00000000..fa9081ee
--- /dev/null
+++ b/src/NavigationActions.res
@@ -0,0 +1,17 @@
+type action
+
+type navigateParams
+
+@obj
+external navigateParams: (~routeName: string, ~params: {..}=?, unit) => navigateParams = ""
+
+type backParams
+
+@obj
+external backParams: (~key: string=?, ~immediate: bool=?, unit) => navigateParams = ""
+
+@module("react-navigation") @scope("NavigationActions")
+external navigate: navigateParams => action = "navigate"
+
+@module("react-navigation") @scope("NavigationActions")
+external back: backParams => action = "back"
diff --git a/src/NavigationState.re b/src/NavigationState.re
deleted file mode 100644
index 70b43f9d..00000000
--- a/src/NavigationState.re
+++ /dev/null
@@ -1,9 +0,0 @@
-type t = {
-  index: int,
-  routeName: string,
-  routes: option(array(t)),
-  isDrawerOpen: bool,
-};
-
-type persistNavigationState = t => Js.Promise.t(unit);
-type loadNavigationState = unit => Js.Promise.t(option(t));
diff --git a/src/NavigationState.res b/src/NavigationState.res
new file mode 100644
index 00000000..48654b1a
--- /dev/null
+++ b/src/NavigationState.res
@@ -0,0 +1,9 @@
+type rec t = {
+  index: int,
+  routeName: string,
+  routes: option<array<t>>,
+  isDrawerOpen: bool,
+}
+
+type persistNavigationState = t => Js.Promise.t<unit>
+type loadNavigationState = unit => Js.Promise.t<option<t>>
diff --git a/src/Navigator.re b/src/Navigator.re
deleted file mode 100644
index 96fbb9de..00000000
--- a/src/Navigator.re
+++ /dev/null
@@ -1,3 +0,0 @@
-type props;
-
-type t = React.component(props);
diff --git a/src/Navigator.res b/src/Navigator.res
new file mode 100644
index 00000000..02a5a028
--- /dev/null
+++ b/src/Navigator.res
@@ -0,0 +1,3 @@
+type props
+
+type t = React.component<props>
diff --git a/src/Stack.re b/src/Stack.re
deleted file mode 100644
index 2e0401dc..00000000
--- a/src/Stack.re
+++ /dev/null
@@ -1,446 +0,0 @@
-open Core;
-
-type options;
-
-type safeAreaInsets = {
-  top: float,
-  bottom: float,
-  left: float,
-  right: float,
-};
-
-type layout = {
-  width: float,
-  height: float,
-};
-
-type layouts = {
-  screen: layout,
-  title: option(layout),
-  leftLabel: option(layout),
-};
-
-//TODO
-type any;
-type animatedNode = ReactNative.Animated.Value.t;
-type stackHeaderInterpolation = {progress: animatedNode};
-type stackHeaderInterpolationProps = {
-  current: stackHeaderInterpolation,
-  next: option(stackHeaderInterpolation),
-  layouts,
-};
-type stackHeaderInterpolatedStyle = {
-  leftLabelStyle: option(any),
-  leftButtonStyle: option(any),
-  rightButtonStyle: option(any),
-  titleStyle: option(any),
-  backgroundStyle: option(any),
-};
-type stackHeaderStyleInterpolator =
-  stackHeaderInterpolationProps => stackHeaderInterpolatedStyle;
-
-type insets = {
-  top: float,
-  right: float,
-  bottom: float,
-  left: float,
-};
-
-type stackCardInterpolationProps = {
-  current: stackHeaderInterpolation,
-  next: option(stackHeaderInterpolation),
-  index: int,
-  closing: animatedNode,
-  layouts,
-  insets,
-};
-type stackCardInterpolatedStyle = {
-  containerStyle: option(any),
-  cardStyle: option(any),
-  overlayStyle: option(any),
-  shadowStyle: option(any),
-};
-type stackCardStyleInterpolator =
-  stackCardInterpolationProps => stackCardInterpolatedStyle;
-
-type layoutChangeEvent;
-
-type backImageProps = {tintColor: ReactNative.Color.t};
-type backImage = backImageProps => React.element;
-type stackHeaderLeftButtonProps = {
-  disabled: option(bool),
-  onPress: option(unit => unit),
-  pressColorAndroid: option(ReactNative.Color.t),
-  backImage: option(backImage),
-  tintColor: option(ReactNative.Color.t),
-  label: option(string),
-  truncatedLabel: option(string),
-  labelVisible: option(bool),
-  labelStyle: option(ReactNative.Style.t),
-  allowFontScaling: option(bool),
-  onLabelLayout: option(layoutChangeEvent => unit),
-  screenLayout: option(layout),
-  titleLayout: option(layout),
-  canGoBack: option(bool),
-};
-
-module TransitionSpec = {
-  type t;
-  type springConfig = {
-    damping: int,
-    mass: int,
-    stiffness: int,
-    restSpeedThreshold: int,
-    restDisplacementThreshold: int,
-    overshootClamping: bool,
-  };
-  [@bs.obj]
-  external spring: (~animation: [ | `spring], ~config: springConfig) => t;
-
-  type timingConfig = {
-    duration: int,
-    easing: ReactNative.Easing.t,
-  };
-
-  [@bs.obj]
-  external timing: (~animation: [ | `timing], ~config: timingConfig) => t;
-};
-
-type transitionSpec = {
-  [@bs.as "open"]
-  open_: TransitionSpec.t,
-  close: TransitionSpec.t,
-};
-
-module StackNavigationScreenProp = (M: {
-                                      type params;
-                                      type options;
-                                    }) => {
-  include NavigationScreenProp(M);
-
-  type t = navigation;
-
-  [@bs.send] external push: (t, string) => unit = "push";
-  [@bs.send] external pushWithParams: (t, string, M.params) => unit = "push";
-
-  [@bs.send] external pop: (t, ~count: int=?, unit) => unit = "pop";
-
-  [@bs.send] external popToTop: (t, unit) => unit = "popToTop";
-};
-
-module Make = (M: {type params;}) => {
-  type nonrec route = route(M.params);
-  module Navigation =
-    StackNavigationScreenProp({
-      include M;
-      type nonrec options = options;
-    });
-
-  type gestureResponseDistance;
-  [@bs.obj]
-  external gestureResponseDistance:
-    (~vertical: float=?, ~horizontal: float=?, unit) => gestureResponseDistance;
-
-  module HeaderTitle = {
-    type t;
-
-    type headerTitleProps = {
-      onLayout: layoutChangeEvent => unit,
-      allowFontScaling: option(bool),
-      style: option(ReactNative.Style.t), //textStyle
-      children: option(string),
-    };
-
-    [@bs.val] [@bs.module "./Interop"]
-    external t:
-      (
-      [@bs.unwrap]
-      [ | `String(string) | `Render(headerTitleProps => React.element)]
-      ) =>
-      t =
-      "identity";
-
-    let string = s => t(`String(s));
-    let render = x => t(`Render(x));
-  };
-
-  type mode = string; //TODO: [ | `float | `screen | `none]
-
-  module Header = {
-    type descriptor = {
-      render: unit => React.element,
-      options,
-      navigation,
-    };
-    type progress = {
-      current: animatedNode,
-      next: option(animatedNode),
-      previous: option(animatedNode),
-    };
-    type headerProps('params) = {
-      mode,
-      style: ReactNative.Style.t,
-      /* extends NavigationSceneRendererProps */
-      layout,
-      scene: scene(Core.route('params)),
-      previous: option(scene(Core.route('params))),
-      navigation,
-      styleInterpolator: stackHeaderStyleInterpolator,
-    }
-    and scene('t) = {
-      route: 't,
-      descriptor,
-      progress,
-    };
-
-    type t;
-    [@bs.val] [@bs.module "./Interop"]
-    external t:
-      (
-      [@bs.unwrap]
-      [
-        | `Render(headerProps('params) => React.element)
-        | `Null(Js.null(unit))
-      ]
-      ) =>
-      t =
-      "identity";
-
-    let render = x => t(`Render(x));
-
-    let null = t(`Null(Js.Null.empty));
-  };
-
-  type headerRightOptions = {tintColor: option(ReactNative.Color.t)};
-  type headerBackgroundOptions = {style: option(ReactNative.Style.t)};
-
-  [@bs.obj]
-  external options:
-    (
-      ~animationEnabled: bool=?,
-      ~animationTypeForReplace: [ | `push | `pop]=?,
-      ~cardOverlay: unit => React.element=?,
-      ~cardOverlayEnabled: bool=?,
-      ~cardShadowEnabled: bool=?,
-      ~cardStyle: ReactNative.Style.t=?,
-      ~cardStyleInterpolator: stackCardStyleInterpolator=?,
-      ~detachPreviousScreen: bool=?,
-      ~gestureDirection: [ | `horizontal | `vertical]=?,
-      ~gestureEnabled: bool=?,
-      ~gestureResponseDistance: gestureResponseDistance=?,
-      ~gestureVelocityImpact: float=?,
-      ~header: Header.t=?,
-      ~headerBackAccessibilityLabel: string=?,
-      ~headerBackAllowFontScaling: bool=?,
-      ~headerBackground: headerBackgroundOptions => React.element=?,
-      ~headerBackImage: backImage=?,
-      ~headerBackTitle: string=?,
-      ~headerBackTitleStyle: ReactNative.Style.t=?,
-      ~headerBackTitleVisible: bool=?,
-      ~headerLeft: stackHeaderLeftButtonProps => React.element=?,
-      ~headerLeftContainerStyle: ReactNative.Style.t=?,
-      ~headerPressColorAndroid: ReactNative.Color.t=?,
-      ~headerRight: headerRightOptions => React.element=?,
-      ~headerRightContainerStyle: ReactNative.Style.t=?,
-      ~headerShown: bool=?,
-      ~headerStatusBarHeight: ReactNative.Style.size=?,
-      ~headerStyle: ReactNative.Style.t=?,
-      ~headerStyleInterpolator: stackHeaderStyleInterpolator=?,
-      ~headerTintColor: ReactNative.Color.t=?,
-      ~headerTitle: HeaderTitle.t=?,
-      ~headerTitleAlign: [ | `left | `center]=?,
-      ~headerTitleAllowFontScaling: bool=?,
-      ~headerTitleContainerStyle: ReactNative.Style.t=?,
-      ~headerTitleStyle: ReactNative.Style.t=?,
-      ~headerTransparent: bool=?,
-      ~headerTruncatedBackTitle: string=?,
-      ~safeAreaInsets: safeAreaInsets=?,
-      ~title: string=?,
-      ~transitionSpec: transitionSpec=?,
-      unit
-    ) =>
-    options;
-  type optionsProps = {
-    navigation,
-    route,
-  };
-  type optionsCallback = optionsProps => options;
-
-  type navigatorProps = {
-    initialRouteName: option(string),
-    screenOptions: option(optionsCallback),
-    mode: option(string),
-    headerMode: option(string),
-    keyboardHandlingEnabled: option(bool),
-  };
-  type renderCallbackProp = {
-    navigation,
-    route,
-  };
-  type screenProps('params) = {
-    name: string,
-    options: option(optionsCallback),
-    initialParams: option('params),
-    component:
-      option(
-        React.component({
-          .
-          "navigation": navigation,
-          "route": route,
-        }),
-      ),
-    children: option(renderCallbackProp => React.element),
-  };
-
-  [@bs.module "@react-navigation/stack"]
-  external make:
-    unit =>
-    {
-      .
-      "Navigator": navigatorProps => React.element,
-      "Screen": screenProps(M.params) => React.element,
-    } =
-    "createStackNavigator";
-
-  let stack = make();
-  module ScreenWithCallback = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~children: renderCallbackProp => React.element,
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-    let make = stack##"Screen";
-  };
-  module Screen = {
-    type componentProps = {navigation};
-    [@bs.obj]
-    external makeProps:
-      (
-        ~name: string,
-        ~options: optionsCallback=?,
-        ~initialParams: M.params=?,
-        ~component: React.component({
-                      .
-                      "navigation": navigation,
-                      "route": route,
-                    }),
-        ~key: string=?,
-        unit
-      ) =>
-      screenProps(M.params);
-
-    let make = stack##"Screen";
-  };
-
-  module Navigator = {
-    [@bs.obj]
-    external makeProps:
-      (
-        ~initialRouteName: string=?,
-        ~screenOptions: optionsCallback=?,
-        ~mode: [ | `card | `modal]=?,
-        ~headerMode: [ | `float | `screen | `none]=?,
-        ~keyboardHandlingEnabled: bool=?,
-        ~children: React.element,
-        ~key: string=?,
-        unit
-      ) =>
-      navigatorProps;
-
-    let make = stack##"Navigator";
-  };
-};
-
-module TransitionSpecs = {
-  /* Exact values from UINavigationController's animation configuration */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionSpecs"]
-  external transitionIOSSpec: transitionSpec = "TransitionIOSSpec";
-  /* Configuration for activity open animation from Android Nougat */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionSpecs"]
-  external fadeInFromBottomAndroidSpec: transitionSpec =
-    "FadeInFromBottomAndroidSpec";
-  /* Configuration for activity close animation from Android Nougat */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionSpecs"]
-  external fadeOutToBottomAndroidSpec: transitionSpec =
-    "FadeOutToBottomAndroidSpec";
-  /* Approximate configuration for activity open animation from Android Pie */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionSpecs"]
-  external revealFromBottomAndroidSpec: transitionSpec =
-    "RevealFromBottomAndroidSpec";
-};
-
-module CardStyleInterpolators = {
-  /* Standard iOS-style slide in from the right */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "CardStyleInterpolators"]
-  external forHorizontalIOS: stackCardStyleInterpolator = "forHorizontalIOS";
-  /* Standard iOS-style slide in from the bottom (used for modals) */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "CardStyleInterpolators"]
-  external forVerticalIOS: stackCardStyleInterpolator = "forVerticalIOS";
-  /* Standard iOS-style modal animation in iOS 13 */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "CardStyleInterpolators"]
-  external forModalPresentationIOS: stackCardStyleInterpolator =
-    "forModalPresentationIOS";
-  /* Standard Android-style fade in from the bottom for Android Oreo */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "CardStyleInterpolators"]
-  external forFadeFromBottomAndroid: stackCardStyleInterpolator =
-    "forFadeFromBottomAndroid";
-  /* Standard Android-style reveal from the bottom for Android Pie */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "CardStyleInterpolators"]
-  external forRevealFromBottomAndroid: stackCardStyleInterpolator =
-    "forRevealFromBottomAndroid";
-};
-
-module HeaderStyleInterpolators = {
-  /* Standard UIKit style animation for the header where the title fades into the back button label */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "HeaderStyleInterpolators"]
-  external forUIKit: stackHeaderStyleInterpolator = "forUIKit";
-  /* Simple fade animation for the header elements */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "HeaderStyleInterpolators"]
-  external forFade: stackHeaderStyleInterpolator = "forFade";
-  /* Simple translate animation to translate the header along with the sliding screen */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "HeaderStyleInterpolators"]
-  external forStatic: stackHeaderStyleInterpolator = "forStatic";
-};
-
-module TransitionPresets = {
-  /* Standard iOS navigation transition. */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external slideFromRightIOS: options = "SlideFromRightIOS";
-
-  /* Standard iOS navigation transition for modals. */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external modalSlideFromBottomIOS: options = "ModalSlideFromBottomIOS";
-
-  /* Standard iOS modal presentation style (introduced in iOS 13). */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external modalPresentationIOS: options = "ModalPresentationIOS";
-
-  /* Standard Android navigation transition when opening or closing an Activity on Android < 9 (Oreo). */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external fadeFromBottomAndroid: options = "FadeFromBottomAndroid";
-
-  /* Standard Android navigation transition when opening or closing an Activity on Android >= 9 (Pie). */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external revealFromBottomAndroid: options = "RevealFromBottomAndroid";
-
-  /* Standard Android navigation transition when opening or closing an Activity on Android >= 10 */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external scaleFromCenterAndroid: options = "ScaleFromCenterAndroid";
-
-  /* Default navigation transition for the current platform. */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external defaultTransition: options = "DefaultTransition";
-
-  /* Default modal transition for the current platform. */
-  [@bs.module "@react-navigation/stack"] [@bs.scope "TransitionPresets"]
-  external modalTransition: options = "ModalTransition";
-};
-
-[@bs.val]
-external mergeOptions: (options, options) => options = "Object.assign";
diff --git a/src/Stack.res b/src/Stack.res
new file mode 100644
index 00000000..28ab6bf5
--- /dev/null
+++ b/src/Stack.res
@@ -0,0 +1,416 @@
+open Core
+
+type options
+
+type safeAreaInsets = {
+  top: float,
+  bottom: float,
+  left: float,
+  right: float,
+}
+
+type layout = {
+  width: float,
+  height: float,
+}
+
+type layouts = {
+  screen: layout,
+  title: option<layout>,
+  leftLabel: option<layout>,
+}
+
+//TODO
+type any
+type animatedNode = ReactNative.Animated.Value.t
+type stackHeaderInterpolation = {progress: animatedNode}
+type stackHeaderInterpolationProps = {
+  current: stackHeaderInterpolation,
+  next: option<stackHeaderInterpolation>,
+  layouts: layouts,
+}
+type stackHeaderInterpolatedStyle = {
+  leftLabelStyle: option<any>,
+  leftButtonStyle: option<any>,
+  rightButtonStyle: option<any>,
+  titleStyle: option<any>,
+  backgroundStyle: option<any>,
+}
+type stackHeaderStyleInterpolator = stackHeaderInterpolationProps => stackHeaderInterpolatedStyle
+
+type insets = {
+  top: float,
+  right: float,
+  bottom: float,
+  left: float,
+}
+
+type stackCardInterpolationProps = {
+  current: stackHeaderInterpolation,
+  next: option<stackHeaderInterpolation>,
+  index: int,
+  closing: animatedNode,
+  layouts: layouts,
+  insets: insets,
+}
+type stackCardInterpolatedStyle = {
+  containerStyle: option<any>,
+  cardStyle: option<any>,
+  overlayStyle: option<any>,
+  shadowStyle: option<any>,
+}
+type stackCardStyleInterpolator = stackCardInterpolationProps => stackCardInterpolatedStyle
+
+type layoutChangeEvent
+
+type backImageProps = {tintColor: ReactNative.Color.t}
+type backImage = backImageProps => React.element
+type stackHeaderLeftButtonProps = {
+  disabled: option<bool>,
+  onPress: option<unit => unit>,
+  pressColorAndroid: option<ReactNative.Color.t>,
+  backImage: option<backImage>,
+  tintColor: option<ReactNative.Color.t>,
+  label: option<string>,
+  truncatedLabel: option<string>,
+  labelVisible: option<bool>,
+  labelStyle: option<ReactNative.Style.t>,
+  allowFontScaling: option<bool>,
+  onLabelLayout: option<layoutChangeEvent => unit>,
+  screenLayout: option<layout>,
+  titleLayout: option<layout>,
+  canGoBack: option<bool>,
+}
+
+module TransitionSpec = {
+  type t
+  type springConfig = {
+    damping: int,
+    mass: int,
+    stiffness: int,
+    restSpeedThreshold: int,
+    restDisplacementThreshold: int,
+    overshootClamping: bool,
+  }
+  @obj
+  external spring: (~animation: [#spring], ~config: springConfig) => t = ""
+
+  type timingConfig = {
+    duration: int,
+    easing: ReactNative.Easing.t,
+  }
+
+  @obj
+  external timing: (~animation: [#timing], ~config: timingConfig) => t = ""
+}
+
+type transitionSpec = {
+  @as("open")
+  open_: TransitionSpec.t,
+  close: TransitionSpec.t,
+}
+
+module StackNavigationScreenProp = (
+  M: {
+    type params
+    type options
+  },
+) => {
+  include NavigationScreenProp(M)
+
+  type t = navigation
+
+  @send external push: (t, string) => unit = "push"
+  @send external pushWithParams: (t, string, M.params) => unit = "push"
+
+  @send external pop: (t, ~count: int=?, unit) => unit = "pop"
+
+  @send external popToTop: (t, unit) => unit = "popToTop"
+}
+
+module Make = (
+  M: {
+    type params
+  },
+) => {
+  type route = route<M.params>
+  module Navigation = StackNavigationScreenProp({
+    include M
+    type options = options
+  })
+
+  type gestureResponseDistance
+  @obj
+  external gestureResponseDistance: (
+    ~vertical: float=?,
+    ~horizontal: float=?,
+    unit,
+  ) => gestureResponseDistance = ""
+
+  module HeaderTitle = {
+    type t
+
+    type headerTitleProps = {
+      onLayout: layoutChangeEvent => unit,
+      allowFontScaling: option<bool>,
+      style: option<ReactNative.Style.t>, //textStyle
+      children: option<string>,
+    }
+
+    @val @module("./Interop")
+    external t: @unwrap
+    [
+      | #String(string)
+      | #Render(headerTitleProps => React.element)
+    ] => t = "identity"
+
+    let string = s => t(#String(s))
+    let render = x => t(#Render(x))
+  }
+
+  type mode = string //TODO: [ | `float | `screen | `none]
+
+  module Header = {
+    type descriptor = {
+      render: unit => React.element,
+      options: options,
+      navigation: navigation,
+    }
+    type progress = {
+      current: animatedNode,
+      next: option<animatedNode>,
+      previous: option<animatedNode>,
+    }
+    type rec headerProps<'params> = {
+      mode: mode,
+      style: ReactNative.Style.t,
+      /* extends NavigationSceneRendererProps */
+      layout: layout,
+      scene: scene<Core.route<'params>>,
+      previous: option<scene<Core.route<'params>>>,
+      navigation: navigation,
+      styleInterpolator: stackHeaderStyleInterpolator,
+    }
+    and scene<'t> = {
+      route: 't,
+      descriptor: descriptor,
+      progress: progress,
+    }
+
+    type t
+    @val @module("./Interop")
+    external t: @unwrap
+    [
+      | #Render(headerProps<'params> => React.element)
+      | #Null(Js.null<unit>)
+    ] => t = "identity"
+
+    let render = x => t(#Render(x))
+
+    let null = t(#Null(Js.Null.empty))
+  }
+
+  type headerRightOptions = {tintColor: option<ReactNative.Color.t>}
+  type headerBackgroundOptions = {style: option<ReactNative.Style.t>}
+
+  @obj
+  external options: (
+    ~animationEnabled: bool=?,
+    ~animationTypeForReplace: [#push | #pop]=?,
+    ~cardOverlay: unit => React.element=?,
+    ~cardOverlayEnabled: bool=?,
+    ~cardShadowEnabled: bool=?,
+    ~cardStyle: ReactNative.Style.t=?,
+    ~cardStyleInterpolator: stackCardStyleInterpolator=?,
+    ~detachPreviousScreen: bool=?,
+    ~gestureDirection: [#horizontal | #vertical]=?,
+    ~gestureEnabled: bool=?,
+    ~gestureResponseDistance: gestureResponseDistance=?,
+    ~gestureVelocityImpact: float=?,
+    ~header: Header.t=?,
+    ~headerBackAccessibilityLabel: string=?,
+    ~headerBackAllowFontScaling: bool=?,
+    ~headerBackground: headerBackgroundOptions => React.element=?,
+    ~headerBackImage: backImage=?,
+    ~headerBackTitle: string=?,
+    ~headerBackTitleStyle: ReactNative.Style.t=?,
+    ~headerBackTitleVisible: bool=?,
+    ~headerLeft: stackHeaderLeftButtonProps => React.element=?,
+    ~headerLeftContainerStyle: ReactNative.Style.t=?,
+    ~headerPressColorAndroid: ReactNative.Color.t=?,
+    ~headerRight: headerRightOptions => React.element=?,
+    ~headerRightContainerStyle: ReactNative.Style.t=?,
+    ~headerShown: bool=?,
+    ~headerStatusBarHeight: ReactNative.Style.size=?,
+    ~headerStyle: ReactNative.Style.t=?,
+    ~headerStyleInterpolator: stackHeaderStyleInterpolator=?,
+    ~headerTintColor: ReactNative.Color.t=?,
+    ~headerTitle: HeaderTitle.t=?,
+    ~headerTitleAlign: [#left | #center]=?,
+    ~headerTitleAllowFontScaling: bool=?,
+    ~headerTitleContainerStyle: ReactNative.Style.t=?,
+    ~headerTitleStyle: ReactNative.Style.t=?,
+    ~headerTransparent: bool=?,
+    ~headerTruncatedBackTitle: string=?,
+    ~safeAreaInsets: safeAreaInsets=?,
+    ~title: string=?,
+    ~transitionSpec: transitionSpec=?,
+    unit,
+  ) => options = ""
+  type optionsProps = {
+    navigation: navigation,
+    route: route,
+  }
+  type optionsCallback = optionsProps => options
+
+  type navigatorProps = {
+    initialRouteName: option<string>,
+    screenOptions: option<optionsCallback>,
+    mode: option<string>,
+    headerMode: option<string>,
+    keyboardHandlingEnabled: option<bool>,
+  }
+  type renderCallbackProp = {
+    navigation: navigation,
+    route: route,
+  }
+  type screenProps<'params> = {
+    name: string,
+    options: option<optionsCallback>,
+    initialParams: option<'params>,
+    component: option<React.component<{"navigation": navigation, "route": route}>>,
+    children: option<renderCallbackProp => React.element>,
+  }
+
+  @module("@react-navigation/stack")
+  external make: unit => {
+    "Navigator": navigatorProps => React.element,
+    "Screen": screenProps<M.params> => React.element,
+  } = "createStackNavigator"
+
+  let stack = make()
+  module ScreenWithCallback = {
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~children: renderCallbackProp => React.element,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+    let make = stack["Screen"]
+  }
+  module Screen = {
+    type componentProps = {navigation: navigation}
+    @obj
+    external makeProps: (
+      ~name: string,
+      ~options: optionsCallback=?,
+      ~initialParams: M.params=?,
+      ~component: React.component<{"navigation": navigation, "route": route}>,
+      ~key: string=?,
+      unit,
+    ) => screenProps<M.params> = ""
+
+    let make = stack["Screen"]
+  }
+
+  module Navigator = {
+    @obj
+    external makeProps: (
+      ~initialRouteName: string=?,
+      ~screenOptions: optionsCallback=?,
+      ~mode: [#card | #modal]=?,
+      ~headerMode: [#float | #screen | #none]=?,
+      ~keyboardHandlingEnabled: bool=?,
+      ~children: React.element,
+      ~key: string=?,
+      unit,
+    ) => navigatorProps = ""
+
+    let make = stack["Navigator"]
+  }
+}
+
+module TransitionSpecs = {
+  /* Exact values from UINavigationController's animation configuration */
+  @module("@react-navigation/stack") @scope("TransitionSpecs")
+  external transitionIOSSpec: transitionSpec = "TransitionIOSSpec"
+  /* Configuration for activity open animation from Android Nougat */
+  @module("@react-navigation/stack") @scope("TransitionSpecs")
+  external fadeInFromBottomAndroidSpec: transitionSpec = "FadeInFromBottomAndroidSpec"
+  /* Configuration for activity close animation from Android Nougat */
+  @module("@react-navigation/stack") @scope("TransitionSpecs")
+  external fadeOutToBottomAndroidSpec: transitionSpec = "FadeOutToBottomAndroidSpec"
+  /* Approximate configuration for activity open animation from Android Pie */
+  @module("@react-navigation/stack") @scope("TransitionSpecs")
+  external revealFromBottomAndroidSpec: transitionSpec = "RevealFromBottomAndroidSpec"
+}
+
+module CardStyleInterpolators = {
+  /* Standard iOS-style slide in from the right */
+  @module("@react-navigation/stack") @scope("CardStyleInterpolators")
+  external forHorizontalIOS: stackCardStyleInterpolator = "forHorizontalIOS"
+  /* Standard iOS-style slide in from the bottom (used for modals) */
+  @module("@react-navigation/stack") @scope("CardStyleInterpolators")
+  external forVerticalIOS: stackCardStyleInterpolator = "forVerticalIOS"
+  /* Standard iOS-style modal animation in iOS 13 */
+  @module("@react-navigation/stack") @scope("CardStyleInterpolators")
+  external forModalPresentationIOS: stackCardStyleInterpolator = "forModalPresentationIOS"
+  /* Standard Android-style fade in from the bottom for Android Oreo */
+  @module("@react-navigation/stack") @scope("CardStyleInterpolators")
+  external forFadeFromBottomAndroid: stackCardStyleInterpolator = "forFadeFromBottomAndroid"
+  /* Standard Android-style reveal from the bottom for Android Pie */
+  @module("@react-navigation/stack") @scope("CardStyleInterpolators")
+  external forRevealFromBottomAndroid: stackCardStyleInterpolator = "forRevealFromBottomAndroid"
+}
+
+module HeaderStyleInterpolators = {
+  /* Standard UIKit style animation for the header where the title fades into the back button label */
+  @module("@react-navigation/stack") @scope("HeaderStyleInterpolators")
+  external forUIKit: stackHeaderStyleInterpolator = "forUIKit"
+  /* Simple fade animation for the header elements */
+  @module("@react-navigation/stack") @scope("HeaderStyleInterpolators")
+  external forFade: stackHeaderStyleInterpolator = "forFade"
+  /* Simple translate animation to translate the header along with the sliding screen */
+  @module("@react-navigation/stack") @scope("HeaderStyleInterpolators")
+  external forStatic: stackHeaderStyleInterpolator = "forStatic"
+}
+
+module TransitionPresets = {
+  /* Standard iOS navigation transition. */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external slideFromRightIOS: options = "SlideFromRightIOS"
+
+  /* Standard iOS navigation transition for modals. */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external modalSlideFromBottomIOS: options = "ModalSlideFromBottomIOS"
+
+  /* Standard iOS modal presentation style (introduced in iOS 13). */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external modalPresentationIOS: options = "ModalPresentationIOS"
+
+  /* Standard Android navigation transition when opening or closing an Activity on Android < 9 (Oreo). */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external fadeFromBottomAndroid: options = "FadeFromBottomAndroid"
+
+  /* Standard Android navigation transition when opening or closing an Activity on Android >= 9 (Pie). */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external revealFromBottomAndroid: options = "RevealFromBottomAndroid"
+
+  /* Standard Android navigation transition when opening or closing an Activity on Android >= 10 */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external scaleFromCenterAndroid: options = "ScaleFromCenterAndroid"
+
+  /* Default navigation transition for the current platform. */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external defaultTransition: options = "DefaultTransition"
+
+  /* Default modal transition for the current platform. */
+  @module("@react-navigation/stack") @scope("TransitionPresets")
+  external modalTransition: options = "ModalTransition"
+}
+
+@val
+external mergeOptions: (options, options) => options = "Object.assign"
diff --git a/yarn.lock b/yarn.lock
index 49edb77e..8530a54b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -256,11 +256,6 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-bs-platform@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-9.0.2.tgz#a6eac70eb8924a322556dacaccbfbc9b2a0d3a37"
-  integrity sha512-Ye9JqJ4Oa7mcjjoOVRYI8Uc2Cf8N7jQLWDcdUplY7996d/YErSR7WitmV7XnSwr4EvdrbwjEsg1NxNjUQv3ChA==
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1119,6 +1114,11 @@ rescript-react-native@^0.64.3:
   resolved "https://registry.yarnpkg.com/rescript-react-native/-/rescript-react-native-0.64.3.tgz#8fd11a2681cfdd65c02f0ff620186e5adf0c6854"
   integrity sha512-PjGDkV3RYiCTk4hCZyaKtZJV69By0AmJuzWyuHZONdeCB0q3DwjVJtA73gu6+jBrdl0OWon6UdXaVRXhhR47cQ==
 
+rescript@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/rescript/-/rescript-9.1.2.tgz#a81f8a735f1a7006233bfc72eb081ca7182a0d79"
+  integrity sha512-4wHvTDv3nyYnAPJHcg1RGG8z7u3HDiBf6RN3P/dITDv859Qo35aKOzJWQtfBzbAs0EKNafLqei3TnUqiAv6BwQ==
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"