diff --git a/ios/Pepo2/AppDelegate.m b/ios/Pepo2/AppDelegate.m
index 18fde448..0920b269 100644
--- a/ios/Pepo2/AppDelegate.m
+++ b/ios/Pepo2/AppDelegate.m
@@ -21,6 +21,8 @@
 #import "React/RCTLinkingManager.h"
 
 static NSString *const CUSTOM_URL_SCHEME = @"com.pepo.staging";
+//static NSString *const CUSTOM_URL_SCHEME = @"com.pepo.v2.sandbox";
+//static NSString *const CUSTOM_URL_SCHEME = @"com.pepo.v2.production";
 
 @implementation AppDelegate
 
diff --git a/ios/Pepo2/Entitlements/com.pepo.staging-Pepo2.entitlements b/ios/Pepo2/Entitlements/com.pepo.staging-Pepo2.entitlements
index 2d38fff7..956a0e32 100644
--- a/ios/Pepo2/Entitlements/com.pepo.staging-Pepo2.entitlements
+++ b/ios/Pepo2/Entitlements/com.pepo.staging-Pepo2.entitlements
@@ -7,6 +7,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:stagingpepo.com</string>
+		<string>applinks:app.stagingpepo.com</string>
 	</array>
 </dict>
 </plist>
diff --git a/ios/Pepo2/Entitlements/com.pepo.v2.production-Pepo2.entitlements b/ios/Pepo2/Entitlements/com.pepo.v2.production-Pepo2.entitlements
index 46b1d6d9..ae86005a 100644
--- a/ios/Pepo2/Entitlements/com.pepo.v2.production-Pepo2.entitlements
+++ b/ios/Pepo2/Entitlements/com.pepo.v2.production-Pepo2.entitlements
@@ -7,6 +7,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:pepo.com</string>
+		<string>applinks:app.pepo.com</string>
 	</array>
 </dict>
 </plist>
diff --git a/ios/Pepo2/Entitlements/com.pepo.v2.sandbox-Pepo2.entitlements b/ios/Pepo2/Entitlements/com.pepo.v2.sandbox-Pepo2.entitlements
index 631ce7f3..18afb298 100644
--- a/ios/Pepo2/Entitlements/com.pepo.v2.sandbox-Pepo2.entitlements
+++ b/ios/Pepo2/Entitlements/com.pepo.v2.sandbox-Pepo2.entitlements
@@ -7,6 +7,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:sandboxpepo.com</string>
+		<string>applinks:app.sandboxpepo.com</string>
 	</array>
 </dict>
 </plist>
diff --git a/ios/Pepo2/InfoPlist/com.pepo.staging-Info.plist b/ios/Pepo2/InfoPlist/com.pepo.staging-Info.plist
index 7df5e807..c3d8cc3b 100644
--- a/ios/Pepo2/InfoPlist/com.pepo.staging-Info.plist
+++ b/ios/Pepo2/InfoPlist/com.pepo.staging-Info.plist
@@ -1,144 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Pepo Staging</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>en</string>
+		<key>CFBundleDisplayName</key>
+		<string>Pepo Staging</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>$(PRODUCT_NAME)</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>0.9.4</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>twitterkit-NEo4gEXzdQZaoTsqzpZvepfKb</string>
+				</array>
+			</dict>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>com.pepo.staging</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>com.pepo.staging</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>18</string>
+		<key>Fabric</key>
 		<dict>
-			<key>CFBundleURLSchemes</key>
+			<key>APIKey</key>
+			<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
+			<key>Kits</key>
 			<array>
-				<string>twitterkit-NEo4gEXzdQZaoTsqzpZvepfKb</string>
+				<dict>
+					<key>KitInfo</key>
+					<dict/>
+					<key>KitName</key>
+					<string>Crashlytics</string>
+				</dict>
 			</array>
 		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>18</string>
-	<key>Fabric</key>
-	<dict>
-		<key>APIKey</key>
-		<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
-		<key>Kits</key>
+		<key>FirebaseAppDelegateProxyEnabled</key>
+		<true/>
+		<key>FirebaseDynamicLinksCustomDomains</key>
 		<array>
-			<dict>
-				<key>KitInfo</key>
-				<dict/>
-				<key>KitName</key>
-				<string>Crashlytics</string>
-			</dict>
+			<string>https://app.stagingpepo.com/</string>
 		</array>
