diff --git a/src/App/App.csproj b/src/App/App.csproj
index 5b4ede89f..402a4c815 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Xam.Plugin.Connectivity" Version="3.0.3" />
     <PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" />
-    <PackageReference Include="Xamarin.Forms" Version="2.3.4.267" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" />
     <PackageReference Include="XLabs.IoC" Version="2.0.5782" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" />
   </ItemGroup>
diff --git a/src/App/Controls/ExtendedTableView.cs b/src/App/Controls/ExtendedTableView.cs
index 42a954208..85dd30399 100644
--- a/src/App/Controls/ExtendedTableView.cs
+++ b/src/App/Controls/ExtendedTableView.cs
@@ -43,7 +43,7 @@ namespace Bit.App.Controls
 
         protected override SizeRequest OnSizeRequest(double widthConstraint, double heightConstraint)
         {
-            if(!VerticalOptions.Expands && Device.RuntimePlatform != Device.Windows)
+            if(!VerticalOptions.Expands && Device.RuntimePlatform != Device.UWP)
             {
                 var reflectionService = Resolver.Resolve<IReflectionService>();
                 var baseBaseOnSizeRequest = reflectionService.GetVisualElementOnSizeRequest(this);
diff --git a/src/App/Pages/ScanPage.cs b/src/App/Pages/ScanPage.cs
index a3cd92fda..2e8b8c784 100644
--- a/src/App/Pages/ScanPage.cs
+++ b/src/App/Pages/ScanPage.cs
@@ -68,7 +68,7 @@ namespace Bit.App.Pages
                 Children = { _zxing, _overlay }
             };
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/App/Pages/Settings/SettingsAboutPage.cs b/src/App/Pages/Settings/SettingsAboutPage.cs
index 2eb5aa121..ff41bba1f 100644
--- a/src/App/Pages/Settings/SettingsAboutPage.cs
+++ b/src/App/Pages/Settings/SettingsAboutPage.cs
@@ -79,7 +79,7 @@ namespace Bit.App.Pages
                 Spacing = 0
             };
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/App/Pages/Settings/SettingsAddFolderPage.cs b/src/App/Pages/Settings/SettingsAddFolderPage.cs
index cb17231df..fa0c65a5a 100644
--- a/src/App/Pages/Settings/SettingsAddFolderPage.cs
+++ b/src/App/Pages/Settings/SettingsAddFolderPage.cs
@@ -106,7 +106,7 @@ namespace Bit.App.Pages
             Title = AppResources.AddFolder;
             Content = table;
             ToolbarItems.Add(saveToolBarItem);
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
             }
diff --git a/src/App/Pages/Settings/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs
index 348cda4cc..2055010cc 100644
--- a/src/App/Pages/Settings/SettingsEditFolderPage.cs
+++ b/src/App/Pages/Settings/SettingsEditFolderPage.cs
@@ -120,7 +120,7 @@ namespace Bit.App.Pages
             Title = AppResources.EditFolder;
             Content = mainTable;
             ToolbarItems.Add(saveToolBarItem);
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
             }
diff --git a/src/App/Pages/Settings/SettingsHelpPage.cs b/src/App/Pages/Settings/SettingsHelpPage.cs
index 01235f9d3..4961aace1 100644
--- a/src/App/Pages/Settings/SettingsHelpPage.cs
+++ b/src/App/Pages/Settings/SettingsHelpPage.cs
@@ -103,7 +103,7 @@ namespace Bit.App.Pages
                 Spacing = 0
             };
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/App/Pages/Settings/SettingsListFoldersPage.cs b/src/App/Pages/Settings/SettingsListFoldersPage.cs
index e07f2a3a4..34d674590 100644
--- a/src/App/Pages/Settings/SettingsListFoldersPage.cs
+++ b/src/App/Pages/Settings/SettingsListFoldersPage.cs
@@ -41,7 +41,7 @@ namespace Bit.App.Pages
                 ItemTemplate = new DataTemplate(() => new SettingsFolderListViewCell(this))
             };
              
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/App/Pages/Settings/SettingsOptionsPage.cs b/src/App/Pages/Settings/SettingsOptionsPage.cs
index e1bb9b589..b1e5dfb34 100644
--- a/src/App/Pages/Settings/SettingsOptionsPage.cs
+++ b/src/App/Pages/Settings/SettingsOptionsPage.cs
@@ -223,7 +223,7 @@ namespace Bit.App.Pages
                 Content = StackLayout
             };
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 analyticsTable.RowHeight = websiteIconsTable.RowHeight = totpTable.RowHeight = -1;
                 analyticsTable.EstimatedRowHeight = websiteIconsTable.EstimatedRowHeight =