-	</dict>
-	<key>FirebaseAppDelegateProxyEnabled</key>
-	<true/>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>twitter</string>
-		<string>twitterauth</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
+		<key>LSApplicationQueriesSchemes</key>
+		<array>
+			<string>twitter</string>
+			<string>twitterauth</string>
+		</array>
+		<key>LSRequiresIPhoneOS</key>
 		<true/>
-		<key>NSExceptionDomains</key>
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>localhost</key>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+				</dict>
 			</dict>
 		</dict>
+		<key>NSAppleMusicUsageDescription</key>
+		<string>Application uses apple music</string>
+		<key>NSBluetoothAlwaysUsageDescription</key>
+		<string>Application uses bluetooth</string>
+		<key>NSBluetoothPeripheralUsageDescription</key>
+		<string>Application users bluetooth</string>
+		<key>NSCalendarsUsageDescription</key>
+		<string>Application uses calender</string>
+		<key>NSCameraUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Applications uses Face ID to verify your identity</string>
+		<key>NSLocationAlwaysUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSMotionUsageDescription</key>
+		<string>Application uses accelerometer</string>
+		<key>NSPhotoLibraryAddUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSSpeechRecognitionUsageDescription</key>
+		<string>Application uses speech recognition</string>
+		<key>UIAppFonts</key>
+		<array>
+			<string>Lato-Black.ttf</string>
+			<string>Lato-BlackItalic.ttf</string>
+			<string>Lato-Bold.ttf</string>
+			<string>Lato-BoldItalic.ttf</string>
+			<string>Lato-Hairline.ttf</string>
+			<string>Lato-HairlineItalic.ttf</string>
+			<string>Lato-Italic.ttf</string>
+			<string>Lato-Light.ttf</string>
+			<string>Lato-LightItalic.ttf</string>
+			<string>Lato-Regular.ttf</string>
+			<string>AntDesign.ttf</string>
+			<string>Entypo.ttf</string>
+			<string>EvilIcons.ttf</string>
+			<string>Feather.ttf</string>
+			<string>FontAwesome.ttf</string>
+			<string>FontAwesome5_Brands.ttf</string>
+			<string>FontAwesome5_Regular.ttf</string>
+			<string>FontAwesome5_Solid.ttf</string>
+			<string>Foundation.ttf</string>
+			<string>Ionicons.ttf</string>
+			<string>MaterialCommunityIcons.ttf</string>
+			<string>MaterialIcons.ttf</string>
+			<string>Octicons.ttf</string>
+			<string>Roboto_medium.ttf</string>
+			<string>Roboto.ttf</string>
+			<string>rubicon-icon-font.ttf</string>
+			<string>SimpleLineIcons.ttf</string>
+			<string>Zocial.ttf</string>
+		</array>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>remote-notification</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIRequiredDeviceCapabilities</key>
+		<array>
+			<string>armv7</string>
+		</array>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
 	</dict>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>Application uses apple music</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Application uses bluetooth</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Application users bluetooth</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Application uses calender</string>
-	<key>NSCameraUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Applications uses Face ID to verify your identity</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSMotionUsageDescription</key>
-	<string>Application uses accelerometer</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>Application uses speech recognition</string>
-	<key>UIAppFonts</key>
-	<array>
-		<string>Lato-Black.ttf</string>
-		<string>Lato-BlackItalic.ttf</string>
-		<string>Lato-Bold.ttf</string>
-		<string>Lato-BoldItalic.ttf</string>
-		<string>Lato-Hairline.ttf</string>
-		<string>Lato-HairlineItalic.ttf</string>
-		<string>Lato-Italic.ttf</string>
-		<string>Lato-Light.ttf</string>
-		<string>Lato-LightItalic.ttf</string>
-		<string>Lato-Regular.ttf</string>
-		<string>AntDesign.ttf</string>
-		<string>Entypo.ttf</string>
-		<string>EvilIcons.ttf</string>
-		<string>Feather.ttf</string>
-		<string>FontAwesome.ttf</string>
-		<string>FontAwesome5_Brands.ttf</string>
-		<string>FontAwesome5_Regular.ttf</string>
-		<string>FontAwesome5_Solid.ttf</string>
-		<string>Foundation.ttf</string>
-		<string>Ionicons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>MaterialIcons.ttf</string>
-		<string>Octicons.ttf</string>
-		<string>Roboto_medium.ttf</string>
-		<string>Roboto.ttf</string>
-		<string>rubicon-icon-font.ttf</string>
-		<string>SimpleLineIcons.ttf</string>
-		<string>Zocial.ttf</string>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>remote-notification</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
 </plist>
diff --git a/ios/Pepo2/InfoPlist/com.pepo.v2.production-Info.plist b/ios/Pepo2/InfoPlist/com.pepo.v2.production-Info.plist
index d64ca3c4..5eb9a910 100644
--- a/ios/Pepo2/InfoPlist/com.pepo.v2.production-Info.plist
+++ b/ios/Pepo2/InfoPlist/com.pepo.v2.production-Info.plist
@@ -1,144 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Pepo</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>en</string>
+		<key>CFBundleDisplayName</key>
+		<string>Pepo</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>$(PRODUCT_NAME)</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>0.9.4</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>twitterkit-53Q0hHEe4Hhartej9lFVWZX4C</string>
+				</array>
+			</dict>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>com.pepo.v2.production</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>com.pepo.v2.production</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>18</string>
+		<key>Fabric</key>
 		<dict>
-			<key>CFBundleURLSchemes</key>
+			<key>APIKey</key>
+			<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
+			<key>Kits</key>
 			<array>
-				<string>twitterkit-53Q0hHEe4Hhartej9lFVWZX4C</string>
+				<dict>
+					<key>KitInfo</key>
+					<dict/>
+					<key>KitName</key>
+					<string>Crashlytics</string>
+				</dict>
 			</array>
 		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>18</string>
-	<key>Fabric</key>
-	<dict>
-		<key>APIKey</key>
-		<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
-		<key>Kits</key>
+		<key>FirebaseAppDelegateProxyEnabled</key>
+		<true/>
+		<key>FirebaseDynamicLinksCustomDomains</key>
 		<array>
-			<dict>
-				<key>KitInfo</key>
-				<dict/>
-				<key>KitName</key>
-				<string>Crashlytics</string>
-			</dict>
+			<string>https://app.pepo.com/</string>
 		</array>
-	</dict>
-	<key>FirebaseAppDelegateProxyEnabled</key>
-	<true/>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>twitter</string>
-		<string>twitterauth</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
+		<key>LSApplicationQueriesSchemes</key>
+		<array>
+			<string>twitter</string>
+			<string>twitterauth</string>
+		</array>
+		<key>LSRequiresIPhoneOS</key>
 		<true/>
-		<key>NSExceptionDomains</key>
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>localhost</key>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+				</dict>
 			</dict>
 		</dict>
+		<key>NSAppleMusicUsageDescription</key>
+		<string>Application uses apple music</string>
+		<key>NSBluetoothAlwaysUsageDescription</key>
+		<string>Application uses bluetooth</string>
+		<key>NSBluetoothPeripheralUsageDescription</key>
+		<string>Application users bluetooth</string>
+		<key>NSCalendarsUsageDescription</key>
+		<string>Application uses calender</string>
+		<key>NSCameraUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Applications uses Face ID to verify your identity</string>
+		<key>NSLocationAlwaysUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSMotionUsageDescription</key>
+		<string>Application uses accelerometer</string>
+		<key>NSPhotoLibraryAddUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSSpeechRecognitionUsageDescription</key>
+		<string>Application uses speech recognition</string>
+		<key>UIAppFonts</key>
+		<array>
+			<string>Lato-Black.ttf</string>
+			<string>Lato-BlackItalic.ttf</string>
+			<string>Lato-Bold.ttf</string>
+			<string>Lato-BoldItalic.ttf</string>
+			<string>Lato-Hairline.ttf</string>
+			<string>Lato-HairlineItalic.ttf</string>
+			<string>Lato-Italic.ttf</string>
+			<string>Lato-Light.ttf</string>
+			<string>Lato-LightItalic.ttf</string>
+			<string>Lato-Regular.ttf</string>
+			<string>AntDesign.ttf</string>
+			<string>Entypo.ttf</string>
+			<string>EvilIcons.ttf</string>
+			<string>Feather.ttf</string>
+			<string>FontAwesome.ttf</string>
+			<string>FontAwesome5_Brands.ttf</string>
+			<string>FontAwesome5_Regular.ttf</string>
+			<string>FontAwesome5_Solid.ttf</string>
+			<string>Foundation.ttf</string>
+			<string>Ionicons.ttf</string>
+			<string>MaterialCommunityIcons.ttf</string>
+			<string>MaterialIcons.ttf</string>
+			<string>Octicons.ttf</string>
+			<string>Roboto_medium.ttf</string>
+			<string>Roboto.ttf</string>
+			<string>rubicon-icon-font.ttf</string>
+			<string>SimpleLineIcons.ttf</string>
+			<string>Zocial.ttf</string>
+		</array>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>remote-notification</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIRequiredDeviceCapabilities</key>
+		<array>
+			<string>armv7</string>
+		</array>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
 	</dict>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>Application uses apple music</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Application uses bluetooth</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Application users bluetooth</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Application uses calender</string>