diff --git a/src/App/Pages/Settings/SettingsPinPage.cs b/src/App/Pages/Settings/SettingsPinPage.cs
index cd827a8fd..d453d7cac 100644
--- a/src/App/Pages/Settings/SettingsPinPage.cs
+++ b/src/App/Pages/Settings/SettingsPinPage.cs
@@ -56,7 +56,7 @@ namespace Bit.App.Pages
             PinControl.Label.GestureRecognizers.Add(Tgr);
             instructionLabel.GestureRecognizers.Add(Tgr);
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
             }
diff --git a/src/App/Pages/Settings/SettingsSyncPage.cs b/src/App/Pages/Settings/SettingsSyncPage.cs
index 0b8980af3..e79b3e728 100644
--- a/src/App/Pages/Settings/SettingsSyncPage.cs
+++ b/src/App/Pages/Settings/SettingsSyncPage.cs
@@ -57,7 +57,7 @@ namespace Bit.App.Pages
                 Padding = new Thickness(15, 0)
             };
 
-            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/App/Pages/Vault/VaultListCiphersPage.cs b/src/App/Pages/Vault/VaultListCiphersPage.cs
index 2b3596de8..f34234b2d 100644
--- a/src/App/Pages/Vault/VaultListCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultListCiphersPage.cs
@@ -156,7 +156,7 @@ namespace Bit.App.Pages
             {
                 Title = AppResources.SearchVault;
 
-                if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
+                if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP)
                 {
                     ToolbarItems.Add(new DismissModalToolBarItem(this));
                 }
diff --git a/src/App/Utilities/Extentions.cs b/src/App/Utilities/Extentions.cs
index 7927bd018..5ea3c317f 100644
--- a/src/App/Utilities/Extentions.cs
+++ b/src/App/Utilities/Extentions.cs
@@ -55,7 +55,7 @@ namespace Bit.App
 
         public static async Task PushForDeviceAsync(this INavigation navigation, Page page)
         {
-            if (Device.RuntimePlatform != Device.Windows)
+            if (Device.RuntimePlatform != Device.UWP)
             {
                 await navigation.PushModalAsync(new ExtendedNavigationPage(page), true);
             }
@@ -69,7 +69,7 @@ namespace Bit.App
         {
             if(navigation.ModalStack.Count < 1)
             {
-                if (navigation.NavigationStack.Count > 0 && Device.RuntimePlatform == Device.Windows)
+                if (navigation.NavigationStack.Count > 0 && Device.RuntimePlatform == Device.UWP)
                 {
                     await navigation.PopAsync();
                 }
diff --git a/src/App/Utilities/Helpers.cs b/src/App/Utilities/Helpers.cs
index cc431dd8c..a99b415f7 100644
--- a/src/App/Utilities/Helpers.cs
+++ b/src/App/Utilities/Helpers.cs
@@ -33,7 +33,7 @@ namespace Bit.App.Utilities
                     return Android;
                 case Device.WinPhone:
                     return WinPhone;
-                case Device.Windows:
+                case Device.UWP:
                     return Windows;
                 default:
                     throw new Exception("Unsupported platform.");