-	<key>NSCameraUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Applications uses Face ID to verify your identity</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSMotionUsageDescription</key>
-	<string>Application uses accelerometer</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>Application uses speech recognition</string>
-	<key>UIAppFonts</key>
-	<array>
-		<string>Lato-Black.ttf</string>
-		<string>Lato-BlackItalic.ttf</string>
-		<string>Lato-Bold.ttf</string>
-		<string>Lato-BoldItalic.ttf</string>
-		<string>Lato-Hairline.ttf</string>
-		<string>Lato-HairlineItalic.ttf</string>
-		<string>Lato-Italic.ttf</string>
-		<string>Lato-Light.ttf</string>
-		<string>Lato-LightItalic.ttf</string>
-		<string>Lato-Regular.ttf</string>
-		<string>AntDesign.ttf</string>
-		<string>Entypo.ttf</string>
-		<string>EvilIcons.ttf</string>
-		<string>Feather.ttf</string>
-		<string>FontAwesome.ttf</string>
-		<string>FontAwesome5_Brands.ttf</string>
-		<string>FontAwesome5_Regular.ttf</string>
-		<string>FontAwesome5_Solid.ttf</string>
-		<string>Foundation.ttf</string>
-		<string>Ionicons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>MaterialIcons.ttf</string>
-		<string>Octicons.ttf</string>
-		<string>Roboto_medium.ttf</string>
-		<string>Roboto.ttf</string>
-		<string>rubicon-icon-font.ttf</string>
-		<string>SimpleLineIcons.ttf</string>
-		<string>Zocial.ttf</string>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>remote-notification</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
 </plist>
diff --git a/ios/Pepo2/InfoPlist/com.pepo.v2.sandbox-Info.plist b/ios/Pepo2/InfoPlist/com.pepo.v2.sandbox-Info.plist
index f2b1330e..2f796fda 100644
--- a/ios/Pepo2/InfoPlist/com.pepo.v2.sandbox-Info.plist
+++ b/ios/Pepo2/InfoPlist/com.pepo.v2.sandbox-Info.plist
@@ -1,144 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Pepo Sandbox</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>en</string>
+		<key>CFBundleDisplayName</key>
+		<string>Pepo Sandbox</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>$(PRODUCT_NAME)</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>0.9.4</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>twitterkit-qqc45NF23dhKRuNbfsdnHGEkI</string>
+				</array>
+			</dict>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>com.pepo.v2.sandbox</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>com.pepo.v2.sandbox</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>18</string>
+		<key>Fabric</key>
 		<dict>
-			<key>CFBundleURLSchemes</key>
+			<key>APIKey</key>
+			<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
+			<key>Kits</key>
 			<array>
-				<string>twitterkit-qqc45NF23dhKRuNbfsdnHGEkI</string>
+				<dict>
+					<key>KitInfo</key>
+					<dict/>
+					<key>KitName</key>
+					<string>Crashlytics</string>
+				</dict>
 			</array>
 		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>18</string>
-	<key>Fabric</key>
-	<dict>
-		<key>APIKey</key>
-		<string>e500ef3e75c9fb12689f830748bd17e7bfae62a5</string>
-		<key>Kits</key>
+		<key>FirebaseAppDelegateProxyEnabled</key>
+		<true/>
+		<key>FirebaseDynamicLinksCustomDomains</key>
 		<array>
-			<dict>
-				<key>KitInfo</key>
-				<dict/>
-				<key>KitName</key>
-				<string>Crashlytics</string>
-			</dict>
+			<string>https://app.sandboxpepo.com/</string>
 		</array>
-	</dict>
-	<key>FirebaseAppDelegateProxyEnabled</key>
-	<true/>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>twitter</string>
-		<string>twitterauth</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
+		<key>LSApplicationQueriesSchemes</key>
+		<array>
+			<string>twitter</string>
+			<string>twitterauth</string>
+		</array>
+		<key>LSRequiresIPhoneOS</key>
 		<true/>
-		<key>NSExceptionDomains</key>
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>localhost</key>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+				</dict>
 			</dict>
 		</dict>
+		<key>NSAppleMusicUsageDescription</key>
+		<string>Application uses apple music</string>
+		<key>NSBluetoothAlwaysUsageDescription</key>
+		<string>Application uses bluetooth</string>
+		<key>NSBluetoothPeripheralUsageDescription</key>
+		<string>Application users bluetooth</string>
+		<key>NSCalendarsUsageDescription</key>
+		<string>Application uses calender</string>
+		<key>NSCameraUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Applications uses Face ID to verify your identity</string>
+		<key>NSLocationAlwaysUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Application uses location</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>The app allows you to record and share 30 second video updates.</string>
+		<key>NSMotionUsageDescription</key>
+		<string>Application uses accelerometer</string>
+		<key>NSPhotoLibraryAddUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Please allow access to photo library to select your profile picture</string>
+		<key>NSSpeechRecognitionUsageDescription</key>
+		<string>Application uses speech recognition</string>
+		<key>UIAppFonts</key>
+		<array>
+			<string>Lato-Black.ttf</string>
+			<string>Lato-BlackItalic.ttf</string>
+			<string>Lato-Bold.ttf</string>
+			<string>Lato-BoldItalic.ttf</string>
+			<string>Lato-Hairline.ttf</string>
+			<string>Lato-HairlineItalic.ttf</string>
+			<string>Lato-Italic.ttf</string>
+			<string>Lato-Light.ttf</string>
+			<string>Lato-LightItalic.ttf</string>
+			<string>Lato-Regular.ttf</string>
+			<string>AntDesign.ttf</string>
+			<string>Entypo.ttf</string>
+			<string>EvilIcons.ttf</string>
+			<string>Feather.ttf</string>
+			<string>FontAwesome.ttf</string>
+			<string>FontAwesome5_Brands.ttf</string>
+			<string>FontAwesome5_Regular.ttf</string>
+			<string>FontAwesome5_Solid.ttf</string>
+			<string>Foundation.ttf</string>
+			<string>Ionicons.ttf</string>
+			<string>MaterialCommunityIcons.ttf</string>
+			<string>MaterialIcons.ttf</string>
+			<string>Octicons.ttf</string>
+			<string>Roboto_medium.ttf</string>
+			<string>Roboto.ttf</string>
+			<string>rubicon-icon-font.ttf</string>
+			<string>SimpleLineIcons.ttf</string>
+			<string>Zocial.ttf</string>
+		</array>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>remote-notification</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIRequiredDeviceCapabilities</key>
+		<array>
+			<string>armv7</string>
+		</array>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
 	</dict>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>Application uses apple music</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Application uses bluetooth</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Application users bluetooth</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Application uses calender</string>
-	<key>NSCameraUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Applications uses Face ID to verify your identity</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Application uses location</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>The app allows you to record and share 30 second video updates.</string>
-	<key>NSMotionUsageDescription</key>
-	<string>Application uses accelerometer</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Please allow access to photo library to select your profile picture</string>
-	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>Application uses speech recognition</string>
-	<key>UIAppFonts</key>
-	<array>
-		<string>Lato-Black.ttf</string>
-		<string>Lato-BlackItalic.ttf</string>
-		<string>Lato-Bold.ttf</string>
-		<string>Lato-BoldItalic.ttf</string>
-		<string>Lato-Hairline.ttf</string>
-		<string>Lato-HairlineItalic.ttf</string>
-		<string>Lato-Italic.ttf</string>
-		<string>Lato-Light.ttf</string>
-		<string>Lato-LightItalic.ttf</string>
-		<string>Lato-Regular.ttf</string>
-		<string>AntDesign.ttf</string>
-		<string>Entypo.ttf</string>
-		<string>EvilIcons.ttf</string>
-		<string>Feather.ttf</string>
-		<string>FontAwesome.ttf</string>
-		<string>FontAwesome5_Brands.ttf</string>
-		<string>FontAwesome5_Regular.ttf</string>
-		<string>FontAwesome5_Solid.ttf</string>
-		<string>Foundation.ttf</string>
-		<string>Ionicons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>MaterialIcons.ttf</string>
-		<string>Octicons.ttf</string>
-		<string>Roboto_medium.ttf</string>
-		<string>Roboto.ttf</string>
-		<string>rubicon-icon-font.ttf</string>
-		<string>SimpleLineIcons.ttf</string>
-		<string>Zocial.ttf</string>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>remote-notification</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
 </plist>