diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 9e4bc777f..dc4e8a9a2 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.245.1",
+      "version": "5.257.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.0",
+      "version": "5.20.3",
       "commands": [
         "fake"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index f2ed368b0..390d6eb1f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,8 +3,10 @@
   <PropertyGroup>
     <Version>0.60.0</Version>
     <Authors>Fabulous Contributors</Authors>
-    <PackageVersion>0.60.0-preview1</PackageVersion>
-    <PackageReleaseNotes>[Fabulous.XamarinForms] Disabled StructMemoization to check if it's the source of some issues</PackageReleaseNotes>
+    <PackageVersion>0.60.0-preview4</PackageVersion>
+    <PackageReleaseNotes>[Fabulous.XamarinForms] [Templates] Updated templates to target Android 11 by default
+[Fabulous.XamarinForms] [Templates] Fixed fabulous-cli version referenced in templates
+[Fabulous.XamarinForms] [Samples] Updated samples to target Android 11</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/fsprojects/Fabulous</PackageProjectUrl>
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AssemblyInfo.fs b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/AssemblyInfo.fs
similarity index 71%
rename from Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.StaticView/samples/StaticViewCounterApp/Droid/AssemblyInfo.fs
index adf842480..84dce2750 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AssemblyInfo.fs
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/AssemblyInfo.fs
@@ -2,6 +2,10 @@
 open System.Reflection
 open System.Runtime.CompilerServices
 
+// the name of the type here needs to match the name inside the ResourceDesigner attribute
+type Resources = Droid.Resource
+[<assembly: Android.Runtime.ResourceDesigner("Droid.Resources", IsApplication=true)>]
+
 [<assembly: AssemblyTitle("Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/MainActivity.fs b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/MainActivity.fs
index 9446a2222..2b7180a36 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/MainActivity.fs
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/MainActivity.fs
@@ -1,23 +1,20 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace Droid
 
-open System
-
 open Android.App
-open Android.Content
 open Android.Content.PM
-open Android.Runtime
-open Android.Views
-open Android.Widget
 open Android.OS
+open Xamarin.Forms.Platform.Android
+open StaticViewCounterApp
 
-[<Activity (Label = "StaticViewCounterApp", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
+[<Activity (Label = "StaticViewCounterApp", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit Xamarin.Forms.Platform.Android.FormsApplicationActivity()
-    override this.OnCreate (bundle: Bundle) =
-        base.OnCreate (bundle)
-
-        Xamarin.Forms.Forms.Init (this, bundle)
+    override this.OnCreate(bundle: Bundle) =
+        FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
+        FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
 
-        this.LoadApplication (new StaticViewCounterApp.StaticViewCounterApp ())
+        base.OnCreate(bundle)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(StaticViewCounterApp())
 
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AndroidManifest.xml b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AndroidManifest.xml
index 5ffb1d674..9040c3bbe 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.StaticViewCounterApp">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="StaticViewCounterApp"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Tabbar.axml b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Tabbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Tabbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Toolbar.axml b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Toolbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Toolbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/values/styles.xml b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/values/styles.xml
new file mode 100644
index 000000000..eba6c5dd7
--- /dev/null
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/StaticViewCounterApp.Droid.fsproj b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/StaticViewCounterApp.Droid.fsproj
index 2fd4132a1..0029be90e 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/StaticViewCounterApp.Droid.fsproj
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Droid/StaticViewCounterApp.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Droid</RootNamespace>
     <AssemblyName>Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -19,6 +19,8 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <SelectedDevice>Google Pixel 2</SelectedDevice>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,9 +29,10 @@
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
     <PlatformTarget>
     </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,215 +48,242 @@
     <PlatformTarget>
     </PlatformTarget>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
-    <Compile Include="MainActivity.fs" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Fabulous.StaticView.XamarinForms\Fabulous.StaticView.XamarinForms.fsproj">
       <Project>{5b23ac3b-e949-4992-93bd-6ce091f4e351}</Project>
       <Name>Fabulous.StaticView.XamarinForms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\StaticViewCounterApp\StaticViewCounterApp.fsproj">
+      <Project>{7EAD7307-E81F-4B5D-A212-4B274B43406C}</Project>
+      <Name>StaticViewCounterApp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\StaticViewCounterApp\StaticViewCounterApp.fsproj">
-      <Project>{7EAD7307-E81F-4B5D-A212-4B274B43406C}</Project>
-      <Name>StaticViewCounterApp</Name>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/Gtk/StaticViewCounterApp.Gtk.fsproj b/Fabulous.StaticView/samples/StaticViewCounterApp/Gtk/StaticViewCounterApp.Gtk.fsproj
index 6f3f43268..5dc51f306 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/Gtk/StaticViewCounterApp.Gtk.fsproj
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/Gtk/StaticViewCounterApp.Gtk.fsproj
@@ -10,6 +10,7 @@
     <RootNamespace>StaticViewCounterApp.Gtk</RootNamespace>
     <AssemblyName>StaticViewCounterApp.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,7 @@
     <Reference Include="OpenTK">
       <HintPath>..\..\..\..\packages\gtkapp\OpenTK\lib\net20\OpenTK.dll</HintPath>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="webkit-sharp">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\webkit-sharp.dll</HintPath>
     </Reference>
@@ -75,7 +77,7 @@
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
@@ -89,6 +91,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\gtkapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\gtkapp\System.Buffers\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/WPF/StaticViewCounterApp.WPF.fsproj b/Fabulous.StaticView/samples/StaticViewCounterApp/WPF/StaticViewCounterApp.WPF.fsproj
index f280ca669..f8073ea7c 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/WPF/StaticViewCounterApp.WPF.fsproj
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/WPF/StaticViewCounterApp.WPF.fsproj
@@ -1,32 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\..\..\netfx.props" />
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net472</TargetFramework>
-		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-	<ItemGroup>
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="System.Net.Http" />
-		<Reference Include="System.Xaml">
-		</Reference>
-		<Reference Include="UIAutomationTypes" />
-		<Reference Include="WindowsBase" />
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="App.fs" />
-		<None Include="app.config" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="FSharp.Core" />
-		<PackageReference Include="Xamarin.Forms.Platform.WPF" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\StaticViewCounterApp\StaticViewCounterApp.fsproj" />
-	</ItemGroup>
-	<Import Project="..\..\..\..\Packages.targets" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <Import Project="..\..\..\..\netfx.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.fs" />
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FSharp.Core" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" />
+  </ItemGroup>
+  <ItemGroup>
+      <ProjectReference Include="..\StaticViewCounterApp\StaticViewCounterApp.fsproj" />
+  </ItemGroup>
+  <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/iOS/StaticViewCounterApp.iOS.fsproj b/Fabulous.StaticView/samples/StaticViewCounterApp/iOS/StaticViewCounterApp.iOS.fsproj
index 43cac1bc0..0dffe2be8 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/iOS/StaticViewCounterApp.iOS.fsproj
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/iOS/StaticViewCounterApp.iOS.fsproj
@@ -103,10 +103,6 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\iosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\iosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Fabulous.StaticView.XamarinForms\Fabulous.StaticView.XamarinForms.fsproj">
-      <Project>{5b23ac3b-e949-4992-93bd-6ce091f4e351}</Project>
-      <Name>Fabulous.StaticView.XamarinForms</Name>
-    </ProjectReference>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
@@ -126,6 +122,15 @@
     <Reference Include="FSharp.Core">
       <HintPath>..\..\..\..\packages\iosapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Fabulous.StaticView.XamarinForms\Fabulous.StaticView.XamarinForms.fsproj">
+      <Project>{5b23ac3b-e949-4992-93bd-6ce091f4e351}</Project>
+      <Name>Fabulous.StaticView.XamarinForms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\StaticViewCounterApp\StaticViewCounterApp.fsproj">
       <Project>{4282E90F-2519-46D0-B593-D57CFCA36A2D}</Project>
       <Name>StaticViewCounterApp</Name>
diff --git a/Fabulous.StaticView/samples/StaticViewCounterApp/macOS/StaticViewCounterApp.macOS.fsproj b/Fabulous.StaticView/samples/StaticViewCounterApp/macOS/StaticViewCounterApp.macOS.fsproj
index d11e55143..5a21c82a7 100644
--- a/Fabulous.StaticView/samples/StaticViewCounterApp/macOS/StaticViewCounterApp.macOS.fsproj
+++ b/Fabulous.StaticView/samples/StaticViewCounterApp/macOS/StaticViewCounterApp.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +65,7 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -74,9 +76,6 @@
     <Reference Include="Xamarin.Forms.Platform">
       <HintPath>..\..\..\..\packages\macosapp\Xamarin.Forms\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.macOS">
-      <HintPath>..\..\..\..\packages\macosapp\Xamarin.Forms\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
       <HintPath>..\..\..\..\packages\macosapp\Xamarin.Forms\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
@@ -86,6 +85,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/AllControls/AllControls/AllControls.fsproj b/Fabulous.XamarinForms/samples/AllControls/AllControls/AllControls.fsproj
index eb0ab53dc..8f8ce42cd 100644
--- a/Fabulous.XamarinForms/samples/AllControls/AllControls/AllControls.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/AllControls/AllControls.fsproj
@@ -21,7 +21,6 @@
       <Compile Include="Samples\Controls\SwipeView.fs" />
       <Compile Include="Samples\Extensions\SkiaSharp.fs" />
       <Compile Include="Samples\Extensions\OxyPlot.fs" />
-      <Compile Include="Samples\Extensions\Maps.fs" />
       <Compile Include="Samples\Extensions\VideoManager.fs" />
       <Compile Include="Samples\Extensions\FFImageLoading.fs" />
       <Compile Include="Samples\Pages\CarouselPage.fs" />
diff --git a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Extensions/Maps.fs b/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Extensions/Maps.fs
deleted file mode 100644
index fa9c8a90d..000000000
--- a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Extensions/Maps.fs
+++ /dev/null
@@ -1,58 +0,0 @@
-namespace AllControls.Samples.Extensions
-
-open AllControls.Helpers
-
-open Xamarin.Forms
-open Xamarin.Forms.Maps
-open Fabulous.XamarinForms
-open Fabulous.XamarinForms.Maps
-
-module Maps =    
-    let mapView () = 
-        let sample1 = View.Map(hasZoomEnabled = true, hasScrollEnabled = true)
-
-        let sample2 = 
-            let timbuktu = Position(16.7666, -3.0026)
-            View.Map(
-                hasZoomEnabled = true,
-                hasScrollEnabled = true,
-                requestedRegion = MapSpan.FromCenterAndRadius(timbuktu, Distance.FromKilometers(1.0))
-            )
-
-        let sample3 = 
-            let paris = Position(48.8566, 2.3522)
-            let london = Position(51.5074, -0.1278)
-            let calais = Position(50.9513, 1.8587)
-            View.Map(
-                hasZoomEnabled = true,
-                hasScrollEnabled = true, 
-                pins = [
-                    View.Pin(position = paris, label = "Paris", pinType = PinType.Place)
-                    View.Pin(position = london, label = "London", pinType = PinType.Place)
-                ] ,
-                requestedRegion = MapSpan.FromCenterAndRadius(calais, Distance.FromKilometers(300.0))
-            )
-
-        View.ScrollingContentPage(
-            title = "Map Samples",
-            content = View.StackLayout([
-                yield View.Label "Note, may require setup to access maps, see "
-                yield View.Label "https://fsprojects.github.io/Fabulous/Fabulous.XamarinForms/views-maps.html"
-                yield View.Label ""
-                yield View.Label "Android - put your Google Maps API Key in AllControls\Droid\Properties\AndroidManifest.xml"
-                for map in [ sample1; sample2; sample3 ] do
-                    yield map
-            ])
-        )
-
-    let view() = 
-        match Device.RuntimePlatform with
-        | Device.GTK -> 
-            View.ContentPage( 
-                View.StackLayout [
-                    View.Label(text="When last tested Xamarin.Forms.Maps on GTK does not work correctly")
-                    View.Label(text="Please uncomment the code in AllControls.fs and try again")
-                  ])
-        | _ -> 
-            mapView ()
-
diff --git a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Samples.fs b/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Samples.fs
index 44c5c62bb..2ef711b8e 100644
--- a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Samples.fs
+++ b/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/Samples.fs
@@ -77,7 +77,6 @@ module Samples =
                         { Title = "Extensions"
                           Nodes =
                               [ Sample (createViewOnlyDefinition "FFImageLoading" Extensions.FFImageLoading.view)
-                                Sample (createViewOnlyDefinition "Maps" Extensions.Maps.view)
                                 Sample (createViewOnlyDefinition "OxyPlot" Extensions.OxyPlot.view)
                                 Sample
                                     ({ Title = "SkiaSharp"
diff --git a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/TestLabel.fs b/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/TestLabel.fs
index 53c9b65d1..75a64225a 100644
--- a/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/TestLabel.fs
+++ b/Fabulous.XamarinForms/samples/AllControls/AllControls/Samples/TestLabel.fs
@@ -32,7 +32,8 @@ module TestLabel =
                 source.UpdatePrimitive(prevOpt, target, TestLabelTextAttribKey, (fun target v -> target.Text <- v))
                 source.UpdatePrimitive(prevOpt, target, TestLabelFontFamilyAttribKey, (fun target v -> target.FontFamily <- v))
 
-            let updateAttachedProperties _ _ _ _ = ()
+            let updateAttachedProperties propertyKey prevOpt source targetChild =
+                ViewBuilders.UpdateViewAttachedProperties(propertyKey, prevOpt, source, targetChild)
 
             ViewElement.Create<Xamarin.Forms.Label>(create, update, updateAttachedProperties, attribs)
 
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/AllControls.Droid.fsproj b/Fabulous.XamarinForms/samples/AllControls/Droid/AllControls.Droid.fsproj
index c14c82764..eaaa67cc6 100644
--- a/Fabulous.XamarinForms/samples/AllControls/Droid/AllControls.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/AllControls.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>AllControls.Droid</RootNamespace>
     <AssemblyName>AllControls.Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -18,9 +18,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <SelectedDevice>Google Pixel 2</SelectedDevice>
-    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
-    <Name>AllControls.Droid</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,12 +29,10 @@
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
     <PlatformTarget>
     </PlatformTarget>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,308 +47,322 @@
     <GenerateTailCalls>true</GenerateTailCalls>
     <PlatformTarget>
     </PlatformTarget>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.fs" />
+    <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="MainActivity.fs" />
     <Compile Include="FocusEffect.fs" />
     <Compile Include="LabelShadowEffect.fs" />
-    <Compile Include="RegisterEffects.fs" />
-    <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets')" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
+      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
+      <Name>Fabulous.LiveUpdate</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\src\Fabulous\Fabulous.fsproj">
       <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
       <Name>Fabulous</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
+      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
+      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
       <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
       <Name>Fabulous.XamarinForms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\AllControls\AllControls.fsproj">
+      <Project>{AEBBB2CB-3D81-4DB0-8A64-70D80EDCBD38}</Project>
+      <Name>AllControls</Name>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="FSharp.Data">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Data\lib\netstandard2.0\FSharp.Data.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="SkiaSharp">
-      <HintPath>..\..\..\..\packages\androidapp\SkiaSharp\lib\monoandroid1.0\SkiaSharp.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="SkiaSharp.Views.Android">
-      <HintPath>..\..\..\..\packages\androidapp\SkiaSharp.Views\lib\monoandroid1.0\SkiaSharp.Views.Android.dll</HintPath>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="SkiaSharp.Views.Forms">
-      <HintPath>..\..\..\..\packages\androidapp\SkiaSharp.Views.Forms\lib\monoandroid1.0\SkiaSharp.Views.Forms.dll</HintPath>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms.Maps\lib\MonoAndroid90\Xamarin.Forms.Maps.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Maps.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms.Maps\lib\MonoAndroid90\Xamarin.Forms.Maps.Android.dll</HintPath>
+    <Reference Include="FFImageLoading">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.FFImageLoading\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Base">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.GooglePlayServices.Base\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
+    <Reference Include="FFImageLoading.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.FFImageLoading\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Basement">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.GooglePlayServices.Basement\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
+    <Reference Include="FFImageLoading.Forms">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.FFImageLoading.Forms\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Maps">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.GooglePlayServices.Maps\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll</HintPath>
+    <Reference Include="FFImageLoading.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.FFImageLoading.Forms\lib\MonoAndroid10\FFImageLoading.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.GooglePlayServices.Tasks">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.GooglePlayServices.Tasks\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
+    <Reference Include="OxyPlot">
+      <HintPath>..\..\..\..\packages\androidxapp\OxyPlot.Core\lib\netstandard1.0\OxyPlot.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.PancakeView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms.PancakeView\lib\monoandroid90\Xamarin.Forms.PancakeView.dll</HintPath>
+    <Reference Include="OxyPlot.Xamarin.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\OxyPlot.Xamarin.Android\lib\MonoAndroid10\OxyPlot.Xamarin.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.MediaManager">
-      <HintPath>..\..\..\..\packages\androidapp\Plugin.MediaManager\lib\monoandroid90\MediaManager.dll</HintPath>
+    <Reference Include="OxyPlot.Xamarin.Forms">
+      <HintPath>..\..\..\..\packages\androidxapp\OxyPlot.Xamarin.Forms\lib\MonoAndroid10\OxyPlot.Xamarin.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.MediaManager.Forms">
-      <HintPath>..\..\..\..\packages\androidapp\Plugin.MediaManager.Forms\lib\monoandroid90\MediaManager.Forms.dll</HintPath>
+    <Reference Include="OxyPlot.Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\OxyPlot.Xamarin.Forms\lib\MonoAndroid10\OxyPlot.Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="ExoPlayer">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer\lib\monoandroid90\ExoPlayer.dll</HintPath>
+    <Reference Include="SkiaSharp">
+      <HintPath>..\..\..\..\packages\androidxapp\SkiaSharp\lib\monoandroid1.0\SkiaSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="SkiaSharp.Views.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\SkiaSharp.Views\lib\monoandroid1.0\SkiaSharp.Views.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="SkiaSharp.Views.Forms">
+      <HintPath>..\..\..\..\packages\androidxapp\SkiaSharp.Views.Forms\lib\monoandroid1.0\SkiaSharp.Views.Forms.dll</HintPath>
     </Reference>
     <Reference Include="ExoPlayer.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.Core\lib\monoandroid90\ExoPlayer.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.Core\lib\monoandroid10.0\ExoPlayer.Core.dll</HintPath>
     </Reference>
     <Reference Include="ExoPlayer.Dash">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.Dash\lib\monoandroid90\ExoPlayer.Dash.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.Dash\lib\monoandroid10.0\ExoPlayer.Dash.dll</HintPath>
     </Reference>
     <Reference Include="ExoPlayer.Hls">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.Hls\lib\monoandroid90\ExoPlayer.Hls.dll</HintPath>
-    </Reference>
-    <Reference Include="ExoPlayer.Ext.MediaSession">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.MediaSession\lib\monoandroid90\ExoPlayer.Ext.MediaSession.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.Hls\lib\monoandroid10.0\ExoPlayer.Hls.dll</HintPath>
     </Reference>
     <Reference Include="ExoPlayer.SmoothStreaming">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.SmoothStreaming\lib\monoandroid90\ExoPlayer.SmoothStreaming.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.SmoothStreaming\lib\monoandroid10.0\ExoPlayer.SmoothStreaming.dll</HintPath>
     </Reference>
-    <Reference Include="ExoPlayer.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xam.Plugins.Android.ExoPlayer.UI\lib\monoandroid90\ExoPlayer.UI.dll</HintPath>
+    <Reference Include="ExoPlayer.Ext.MediaSession">
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.MediaSession\lib\monoandroid10.0\ExoPlayer.Ext.MediaSession.dll</HintPath>
     </Reference>
-    <Reference Include="OxyPlot">
-      <HintPath>..\..\..\..\packages\androidapp\OxyPlot.Core\lib\netstandard1.0\OxyPlot.dll</HintPath>
+    <Reference Include="ExoPlayer.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer.UI\lib\monoandroid10.0\ExoPlayer.UI.dll</HintPath>
     </Reference>
-    <Reference Include="OxyPlot.Xamarin.Forms">
-      <HintPath>..\..\..\..\packages\androidapp\OxyPlot.Xamarin.Forms\lib\MonoAndroid10\OxyPlot.Xamarin.Forms.dll</HintPath>
+    <Reference Include="ExoPlayer">
+      <HintPath>..\..\..\..\packages\androidxapp\Xam.Plugins.Android.ExoPlayer\lib\monoandroid10.0\ExoPlayer.dll</HintPath>
     </Reference>
-    <Reference Include="OxyPlot.Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\OxyPlot.Xamarin.Forms\lib\MonoAndroid10\OxyPlot.Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="MediaManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Plugin.MediaManager\lib\monoandroid10.0\MediaManager.dll</HintPath>
     </Reference>
-    <Reference Include="OxyPlot.Xamarin.Android">
-      <HintPath>..\..\..\..\packages\androidapp\OxyPlot.Xamarin.Android\lib\MonoAndroid10\OxyPlot.Xamarin.Android.dll</HintPath>
+    <Reference Include="MediaManager.Forms">
+      <HintPath>..\..\..\..\packages\androidxapp\Plugin.MediaManager.Forms\lib\monoandroid10.0\MediaManager.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="FFImageLoading">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.FFImageLoading\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
+    <Reference Include="FSharp.Data">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Data\lib\netstandard2.0\FSharp.Data.dll</HintPath>
     </Reference>
-    <Reference Include="FFImageLoading.Forms">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.FFImageLoading.Forms\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <Reference Include="FFImageLoading.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.FFImageLoading.Forms\lib\MonoAndroid10\FFImageLoading.Forms.Platform.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\AllControls\AllControls.fsproj">
-      <Project>{AEBBB2CB-3D81-4DB0-8A64-70D80EDCBD38}</Project>
-      <Name>AllControls</Name>
-      <Private>True</Private>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\SkiaSharp\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\packages\androidxapp\SkiaSharp\build\monoandroid1.0\SkiaSharp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/AllControls/Droid/AssemblyInfo.fs
similarity index 100%
rename from Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/AllControls/Droid/AssemblyInfo.fs
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/AllControls/Droid/MainActivity.fs
index a1aacdbf2..ed657a26e 100644
--- a/Fabulous.XamarinForms/samples/AllControls/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/MainActivity.fs
@@ -1,4 +1,4 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace AllControls.Droid
 
 open Android.App
@@ -17,7 +17,6 @@ type MainActivity() =
         base.OnCreate (bundle)
         
         Xamarin.Forms.Forms.Init (this, bundle)
-        Xamarin.FormsMaps.Init(this, bundle) 
         OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init()
         FFImageLoading.Forms.Platform.CachedImageRenderer.Init(enableFastRenderer=Nullable true)
 
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AndroidManifest.xml
index 556237a1e..032bd8a79 100644
--- a/Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/Properties/AndroidManifest.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.AllControls">
-	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="28" />
-	<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
-	<application android:label="AllControls" android:icon="@drawable/icon">
-		<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="PUT-YOUR-API-KEY-HERE" />
-	</application>
+	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" />
+	<application android:label="AllControls"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Tabbar.axml b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Tabbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Tabbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Toolbar.axml b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Toolbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/layout/Toolbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/values/styles.xml b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/values/styles.xml
new file mode 100644
index 000000000..eba6c5dd7
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/AllControls/Droid/Resources/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>
diff --git a/Fabulous.XamarinForms/samples/AllControls/Gtk/AllControls.Gtk.fsproj b/Fabulous.XamarinForms/samples/AllControls/Gtk/AllControls.Gtk.fsproj
index 896ac2f63..cd3e9686a 100644
--- a/Fabulous.XamarinForms/samples/AllControls/Gtk/AllControls.Gtk.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/Gtk/AllControls.Gtk.fsproj
@@ -43,6 +43,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Package>gtk-sharp-2.0</Package>
       <SpecificVersion>False</SpecificVersion>
@@ -123,6 +124,9 @@
     <Reference Include="Xamarin.Forms.PancakeView">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.PancakeView\lib\netstandard2.0\Xamarin.Forms.PancakeView.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\gtkapp\System.Buffers\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <!--
     <Reference Include="Plugin.MediaManager">
       <HintPath>..\..\..\..\packages\gtkapp\Plugin.MediaManager\lib\net45\MediaManager.dll</HintPath>
@@ -137,9 +141,6 @@
     <Reference Include="OxyPlot.Xamarin.Forms">
       <HintPath>..\..\..\..\packages\gtkapp\OxyPlot.Xamarin.Forms\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\OxyPlot.Xamarin.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="OxyPlot.GtkSharp ">
-      <HintPath>..\..\..\..\packages\gtkapp\OxyPlot.GtkSharp\lib\net45\OxyPlot.GtkSharp.dll</HintPath>
-    </Reference>
 <!--
     <Reference Include="FFImageLoading">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.FFImageLoading\lib\netstandard1.0\FFImageLoading.dll</HintPath>
diff --git a/Fabulous.XamarinForms/samples/AllControls/WPF/AllControls.WPF.fsproj b/Fabulous.XamarinForms/samples/AllControls/WPF/AllControls.WPF.fsproj
index 429d2fbae..d53855a23 100644
--- a/Fabulous.XamarinForms/samples/AllControls/WPF/AllControls.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/WPF/AllControls.WPF.fsproj
@@ -1,38 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\..\..\..\netfx.props" />
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net472</TargetFramework>
-        <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-        <PreferredNativeSkiaSharp>x64</PreferredNativeSkiaSharp>
-        <PlatformTarget>x64</PlatformTarget>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="System.Xaml">
-        </Reference>
-        <Reference Include="UIAutomationTypes" />
-        <Reference Include="WindowsBase" />
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="App.fs" />
-        <None Include="app.config" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="FSharp.Core" />
-        <PackageReference Include="FSharp.Data" />
-        <PackageReference Include="SkiaSharp.Views.Forms.WPF" />
-        <PackageReference Include="Xamarin.Forms.Platform.WPF" />
-        <PackageReference Include="Xamarin.Forms.Maps.WPF" />
-       <!-- <PackageReference Include="Xamarin.FFImageLoading.Forms" /> -->
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\AllControls\AllControls.fsproj" />
-    </ItemGroup>
-    <Import Project="..\..\..\..\Packages.targets" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <Import Project="..\..\..\..\netfx.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.fs" />
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FSharp.Core" />
+    <PackageReference Include="FSharp.Data" />
+    <PackageReference Include="SkiaSharp.Views.Forms.WPF" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" />
+    <PackageReference Include="Xamarin.Forms.Maps.WPF" />
+  </ItemGroup>
+  <ItemGroup>
+      <ProjectReference Include="..\AllControls\AllControls.fsproj" />
+  </ItemGroup>
+  <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/AllControls/iOS/AllControls.iOS.fsproj b/Fabulous.XamarinForms/samples/AllControls/iOS/AllControls.iOS.fsproj
index 4228325fc..813c00f5e 100644
--- a/Fabulous.XamarinForms/samples/AllControls/iOS/AllControls.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/iOS/AllControls.iOS.fsproj
@@ -156,6 +156,9 @@
     <Reference Include="WebP.Touch">
       <HintPath>..\..\..\..\packages\iosapp\WebP.Touch\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
diff --git a/Fabulous.XamarinForms/samples/AllControls/macOS/AllControls.macOS.fsproj b/Fabulous.XamarinForms/samples/AllControls/macOS/AllControls.macOS.fsproj
index 16250d10a..6c9c4335f 100644
--- a/Fabulous.XamarinForms/samples/AllControls/macOS/AllControls.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/AllControls/macOS/AllControls.macOS.fsproj
@@ -65,6 +65,7 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -132,6 +133,9 @@
     <Reference Include="WebP.Touch">
       <HintPath>..\..\..\..\packages\macosapp\WebP.Touch\lib\Xamarin.Mac20\WebP.Mac.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/Calculator/Droid/AssemblyInfo.fs
similarity index 71%
rename from Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/Calculator/Droid/AssemblyInfo.fs
index adf842480..84dce2750 100644
--- a/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AssemblyInfo.fs
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/AssemblyInfo.fs
@@ -2,6 +2,10 @@
 open System.Reflection
 open System.Runtime.CompilerServices
 
+// the name of the type here needs to match the name inside the ResourceDesigner attribute
+type Resources = Droid.Resource
+[<assembly: Android.Runtime.ResourceDesigner("Droid.Resources", IsApplication=true)>]
+
 [<assembly: AssemblyTitle("Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Calculator.Droid.fsproj b/Fabulous.XamarinForms/samples/Calculator/Droid/Calculator.Droid.fsproj
index 51b241515..469011fc2 100644
--- a/Fabulous.XamarinForms/samples/Calculator/Droid/Calculator.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/Calculator.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\netstandard1.0\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Droid</RootNamespace>
     <AssemblyName>Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -31,6 +31,8 @@
     <ErrorReport>prompt</ErrorReport>
     <PlatformTarget>
     </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,229 +48,254 @@
     <PlatformTarget>
     </PlatformTarget>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+    <None Include="Resources\AboutResources.txt" />
+    <AndroidResource Include="Resources\drawable\icon.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
+      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
+      <Name>Fabulous.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\Fabulous\Fabulous.fsproj">
+      <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
+      <Name>Fabulous</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
+      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
+      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
+      <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
+      <Name>Fabulous.XamarinForms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Calculator\Calculator.fsproj">
+      <Project>{F75B6CFC-73D7-4A30-9BC9-CA24E808449D}</Project>
+      <Name>Calculator</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Resources\AboutResources.txt" />
-    <AndroidResource Include="Resources\drawable\icon.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="MainActivity.fs" />
-    <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
-      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
-      <Name>Fabulous.LiveUpdate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\src\Fabulous\Fabulous.fsproj">
-      <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
-      <Name>Fabulous</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
-      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
-      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
-      <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
-      <Name>Fabulous.XamarinForms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Calculator\Calculator.fsproj">
-      <Project>{F75B6CFC-73D7-4A30-9BC9-CA24E808449D}</Project>
-      <Name>Calculator</Name>
-    </ProjectReference>
-  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/Calculator/Droid/MainActivity.fs
index f532d5768..3af5def42 100644
--- a/Fabulous.XamarinForms/samples/Calculator/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/MainActivity.fs
@@ -1,20 +1,20 @@
-// Copyright 2018-2019 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace Droid
 
-open System
-
 open Android.App
 open Android.Content.PM
 open Android.OS
 open Xamarin.Forms.Platform.Android
+open Calculator
 
-[<Activity (Label = "Calculator", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
+[<Activity (Label = "Calculator", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit FormsApplicationActivity()
     override this.OnCreate (bundle: Bundle) =
-        base.OnCreate (bundle)
-
-        Xamarin.Forms.Forms.Init (this, bundle)
-
-        this.LoadApplication (new Calculator.CalculatorApp ())
+        FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
+        FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
+        
+        base.OnCreate(bundle)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(CalculatorApp())
 
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AndroidManifest.xml
index f3939e80c..6dd2fd235 100644
--- a/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/Properties/AndroidManifest.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.Calculator">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="Calculator" android:icon="@drawable/icon"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Tabbar.axml b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Tabbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Tabbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Toolbar.axml b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Toolbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/layout/Toolbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/values/styles.xml b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/values/styles.xml
new file mode 100644
index 000000000..eba6c5dd7
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/Calculator/Droid/Resources/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>
diff --git a/Fabulous.XamarinForms/samples/Calculator/Gtk/Calculator.Gtk.fsproj b/Fabulous.XamarinForms/samples/Calculator/Gtk/Calculator.Gtk.fsproj
index 14fcac3cb..d2d4554ec 100644
--- a/Fabulous.XamarinForms/samples/Calculator/Gtk/Calculator.Gtk.fsproj
+++ b/Fabulous.XamarinForms/samples/Calculator/Gtk/Calculator.Gtk.fsproj
@@ -10,6 +10,7 @@
     <RootNamespace>Calculator.Gtk</RootNamespace>
     <AssemblyName>Calculator.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,7 @@
     <Reference Include="OpenTK">
       <HintPath>..\..\..\..\packages\gtkapp\OpenTK\lib\net20\OpenTK.dll</HintPath>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="webkit-sharp">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\webkit-sharp.dll</HintPath>
     </Reference>
@@ -75,7 +77,7 @@
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
@@ -89,6 +91,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\gtkapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\gtkapp\System.Buffers\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/Fabulous.XamarinForms/samples/Calculator/WPF/Calculator.WPF.fsproj b/Fabulous.XamarinForms/samples/Calculator/WPF/Calculator.WPF.fsproj
index d95176441..63e525de3 100644
--- a/Fabulous.XamarinForms/samples/Calculator/WPF/Calculator.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/Calculator/WPF/Calculator.WPF.fsproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.fs" />
     <None Include="app.config" />
@@ -25,7 +16,7 @@
     <PackageReference Include="Xamarin.Forms.Platform.WPF" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Calculator\Calculator.fsproj" />
+      <ProjectReference Include="..\Calculator\Calculator.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/Calculator/iOS/Calculator.iOS.fsproj b/Fabulous.XamarinForms/samples/Calculator/iOS/Calculator.iOS.fsproj
index ed3af718c..718a90f09 100644
--- a/Fabulous.XamarinForms/samples/Calculator/iOS/Calculator.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/Calculator/iOS/Calculator.iOS.fsproj
@@ -10,7 +10,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -123,6 +123,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\iosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
diff --git a/Fabulous.XamarinForms/samples/Calculator/macOS/Calculator.macOS.fsproj b/Fabulous.XamarinForms/samples/Calculator/macOS/Calculator.macOS.fsproj
index edb63a245..2443bd524 100644
--- a/Fabulous.XamarinForms/samples/Calculator/macOS/Calculator.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/Calculator/macOS/Calculator.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +65,7 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -83,6 +85,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/CounterApp/Droid/AssemblyInfo.fs
similarity index 71%
rename from Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/CounterApp/Droid/AssemblyInfo.fs
index adf842480..84dce2750 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AssemblyInfo.fs
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/AssemblyInfo.fs
@@ -2,6 +2,10 @@
 open System.Reflection
 open System.Runtime.CompilerServices
 
+// the name of the type here needs to match the name inside the ResourceDesigner attribute
+type Resources = Droid.Resource
+[<assembly: Android.Runtime.ResourceDesigner("Droid.Resources", IsApplication=true)>]
+
 [<assembly: AssemblyTitle("Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/CounterApp.Droid.fsproj b/Fabulous.XamarinForms/samples/CounterApp/Droid/CounterApp.Droid.fsproj
index 91f13e31e..2611c4a0a 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/Droid/CounterApp.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/CounterApp.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Droid</RootNamespace>
     <AssemblyName>Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -31,6 +31,8 @@
     <ErrorReport>prompt</ErrorReport>
     <PlatformTarget>
     </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,58 +48,19 @@
     <PlatformTarget>
     </PlatformTarget>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets')" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
-    <Compile Include="MainActivity.fs" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
@@ -116,159 +79,223 @@
       <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
       <Name>Fabulous.XamarinForms</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.CSharp" />
+    <ProjectReference Include="..\CounterApp\CounterApp.fsproj">
+      <Project>{49318C29-43F7-4B2F-AE4A-77B9643BE6C9}</Project>
+      <Name>CounterApp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\CounterApp\CounterApp.fsproj">
-      <Project>{49318C29-43F7-4B2F-AE4A-77B9643BE6C9}</Project>
-      <Name>CounterApp</Name>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/CounterApp/Droid/MainActivity.fs
index c9467920f..407719c85 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/MainActivity.fs
@@ -1,25 +1,20 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace Droid
 
-open System
-
 open Android.App
-open Android.Content
 open Android.Content.PM
-open Android.Runtime
-open Android.Views
-open Android.Widget
 open Android.OS
 open Xamarin.Forms.Platform.Android
 open CounterApp
 
-[<Activity (Label = "CounterApp.Droid", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
+[<Activity (Label = "CounterApp", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit FormsApplicationActivity()
     override this.OnCreate (bundle: Bundle) =
-        base.OnCreate (bundle)
-
-        Xamarin.Forms.Forms.Init (this, bundle)
-
-        this.LoadApplication (new CounterApp())
+        FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
+        FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
+        
+        base.OnCreate(bundle)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(CounterApp())
 
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AndroidManifest.xml
index b67914a76..9156d56da 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/Properties/AndroidManifest.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.CounterApp">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-	<application android:label="CounterApp" android:icon="@drawable/icon"></application>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+	<application android:label="CounterApp"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Tabbar.axml b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Tabbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Tabbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Toolbar.axml b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Toolbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/layout/Toolbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/values/styles.xml b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/values/styles.xml
new file mode 100644
index 000000000..eba6c5dd7
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/CounterApp/Droid/Resources/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>
diff --git a/Fabulous.XamarinForms/samples/CounterApp/Gtk/CounterApp.Gtk.fsproj b/Fabulous.XamarinForms/samples/CounterApp/Gtk/CounterApp.Gtk.fsproj
index e6b697458..b63b59a2a 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/Gtk/CounterApp.Gtk.fsproj
+++ b/Fabulous.XamarinForms/samples/CounterApp/Gtk/CounterApp.Gtk.fsproj
@@ -10,6 +10,7 @@
     <RootNamespace>CounterApp.Gtk</RootNamespace>
     <AssemblyName>CounterApp.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,7 @@
     <Reference Include="OpenTK">
       <HintPath>..\..\..\..\packages\gtkapp\OpenTK\lib\net20\OpenTK.dll</HintPath>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="webkit-sharp">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\webkit-sharp.dll</HintPath>
     </Reference>
@@ -75,7 +77,7 @@
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
@@ -89,6 +91,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\gtkapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\gtkapp\System.Buffers\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/Fabulous.XamarinForms/samples/CounterApp/WPF/CounterApp.WPF.fsproj b/Fabulous.XamarinForms/samples/CounterApp/WPF/CounterApp.WPF.fsproj
index 5b4fb8e24..be7e5165e 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/WPF/CounterApp.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/CounterApp/WPF/CounterApp.WPF.fsproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.fs" />
     <None Include="app.config" />
@@ -25,7 +16,7 @@
     <PackageReference Include="Xamarin.Forms.Platform.WPF" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CounterApp\CounterApp.fsproj" />
+      <ProjectReference Include="..\CounterApp\CounterApp.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/CounterApp/iOS/CounterApp.iOS.fsproj b/Fabulous.XamarinForms/samples/CounterApp/iOS/CounterApp.iOS.fsproj
index 8f5e78767..eec66972a 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/iOS/CounterApp.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/CounterApp/iOS/CounterApp.iOS.fsproj
@@ -10,7 +10,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -123,6 +123,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\iosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
diff --git a/Fabulous.XamarinForms/samples/CounterApp/macOS/CounterApp.macOS.fsproj b/Fabulous.XamarinForms/samples/CounterApp/macOS/CounterApp.macOS.fsproj
index a41dc66e4..1213edf56 100644
--- a/Fabulous.XamarinForms/samples/CounterApp/macOS/CounterApp.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/CounterApp/macOS/CounterApp.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +65,7 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -83,6 +85,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/AssemblyInfo.fs
new file mode 100644
index 000000000..e28623fe7
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/AssemblyInfo.fs
@@ -0,0 +1,24 @@
+namespace FabulousWeather.Droid
+open System.Reflection
+open System.Runtime.CompilerServices
+
+// the name of the type here needs to match the name inside the ResourceDesigner attribute
+type Resources = FabulousWeather.Droid.Resource
+[<assembly: Android.Runtime.ResourceDesigner("FabulousWeather.Droid.Resources", IsApplication=true)>]
+
+[<assembly: AssemblyTitle("Droid")>]
+[<assembly: AssemblyDescription("")>]
+[<assembly: AssemblyConfiguration("")>]
+[<assembly: AssemblyCompany("")>]
+[<assembly: AssemblyProduct("")>]
+[<assembly: AssemblyCopyright("")>]
+[<assembly: AssemblyTrademark("")>]
+
+// The assembly version has the format {Major}.{Minor}.{Build}.{Revision}
+
+[<assembly: AssemblyVersion("1.0.0.0")>]
+
+//[<assembly: AssemblyDelaySign(false)>]
+//[<assembly: AssemblyKeyFile("")>]
+
+()
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Assets/AboutAssets.txt b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Assets/AboutAssets.txt
index 5d620ee34..a9b0638eb 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Assets/AboutAssets.txt
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Assets/AboutAssets.txt
@@ -16,4 +16,4 @@ public class ReadAsset : Activity
 
 Additionally, some Android functions will automatically load asset files:
 
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/FabulousWeather.Droid.fsproj b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/FabulousWeather.Droid.fsproj
index 891324637..578194db4 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/FabulousWeather.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/FabulousWeather.Droid.fsproj
@@ -1,145 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{10b86d0f-3171-4657-a628-3cd70c2daa8c}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
-    <ProjectGuid>f539dd22-3911-47e1-b5e8-810367e80a51</ProjectGuid>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
     <OutputType>Library</OutputType>
     <RootNamespace>FabulousWeather.Droid</RootNamespace>
     <AssemblyName>FabulousWeather.Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <Name>PrettyWeather.Droid</Name>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <AndroidDesignerPreferredDevice>Nexus 4</AndroidDesignerPreferredDevice>
-    <SelectedDevice>my_device</SelectedDevice>
-    <DefaultDevice>my_device</DefaultDevice>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <SelectedDevice>Google Pixel 2</SelectedDevice>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>False</ConsolePause>
-    <Tailcalls>False</Tailcalls>
     <PlatformTarget>
     </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <Optimize>True</Optimize>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <PlatformTarget>
-    </PlatformTarget>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <ConsolePause>False</ConsolePause>
-    <Tailcalls>True</Tailcalls>
     <DefineConstants>
     </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>
+    </PlatformTarget>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable\paris.png" />
@@ -148,161 +59,252 @@
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="MainActivity.fs" />
-    <AndroidAsset Include="Assets\AboutAssets.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
-    </Reference>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="FSharp.Data">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Data\lib\netstandard2.0\FSharp.Data.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
+      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
+      <Name>Fabulous.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\Fabulous\Fabulous.fsproj">
+      <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
+      <Name>Fabulous</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
+      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
+      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
+      <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
+      <Name>Fabulous.XamarinForms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\FabulousWeather\FabulousWeather.fsproj">
+      <Project>{39f73f10-b026-4dd4-a1be-2755c0757c85}</Project>
+      <Name>FabulousWeather</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="Java.Interop" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
-    </Reference>
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.PancakeView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms.PancakeView\lib\MonoAndroid90\Xamarin.Forms.PancakeView.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms.PancakeView\lib\monoandroid10.0\Xamarin.Forms.PancakeView.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Data">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Data\lib\netstandard2.0\FSharp.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\FabulousWeather\FabulousWeather.fsproj">
-      <Project>{39f73f10-b026-4dd4-a1be-2755c0757c85}</Project>
-      <Name>FabulousWeather</Name>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/MainActivity.fs
index 88337c3c5..6b6a867a3 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/MainActivity.fs
@@ -1,18 +1,20 @@
-namespace FabulousWeather.Droid
+// Copyright Fabulous contributors. See LICENSE.md for license.
+namespace FabulousWeather.Droid
 
 open Android.App
 open Android.Content.PM
 open Android.OS
-open Android.Views
 open Xamarin.Forms.Platform.Android
+open FabulousWeather
 
-[<Activity (Label = "FabulousWeather", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
+[<Activity (Label = "FabulousWeather.Droid", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit FormsApplicationActivity()
     override this.OnCreate (bundle: Bundle) =
-        base.OnCreate (bundle)
-        this.Window.AddFlags(WindowManagerFlags.TranslucentStatus)
-        this.Window.AddFlags(WindowManagerFlags.ForceNotFullscreen)
-        Xamarin.Forms.Forms.SetFlags("IndicatorView_Experimental")
-        Xamarin.Forms.Forms.Init (this, bundle)
-        this.LoadApplication (new FabulousWeather.App())
\ No newline at end of file
+        FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
+        FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
+        
+        base.OnCreate(bundle)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(App())
+
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AndroidManifest.xml
index 330f784c4..8b0a4cb92 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.fabulousweather">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:allowBackup="true" android:icon="@drawable/icon" android:label="FabulousWeather"></application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.FabulousWeather">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+	<application android:label="FabulousWeather"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AssemblyInfo.fs
deleted file mode 100644
index 7bbc688e0..000000000
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Properties/AssemblyInfo.fs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace FabulousWeather.Droid
-module AssemblyInfo =
-
-  open System.Reflection
-  open System.Runtime.CompilerServices
-  open Android.App
-
-  // Information about this assembly is defined by the following attributes. 
-  // Change them to the values specific to your project.
-
-  [<assembly: AssemblyTitle("Droid")>]
-  [<assembly: AssemblyDescription("")>]
-  [<assembly: AssemblyConfiguration("")>]
-  [<assembly: AssemblyCompany("")>]
-  [<assembly: AssemblyProduct("")>]
-  [<assembly: AssemblyCopyright("")>]
-  [<assembly: AssemblyTrademark("")>]
-  [<assembly: AssemblyCulture("")>]
-
-  // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-  // The form "{Major}.{Minor}.*" will automatically update the build and revision,
-  // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-  [<assembly: AssemblyVersion("1.0.0.0")>]
-
-  // The following attributes are used to specify the signing key for the assembly, 
-  // if desired. See the Mono documentation for more information about signing.
-
-  //[<assembly: AssemblyDelaySign(false)>]
-  //[<assembly: AssemblyKeyFile("")>]
-
-  ()
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/AboutResources.txt b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/AboutResources.txt
index c2bca974c..10f52d460 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/AboutResources.txt
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/AboutResources.txt
@@ -41,4 +41,4 @@ public class R {
 
 You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
 to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
\ No newline at end of file
+string in the dictionary file values/strings.xml.
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Tabbar.axml b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Tabbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Tabbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Toolbar.axml b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Toolbar.axml
new file mode 100644
index 000000000..f9f3aadf4
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/layout/Toolbar.axml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/values/styles.xml b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/values/styles.xml
new file mode 100644
index 000000000..eba6c5dd7
--- /dev/null
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Resources/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Add.png b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Add.png
new file mode 100644
index 000000000..c856464dd
Binary files /dev/null and b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Add.png differ
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Cancel.png b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Cancel.png
new file mode 100644
index 000000000..94d628b85
Binary files /dev/null and b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Cancel.png differ
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Check.png b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Check.png
new file mode 100644
index 000000000..f95153df3
Binary files /dev/null and b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Check.png differ
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Delete.png b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Delete.png
new file mode 100644
index 000000000..8965c7037
Binary files /dev/null and b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Delete.png differ
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Select.png b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Select.png
new file mode 100644
index 000000000..120a5ce03
Binary files /dev/null and b/Fabulous.XamarinForms/samples/FabulousWeather/Droid/Toolkit.Content/ApplicationBar.Select.png differ
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/App.fs b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/App.fs
index 2490c4cd0..0807d5d55 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/App.fs
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/App.fs
@@ -153,8 +153,7 @@ module App =
             created = onPageCreated,
             content =
                  View.PancakeView(
-                     backgroundGradientStartColor = Styles.getStartGradientColor temperatureOfCurrentCity, 
-                     backgroundGradientEndColor = Styles.getEndGradientColor temperatureOfCurrentCity,
+                     backgroundGradientStops = Styles.gradientStops temperatureOfCurrentCity,
                      content =
                          match Device.RuntimePlatform with
                          | Device.Android | Device.iOS -> carouselView model dispatch
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/CityView.fs b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/CityView.fs
index e5c188134..0164bcf21 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/CityView.fs
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/CityView.fs
@@ -108,9 +108,9 @@ module CityView =
                                         width = 50.,
                                         height = 130.,
                                         padding = Thickness(10.),
-                                        backgroundGradientStartColor = Styles.HourlyForecastStartColor,
-                                        backgroundGradientEndColor = Styles.HourlyForecastEndColor,
-                                        backgroundGradientAngle = 315,
+                                        backgroundGradientStops = Styles.HourlyForecastGradientStops,
+                                        backgroundGradientStartPoint = Point(0., 0.),
+                                        backgroundGradientEndPoint = Point(1., 1.),
                                         cornerRadius = CornerRadius(10.),
                                         content =
                                             View.StackLayout(
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/PancakeViewExtensions.fs b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/PancakeViewExtensions.fs
index acf5a91ad..1e7849526 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/PancakeViewExtensions.fs
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/PancakeViewExtensions.fs
@@ -7,20 +7,20 @@ open Fabulous.XamarinForms
 module PancakeViewExtensions =
 
     // Define keys for the possible attributes
-    let backgroundGradientStartColorAttribKey = AttributeKey "BackgroundGradientStartColor"
-    let backgroundGradientEndColorAttribKey = AttributeKey "BackgroundGradientEndColor"
+    let backgroundGradientStartPointAttribKey = AttributeKey "BackgroundGradientStartPoint"
+    let backgroundGradientEndPointAttribKey = AttributeKey "BackgroundGradientEndPoint"
+    let backgroundGradientStopsAttribKey = AttributeKey<Xamarin.Forms.PancakeView.GradientStopCollection> "BackgroundGradientStops"
     let pancakeContentAttribKey = AttributeKey "PancakeContent"
     let paddingAttribKey = AttributeKey "Padding"
     let cornerRadiusKey = AttributeKey "CornerRadius"
-    let backgroundGradientAngleKey = AttributeKey "BackgroundGradientAngle"
     
     // Fully-qualified name to avoid extending by mistake
     // another View class (like Xamarin.Forms.View)
     type Fabulous.XamarinForms.View with
         /// Describes a ABC in the view
         /// The inline keyword is important for performance
-        static member inline PancakeView(?content, ?backgroundGradientStartColor, ?backgroundGradientEndColor,
-                                         ?cornerRadius, ?padding, ?backgroundGradientAngle,
+        static member inline PancakeView(?content, ?backgroundGradientStartPoint, ?backgroundGradientEndPoint,
+                                         ?cornerRadius, ?padding, ?backgroundGradientStops,
                                          // inherited attributes common to all views
                                          ?gestureRecognizers, ?horizontalOptions, ?margin, ?verticalOptions, ?anchorX, ?anchorY, ?backgroundColor,
                                          ?behaviors, ?flowDirection, ?height, ?inputTransparent, ?isEnabled, ?isTabStop, ?isVisible, ?minimumHeight,
@@ -32,12 +32,12 @@ module PancakeViewExtensions =
                                          ?shellUnselectedColor, ?automationId, ?classId, ?effects, ?menu, ?ref, ?styleId, ?tag, ?focused, ?unfocused, ?created) =
 
             let attribCount = 0
-            let attribCount = match backgroundGradientStartColor with Some _ -> attribCount + 1 | None -> attribCount
-            let attribCount = match backgroundGradientEndColor with Some _ -> attribCount + 1 | None -> attribCount
+            let attribCount = match backgroundGradientStartPoint with Some _ -> attribCount + 1 | None -> attribCount
+            let attribCount = match backgroundGradientEndPoint with Some _ -> attribCount + 1 | None -> attribCount
             let attribCount = match content with Some _ -> attribCount + 1 | None -> attribCount
             let attribCount = match cornerRadius with Some _ -> attribCount + 1 | None -> attribCount
             let attribCount = match padding with Some _ -> attribCount + 1 | None -> attribCount
-            let attribCount = match backgroundGradientAngle with Some _ -> attribCount + 1 | None -> attribCount
+            let attribCount = match backgroundGradientStops with Some _ -> attribCount + 1 | None -> attribCount
             
             let attribs = ViewBuilders.BuildView(attribCount, ?gestureRecognizers=gestureRecognizers, ?horizontalOptions=horizontalOptions, ?margin=margin,
                                        ?verticalOptions=verticalOptions, ?anchorX=anchorX, ?anchorY=anchorY, ?backgroundColor=backgroundColor, ?behaviors=behaviors,
@@ -53,12 +53,12 @@ module PancakeViewExtensions =
                                        ?shellTitleColor=shellTitleColor, ?shellTitleView=shellTitleView, ?shellUnselectedColor=shellUnselectedColor, ?automationId=automationId,
                                        ?classId=classId, ?effects=effects, ?menu=menu, ?ref=ref, ?styleId=styleId, ?tag=tag, ?focused=focused, ?unfocused=unfocused, ?created=created)
 
-            match backgroundGradientStartColor with None -> () | Some v -> attribs.Add(backgroundGradientStartColorAttribKey, v)
-            match backgroundGradientEndColor with None -> () | Some v -> attribs.Add(backgroundGradientEndColorAttribKey, v)
+            match backgroundGradientStartPoint with None -> () | Some v -> attribs.Add(backgroundGradientStartPointAttribKey, v)
+            match backgroundGradientEndPoint with None -> () | Some v -> attribs.Add(backgroundGradientEndPointAttribKey, v)
             match content with None -> () | Some v -> attribs.Add(pancakeContentAttribKey, v)
             match padding with None -> () | Some v -> attribs.Add(paddingAttribKey, v)
             match cornerRadius with None -> () | Some v -> attribs.Add(cornerRadiusKey, v)
-            match backgroundGradientAngle with None -> () | Some v -> attribs.Add(backgroundGradientAngleKey, v)
+            match backgroundGradientStops with None -> () | Some v -> attribs.Add(backgroundGradientStopsAttribKey, v)
 
             // The creation method
             let create () = Xamarin.Forms.PancakeView.PancakeView()
@@ -67,12 +67,13 @@ module PancakeViewExtensions =
             let update (prev: ViewElement voption) (source: ViewElement) (target: Xamarin.Forms.PancakeView.PancakeView) =
                 ViewBuilders.UpdateView(prev,source,target)
                 source.UpdateElement(prev,target, pancakeContentAttribKey,(fun target -> target.Content), (fun target v -> target.Content <- v))
-                source.UpdatePrimitive(prev, target, backgroundGradientStartColorAttribKey, (fun target v -> target.BackgroundGradientStartColor <- v))
-                source.UpdatePrimitive(prev, target, backgroundGradientEndColorAttribKey, (fun target v -> target.BackgroundGradientEndColor <- v))
+                source.UpdatePrimitive(prev, target, backgroundGradientStartPointAttribKey, (fun target v -> target.BackgroundGradientStartPoint <- v))
+                source.UpdatePrimitive(prev, target, backgroundGradientEndPointAttribKey, (fun target v -> target.BackgroundGradientEndPoint <- v))
+                source.UpdatePrimitive(prev, target, backgroundGradientStopsAttribKey, (fun target v -> target.BackgroundGradientStops <- v))
                 source.UpdatePrimitive(prev, target, paddingAttribKey, (fun target v -> target.Padding <- v))
                 source.UpdatePrimitive(prev, target, cornerRadiusKey, (fun target v -> target.CornerRadius <- v))
-                source.UpdatePrimitive(prev, target, backgroundGradientAngleKey, (fun target v -> target.BackgroundGradientAngle <- v))
 
-            let updateAttachedProperties _ _ _ _ = ()
+            let updateAttachedProperties propertyKey prevOpt source targetChild =
+                ViewBuilders.UpdateViewAttachedProperties(propertyKey, prevOpt, source, targetChild)
 
             ViewElement.Create<Xamarin.Forms.PancakeView.PancakeView>(create, update, updateAttachedProperties, attribs)
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/Styles.fs b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/Styles.fs
index b1d6ff256..593979bb6 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/Styles.fs
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/FabulousWeather/Styles.fs
@@ -53,4 +53,16 @@ module Styles =
         else if temp < 199<kelvin> then
             NightEndColor
         else
-            ColdEndColor
\ No newline at end of file
+            ColdEndColor
+            
+    let gradientStops temp =
+        let coll = Xamarin.Forms.PancakeView.GradientStopCollection()
+        coll.Add(PancakeView.GradientStop(Color = getStartGradientColor temp, Offset = float32 0.))
+        coll.Add(PancakeView.GradientStop(Color = getEndGradientColor temp, Offset = float32 1.))
+        coll
+        
+    let HourlyForecastGradientStops =
+        let coll = Xamarin.Forms.PancakeView.GradientStopCollection()
+        coll.Add(PancakeView.GradientStop(Color = HourlyForecastStartColor, Offset = float32 0.))
+        coll.Add(PancakeView.GradientStop(Color = HourlyForecastEndColor, Offset = float32 1.))
+        coll
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/FabulousWeather/iOS/FabulousWeather.iOS.fsproj b/Fabulous.XamarinForms/samples/FabulousWeather/iOS/FabulousWeather.iOS.fsproj
index a20701fd8..e34bf23a0 100644
--- a/Fabulous.XamarinForms/samples/FabulousWeather/iOS/FabulousWeather.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/FabulousWeather/iOS/FabulousWeather.iOS.fsproj
@@ -10,7 +10,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>FabulousWeather.iOS</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -69,7 +69,7 @@
     <OutputPath>bin\iPhone\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <CodesignKey>iPhone Developer: Timothe Lariviere (8AK42GUU25)</CodesignKey>
+    <CodesignKey>iPhone Developer</CodesignKey>
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <MtouchDebug>true</MtouchDebug>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
@@ -132,6 +132,9 @@
       <HintPath>..\..\..\..\packages\iosapp\Xamarin.Forms\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
diff --git a/Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/LoginShape/Droid/AssemblyInfo.fs
similarity index 100%
rename from Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/LoginShape/Droid/AssemblyInfo.fs
diff --git a/Fabulous.XamarinForms/samples/LoginShape/Droid/LoginShape.Droid.fsproj b/Fabulous.XamarinForms/samples/LoginShape/Droid/LoginShape.Droid.fsproj
index 477678d6e..ca17283f2 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/Droid/LoginShape.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/LoginShape/Droid/LoginShape.Droid.fsproj
@@ -1,74 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
     <ProjectGuid>{89E6FCEE-092E-4B56-A230-066667932521}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
     <OutputType>Library</OutputType>
     <RootNamespace>LoginShape.Droid</RootNamespace>
     <AssemblyName>LoginShape.Droid</AssemblyName>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <Name>LoginShape.Droid</Name>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <SelectedDevice>Google Pixel 2</SelectedDevice>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <OtherFlags>/warnon:1182</OtherFlags>
-    <WarningLevel>4</WarningLevel>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>False</ConsolePause>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
+    <PlatformTarget>
+    </PlatformTarget>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>False</ConsolePause>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <AndroidLinkTool>r8</AndroidLinkTool>
-    <AndroidSupportedAbis />
+    <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>
+    </PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <Compile Include="MainActivity.fs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
@@ -77,7 +59,8 @@
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
@@ -100,215 +83,219 @@
       <Project>{566B273F-79E4-4CE3-B312-5633602BE687}</Project>
       <Name>LoginShape</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Essentials">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Activity">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Annotation">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Browser">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CardView">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Collection">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Core">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.CustomView">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.DrawerLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Fragment">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Interpolator">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Loader">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Media">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.MultiDex">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Print">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.RecyclerView">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.SavedState">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Transition">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.VectorDrawable">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.ViewPager">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Google.Android.Material">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
-</Project>
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
+</Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/LoginShape/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/LoginShape/Droid/MainActivity.fs
index 0a1cee9ce..f5e2495aa 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/LoginShape/Droid/MainActivity.fs
@@ -1,4 +1,4 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace LoginShape.Droid
 
 open System
diff --git a/Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AndroidManifest.xml
index a55426923..9369c7b97 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/LoginShape/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.loginshape">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
     <application android:label="LoginShape"></application>
 </manifest>
diff --git a/Fabulous.XamarinForms/samples/LoginShape/Droid/Resources/values/colors.xml b/Fabulous.XamarinForms/samples/LoginShape/Droid/Resources/values/colors.xml
deleted file mode 100644
index d00eaab51..000000000
--- a/Fabulous.XamarinForms/samples/LoginShape/Droid/Resources/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="launcher_background">#FFFFFF</color>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/Fabulous.XamarinForms/samples/LoginShape/WPF/LoginShape.WPF.fsproj b/Fabulous.XamarinForms/samples/LoginShape/WPF/LoginShape.WPF.fsproj
index d559a679c..599303599 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/WPF/LoginShape.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/LoginShape/WPF/LoginShape.WPF.fsproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.fs" />
     <None Include="app.config" />
@@ -25,7 +16,7 @@
     <PackageReference Include="Xamarin.Forms.Platform.WPF" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../LoginShape/LoginShape.fsproj" />
+      <ProjectReference Include="..\LoginShape\LoginShape.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/LoginShape/iOS/LoginShape.iOS.fsproj b/Fabulous.XamarinForms/samples/LoginShape/iOS/LoginShape.iOS.fsproj
index 11daeddc4..feb5889d9 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/iOS/LoginShape.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/LoginShape/iOS/LoginShape.iOS.fsproj
@@ -11,7 +11,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>LoginShape.iOS</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -130,6 +130,9 @@
       <HintPath>..\..\..\..\packages\iosapp\Xamarin.Forms\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
diff --git a/Fabulous.XamarinForms/samples/LoginShape/macOS/LoginShape.macOS.fsproj b/Fabulous.XamarinForms/samples/LoginShape/macOS/LoginShape.macOS.fsproj
index 10d12b8c7..baaf2a371 100644
--- a/Fabulous.XamarinForms/samples/LoginShape/macOS/LoginShape.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/LoginShape/macOS/LoginShape.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,6 +62,7 @@
     </XamMacArch>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -80,6 +82,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/AssemblyInfo.fs
similarity index 100%
rename from Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/ShapesDemo/Droid/AssemblyInfo.fs
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/MainActivity.fs
index 0c8bf26b3..6a537416a 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/MainActivity.fs
@@ -1,4 +1,4 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace ShapesDemo.Droid
 
 open System
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AndroidManifest.xml
index 419faf3a0..189c04305 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.shapesdemo">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
     <application android:label="ShapesDemo"></application>
 </manifest>
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Resources/values/colors.xml b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Resources/values/colors.xml
deleted file mode 100644
index d00eaab51..000000000
--- a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/Resources/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="launcher_background">#FFFFFF</color>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/ShapesDemo.Droid.fsproj b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/ShapesDemo.Droid.fsproj
index 629f85bd8..6f05518b0 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/Droid/ShapesDemo.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/Droid/ShapesDemo.Droid.fsproj
@@ -1,87 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
     <ProjectGuid>{FD3E32A1-CCA8-499A-A47F-AD21EC27FCDD}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
     <OutputType>Library</OutputType>
     <RootNamespace>ShapesDemo.Droid</RootNamespace>
     <AssemblyName>ShapesDemo.Droid</AssemblyName>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <Name>ShapesDemo.Droid</Name>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <SelectedDevice>Google Pixel 2</SelectedDevice>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <OtherFlags>/warnon:1182</OtherFlags>
-    <WarningLevel>4</WarningLevel>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>False</ConsolePause>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
+    <PlatformTarget>
+    </PlatformTarget>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>False</ConsolePause>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <AndroidLinkTool>r8</AndroidLinkTool>
-    <AndroidSupportedAbis />
+    <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>
+    </PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <Compile Include="MainActivity.fs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
-    <AndroidResource Include="Resources\drawable\monkeyface.png">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-    </AndroidResource>
+    <AndroidResource Include="Resources\drawable\monkeyface.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
@@ -104,215 +84,219 @@
       <Project>{AA2BEC0E-9BA3-4103-A60E-1B61F0F83CE6}</Project>
       <Name>ShapesDemo</Name>
     </ProjectReference>
-    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Essentials">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Activity">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Annotation">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Browser">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CardView">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Collection">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Core">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.CustomView">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.DrawerLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Fragment">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Interpolator">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Loader">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Media">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.MultiDex">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Print">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.RecyclerView">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.SavedState">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Transition">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.VectorDrawable">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.ViewPager">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
       <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Google.Android.Material">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
-      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModelSavedState\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
   <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
-</Project>
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
+</Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/WPF/ShapesDemo.WPF.fsproj b/Fabulous.XamarinForms/samples/ShapesDemo/WPF/ShapesDemo.WPF.fsproj
index 07b5ae778..2c8e0f4b5 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/WPF/ShapesDemo.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/WPF/ShapesDemo.WPF.fsproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.fs" />
     <None Include="app.config" />
@@ -25,7 +16,7 @@
     <PackageReference Include="Xamarin.Forms.Platform.WPF" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../ShapesDemo/ShapesDemo.fsproj" />
+      <ProjectReference Include="..\ShapesDemo\ShapesDemo.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/iOS/ShapesDemo.iOS.fsproj b/Fabulous.XamarinForms/samples/ShapesDemo/iOS/ShapesDemo.iOS.fsproj
index 9db4f545c..51eb05525 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/iOS/ShapesDemo.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/iOS/ShapesDemo.iOS.fsproj
@@ -11,7 +11,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>ShapesDemo.iOS</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -131,6 +131,9 @@
       <HintPath>..\..\..\..\packages\iosapp\Xamarin.Forms\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
diff --git a/Fabulous.XamarinForms/samples/ShapesDemo/macOS/ShapesDemo.macOS.fsproj b/Fabulous.XamarinForms/samples/ShapesDemo/macOS/ShapesDemo.macOS.fsproj
index d6302d66e..5eee474d0 100644
--- a/Fabulous.XamarinForms/samples/ShapesDemo/macOS/ShapesDemo.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/ShapesDemo/macOS/ShapesDemo.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,6 +62,7 @@
     </XamMacArch>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -80,6 +82,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/AssemblyInfo.fs
index ad7a4b0ec..24080480e 100644
--- a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/AssemblyInfo.fs
+++ b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/AssemblyInfo.fs
@@ -5,8 +5,8 @@ open System.Runtime.CompilerServices
 
 // the name of the type here needs to match the name inside the ResourceDesigner attribute
 type Resources = Droid.Resource
-
 [<assembly:Android.Runtime.ResourceDesigner("Droid.Resources", IsApplication = true)>]
+
 [<assembly:AssemblyTitle("Fabimals.Droid")>]
 [<assembly:AssemblyDescription("")>]
 [<assembly:AssemblyConfiguration("")>]
diff --git a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Fabimals.Droid.fsproj b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Fabimals.Droid.fsproj
index 7f72dedeb..8335a3092 100644
--- a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Fabimals.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Fabimals.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,26 +10,33 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Droid</RootNamespace>
     <AssemblyName>Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <SelectedDevice>android_pie</SelectedDevice>
-    <DefaultDevice>android_pie</DefaultDevice>
+    <SelectedDevice>Google Pixel 2</SelectedDevice>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <PlatformTarget>
+    </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <DefineConstants>
@@ -41,74 +48,31 @@
     <PlatformTarget>
     </PlatformTarget>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="MainActivity.fs" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
+    <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable\back.png" />
     <AndroidResource Include="Resources\drawable\bear.png" />
     <AndroidResource Include="Resources\drawable\cat.png" />
     <AndroidResource Include="Resources\drawable\dog.png" />
     <AndroidResource Include="Resources\drawable\elephant.png" />
     <AndroidResource Include="Resources\drawable\help.png" />
-    <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable\info.png" />
+    <AndroidResource Include="Resources\drawable\logo_fabulous.png" />
     <AndroidResource Include="Resources\drawable\monkey.png" />
     <AndroidResource Include="Resources\drawable\paw.png" />
     <AndroidResource Include="Resources\drawable\random.png" />
-    <AndroidResource Include="Resources\drawable\logo_fabulous.png" />
     <AndroidResource Include="Resources\drawable\xamarinstore.jpg" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
     <AndroidResource Include="Resources\values\styles.xml" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
@@ -127,160 +91,223 @@
       <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
       <Name>Fabulous.XamarinForms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Fabimals\Fabimals.fsproj">
+      <Project>{F6AE8E23-F4B8-415F-956B-1B651CB496CD}</Project>
+      <Name>Fabimals</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Java.Interop" />
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\..\packages\androidapp\Xamarin.Essentials\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
+      <HintPath>..\..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\Fabimals\Fabimals.fsproj">
-      <Project>{F6AE8E23-F4B8-415F-956B-1B651CB496CD}</Project>
-      <Name>Fabimals</Name>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Properties/AndroidManifest.xml
index b8dda53db..47f0e35ec 100644
--- a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.Fabimals">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="Fabimals" android:icon="@drawable/icon"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Resources/values/colors.xml b/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Resources/values/colors.xml
deleted file mode 100644
index bdd44a837..000000000
--- a/Fabulous.XamarinForms/samples/Shell/Fabimals/Droid/Resources/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="launcher_background">#FFFFFF</color>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/Shell/Fabimals/iOS/Fabimals.iOS.fsproj b/Fabulous.XamarinForms/samples/Shell/Fabimals/iOS/Fabimals.iOS.fsproj
index d3eec6972..7ebb2d62b 100644
--- a/Fabulous.XamarinForms/samples/Shell/Fabimals/iOS/Fabimals.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/Shell/Fabimals/iOS/Fabimals.iOS.fsproj
@@ -10,7 +10,7 @@
     <RootNamespace>iOS</RootNamespace>
     <AssemblyName>iOS</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AutoGenerateBindingRedirects>Resources</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SelectedDevice>iPhone Xs iOS 12.2</SelectedDevice>
     <DefaultDevice>iPhone Xs iOS 12.2</DefaultDevice>
   </PropertyGroup>
@@ -131,22 +131,6 @@
     <BundleResource Include="Resources\xamarinstore.jpg" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
-      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
-      <Name>Fabulous.LiveUpdate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\Fabulous\Fabulous.fsproj">
-      <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
-      <Name>Fabulous</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
-      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
-      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
-      <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
-      <Name>Fabulous.XamarinForms</Name>
-    </ProjectReference>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -167,9 +151,30 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\..\packages\iosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Xamarin.Essentials">
       <HintPath>..\..\..\..\..\packages\iosapp\Xamarin.Essentials\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
+      <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
+      <Name>Fabulous.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\src\Fabulous\Fabulous.fsproj">
+      <Project>{07bd345b-2964-46be-87eb-1c009f5fd316}</Project>
+      <Name>Fabulous</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\Fabulous.XamarinForms.LiveUpdate\Fabulous.XamarinForms.LiveUpdate.fsproj">
+      <Project>{74083fca-7678-4c90-a257-59e2eebf415d}</Project>
+      <Name>Fabulous.XamarinForms.LiveUpdate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\src\Fabulous.XamarinForms\Fabulous.XamarinForms.fsproj">
+      <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
+      <Name>Fabulous.XamarinForms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Fabimals\Fabimals.fsproj">
       <Project>{F6AE8E23-F4B8-415F-956B-1B651CB496CD}</Project>
       <Name>Fabimals</Name>
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/samples/TicTacToe/Droid/AssemblyInfo.fs
similarity index 100%
rename from Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/samples/TicTacToe/Droid/AssemblyInfo.fs
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/Droid/MainActivity.fs b/Fabulous.XamarinForms/samples/TicTacToe/Droid/MainActivity.fs
index b84ea540d..06e673847 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/Droid/MainActivity.fs
+++ b/Fabulous.XamarinForms/samples/TicTacToe/Droid/MainActivity.fs
@@ -1,4 +1,4 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace TicTacToe.Droid
 
 open System
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AndroidManifest.xml b/Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AndroidManifest.xml
index 0e36aea65..cc5797501 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AndroidManifest.xml
+++ b/Fabulous.XamarinForms/samples/TicTacToe/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.TicTacToe">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="TicTacToe" android:icon="@drawable/icon"></application>
 </manifest>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/Droid/TicTacToe.Droid.fsproj b/Fabulous.XamarinForms/samples/TicTacToe/Droid/TicTacToe.Droid.fsproj
index db88b9f36..9f8a57ba1 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/Droid/TicTacToe.Droid.fsproj
+++ b/Fabulous.XamarinForms/samples/TicTacToe/Droid/TicTacToe.Droid.fsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>TicTacToe.Droid</RootNamespace>
     <AssemblyName>TicTacToe.Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -18,9 +18,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <SelectedDevice>Google Pixel 2</SelectedDevice>
-    <DefaultDevice>new_device</DefaultDevice>
-    <Name>TicTacToe.Droid</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefaultDevice>Android_Accelerated_x86_Nougat</DefaultDevice>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,9 +29,10 @@
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
     <PlatformTarget>
     </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,69 +49,27 @@
     </PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.fs" />
+    <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="MainActivity.fs" />
     <None Include="Resources\AboutResources.txt" />
-    <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\drawable\icon.png" />
-    <AndroidResource Include="Resources\drawable\Nought.png" />
     <AndroidResource Include="Resources\drawable\Cross.png" />
+    <AndroidResource Include="Resources\drawable\Nought.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\Cross.png" />
     <AndroidResource Include="Resources\drawable-hdpi\Nought.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\Cross.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\Nought.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\Nought.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\Cross.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\Cross.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\Nought.png" />
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
-  <!-- Disabled because of an issue when using neither packages.config nor PackageReference (https://github.com/xamarin/AndroidSupportComponents/issues/176) -->
-  <!-- <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" /> -->
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\build\monoandroid90\Xamarin.Android.Arch.Core.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\build\monoandroid90\Xamarin.Android.Arch.Core.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\build\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\build\monoandroid90\Xamarin.Android.Support.Collections.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\build\monoandroid90\Xamarin.Android.Support.CursorAdapter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\build\monoandroid90\Xamarin.Android.Support.DocumentFile.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\build\monoandroid90\Xamarin.Android.Support.Interpolator.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\build\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\build\monoandroid90\Xamarin.Android.Support.Print.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\build\monoandroid90\Xamarin.Android.Support.v7.CardView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\build\monoandroid90\Xamarin.Android.Support.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\build\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\build\monoandroid90\Xamarin.Android.Support.CustomView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\build\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\build\monoandroid90\Xamarin.Android.Support.DrawerLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\build\monoandroid90\Xamarin.Android.Support.Loader.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\build\monoandroid90\Xamarin.Android.Support.Core.Utils.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\build\monoandroid90\Xamarin.Android.Support.Media.Compat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\build\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\build\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\build\monoandroid90\Xamarin.Android.Support.v7.Palette.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\build\monoandroid90\Xamarin.Android.Support.Core.UI.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\build\monoandroid90\Xamarin.Android.Support.CustomTabs.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\build\monoandroid90\Xamarin.Android.Support.Fragment.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\build\monoandroid90\Xamarin.Android.Support.Transition.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\build\monoandroid90\Xamarin.Android.Support.v4.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj">
       <Project>{cf47f218-12c5-4026-b1f1-bd534d0a3fa6}</Project>
@@ -128,159 +87,223 @@
       <Project>{e8353f5f-71ec-4982-8865-f95991d5a0f6}</Project>
       <Name>Fabulous.XamarinForms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\TicTacToe\TicTacToe.fsproj">
+      <Project>{391D3679-0EF6-44BB-978A-82F7EECF1A66}</Project>
+      <Name>TicTacToe</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Java.Interop" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\androidapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Annotations">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Annotations\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Annotation">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Common\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Common\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CardView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Compat\lib\monoandroid90\Xamarin.Android.Support.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Collection">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.UI">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.UI\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CursorAdapter">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Core.Utils\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DocumentFile">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Fragment\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Interpolator">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Media.Compat\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v4\lib\monoandroid90\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Transition">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Transition\lib\monoandroid90\Xamarin.Android.Support.Transition.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.CardView\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.Palette">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.Palette\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.RecyclerView\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Animated.Vector.Drawable\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.AppCompat\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Design\lib\monoandroid90\Xamarin.Android.Support.Design.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.v7.MediaRouter\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Forms\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Loader">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Core.Runtime">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Core.Runtime\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Media">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData.Core">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData.Core\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.RecyclerView">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.LiveData">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.LiveData\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Arch.Lifecycle.ViewModel">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Arch.Lifecycle.ViewModel\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Collections">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Collections\lib\monoandroid90\Xamarin.Android.Support.Collections.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CursorAdapter">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CursorAdapter\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DocumentFile">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DocumentFile\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Interpolator">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Interpolator\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.LocalBroadcastManager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.LocalBroadcastManager\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.ViewPager2">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Print">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Print\lib\monoandroid90\Xamarin.Android.Support.Print.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.VersionedParcelable">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.VersionedParcelable\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.AsyncLayoutInflater">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.AsyncLayoutInflater\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomView">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomView\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CoordinaterLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CoordinaterLayout\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.DrawerLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.DrawerLayout\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Loader">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.Loader\lib\monoandroid90\Xamarin.Android.Support.Loader.dll</HintPath>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SlidingPaneLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SlidingPaneLayout\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll</HintPath>
+    <Reference Include="Xamarin.Google.Guava.ListenableFuture">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.SwipeRefreshLayout">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.SwipeRefreshLayout\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll</HintPath>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.ViewPager">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.ViewPager\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.CustomTabs">
-      <HintPath>..\..\..\..\packages\androidapp\Xamarin.Android.Support.CustomTabs\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll</HintPath>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Forms\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\..\..\packages\androidxapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Android.FSharp.ResourceProvider\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Essentials">
+      <HintPath>..\..\..\..\packages\androidxapp\Xamarin.Essentials\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\androidapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\packages\androidxapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\androidxapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\TicTacToe\TicTacToe.fsproj">
-      <Project>{391D3679-0EF6-44BB-978A-82F7EECF1A66}</Project>
-      <Name>TicTacToe</Name>
-      <Private>True</Private>
-    </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.MultiDex\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Migration\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Annotation\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Common\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Arch.Core.Runtime\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CardView\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Collection\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CursorAdapter\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DocumentFile\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Interpolator\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Common\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData.Core\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.LiveData\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.Runtime\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Lifecycle.ViewModel\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.LocalBroadcastManager\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Print\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SavedState\build\monoandroid90\Xamarin.AndroidX.SavedState.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VersionedParcelable\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Core\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Activity\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AsyncLayoutInflater\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CustomView\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.CoordinatorLayout\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.DrawerLayout\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Loader\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.Utils\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Media\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.RecyclerView\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SlidingPaneLayout\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.SwipeRefreshLayout\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.VectorDrawable.Animated\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat.AppCompatResources\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.ViewPager2\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Fragment\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.AppCompat\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.Core.UI\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Browser\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Legacy.Support.V4\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.AndroidX.Transition\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Android.Material\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Google.Guava.ListenableFuture\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
+  <Import Project="..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\androidxapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/Gtk/TicTacToe.Gtk.fsproj b/Fabulous.XamarinForms/samples/TicTacToe/Gtk/TicTacToe.Gtk.fsproj
index 00194bf9c..ec50284a1 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/Gtk/TicTacToe.Gtk.fsproj
+++ b/Fabulous.XamarinForms/samples/TicTacToe/Gtk/TicTacToe.Gtk.fsproj
@@ -10,6 +10,7 @@
     <RootNamespace>TicTacToe.Gtk</RootNamespace>
     <AssemblyName>TicTacToe.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,7 @@
     <Reference Include="OpenTK">
       <HintPath>..\..\..\..\packages\gtkapp\OpenTK\lib\net20\OpenTK.dll</HintPath>
     </Reference>
+    <Reference Include="System.Numerics" />
     <Reference Include="webkit-sharp">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\webkit-sharp.dll</HintPath>
     </Reference>
@@ -75,7 +77,7 @@
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms.Platform.GTK\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\gtkapp\FSharp.Core\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\..\..\..\packages\gtkapp\Xamarin.Forms\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
@@ -89,6 +91,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\gtkapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\gtkapp\System.Buffers\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/WPF/TicTacToe.WPF.fsproj b/Fabulous.XamarinForms/samples/TicTacToe/WPF/TicTacToe.WPF.fsproj
index 81b3de180..2b684918d 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/WPF/TicTacToe.WPF.fsproj
+++ b/Fabulous.XamarinForms/samples/TicTacToe/WPF/TicTacToe.WPF.fsproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\..\..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -34,7 +25,7 @@
     <PackageReference Include="Xamarin.Forms.Platform.WPF" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TicTacToe\TicTacToe.fsproj" />
+      <ProjectReference Include="..\TicTacToe\TicTacToe.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\..\Packages.targets" />
 </Project>
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/iOS/TicTacToe.iOS.fsproj b/Fabulous.XamarinForms/samples/TicTacToe/iOS/TicTacToe.iOS.fsproj
index 29d6b423b..7e3abaf66 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/iOS/TicTacToe.iOS.fsproj
+++ b/Fabulous.XamarinForms/samples/TicTacToe/iOS/TicTacToe.iOS.fsproj
@@ -165,6 +165,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\iosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\iosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
     <ProjectReference Include="..\TicTacToe\TicTacToe.fsproj">
       <Project>{391D3679-0EF6-44BB-978A-82F7EECF1A66}</Project>
       <Name>TicTacToe</Name>
diff --git a/Fabulous.XamarinForms/samples/TicTacToe/macOS/TicTacToe.macOS.fsproj b/Fabulous.XamarinForms/samples/TicTacToe/macOS/TicTacToe.macOS.fsproj
index e6729c9bd..da1780efb 100644
--- a/Fabulous.XamarinForms/samples/TicTacToe/macOS/TicTacToe.macOS.fsproj
+++ b/Fabulous.XamarinForms/samples/TicTacToe/macOS/TicTacToe.macOS.fsproj
@@ -16,6 +16,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,6 +67,7 @@
     <Folder Include="Assets.xcassets\Nought.imageset\" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -85,6 +87,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\..\packages\macosapp\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\..\..\..\packages\macosapp\System.Buffers\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')" />
   <Import Project="..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\macosapp\Xamarin.Forms\build\Xamarin.Forms.targets')" />
diff --git a/Fabulous.XamarinForms/templates/Fabulous.XamarinForms.Templates.nuspec b/Fabulous.XamarinForms/templates/Fabulous.XamarinForms.Templates.nuspec
index 91d6b9c31..3813a0a47 100644
--- a/Fabulous.XamarinForms/templates/Fabulous.XamarinForms.Templates.nuspec
+++ b/Fabulous.XamarinForms/templates/Fabulous.XamarinForms.Templates.nuspec
@@ -9,7 +9,7 @@
         <projectUrl>https://fsprojects.github.io/Fabulous/</projectUrl>
         <license type="expression">Apache-2.0</license>
         <iconUrl>http://xamarin.com/content/images/nuget/xamarin.png</iconUrl>
-        <copyright>Copyright 2018</copyright>
+        <copyright>Copyright 2018-2020</copyright>
         <packageTypes>
             <packageType name="Template" />
         </packageTypes>
diff --git a/Fabulous.XamarinForms/templates/content/blank/.config/dotnet-tools.json b/Fabulous.XamarinForms/templates/content/blank/.config/dotnet-tools.json
index 8286439bf..1a4edf549 100644
--- a/Fabulous.XamarinForms/templates/content/blank/.config/dotnet-tools.json
+++ b/Fabulous.XamarinForms/templates/content/blank/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fabulous-cli": {
-      "version": "0.54.1",
+      "version": "FabulousPkgsVersion",
       "commands": [
         "fabulous"
       ]
diff --git a/Fabulous.XamarinForms/templates/content/blank/.template.config/template.json b/Fabulous.XamarinForms/templates/content/blank/.template.config/template.json
index b6f566213..1d786b143 100644
--- a/Fabulous.XamarinForms/templates/content/blank/.template.config/template.json
+++ b/Fabulous.XamarinForms/templates/content/blank/.template.config/template.json
@@ -7,7 +7,7 @@
     "Elmish",
     "Cross-platform"
   ],
-  "name": "Fabulous Xamarin.Forms App v0.60.0-preview1",
+  "name": "Fabulous Xamarin.Forms App v0.60.0-preview4",
   "groupIdentity": "Fabulous.XamarinForms.App",
   "identity": "Fabulous.XamarinForms.FSharp",
   "shortName": "fabulous-xf-app",
@@ -136,13 +136,13 @@
       "type": "parameter",
       "datatype": "string",
       "replaces": "AndroidSDKVersion",
-      "defaultValue": "v10.0"
+      "defaultValue": "v11.0"
     },
     "TargetAndroidAPI": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "TargetAndroidAPI",
-      "defaultValue": "29"
+      "defaultValue": "30"
     },
     "MinAndroidAPI": {
       "type": "parameter",
@@ -154,25 +154,19 @@
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXActivityVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXAnnotationVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXAnnotationVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXAppCompatVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXAppCompatVersion",
-      "defaultValue": "1.1.0"
-    },
-    "XamarinAndroidXAppCompatResourcesVersion": {
-      "type": "parameter",
-      "datatype": "string",
-      "replaces": "XamarinAndroidXAppCompatResourcesVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXAppCompatAppCompatResourcesVersion": {
       "type": "parameter",
@@ -184,241 +178,247 @@
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXArchCoreCommonVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXArchCoreRuntimeVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXArchCoreRuntimeVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXAsyncLayoutInflaterVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXAsyncLayoutInflaterVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXBrowserVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXBrowserVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXCardViewVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCardViewVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXCollectionVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCollectionVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXCoordinatorLayoutVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCoordinatorLayoutVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXCoreVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCoreVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXCursorAdapterVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCursorAdapterVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXCustomViewVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXCustomViewVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXDocumentFileVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXDocumentFileVersion",
-      "defaultValue": "1.0.1"
+      "defaultValue": "1.0.1.1"
     },
     "XamarinAndroidXDrawerLayoutVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXDrawerLayoutVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXFragmentVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXFragmentVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXInterpolatorVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXInterpolatorVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXLegacySupportCoreUIVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLegacySupportCoreUIVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXLegacySupportCoreUtilsVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLegacySupportCoreUtilsVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXLegacySupportV4Version": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLegacySupportV4Version",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXLifecycleCommonVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLifecycleCommonVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXLifecycleLiveDataVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLifecycleLiveDataVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXLifecycleLiveDataCoreVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLifecycleLiveDataCoreVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXLifecycleRuntimeVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLifecycleRuntimeVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXLifecycleViewModelVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLifecycleViewModelVersion",
-      "defaultValue": "2.1.0"
+      "defaultValue": "2.1.0.1"
     },
     "XamarinAndroidXLoaderVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLoaderVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXLocalBroadcastManagerVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXLocalBroadcastManagerVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXMediaVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXMediaVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
+    },
+    "XamarinAndroidXMigrationVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "replaces": "XamarinAndroidXMigrationVersion",
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXMultiDexVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXMultiDexVersion",
-      "defaultValue": "2.0.1"
+      "defaultValue": "2.0.1.1"
     },
     "XamarinAndroidXPrintVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXPrintVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXRecyclerViewVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXRecyclerViewVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXSavedStateVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXSavedStateVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXSlidingPaneLayoutVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXSlidingPaneLayoutVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXSwipeRefreshLayoutVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXSwipeRefreshLayoutVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinAndroidXTransitionVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXTransitionVersion",
-      "defaultValue": "1.2.0"
+      "defaultValue": "1.2.0.1"
     },
     "XamarinAndroidXVectorDrawableVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXVectorDrawableVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXVectorDrawableAnimatedVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXVectorDrawableAnimatedVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXVersionedParcelableVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXVersionedParcelableVersion",
-      "defaultValue": "1.1.0"
+      "defaultValue": "1.1.0.1"
     },
     "XamarinAndroidXViewPagerVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinAndroidXViewPagerVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinGoogleAndroidMaterialVersion": {
       "type": "parameter",
       "datatype": "string",
       "replaces": "XamarinGoogleAndroidMaterialVersion",
-      "defaultValue": "1.0.0"
+      "defaultValue": "1.0.0.1"
     },
     "XamarinEssentialsSdk": {
       "type": "parameter",
       "dataType": "string",
       "replaces": "XamarinEssentialsSdk",
-      "defaultValue": "1.5.1"
+      "defaultValue": "1.5.3.2"
     },
     "XamarinFormsSdk": {
       "type": "parameter",
       "dataType": "string",
       "replaces": "XamarinFormsSdk",
-      "defaultValue": "4.8.0.1269"
+      "defaultValue": "4.8.0.1687"
     },
     "FabulousPkgsVersion": {
       "type": "parameter",
       "dataType": "string",
       "replaces": "FabulousPkgsVersion",
-      "defaultValue": "0.60.0-preview1"
+      "defaultValue": "0.60.0-preview4"
     },
     "NewtonsoftJsonPkg": {
       "type": "parameter",
@@ -432,11 +432,17 @@
       "replaces": "XamarinAndroidFSharpResourceProviderPkg",
       "defaultValue": "1.0.0.28"
     },
+    "SystemBuffersPkg": {
+      "type": "parameter",
+      "dataType": "string",
+      "replaces": "SystemBuffersPkg",
+      "defaultValue": "4.5.1"
+    },
     "FSharpCorePkgVersion": {
       "type": "parameter",
       "dataType": "string",
       "replaces": "FSharpCorePkgVersion",
-      "defaultValue": "4.7.1"
+      "defaultValue": "5.0.0"
     },
     "OpenTKPkgVersion": {
       "type": "parameter",
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/Properties/AssemblyInfo.fs b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/AssemblyInfo.fs
similarity index 100%
rename from Fabulous.XamarinForms/templates/content/blank/NewApp.Android/Properties/AssemblyInfo.fs
rename to Fabulous.XamarinForms/templates/content/blank/NewApp.Android/AssemblyInfo.fs
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/MainActivity.fs b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/MainActivity.fs
index b67a748a8..4ea263b61 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/MainActivity.fs
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/MainActivity.fs
@@ -11,23 +11,20 @@ open Android.Views
 open Android.Widget
 open Android.OS
 open Xamarin.Forms.Platform.Android
+open NewApp
 
 [<Activity (Label = "NewApp.Android", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit FormsAppCompatActivity()
-    override this.OnCreate (bundle: Bundle) =
+    override this.OnCreate(bundle: Bundle) =
         FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
         FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
-        base.OnCreate (bundle)
 
+        base.OnCreate (bundle)
         Xamarin.Essentials.Platform.Init(this, bundle)
-
-        Xamarin.Forms.Forms.Init (this, bundle)
-
-        let appcore  = new NewApp.App()
-        this.LoadApplication (appcore)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(App())
 
     override this.OnRequestPermissionsResult(requestCode: int, permissions: string[], [<GeneratedEnum>] grantResults: Android.Content.PM.Permission[]) =
         Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults)
-
         base.OnRequestPermissionsResult(requestCode, permissions, grantResults)
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/NewApp.Android.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/NewApp.Android.fsproj
index 093317cd9..6189bd2c5 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/NewApp.Android.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/NewApp.Android.fsproj
@@ -1,75 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
     <ProjectGuid>{8D9F8CF0-E178-402D-8D40-A88B7B5F3D42}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
     <OutputType>Library</OutputType>
     <RootNamespace>NewApp.Android</RootNamespace>
     <AssemblyName>NewApp.Android</AssemblyName>
     <TargetFrameworkVersion>AndroidSDKVersion</TargetFrameworkVersion>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-    <!--#if (MinAndroidAPI >= 21)
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <#endif-->
-    <Name>NewApp.Android</Name>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <OtherFlags>/warnon:1182</OtherFlags>
-    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>False</ConsolePause>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
+    <PlatformTarget>
+    </PlatformTarget>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <ConsolePause>False</ConsolePause>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidDexTool>d8</AndroidDexTool>
-    <AndroidLinkTool>r8</AndroidLinkTool>
-    <AndroidSupportedAbis />
+    <GenerateTailCalls>true</GenerateTailCalls>
+    <PlatformTarget>
+    </PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <Compile Include="MainActivity.fs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidResource Include="Resources\drawable\icon.png" />
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
@@ -78,157 +58,173 @@
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
-    <None Include="packages.config" />
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="MainActivity.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NewApp\NewApp.fsproj">
+      <Project>{99E19497-29A6-4B77-B773-BEC55F9B55DC}</Project>
+      <Name>NewApp</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
-    </Reference>
     <Reference Include="Java.Interop" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>..\packages\Xamarin.Android.FSharp.ResourceProvider.XamarinAndroidFSharpResourceProviderPkg\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.FSharpCorePkgVersion\lib\netstandard2.0\FSharp.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.NewtonsoftJsonPkg\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Activity">
-      <HintPath>..\packages\Xamarin.AndroidX.Activity.XamarinAndroidXActivityVersion\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.MultiDex">
+      <HintPath>..\packages\Xamarin.AndroidX.MultiDex.XamarinAndroidXMultiDexVersion\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Annotation">
       <HintPath>..\packages\Xamarin.AndroidX.Annotation.XamarinAndroidXAnnotationVersion\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat">
-      <HintPath>..\packages\Xamarin.AndroidX.AppCompat.XamarinAndroidXAppCompatVersion\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat.Resources">
-      <HintPath>..\packages\Xamarin.AndroidX.AppCompat.Resources.XamarinAndroidXAppCompatResourcesVersion\lib\monoandroid90\Xamarin.AndroidX.AppCompat.Resources.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
-      <HintPath>..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.XamarinAndroidXAppCompatAppCompatResourcesVersion\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Arch.Core.Common">
       <HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Common.XamarinAndroidXArchCoreCommonVersion\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
       <HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Runtime.XamarinAndroidXArchCoreRuntimeVersion\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
-      <HintPath>..\packages\Xamarin.AndroidX.AsyncLayoutInflater.XamarinAndroidXAsyncLayoutInflaterVersion\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Browser">
-      <HintPath>..\packages\Xamarin.AndroidX.Browser.XamarinAndroidXBrowserVersion\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.CardView">
       <HintPath>..\packages\Xamarin.AndroidX.CardView.XamarinAndroidXCardViewVersion\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Collection">
       <HintPath>..\packages\Xamarin.AndroidX.Collection.XamarinAndroidXCollectionVersion\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
-      <HintPath>..\packages\Xamarin.AndroidX.CoordinatorLayout.XamarinAndroidXCoordinatorLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Core">
-      <HintPath>..\packages\Xamarin.AndroidX.Core.XamarinAndroidXCoreVersion\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.CursorAdapter">
       <HintPath>..\packages\Xamarin.AndroidX.CursorAdapter.XamarinAndroidXCursorAdapterVersion\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.CustomView">
-      <HintPath>..\packages\Xamarin.AndroidX.CustomView.XamarinAndroidXCustomViewVersion\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.DocumentFile">
       <HintPath>..\packages\Xamarin.AndroidX.DocumentFile.XamarinAndroidXDocumentFileVersion\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.DrawerLayout">
-      <HintPath>..\packages\Xamarin.AndroidX.DrawerLayout.XamarinAndroidXDrawerLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Fragment">
-      <HintPath>..\packages\Xamarin.AndroidX.Fragment.XamarinAndroidXFragmentVersion\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Interpolator">
       <HintPath>..\packages\Xamarin.AndroidX.Interpolator.XamarinAndroidXInterpolatorVersion\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
-      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.XamarinAndroidXLegacySupportCoreUIVersion\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
-      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.XamarinAndroidXLegacySupportCoreUtilsVersion\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
-      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.V4.XamarinAndroidXLegacySupportV4Version\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.Common">
       <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Common.XamarinAndroidXLifecycleCommonVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
-      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.XamarinAndroidXLifecycleLiveDataVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
       <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.XamarinAndroidXLifecycleLiveDataCoreVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
+      <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.XamarinAndroidXLifecycleLiveDataVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
       <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Runtime.XamarinAndroidXLifecycleRuntimeVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
       <HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.XamarinAndroidXLifecycleViewModelVersion\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
+      <HintPath>..\packages\Xamarin.AndroidX.LocalBroadcastManager.XamarinAndroidXLocalBroadcastManagerVersion\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Print">
+      <HintPath>..\packages\Xamarin.AndroidX.Print.XamarinAndroidXPrintVersion\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.SavedState">
+      <HintPath>..\packages\Xamarin.AndroidX.SavedState.XamarinAndroidXSavedStateVersion\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
+      <HintPath>..\packages\Xamarin.AndroidX.VersionedParcelable.XamarinAndroidXVersionedParcelableVersion\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Core">
+      <HintPath>..\packages\Xamarin.AndroidX.Core.XamarinAndroidXCoreVersion\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Activity">
+      <HintPath>..\packages\Xamarin.AndroidX.Activity.XamarinAndroidXActivityVersion\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
+      <HintPath>..\packages\Xamarin.AndroidX.AsyncLayoutInflater.XamarinAndroidXAsyncLayoutInflaterVersion\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.CustomView">
+      <HintPath>..\packages\Xamarin.AndroidX.CustomView.XamarinAndroidXCustomViewVersion\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.CoordinatorLayout">
+      <HintPath>..\packages\Xamarin.AndroidX.CoordinatorLayout.XamarinAndroidXCoordinatorLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.DrawerLayout">
+      <HintPath>..\packages\Xamarin.AndroidX.DrawerLayout.XamarinAndroidXDrawerLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.AndroidX.Loader">
       <HintPath>..\packages\Xamarin.AndroidX.Loader.XamarinAndroidXLoaderVersion\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
-      <HintPath>..\packages\Xamarin.AndroidX.LocalBroadcastManager.XamarinAndroidXLocalBroadcastManagerVersion\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
+      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.XamarinAndroidXLegacySupportCoreUtilsVersion\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.Media">
       <HintPath>..\packages\Xamarin.AndroidX.Media.XamarinAndroidXMediaVersion\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.MultiDex">
-      <HintPath>..\packages\Xamarin.AndroidX.MultiDex.XamarinAndroidXMultiDexVersion\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.AndroidX.Print">
-      <HintPath>..\packages\Xamarin.AndroidX.Print.XamarinAndroidXPrintVersion\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.RecyclerView">
       <HintPath>..\packages\Xamarin.AndroidX.RecyclerView.XamarinAndroidXRecyclerViewVersion\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.SavedState">
-      <HintPath>..\packages\Xamarin.AndroidX.SavedState.XamarinAndroidXSavedStateVersion\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
       <HintPath>..\packages\Xamarin.AndroidX.SlidingPaneLayout.XamarinAndroidXSlidingPaneLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
       <HintPath>..\packages\Xamarin.AndroidX.SwipeRefreshLayout.XamarinAndroidXSwipeRefreshLayoutVersion\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.Transition">
-      <HintPath>..\packages\Xamarin.AndroidX.Transition.XamarinAndroidXTransitionVersion\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.AndroidX.VectorDrawable">
       <HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.XamarinAndroidXVectorDrawableVersion\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
       <HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.Animated.XamarinAndroidXVectorDrawableAnimatedVersion\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.AndroidX.VersionedParcelable">
-      <HintPath>..\packages\Xamarin.AndroidX.VersionedParcelable.XamarinAndroidXVersionedParcelableVersion\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
+    <Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
+      <HintPath>..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.XamarinAndroidXAppCompatAppCompatResourcesVersion\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.AndroidX.ViewPager">
       <HintPath>..\packages\Xamarin.AndroidX.ViewPager.XamarinAndroidXViewPagerVersion\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
     </Reference>
+    <Reference Include="Xamarin.AndroidX.Fragment">
+      <HintPath>..\packages\Xamarin.AndroidX.Fragment.XamarinAndroidXFragmentVersion\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.AppCompat">
+      <HintPath>..\packages\Xamarin.AndroidX.AppCompat.XamarinAndroidXAppCompatVersion\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
+      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.XamarinAndroidXLegacySupportCoreUIVersion\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Browser">
+      <HintPath>..\packages\Xamarin.AndroidX.Browser.XamarinAndroidXBrowserVersion\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
+      <HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.V4.XamarinAndroidXLegacySupportV4Version\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.AndroidX.Transition">
+      <HintPath>..\packages\Xamarin.AndroidX.Transition.XamarinAndroidXTransitionVersion\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Google.Android.Material">
+      <HintPath>..\packages\Xamarin.Google.Android.Material.XamarinGoogleAndroidMaterialVersion\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\packages\FSharp.Core.FSharpCorePkgVersion\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
+      <HintPath>..\packages\Xamarin.Android.FSharp.ResourceProvider.XamarinAndroidFSharpResourceProviderPkg\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.Essentials">
       <HintPath>..\packages\Xamarin.Essentials.XamarinEssentialsSdk\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.NewtonsoftJsonPkg\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Fabulous">
       <HintPath>..\packages\Fabulous.FabulousPkgsVersion\lib\netstandard2.0\Fabulous.dll</HintPath>
     </Reference>
@@ -241,28 +237,13 @@
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
       <HintPath>..\packages\Fabulous.XamarinForms.LiveUpdate.FabulousPkgsVersion\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
-    <ProjectReference Include="..\NewApp\NewApp.fsproj">
-      <Project>{99E19497-29A6-4B77-B773-BEC55F9B55DC}</Project>
-      <Name>NewApp</Name>
-    </ProjectReference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Google.Android.Material">
-      <HintPath>..\packages\Xamarin.Google.Android.Material.XamarinGoogleAndroidMaterialVersion\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
+    <Reference Include="System.Buffers">
+      <HintPath>..\packages\System.Buffers.SystemBuffersPkg\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.FSharp.targets" />
   <Import Project="..\packages\Xamarin.AndroidX.MultiDex.XamarinAndroidXMultiDexVersion\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.XamarinAndroidXMultiDexVersion\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
+  <Import Project="..\packages\Xamarin.AndroidX.Migration.XamarinAndroidXMigrationVersion\build\monoandroid90\Xamarin.AndroidX.Migration.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.XamarinAndroidXMigrationVersion\build\monoandroid90\Xamarin.AndroidX.Migration.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.Annotation.XamarinAndroidXAnnotationVersion\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.XamarinAndroidXAnnotationVersion\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Common.XamarinAndroidXArchCoreCommonVersion\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Common.XamarinAndroidXArchCoreCommonVersion\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Runtime.XamarinAndroidXArchCoreRuntimeVersion\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Runtime.XamarinAndroidXArchCoreRuntimeVersion\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
@@ -294,7 +275,6 @@
   <Import Project="..\packages\Xamarin.AndroidX.SwipeRefreshLayout.XamarinAndroidXSwipeRefreshLayoutVersion\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SwipeRefreshLayout.XamarinAndroidXSwipeRefreshLayoutVersion\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.XamarinAndroidXVectorDrawableVersion\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.XamarinAndroidXVectorDrawableVersion\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.Animated.XamarinAndroidXVectorDrawableAnimatedVersion\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.Animated.XamarinAndroidXVectorDrawableAnimatedVersion\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
-  <Import Project="..\packages\Xamarin.AndroidX.AppCompat.Resources.XamarinAndroidXAppCompatResourcesVersion\build\monoandroid90\Xamarin.AndroidX.AppCompat.Resources.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.Resources.XamarinAndroidXAppCompatResourcesVersion\build\monoandroid90\Xamarin.AndroidX.AppCompat.Resources.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.XamarinAndroidXAppCompatAppCompatResourcesVersion\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.XamarinAndroidXAppCompatAppCompatResourcesVersion\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.ViewPager.XamarinAndroidXViewPagerVersion\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager.XamarinAndroidXViewPagerVersion\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
   <Import Project="..\packages\Xamarin.AndroidX.Fragment.XamarinAndroidXFragmentVersion\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Fragment.XamarinAndroidXFragmentVersion\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
@@ -305,4 +285,4 @@
   <Import Project="..\packages\Xamarin.AndroidX.Transition.XamarinAndroidXTransitionVersion\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Transition.XamarinAndroidXTransitionVersion\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
   <Import Project="..\packages\Xamarin.Google.Android.Material.XamarinGoogleAndroidMaterialVersion\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\packages\Xamarin.Google.Android.Material.XamarinGoogleAndroidMaterialVersion\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
   <Import Project="..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.targets')" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/packages.config b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/packages.config
index 860dc19f1..23c72962a 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/packages.config
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.Android/packages.config
@@ -10,7 +10,6 @@
   <package id="Xamarin.AndroidX.Activity" version="XamarinAndroidXActivityVersion" />
   <package id="Xamarin.AndroidX.Annotation" version="XamarinAndroidXAnnotationVersion" />
   <package id="Xamarin.AndroidX.AppCompat" version="XamarinAndroidXAppCompatVersion" />
-  <package id="Xamarin.AndroidX.AppCompat.Resources" version="XamarinAndroidXAppCompatResourcesVersion" />
   <package id="Xamarin.AndroidX.AppCompat.AppCompatResources" version="XamarinAndroidXAppCompatAppCompatResourcesVersion" />
   <package id="Xamarin.AndroidX.Arch.Core.Common" version="XamarinAndroidXArchCoreCommonVersion" />
   <package id="Xamarin.AndroidX.Arch.Core.Runtime" version="XamarinAndroidXArchCoreRuntimeVersion" />
@@ -37,6 +36,7 @@
   <package id="Xamarin.AndroidX.Loader" version="XamarinAndroidXLoaderVersion" />
   <package id="Xamarin.AndroidX.LocalBroadcastManager" version="XamarinAndroidXLocalBroadcastManagerVersion" />
   <package id="Xamarin.AndroidX.Media" version="XamarinAndroidXMediaVersion" />
+  <package id="Xamarin.AndroidX.Migration" version="XamarinAndroidXMigrationVersion" />
   <package id="Xamarin.AndroidX.MultiDex" version="XamarinAndroidXMultiDexVersion" />
   <package id="Xamarin.AndroidX.Print" version="XamarinAndroidXPrintVersion" />
   <package id="Xamarin.AndroidX.RecyclerView" version="XamarinAndroidXRecyclerViewVersion" />
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/NewApp.Gtk.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/NewApp.Gtk.fsproj
index 032553efd..b26206e87 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/NewApp.Gtk.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/NewApp.Gtk.fsproj
@@ -10,6 +10,7 @@
     <RootNamespace>NewApp.Gtk</RootNamespace>
     <AssemblyName>NewApp.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +42,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Package>gtk-sharp-2.0</Package>
       <SpecificVersion>False</SpecificVersion>
@@ -74,7 +76,7 @@
       <HintPath>..\packages\Xamarin.Forms.Platform.GTK.XamarinFormsSdk\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.FSharpCorePkgVersion\lib\net45\FSharp.Core.dll</HintPath>
+      <HintPath>..\packages\FSharp.Core.FSharpCorePkgVersion\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\packages\Xamarin.Forms.XamarinFormsSdk\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
@@ -100,6 +102,9 @@
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
       <HintPath>..\packages\Fabulous.XamarinForms.LiveUpdate.FabulousPkgsVersion\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\packages\System.Buffers.SystemBuffersPkg\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/packages.config b/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/packages.config
index 8ecc29a1a..cb4570f25 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/packages.config
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.Gtk/packages.config
@@ -9,4 +9,7 @@
   <package id="Fabulous.LiveUpdate" version="FabulousPkgsVersion" />
   <package id="Fabulous.XamarinForms" version="FabulousPkgsVersion" />
   <package id="Fabulous.XamarinForms.LiveUpdate" version="FabulousPkgsVersion" />
+
+  <package id="OpenTK" version="OpenTKPkgVersion" />
+  <package id="System.Buffers" version="SystemBuffersPkg" />
 </packages>
\ No newline at end of file
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.WPF/NewApp.WPF.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp.WPF/NewApp.WPF.fsproj
index c213c2ec1..bca729d70 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.WPF/NewApp.WPF.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.WPF/NewApp.WPF.fsproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
   </PropertyGroup>
   <ItemGroup>
@@ -10,18 +11,10 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <PackageReference Include="FSharp.Core" Version="FSharpCorePkgVersion" />
     <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="XamarinFormsSdk" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="../NewApp/NewApp.fsproj" />
   </ItemGroup>
 </Project>
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.iOS/NewApp.iOS.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp.iOS/NewApp.iOS.fsproj
index e7faff8c2..4de04143e 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.iOS/NewApp.iOS.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.iOS/NewApp.iOS.fsproj
@@ -110,6 +110,7 @@
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\ios-marketing.png" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -146,6 +147,9 @@
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
       <HintPath>..\packages\Fabulous.XamarinForms.LiveUpdate.FabulousPkgsVersion\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\packages\System.Buffers.SystemBuffersPkg\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
     <!--#if (CreateUITestProject)
     <PackageReference Include="Xamarin.TestCloud.Agent" Version="0.21.4"/>
     <#endif-->
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp.macOS/NewApp.macOS.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp.macOS/NewApp.macOS.fsproj
index 46eda6c87..5097d1b54 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp.macOS/NewApp.macOS.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp.macOS/NewApp.macOS.fsproj
@@ -15,6 +15,7 @@
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,6 +82,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets" Condition="Exists('$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.FSharp.targets')"/>
   <Import Project="..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.XamarinFormsSdk\build\Xamarin.Forms.targets')" />
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Core" />
@@ -112,6 +114,9 @@
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
       <HintPath>..\packages\Fabulous.XamarinForms.LiveUpdate.FabulousPkgsVersion\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers">
+      <HintPath>..\packages\System.Buffers.SystemBuffersPkg\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NewApp\NewApp.fsproj">
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fs b/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fs
index 9b0a71720..057d73206 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fs
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fs
@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace NewApp
 
 open System.Diagnostics
@@ -9,8 +9,8 @@ open Xamarin.Forms
 
 module App = 
     type Model = 
-      { Count : int
-        Step : int
+      { Count: int
+        Step: int
         TimerOn: bool }
 
     type Msg = 
@@ -58,18 +58,19 @@ module App =
             ]))
 
     // Note, this declaration is needed if you enable LiveUpdate
-    let program = XamarinFormsProgram.mkProgram init update view
+    let program =
+        XamarinFormsProgram.mkProgram init update view
+//-:cnd:noEmit
+#if DEBUG
+        |> Program.withConsoleTrace
+#endif
+//+:cnd:noEmit
 
 type App () as app = 
     inherit Application ()
 
     let runner = 
         App.program
-//-:cnd:noEmit
-#if DEBUG
-        |> Program.withConsoleTrace
-#endif
-//+:cnd:noEmit
         |> XamarinFormsProgram.run app
 
 //-:cnd:noEmit
diff --git a/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fsproj b/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fsproj
index 36bc78d2d..e972505aa 100644
--- a/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fsproj
+++ b/Fabulous.XamarinForms/templates/content/blank/NewApp/NewApp.fsproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <Compile Include="NewApp.fs" />
   </ItemGroup>
+  
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="XamarinFormsSdk" />
     <PackageReference Include="Xamarin.Essentials" Version="XamarinEssentialsSdk" />
diff --git a/Fabulous.sln b/Fabulous.sln
index c8a8dd624..05723da1a 100644
--- a/Fabulous.sln
+++ b/Fabulous.sln
@@ -155,8 +155,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FabulousWeather", "Fabulous
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FabulousWeather", "Fabulous.XamarinForms\samples\FabulousWeather\FabulousWeather\FabulousWeather.fsproj", "{39F73F10-B026-4DD4-A1BE-2755C0757C85}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FabulousWeather.Droid", "Fabulous.XamarinForms\samples\FabulousWeather\Droid\FabulousWeather.Droid.fsproj", "{F539DD22-3911-47E1-B5E8-810367E80A51}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FabulousWeather.iOS", "Fabulous.XamarinForms\samples\FabulousWeather\iOS\FabulousWeather.iOS.fsproj", "{ECD76B65-8469-4AD3-A458-64283251809A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FabulousWeather.UWP", "Fabulous.XamarinForms\samples\FabulousWeather\UWP\FabulousWeather.UWP.csproj", "{EA10B4EC-0F47-4DB6-A2E6-D726AECD5E1A}"
@@ -198,6 +196,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FabulousWeather.Droid", "Fabulous.XamarinForms\samples\FabulousWeather\Droid\FabulousWeather.Droid.fsproj", "{10B86D0F-3171-4657-A628-3CD70C2DAA8C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1866,35 +1866,6 @@ Global
 		{39F73F10-B026-4DD4-A1BE-2755C0757C85}.Release|x64.Build.0 = Release|Any CPU
 		{39F73F10-B026-4DD4-A1BE-2755C0757C85}.Release|x86.ActiveCfg = Release|Any CPU
 		{39F73F10-B026-4DD4-A1BE-2755C0757C85}.Release|x86.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|x64.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Debug|x86.Build.0 = Debug|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|ARM.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|ARM64.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|iPhone.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|x64.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|x64.Build.0 = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|x86.ActiveCfg = Release|Any CPU
-		{F539DD22-3911-47E1-B5E8-810367E80A51}.Release|x86.Build.0 = Release|Any CPU
 		{ECD76B65-8469-4AD3-A458-64283251809A}.Debug|Any CPU.ActiveCfg = Debug|iPhone
 		{ECD76B65-8469-4AD3-A458-64283251809A}.Debug|Any CPU.Build.0 = Debug|iPhone
 		{ECD76B65-8469-4AD3-A458-64283251809A}.Debug|ARM.ActiveCfg = Debug|iPhone
@@ -2319,6 +2290,34 @@ Global
 		{BD6B48FC-CE37-4AD3-9EC6-8BBCDE18B7C7}.Release|x64.Build.0 = Release|Any CPU
 		{BD6B48FC-CE37-4AD3-9EC6-8BBCDE18B7C7}.Release|x86.ActiveCfg = Release|Any CPU
 		{BD6B48FC-CE37-4AD3-9EC6-8BBCDE18B7C7}.Release|x86.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|ARM.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|ARM64.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|iPhone.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|x64.Build.0 = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2393,7 +2392,6 @@ Global
 		{8B4467AD-8368-4E84-A99F-0354FB746076} = {137C3285-05C0-42AD-89DE-DC5F12DDBE24}
 		{4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77} = {96CE6432-1C99-413D-ABE6-6D47D605E472}
 		{39F73F10-B026-4DD4-A1BE-2755C0757C85} = {4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77}
-		{F539DD22-3911-47E1-B5E8-810367E80A51} = {4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77}
 		{ECD76B65-8469-4AD3-A458-64283251809A} = {4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77}
 		{EA10B4EC-0F47-4DB6-A2E6-D726AECD5E1A} = {4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77}
 		{75687888-DD5C-443C-B079-500CE117391E} = {96CE6432-1C99-413D-ABE6-6D47D605E472}
@@ -2411,6 +2409,7 @@ Global
 		{A9C9AD26-CE5D-48A8-B0AA-C86597B49CBB} = {09E8890D-BEA5-4F3A-AE32-B5DE292783D4}
 		{D844F7AD-2860-4D92-8D53-B0017D62FC1F} = {09E8890D-BEA5-4F3A-AE32-B5DE292783D4}
 		{BD6B48FC-CE37-4AD3-9EC6-8BBCDE18B7C7} = {09E8890D-BEA5-4F3A-AE32-B5DE292783D4}
+		{10B86D0F-3171-4657-A628-3CD70C2DAA8C} = {4CF4FD79-EA1E-4EB3-A3A9-4D7E38DEFD77}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E142F9FB-7EA9-4866-81D4-718660BDCAEB}
diff --git a/Packages.targets b/Packages.targets
index a39550827..15729ed6d 100644
--- a/Packages.targets
+++ b/Packages.targets
@@ -15,8 +15,7 @@
         <PackageReference Update="Xamarin.Forms.Maps" Version="4.8.0.1269" />
         <PackageReference Update="OxyPlot.Xamarin.Forms" Version="1.0.0" />
         <PackageReference Update="SkiaSharp.Views.Forms" Version="1.68.1" />
-        <PackageReference Update="Xamarin.Forms.PancakeView" Version="1.3.6" />
-        <PackageReference Update="Plugin.MediaManager.Forms" Version="0.9.6" />
+        <PackageReference Update="Plugin.MediaManager.Forms" Version="1.0.0" />
         <PackageReference Update="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
     </ItemGroup>
 
@@ -37,7 +36,12 @@
         <PackageReference Update="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
         <PackageReference Update="System.Reflection.Emit.Lightweight" Version="4.7.0" />
         <PackageReference Update="NETStandard.Library" Version="2.0.3" />
-        <!-- Samples -->
+    </ItemGroup>
+
+    <!-- Tools and samples -->
+    <ItemGroup Condition=" '$(IsPackable)' == 'false' ">
+        <PackageReference Update="FSharp.Core" Version="5.0.0" />
+        <PackageReference Update="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
         <PackageReference Update="FSharp.Data" Version="3.3.3" />
         <PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.10" />
         <PackageReference Update="SkiaSharp.Views.Forms.WPF" Version="1.68.1.1" />
@@ -46,11 +50,6 @@
         <PackageReference Update="Xamarin.Forms.Maps.WPF" Version="4.8.0.1269" />
     </ItemGroup>
 
-    <!-- Tools and samples can use the latest version of FSharp.Core -->
-    <ItemGroup Condition=" '$(IsPackable)' == 'false' ">
-        <PackageReference Update="FSharp.Core" Version="4.7.2" />
-    </ItemGroup>
-
     <!--
         Replace the versions of all ProjectReferences nodes during dotnet pack with a pre-computed bound (see build.fsx)
         Currently, the ProjectReference nodes don't support setting an upper bound for the version, which results in a `>= X.Y.Z` constraint in the NuGet package.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5c850979e..431169625 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+#### 0.60.0-preview4
+
+* [Fabulous.XamarinForms] [Templates] Updated templates to target Android 11 by default
+* [Fabulous.XamarinForms] [Templates] Fixed fabulous-cli version referenced in templates
+* [Fabulous.XamarinForms] [Samples] Updated samples to target Android 11
+
 #### 0.60.0-preview3
 
 * [Fabulous.XamarinForms] Fixed ViewRef to be updated each time the target control changes (https://github.com/fsprojects/Fabulous/pull/812)
diff --git a/azure-pipeline-osx-setup.sh b/azure-pipeline-osx-setup.sh
index 827c804dc..022332c3b 100755
--- a/azure-pipeline-osx-setup.sh
+++ b/azure-pipeline-osx-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MONO_VERSION=6_10_0
-XCODE_VERSION=11.6
+MONO_VERSION=6_12_0
+XCODE_VERSION=12.1.1
 
 echo "Switch to the latest Xamarin SDK"
 sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $MONO_VERSION
diff --git a/build.fsx b/build.fsx
index 05f31fc1f..01721f026 100644
--- a/build.fsx
+++ b/build.fsx
@@ -44,7 +44,7 @@ let addJDK properties =
     | javaHome when not (System.String.IsNullOrWhiteSpace javaHome && Environment.isWindows) -> ("JavaSdkDirectory", javaHome) :: properties
     | _ -> properties
 
-let dotnetBuild outputSubDir paths =
+let dotnetBuild paths =
     for projectPath in paths do
         DotNet.build (fun opt ->
             { opt with
@@ -111,7 +111,14 @@ Target.create "Clean" (fun _ ->
 )
 
 Target.create "Restore" (fun _ ->
-    DotNet.restore id "Fabulous.sln"
+    // Restore all projects (except templates) compatible with the current platform
+    !! "**/*.fsproj" ++ "**/*.csproj"
+    -- "**/templates/**/*.fsproj" -- "**/templates/**/*.csproj"
+    |> removeIncompatiblePlatformProjects
+    |> (fun projects ->
+        for project in projects do
+            DotNet.restore id project
+    )
 )
 
 Target.create "FormatBindings" (fun _ ->
@@ -159,12 +166,12 @@ Target.create "UpdateVersion" (fun _ ->
 
 Target.create "BuildTools" (fun _ ->
     !! "tools/**/*.fsproj"
-    |> dotnetBuild "tools"
+    |> dotnetBuild
 )
 
 Target.create "BuildFabulous" (fun _ -> 
     !! "src/**/*.fsproj"
-    |> dotnetBuild "Fabulous"
+    |> dotnetBuild
 )
 
 Target.create "RunFabulousTests" (fun _ ->
@@ -174,7 +181,7 @@ Target.create "RunFabulousTests" (fun _ ->
 
 Target.create "BuildFabulousCodeGen" (fun _ -> 
     !! "Fabulous.CodeGen/src/**/*.fsproj"
-    |> dotnetBuild "Fabulous.CodeGen"
+    |> dotnetBuild
 )
 
 Target.create "RunFabulousCodeGenTests" (fun _ ->
@@ -184,13 +191,13 @@ Target.create "RunFabulousCodeGenTests" (fun _ ->
 
 Target.create "BuildFabulousXamarinFormsTools" (fun _ ->
     !! "Fabulous.XamarinForms/tools/**/*.fsproj"
-    |> dotnetBuild "Fabulous.XamarinForms/tools"
+    |> dotnetBuild
 )
 
 Target.create "BuildFabulousXamarinFormsDependencies" (fun _ ->
     !! "Fabulous.XamarinForms/src/**/*.fsproj"
     -- "Fabulous.XamarinForms/src/Fabulous.XamarinForms/Fabulous.XamarinForms.fsproj" // This one needs to run the generator beforehand
-    |> dotnetBuild "Fabulous.XamarinForms"
+    |> dotnetBuild
 )
 
 Target.create "RunGeneratorForFabulousXamarinForms" (fun _ ->
@@ -208,7 +215,7 @@ Target.create "RunGeneratorForFabulousXamarinForms" (fun _ ->
 
 Target.create "BuildFabulousXamarinForms" (fun _ -> 
     !! "Fabulous.XamarinForms/src/Fabulous.XamarinForms/Fabulous.XamarinForms.fsproj"
-    |> dotnetBuild "Fabulous.XamarinForms"
+    |> dotnetBuild
 )
 
 Target.create "RunFabulousXamarinFormsTests" (fun _ ->
@@ -232,12 +239,12 @@ Target.create "RunGeneratorForFabulousXamarinFormsExtensions" (fun _ ->
 
 Target.create "BuildFabulousXamarinFormsExtensions" (fun _ ->
     !! "Fabulous.XamarinForms/extensions/**/*.fsproj"
-    |> dotnetBuild "Fabulous.XamarinForms/Extensions"
+    |> dotnetBuild
 )
 
 Target.create "BuildFabulousStaticView" (fun _ ->
     !! "Fabulous.StaticView/src/**/*.fsproj"
-    |> dotnetBuild "Fabulous.StaticView"
+    |> dotnetBuild
 )
 
 Target.create "PackFabulous" (fun _ -> 
diff --git a/docs/Fabulous.XamarinForms/views-extending.md b/docs/Fabulous.XamarinForms/views-extending.md
index 6b5028d10..009d12a20 100644
--- a/docs/Fabulous.XamarinForms/views-extending.md
+++ b/docs/Fabulous.XamarinForms/views-extending.md
@@ -72,13 +72,17 @@ module MyViewExtensions =
             let create () = new ABC()
 
             // The incremental update method
-            let update registry (prev: ViewElement voption) (source: ViewElement) (target: ABC) =
-                ViewBuilders.UpdateBASE (registry, prev, source, target)
+            let update (prev: ViewElement voption) (source: ViewElement) (target: ABC) =
+                ViewBuilders.UpdateBASE (prev, source, target)
                 source.UpdateElementCollection (prev, rop1AttribKey, target.Prop1)
                 source.UpdatePrimitive (prev, target, Prop2AttribKey, (fun target -> target.Prop2), (fun target v -> target.Prop2 <- v))
                 ...
 
-            ViewElement.Create<ABC>(create, update, attribs)
+            let updateAttachedProperties (propertyKey: int) (prev: ViewElement voption) (curr: ViewElement) (targetChild: obj) =
+                ViewBuilders.UpdateBASEAttachedProperties(propertyKey, prev, curr, targetChild)
+                ...
+
+            ViewElement.Create<ABC>(create, update, updateAttachedProperties, attribs)
 ```
 
 The control is then used as follows:
@@ -181,8 +185,11 @@ module MapsExtension =
                 source.UpdateElementCollection(prevOpt, MapPinsAttribKey, target.Pins)
                 source.UpdatePrimitive(prevOpt, target, MapRequestingRegionAttribKey, (fun target v -> target.MoveToRegion(v)))
 
+            let updateAttachedProperties (propertyKey: int) (prevOpt: ViewElement voption) (source: ViewElement) (targetChild: obj) =
+                ViewBuilders.UpdateViewAttachedProperties(propertyKey, prevOpt, source, target)
+
             // The element
-            ViewElement.Create<Xamarin.Forms.Maps.Map>(Map, update, attribs)
+            ViewElement.Create<Xamarin.Forms.Maps.Map>(Map, update, updateAttachedProperties, attribs)
 
         /// Describes a Pin in the view
         static member Pin(?position: Position, ?label: string, ?pinType: PinType, ?address: string) =
@@ -209,8 +216,11 @@ module MapsExtension =
                 source.UpdatePrimitive(prevOpt, target, PinTypeAttribKey, (fun target v -> target.Type <- v))
                 source.UpdatePrimitive(prevOpt, target, PinAddressAttribKey, (fun target v -> target.Address <- v))
 
+            let updateAttachedProperties (propertyKey: int) (prevOpt: ViewElement voption) (source: ViewElement) (targetChild: obj) =
+                ()
+
             // The element
-            ViewElement.Create<Xamarin.Forms.Maps.Pin>(Pin, update, attribs)
+            ViewElement.Create<Xamarin.Forms.Maps.Pin>(Pin, update, updateAttachedProperties, attribs)
 ```
 
 In the above example, inherited properties from `View` (such as `margin` or `horizontalOptions`) have been included in the facade for `Map`.  These properties
@@ -220,21 +230,6 @@ need not be added, you can set them on elements using the helper `With`, usable
 View.Map(hasZoomEnabled = true, hasScrollEnabled = true).With(horizontalOptions = LayoutOptions.FillAndExpand)
 ```
 
-### Example: MasterDetailPage without a toolbar on UWP with custom ViewBuilders
-
-Fabulous uses ViewBuilders to create the underlying Xamarin.Forms classes. Customizing ViewBuilders is not the recommended way for custom controls but it is a great solution for overridden controls like in the following example:
-
-```fsharp
-type MasterDetailPageWithoutToolbar() =
-    inherit Xamarin.Forms.MasterDetailPage()
-    override __.ShouldShowToolbarButton() = false
-
-Fabulous.XamarinForms.ViewBuilders.CreateFuncMasterDetailPage <- fun () ->
-    upcast(new MasterDetailPageWithoutToolbar())
-
-View.MasterDetailPage() // this now uses MasterDetailPageWithoutToolbar
-```
-
 See also:
 
 * [Core Elements](views-elements.md)
diff --git a/paket.dependencies b/paket.dependencies
index cdebbba05..445498636 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,4 +1,4 @@
-version 5.245.1
+version 5.257.0
 
 # dependencies used for retrieving FAKE and its modules
 group fakebuild
@@ -6,6 +6,7 @@ group fakebuild
   framework: netstandard2.0
   storage: none
 
+  nuget FSharp.Core ~> 4.7
   nuget Fake.Api.GitHub
   nuget Fake.Core.ReleaseNotes
   nuget Fake.Core.Target
@@ -20,12 +21,12 @@ group fakebuild
 group neutral
   framework: netstandard2.0
   source https://www.nuget.org/api/v2
-  github fsprojects/FSharp.Compiler.PortaCode:master src/ProjectCracker.fs
-  github fsprojects/FSharp.Compiler.PortaCode:master src/CodeModel.fs
-  github fsprojects/FSharp.Compiler.PortaCode:master src/Interpreter.fs
-  github fsprojects/FSharp.Compiler.PortaCode:master src/FromCompilerService.fs
-  github fsprojects/FSharp.Compiler.PortaCode:master src/ProcessCommandLine.fs
-  github fsprojects/FSharp.Compiler.PortaCode:master tests/PortaCodeTests.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 src/ProjectCracker.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 src/CodeModel.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 src/Interpreter.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 src/FromCompilerService.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 src/ProcessCommandLine.fs
+  github fsprojects/FSharp.Compiler.PortaCode:190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87 tests/PortaCodeTests.fs
 
 # dependencies used by Fabulous.XamarinForms.Generator to extract types via Reflection
 # should be pinned to a specific version, matching the one in Packages.targets
@@ -40,40 +41,24 @@ group generator
   nuget OxyPlot.Xamarin.Forms 1.0.0
   nuget Xamarin.FFImageLoading.Forms 2.4.11.982
 
-# Dependencies used when compiling and running Android samples.
-group androidapp
-  framework: monoandroid9.0
-  source https://www.nuget.org/api/v2
-  nuget FSharp.Core
-  nuget Xamarin.Forms ~> 4.8.0
-  nuget Xamarin.Forms.Maps ~> 4.8.0
-  nuget Xamarin.Android.FSharp.ResourceProvider
-  nuget Newtonsoft.Json
-  nuget FSharp.Data
-  nuget Xamarin.Essentials
-  nuget Xamarin.Forms.PancakeView
-  nuget SkiaSharp.Views.Forms
-  nuget OxyPlot.Xamarin.Forms
-  nuget Xamarin.FFImageLoading.Forms
-
-  nuget Plugin.MediaManager 0.9.6
-  nuget Plugin.MediaManager.Forms 0.9.6
-  nuget Xam.Plugins.Android.ExoPlayer 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.Core 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.Dash 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.Hls 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.SmoothStreaming 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.MediaSession 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-  nuget Xam.Plugins.Android.ExoPlayer.UI 2.9.8 # Pin ExoPlayer to this version because higher requires AndroidX
-
 group androidxapp
   framework: monoandroid10.0
   source https://www.nuget.org/api/v2
   nuget FSharp.Core
+  nuget FSharp.Data
   nuget Xamarin.Forms ~> 4.8.0
+  nuget Xamarin.Forms.Maps ~> 4.8.0
   nuget Newtonsoft.Json
   nuget Xamarin.Android.FSharp.ResourceProvider
   nuget Xamarin.Essentials
+  nuget Xamarin.Forms.PancakeView ~> 2.3
+  nuget SkiaSharp.Views.Forms ~> 1.68
+  nuget SkiaSharp.Views ~> 1.68
+  nuget SkiaSharp ~> 1.68
+  nuget OxyPlot.Xamarin.Forms ~> 1.0
+  nuget Xamarin.FFImageLoading.Forms ~> 2.4
+  nuget Plugin.MediaManager.Forms ~> 1.0
+  nuget System.Buffers
 
 # Dependencies used when compiling and running iOS samples. We can normally use the latest FSharp.Core and 
 # latest Xamarin.Forms though we pin them for now.
@@ -86,11 +71,14 @@ group iosapp
   nuget Newtonsoft.Json
   nuget FSharp.Data
   nuget Xamarin.Essentials
-  nuget Xamarin.Forms.PancakeView
-  nuget SkiaSharp.Views.Forms
-  nuget Plugin.MediaManager.Forms
-  nuget OxyPlot.Xamarin.Forms
-  nuget Xamarin.FFImageLoading.Forms
+  nuget Xamarin.Forms.PancakeView ~> 2.3
+  nuget SkiaSharp.Views.Forms ~> 1.68
+  nuget SkiaSharp.Views ~> 1.68
+  nuget SkiaSharp ~> 1.68
+  nuget OxyPlot.Xamarin.Forms ~> 1.0
+  nuget Xamarin.FFImageLoading.Forms ~> 2.4
+  nuget Plugin.MediaManager.Forms ~> 1.0
+  nuget System.Buffers
 
 group macosapp
   framework: xamarinmac20
@@ -101,28 +89,14 @@ group macosapp
   nuget Newtonsoft.Json
   nuget FSharp.Data
   nuget Xamarin.Essentials
-  nuget Xamarin.Forms.PancakeView
-  nuget SkiaSharp.Views.Forms
-  nuget Plugin.MediaManager.Forms
-  nuget OxyPlot.Xamarin.Forms
-  nuget Xamarin.FFImageLoading.Forms
-
-group wpfapp
-  framework: net472
-  source https://www.nuget.org/api/v2
-  nuget FSharp.Core
-  nuget Xamarin.Forms ~> 4.8.0
-  nuget Xamarin.Forms.Platform.WPF ~> 4.8.0
-  nuget Xamarin.Forms.Maps ~> 4.8.0
-  nuget Xamarin.Forms.Maps.WPF ~> 4.8.0
-  nuget Newtonsoft.Json
-  nuget FSharp.Data
-  nuget Xamarin.Essentials
-  nuget Xamarin.Forms.PancakeView
-  nuget SkiaSharp.Views.Forms.WPF
-  nuget Plugin.MediaManager.Forms
-  nuget OxyPlot.Xamarin.Forms
-  nuget Xamarin.FFImageLoading.Forms
+  nuget Xamarin.Forms.PancakeView ~> 2.3
+  nuget SkiaSharp.Views.Forms ~> 1.68
+  nuget SkiaSharp.Views ~> 1.68
+  nuget SkiaSharp ~> 1.68
+  nuget OxyPlot.Xamarin.Forms ~> 1.0
+  nuget Xamarin.FFImageLoading.Forms ~> 2.4
+  nuget Plugin.MediaManager.Forms ~> 1.0
+  nuget System.Buffers
 
 group gtkapp
   framework: net471
@@ -135,9 +109,13 @@ group gtkapp
   nuget Newtonsoft.Json
   nuget FSharp.Data
   nuget Xamarin.Essentials
-  nuget Xamarin.Forms.PancakeView
-  nuget SkiaSharp.Views.Gtk2
-  nuget Plugin.MediaManager.Forms
-  nuget OxyPlot.Xamarin.Forms
-  nuget OxyPlot.GtkSharp
-  nuget Xamarin.FFImageLoading.Forms
+  nuget Xamarin.Forms.PancakeView ~> 2.3
+  nuget SkiaSharp.Views.Forms ~> 1.68
+  nuget SkiaSharp.Views ~> 1.68
+  nuget SkiaSharp.Views.Gtk2 ~> 1.68
+  nuget SkiaSharp ~> 1.68
+  nuget OxyPlot.Xamarin.Forms ~> 1.0
+  nuget Xamarin.FFImageLoading.Forms ~> 2.4
+  nuget Plugin.MediaManager.Forms ~> 1.0
+  nuget System.Buffers
+  nuget OpenTK ~> 3
diff --git a/paket.lock b/paket.lock
index 9606d9fb3..cca89a268 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,13 +1,13 @@
 
 
-GROUP androidapp
-RESTRICTION: == monoandroid9.0
+GROUP androidxapp
+RESTRICTION: == monoandroid10.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
+    FSharp.Core (5.0)
     FSharp.Data (3.3.3)
       FSharp.Core (>= 4.3.4)
-    Microsoft.NETCore.Platforms (3.1.1)
+    Microsoft.NETCore.Platforms (5.0)
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (12.0.3)
@@ -18,17 +18,12 @@ NUGET
     OxyPlot.Xamarin.Forms (1.0)
       OxyPlot.Xamarin.Android (>= 1.0)
       Xamarin.Forms (>= 2.3.3.180)
-    Plugin.MediaManager (0.9.6)
-      Xam.Plugins.Android.ExoPlayer (>= 2.9.8)
-      Xam.Plugins.Android.ExoPlayer.MediaSession (>= 2.9.8)
-    Plugin.MediaManager.Forms (0.9.6)
-      Plugin.MediaManager (>= 0.9.6)
-      Xamarin.Android.Support.Design (>= 28.0.0.3)
-      Xamarin.Android.Support.v4 (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.AppCompat (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.CardView (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.MediaRouter (>= 28.0.0.3)
-      Xamarin.Forms (>= 4.2.0.815419)
+    Plugin.MediaManager (1.0.4)
+      Xam.Plugins.Android.ExoPlayer (>= 2.11.8)
+      Xam.Plugins.Android.ExoPlayer.MediaSession (>= 2.11.8)
+    Plugin.MediaManager.Forms (1.0.4)
+      Plugin.MediaManager (>= 1.0.4)
+      Xamarin.Forms (>= 4.5.0.657)
     SkiaSharp (1.68.3)
     SkiaSharp.Views (1.68.3)
       SkiaSharp (>= 1.68.3)
@@ -36,28 +31,28 @@ NUGET
       SkiaSharp (>= 1.68.3)
       SkiaSharp.Views (>= 1.68.3)
       Xamarin.Forms (>= 4.4.0.991757)
+    System.Buffers (4.5.1)
     System.ComponentModel (4.3)
-    Xam.Plugins.Android.ExoPlayer (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Dash (>= 2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Hls (>= 2.9.8)
-      Xam.Plugins.Android.ExoPlayer.SmoothStreaming (>= 2.9.8)
-      Xam.Plugins.Android.ExoPlayer.UI (>= 2.9.8)
-    Xam.Plugins.Android.ExoPlayer.Core (2.9.8)
-      Xamarin.Android.Support.Annotations (>= 28.0.0.3)
-    Xam.Plugins.Android.ExoPlayer.Dash (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-    Xam.Plugins.Android.ExoPlayer.Hls (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-    Xam.Plugins.Android.ExoPlayer.MediaSession (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-      Xamarin.Android.Support.Media.Compat (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.AppCompat (>= 28.0.0.3)
-    Xam.Plugins.Android.ExoPlayer.SmoothStreaming (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-    Xam.Plugins.Android.ExoPlayer.UI (2.9.8)
-      Xam.Plugins.Android.ExoPlayer.Core (>= 2.9.8)
-      Xamarin.Android.Support.Media.Compat (>= 28.0.0.3)
+    Xam.Plugins.Android.ExoPlayer (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Dash (>= 2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Hls (>= 2.11.8)
+      Xam.Plugins.Android.ExoPlayer.SmoothStreaming (>= 2.11.8)
+      Xam.Plugins.Android.ExoPlayer.UI (>= 2.11.8)
+    Xam.Plugins.Android.ExoPlayer.Core (2.11.8)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
+    Xam.Plugins.Android.ExoPlayer.Dash (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+    Xam.Plugins.Android.ExoPlayer.Hls (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+    Xam.Plugins.Android.ExoPlayer.MediaSession (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+      Xamarin.AndroidX.Media (>= 1.1.0.1)
+    Xam.Plugins.Android.ExoPlayer.SmoothStreaming (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+    Xam.Plugins.Android.ExoPlayer.UI (2.11.8)
+      Xam.Plugins.Android.ExoPlayer.Core (>= 2.11.8)
+      Xamarin.AndroidX.Media (>= 1.1.0.1)
     Xamarin.Android.Arch.Core.Common (1.1.1.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
     Xamarin.Android.Arch.Core.Runtime (1.1.1.3)
@@ -80,9 +75,6 @@ NUGET
     Xamarin.Android.Arch.Lifecycle.ViewModel (1.1.1.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
     Xamarin.Android.FSharp.ResourceProvider (1.0.0.28)
-    Xamarin.Android.Support.Animated.Vector.Drawable (28.0.0.3)
-      Xamarin.Android.Support.Core.UI (28.0.0.3)
-      Xamarin.Android.Support.Vector.Drawable (28.0.0.3)
     Xamarin.Android.Support.Annotations (28.0.0.3)
     Xamarin.Android.Support.AsyncLayoutInflater (28.0.0.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
@@ -120,25 +112,9 @@ NUGET
       Xamarin.Android.Support.Print (28.0.0.3)
     Xamarin.Android.Support.CursorAdapter (28.0.0.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
-    Xamarin.Android.Support.CustomTabs (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Collections (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Core.UI (28.0.0.3)
-      Xamarin.Android.Support.Interpolator (28.0.0.3)
     Xamarin.Android.Support.CustomView (28.0.0.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
       Xamarin.Android.Support.Compat (28.0.0.3)
-    Xamarin.Android.Support.Design (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Core.UI (28.0.0.3)
-      Xamarin.Android.Support.Core.Utils (28.0.0.3)
-      Xamarin.Android.Support.Fragment (28.0.0.3)
-      Xamarin.Android.Support.Transition (28.0.0.3)
-      Xamarin.Android.Support.v7.AppCompat (28.0.0.3)
-      Xamarin.Android.Support.v7.CardView (28.0.0.3)
-      Xamarin.Android.Support.v7.RecyclerView (28.0.0.3)
     Xamarin.Android.Support.DocumentFile (28.0.0.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
     Xamarin.Android.Support.DrawerLayout (28.0.0.3)
@@ -175,42 +151,12 @@ NUGET
       Xamarin.Android.Support.Annotations (28.0.0.3)
       Xamarin.Android.Support.Compat (28.0.0.3)
       Xamarin.Android.Support.Interpolator (28.0.0.3)
-    Xamarin.Android.Support.Transition (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Fragment (28.0.0.3)
     Xamarin.Android.Support.v4 (28.0.0.3)
       Xamarin.Android.Support.Compat (28.0.0.3)
       Xamarin.Android.Support.Core.UI (28.0.0.3)
       Xamarin.Android.Support.Core.Utils (28.0.0.3)
       Xamarin.Android.Support.Fragment (28.0.0.3)
       Xamarin.Android.Support.Media.Compat (28.0.0.3)
-    Xamarin.Android.Support.v7.AppCompat (28.0.0.3)
-      Xamarin.Android.Support.Animated.Vector.Drawable (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Collections (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Core.Utils (28.0.0.3)
-      Xamarin.Android.Support.CursorAdapter (28.0.0.3)
-      Xamarin.Android.Support.Fragment (28.0.0.3)
-      Xamarin.Android.Support.Vector.Drawable (28.0.0.3)
-    Xamarin.Android.Support.v7.CardView (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-    Xamarin.Android.Support.v7.MediaRouter (28.0.0.3)
-      Xamarin.Android.Support.Media.Compat (28.0.0.3)
-      Xamarin.Android.Support.v7.AppCompat (28.0.0.3)
-      Xamarin.Android.Support.v7.Palette (28.0.0.3)
-      Xamarin.Android.Support.v7.RecyclerView (28.0.0.3)
-    Xamarin.Android.Support.v7.Palette (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Core.Utils (28.0.0.3)
-    Xamarin.Android.Support.v7.RecyclerView (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
-      Xamarin.Android.Support.Core.UI (28.0.0.3)
-    Xamarin.Android.Support.Vector.Drawable (28.0.0.3)
-      Xamarin.Android.Support.Annotations (28.0.0.3)
-      Xamarin.Android.Support.Compat (28.0.0.3)
     Xamarin.Android.Support.VersionedParcelable (28.0.0.3)
       Xamarin.Android.Support.Annotations (28.0.0.3)
       Xamarin.Android.Support.Collections (28.0.0.3)
@@ -218,637 +164,413 @@ NUGET
       Xamarin.Android.Support.Annotations (28.0.0.3)
       Xamarin.Android.Support.Compat (28.0.0.3)
       Xamarin.Android.Support.CustomView (28.0.0.3)
+    Xamarin.AndroidX.Activity (1.1.0.4)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModelSavedState (>= 2.2.0.3)
+      Xamarin.AndroidX.SavedState (>= 1.1.0.3-alpha01)
+    Xamarin.AndroidX.Annotation (1.1.0.7)
+      Xamarin.AndroidX.Migration (>= 1.0.8)
+    Xamarin.AndroidX.AppCompat (1.2.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.AppCompat.AppCompatResources (>= 1.2.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.CursorAdapter (>= 1.0.0.5)
+      Xamarin.AndroidX.DrawerLayout (>= 1.1.1)
+      Xamarin.AndroidX.Fragment (>= 1.2.5.3)
+    Xamarin.AndroidX.AppCompat.AppCompatResources (1.2.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.VectorDrawable (>= 1.1.0.5)
+      Xamarin.AndroidX.VectorDrawable.Animated (>= 1.1.0.5)
+    Xamarin.AndroidX.Arch.Core.Common (2.1.0.6)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Arch.Core.Runtime (2.1.0.6)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.6)
+    Xamarin.AndroidX.AsyncLayoutInflater (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+    Xamarin.AndroidX.Browser (1.2.0.2)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.2)
+      Xamarin.AndroidX.Core (>= 1.2.0.2)
+      Xamarin.Google.Guava.ListenableFuture (>= 1.0.0.2)
+    Xamarin.AndroidX.CardView (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Collection (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.CoordinatorLayout (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.CustomView (>= 1.1.0.3-rc01)
+    Xamarin.AndroidX.Core (1.3.2)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.3)
+      Xamarin.AndroidX.VersionedParcelable (>= 1.1.1.5)
+    Xamarin.AndroidX.CursorAdapter (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.CustomView (1.1.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+    Xamarin.AndroidX.DocumentFile (1.0.1.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.DrawerLayout (1.1.1)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.CustomView (>= 1.1)
+    Xamarin.AndroidX.Fragment (1.2.5.3)
+      Xamarin.AndroidX.Activity (>= 1.1.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModelSavedState (>= 2.2.0.3)
+      Xamarin.AndroidX.Loader (>= 1.1.0.5)
+      Xamarin.AndroidX.SavedState (>= 1.1.0.3-alpha01)
+      Xamarin.AndroidX.ViewPager (>= 1.0.0.5)
+    Xamarin.AndroidX.Interpolator (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Legacy.Support.Core.UI (1.0.0.6)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.AsyncLayoutInflater (>= 1.0.0.5)
+      Xamarin.AndroidX.CoordinatorLayout (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.CursorAdapter (>= 1.0.0.5)
+      Xamarin.AndroidX.CustomView (>= 1.1.0.3)
+      Xamarin.AndroidX.DrawerLayout (>= 1.1.1)
+      Xamarin.AndroidX.Interpolator (>= 1.0.0.5)
+      Xamarin.AndroidX.Legacy.Support.Core.Utils (>= 1.0.0.5)
+      Xamarin.AndroidX.SlidingPaneLayout (>= 1.1)
+      Xamarin.AndroidX.SwipeRefreshLayout (>= 1.1)
+      Xamarin.AndroidX.ViewPager (>= 1.0.0.5)
+    Xamarin.AndroidX.Legacy.Support.Core.Utils (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.DocumentFile (>= 1.0.1.5)
+      Xamarin.AndroidX.Loader (>= 1.1.0.5)
+      Xamarin.AndroidX.LocalBroadcastManager (>= 1.0.0.5)
+      Xamarin.AndroidX.Print (>= 1.0.0.5)
+    Xamarin.AndroidX.Legacy.Support.V4 (1.0.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Fragment (>= 1.2.5.3)
+      Xamarin.AndroidX.Legacy.Support.Core.UI (>= 1.0.0.5)
+      Xamarin.AndroidX.Legacy.Support.Core.Utils (>= 1.0.0.5)
+      Xamarin.AndroidX.Media (>= 1.1.0.5)
+    Xamarin.AndroidX.Lifecycle.Common (2.2.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Lifecycle.LiveData (2.2.0.3)
+      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.6)
+      Xamarin.AndroidX.Arch.Core.Runtime (>= 2.1.0.6)
+      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.3)
+    Xamarin.AndroidX.Lifecycle.LiveData.Core (2.2.0.3)
+      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.6)
+      Xamarin.AndroidX.Arch.Core.Runtime (>= 2.1.0.6)
+      Xamarin.AndroidX.Lifecycle.Common (>= 2.2.0.3)
+    Xamarin.AndroidX.Lifecycle.Runtime (2.2.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.6)
+      Xamarin.AndroidX.Lifecycle.Common (>= 2.2.0.3)
+    Xamarin.AndroidX.Lifecycle.ViewModel (2.2.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Lifecycle.ViewModelSavedState (2.2.0.3)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.3)
+      Xamarin.AndroidX.SavedState (>= 1.1.0.3-alpha01)
+    Xamarin.AndroidX.Loader (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.3)
+      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.3)
+    Xamarin.AndroidX.LocalBroadcastManager (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.Media (1.2)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+    Xamarin.AndroidX.Migration (1.0.8)
+      Xamarin.AndroidX.MultiDex (>= 2.0.1.5)
+    Xamarin.AndroidX.MultiDex (2.0.1.5)
+    Xamarin.AndroidX.Print (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+    Xamarin.AndroidX.RecyclerView (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.CustomView (>= 1.1.0.3-rc01)
+    Xamarin.AndroidX.SavedState (1.1.0.3-alpha01)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Lifecycle.Common (>= 2.2.0.3)
+    Xamarin.AndroidX.SlidingPaneLayout (1.1)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.CustomView (>= 1.1)
+    Xamarin.AndroidX.SwipeRefreshLayout (1.1)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.Interpolator (>= 1.0.0.5)
+    Xamarin.AndroidX.Transition (1.3.1.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Fragment (>= 1.2.5.3)
+      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.3)
+    Xamarin.AndroidX.VectorDrawable (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+    Xamarin.AndroidX.VectorDrawable.Animated (1.1.0.5)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Interpolator (>= 1.0.0.5)
+      Xamarin.AndroidX.VectorDrawable (>= 1.1.0.5)
+    Xamarin.AndroidX.VersionedParcelable (1.1.1.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+    Xamarin.AndroidX.ViewPager (1.0.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.CustomView (>= 1.1.0.3-rc01)
+    Xamarin.AndroidX.ViewPager2 (1.0.0.7)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.6)
+      Xamarin.AndroidX.Collection (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.0.3)
+      Xamarin.AndroidX.Fragment (>= 1.2.5.3)
+      Xamarin.AndroidX.RecyclerView (>= 1.1.0.5)
     Xamarin.Build.Download (0.10)
     Xamarin.Essentials (1.5.3.2)
-      Xamarin.Android.Support.Compat (>= 28.0.0.3)
-      Xamarin.Android.Support.CustomTabs (>= 28.0.0.3)
+      Xamarin.AndroidX.Browser (>= 1.0)
     Xamarin.FFImageLoading (2.4.11.982)
     Xamarin.FFImageLoading.Forms (2.4.11.982)
       Xamarin.FFImageLoading (>= 2.4.11.982)
       Xamarin.Forms (>= 3.3.0.912540)
-    Xamarin.Forms (4.8.0.1269)
-      Xamarin.Android.Support.CustomTabs (>= 28.0.0.3)
-      Xamarin.Android.Support.Design (>= 28.0.0.3)
+    Xamarin.Forms (4.8.0.1687)
+      Xamarin.AndroidX.Browser (>= 1.0.0.1)
+      Xamarin.AndroidX.Legacy.Support.V4 (>= 1.0.0.1)
+      Xamarin.AndroidX.Lifecycle.LiveData (>= 2.1.0.1)
+      Xamarin.Google.Android.Material (>= 1.0.0.1)
+    Xamarin.Forms.Maps (4.8.0.1687)
       Xamarin.Android.Support.v4 (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.AppCompat (>= 28.0.0.3)
-      Xamarin.Android.Support.v7.CardView (>= 28.0.0.3)
-    Xamarin.Forms.Maps (4.8.0.1269)
-      Xamarin.Android.Support.v7.AppCompat (>= 28.0.0.3)
-      Xamarin.Forms (>= 4.8.0.1269)
+      Xamarin.AndroidX.AppCompat (>= 1.1.0.1)
+      Xamarin.AndroidX.Legacy.Support.Core.UI (>= 1.0.0.1)
+      Xamarin.AndroidX.Legacy.Support.V4 (>= 1.0.0.1)
+      Xamarin.AndroidX.Lifecycle.LiveData (>= 2.1.0.1)
+      Xamarin.AndroidX.Migration (>= 1.0.0.1)
+      Xamarin.Forms (>= 4.8.0.1687)
       Xamarin.GooglePlayServices.Maps (>= 71.1610)
-    Xamarin.Forms.PancakeView (1.4.2)
+    Xamarin.Forms.PancakeView (2.3.0.759)
       System.ComponentModel (>= 4.3)
-      Xamarin.Forms (>= 3.6.0.220655)
-    Xamarin.GooglePlayServices.Base (71.1610.1)
-      Xamarin.Build.Download (>= 0.7)
-      Xamarin.GooglePlayServices.Basement (>= 71.1620.2)
-      Xamarin.GooglePlayServices.Tasks (>= 71.1601.1)
-    Xamarin.GooglePlayServices.Basement (71.1620.2)
-      Xamarin.Android.Support.v4 (>= 28.0.0.3)
-      Xamarin.Build.Download (>= 0.7)
-    Xamarin.GooglePlayServices.Maps (71.1610.1)
-      Xamarin.Build.Download (>= 0.7)
-      Xamarin.GooglePlayServices.Base (>= 71.1610.1)
-      Xamarin.GooglePlayServices.Basement (>= 71.1620.2)
-    Xamarin.GooglePlayServices.Tasks (71.1601.1)
-      Xamarin.Build.Download (>= 0.7)
-      Xamarin.GooglePlayServices.Basement (>= 71.1620.2)
-
-GROUP androidxapp
-RESTRICTION: == monoandroid10.0
-NUGET
-  remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
-    Newtonsoft.Json (12.0.3)
-    Xamarin.Android.FSharp.ResourceProvider (1.0.0.28)
-    Xamarin.AndroidX.Activity (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.2.0.1)
-      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModelSavedState (>= 2.2.0.1)
-      Xamarin.AndroidX.SavedState (>= 1.0.0.1)
-    Xamarin.AndroidX.Annotation (1.1.0.1)
-      Xamarin.AndroidX.Migration (>= 1.0.0.1)
-    Xamarin.AndroidX.AppCompat (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.AppCompat.AppCompatResources (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CursorAdapter (>= 1.0.0.1)
-      Xamarin.AndroidX.DrawerLayout (>= 1.0.0.1)
-      Xamarin.AndroidX.Fragment (>= 1.1.0.1)
-    Xamarin.AndroidX.AppCompat.AppCompatResources (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.VectorDrawable (>= 1.1.0.1)
-      Xamarin.AndroidX.VectorDrawable.Animated (>= 1.1.0.1)
-    Xamarin.AndroidX.Arch.Core.Common (2.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Arch.Core.Runtime (2.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.1)
-    Xamarin.AndroidX.AsyncLayoutInflater (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-    Xamarin.AndroidX.Browser (1.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.2.0.1)
-      Xamarin.Google.Guava.ListenableFuture (>= 1.0.0.2)
-    Xamarin.AndroidX.CardView (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Collection (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.CoordinatorLayout (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-    Xamarin.AndroidX.Core (1.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.1)
-      Xamarin.AndroidX.VersionedParcelable (>= 1.1.0.1)
-    Xamarin.AndroidX.CursorAdapter (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.CustomView (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-    Xamarin.AndroidX.DocumentFile (1.0.1.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.DrawerLayout (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-    Xamarin.AndroidX.Fragment (1.2.4.1)
-      Xamarin.AndroidX.Activity (>= 1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
+      Xamarin.AndroidX.AppCompat (>= 1.2.0.4)
+      Xamarin.Forms (>= 4.8.0.1451)
+    Xamarin.Google.Android.Material (1.1.0.5)
+      Xamarin.AndroidX.Annotation (>= 1.1.0.7)
+      Xamarin.AndroidX.AppCompat (>= 1.2.0.5)
+      Xamarin.AndroidX.CardView (>= 1.0.0.5)
+      Xamarin.AndroidX.CoordinatorLayout (>= 1.1.0.5)
+      Xamarin.AndroidX.Core (>= 1.3.2)
+      Xamarin.AndroidX.Fragment (>= 1.2.5.3)
+      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.3)
+      Xamarin.AndroidX.RecyclerView (>= 1.1.0.5)
+      Xamarin.AndroidX.Transition (>= 1.3.1.5)
+      Xamarin.AndroidX.VectorDrawable (>= 1.1.0.5)
+      Xamarin.AndroidX.ViewPager2 (>= 1.0.0.7)
+    Xamarin.Google.Guava.ListenableFuture (1.0.0.2)
+    Xamarin.GooglePlayServices.Base (117.2.1)
       Xamarin.AndroidX.Collection (>= 1.1.0.1)
       Xamarin.AndroidX.Core (>= 1.2.0.1)
-      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModelSavedState (>= 2.2.0.1)
-      Xamarin.AndroidX.Loader (>= 1.1.0.1)
-      Xamarin.AndroidX.ViewPager (>= 1.0.0.1)
-    Xamarin.AndroidX.Interpolator (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Legacy.Support.Core.UI (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.AsyncLayoutInflater (>= 1.0.0.1)
-      Xamarin.AndroidX.CoordinatorLayout (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CursorAdapter (>= 1.0.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-      Xamarin.AndroidX.DrawerLayout (>= 1.0.0.1)
-      Xamarin.AndroidX.Interpolator (>= 1.0.0.1)
-      Xamarin.AndroidX.Legacy.Support.Core.Utils (>= 1.0.0.1)
-      Xamarin.AndroidX.SlidingPaneLayout (>= 1.0.0.1)
-      Xamarin.AndroidX.SwipeRefreshLayout (>= 1.0.0.1)
-      Xamarin.AndroidX.ViewPager (>= 1.0.0.1)
-    Xamarin.AndroidX.Legacy.Support.Core.Utils (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.DocumentFile (>= 1.0.1.1)
-      Xamarin.AndroidX.Loader (>= 1.1.0.1)
-      Xamarin.AndroidX.LocalBroadcastManager (>= 1.0.0.1)
-      Xamarin.AndroidX.Print (>= 1.0.0.1)
-    Xamarin.AndroidX.Legacy.Support.V4 (1.0.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
       Xamarin.AndroidX.Fragment (>= 1.1.0.1)
-      Xamarin.AndroidX.Legacy.Support.Core.UI (>= 1.0.0.1)
-      Xamarin.AndroidX.Legacy.Support.Core.Utils (>= 1.0.0.1)
-      Xamarin.AndroidX.Media (>= 1.1.0.1)
-    Xamarin.AndroidX.Lifecycle.Common (2.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Lifecycle.LiveData (2.2.0.1)
-      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.1)
-      Xamarin.AndroidX.Arch.Core.Runtime (>= 2.1.0.1)
-      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.1)
-    Xamarin.AndroidX.Lifecycle.LiveData.Core (2.2.0.1)
-      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.1)
-      Xamarin.AndroidX.Arch.Core.Runtime (>= 2.1.0.1)
-      Xamarin.AndroidX.Lifecycle.Common (>= 2.2.0.1)
-    Xamarin.AndroidX.Lifecycle.Runtime (2.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.1)
-      Xamarin.AndroidX.Lifecycle.Common (>= 2.2.0.1)
-    Xamarin.AndroidX.Lifecycle.ViewModel (2.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Lifecycle.ViewModelSavedState (2.2.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.2.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.2.0.1)
-      Xamarin.AndroidX.SavedState (>= 1.0.0.1)
-    Xamarin.AndroidX.Loader (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.Lifecycle.LiveData.Core (>= 2.1.0.1)
-      Xamarin.AndroidX.Lifecycle.ViewModel (>= 2.1.0.1)
-    Xamarin.AndroidX.LocalBroadcastManager (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.Media (1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-    Xamarin.AndroidX.Migration (1.0.6.1)
-      Xamarin.AndroidX.MultiDex (>= 2.0.1.1)
-    Xamarin.AndroidX.MultiDex (2.0.1.1)
-    Xamarin.AndroidX.Print (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-    Xamarin.AndroidX.RecyclerView (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-    Xamarin.AndroidX.SavedState (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Arch.Core.Common (>= 2.1.0.1)
-      Xamarin.AndroidX.Lifecycle.Common (>= 2.1.0.1)
-    Xamarin.AndroidX.SlidingPaneLayout (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-    Xamarin.AndroidX.SwipeRefreshLayout (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.Interpolator (>= 1.0.0.1)
-    Xamarin.AndroidX.Transition (1.3.1.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
+      Xamarin.Build.Download (>= 0.10)
+      Xamarin.GooglePlayServices.Basement (>= 117.2.1)
+      Xamarin.GooglePlayServices.Tasks (>= 117.0.2)
+    Xamarin.GooglePlayServices.Basement (117.2.1)
       Xamarin.AndroidX.Collection (>= 1.1.0.1)
       Xamarin.AndroidX.Core (>= 1.2.0.1)
-      Xamarin.AndroidX.Fragment (>= 1.2.2.1)
-      Xamarin.AndroidX.Lifecycle.Runtime (>= 2.2.0.1)
-    Xamarin.AndroidX.VectorDrawable (1.1.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-    Xamarin.AndroidX.VectorDrawable.Animated (1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-      Xamarin.AndroidX.Interpolator (>= 1.0.0.1)
-      Xamarin.AndroidX.VectorDrawable (>= 1.1.0.1)
-    Xamarin.AndroidX.VersionedParcelable (1.1.1.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Collection (>= 1.1.0.1)
-    Xamarin.AndroidX.ViewPager (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
-      Xamarin.AndroidX.CustomView (>= 1.0.0.1)
-    Xamarin.Essentials (1.5.3.2)
-      Xamarin.AndroidX.Browser (>= 1.0)
-    Xamarin.Forms (4.8.0.1269)
-      Xamarin.AndroidX.Browser (>= 1.0.0.1)
-      Xamarin.AndroidX.Legacy.Support.V4 (>= 1.0.0.1)
-      Xamarin.AndroidX.Lifecycle.LiveData (>= 2.1.0.1)
-      Xamarin.Google.Android.Material (>= 1.0.0.1)
-    Xamarin.Google.Android.Material (1.0.0.1)
-      Xamarin.AndroidX.Annotation (>= 1.1.0.1)
-      Xamarin.AndroidX.AppCompat (>= 1.1.0.1)
-      Xamarin.AndroidX.CardView (>= 1.0.0.1)
-      Xamarin.AndroidX.Core (>= 1.1.0.1)
       Xamarin.AndroidX.Fragment (>= 1.1.0.1)
-      Xamarin.AndroidX.Legacy.Support.Core.UI (>= 1.0.0.1)
-      Xamarin.AndroidX.Legacy.Support.Core.Utils (>= 1.0.0.1)
-      Xamarin.AndroidX.RecyclerView (>= 1.1.0.1)
-      Xamarin.AndroidX.Transition (>= 1.2.0.1)
-    Xamarin.Google.Guava.ListenableFuture (1.0.0.2)
+      Xamarin.Build.Download (>= 0.10)
+    Xamarin.GooglePlayServices.Maps (117.0)
+      Xamarin.AndroidX.Fragment (>= 1.1.0.1)
+      Xamarin.Build.Download (>= 0.10)
+      Xamarin.GooglePlayServices.Base (>= 117.1)
+      Xamarin.GooglePlayServices.Basement (>= 117.1)
+    Xamarin.GooglePlayServices.Tasks (117.0.2)
+      Xamarin.Build.Download (>= 0.10)
+      Xamarin.GooglePlayServices.Basement (>= 117.2.1)
 
 GROUP fakebuild
 STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    BlackFox.VsWhere (1.0)
+    BlackFox.VsWhere (1.1)
       FSharp.Core (>= 4.2.3)
-    Fake.Api.GitHub (5.20)
-      FSharp.Core (>= 4.7.1)
-      Octokit (>= 0.47)
-    Fake.Core.CommandLineParsing (5.20)
+      Microsoft.Win32.Registry (>= 4.7)
+    Fake.Api.GitHub (5.20.3)
+      FSharp.Core (>= 4.7.2)
+      Octokit (>= 0.48)
+    Fake.Core.CommandLineParsing (5.20.3)
       FParsec (>= 1.1.1)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Context (5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Environment (5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.FakeVar (5.20)
-      Fake.Core.Context (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Process (5.20)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.FakeVar (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      Fake.Core.Trace (>= 5.20)
-      Fake.IO.FileSystem (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-      System.Collections.Immutable (>= 1.7)
-    Fake.Core.ReleaseNotes (5.20)
-      Fake.Core.SemVer (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.SemVer (5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.String (5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Target (5.20)
-      Fake.Core.CommandLineParsing (>= 5.20)
-      Fake.Core.Context (>= 5.20)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.FakeVar (>= 5.20)
-      Fake.Core.Process (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      Fake.Core.Trace (>= 5.20)
-      FSharp.Control.Reactive (>= 4.2)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Tasks (5.20)
-      Fake.Core.Trace (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Trace (5.20)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.FakeVar (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Core.Xml (5.20)
-      Fake.Core.String (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.DotNet.Cli (5.20)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.Process (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      Fake.Core.Trace (>= 5.20)
-      Fake.DotNet.MSBuild (>= 5.20)
-      Fake.DotNet.NuGet (>= 5.20)
-      Fake.IO.FileSystem (>= 5.20)
-      FSharp.Core (>= 4.7.1)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Context (5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Environment (5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.FakeVar (5.20.3)
+      Fake.Core.Context (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Process (5.20.3)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.FakeVar (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      Fake.IO.FileSystem (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+      System.Collections.Immutable (>= 1.7.1)
+    Fake.Core.ReleaseNotes (5.20.3)
+      Fake.Core.SemVer (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.SemVer (5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.String (5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Target (5.20.3)
+      Fake.Core.CommandLineParsing (>= 5.20.3)
+      Fake.Core.Context (>= 5.20.3)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.FakeVar (>= 5.20.3)
+      Fake.Core.Process (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      FSharp.Control.Reactive (>= 4.4.2)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Tasks (5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Trace (5.20.3)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.FakeVar (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Core.Xml (5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.DotNet.Cli (5.20.3)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.Process (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      Fake.DotNet.MSBuild (>= 5.20.3)
+      Fake.DotNet.NuGet (>= 5.20.3)
+      Fake.IO.FileSystem (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
       Mono.Posix.NETStandard (>= 1.0)
       Newtonsoft.Json (>= 12.0.3)
-    Fake.DotNet.MSBuild (5.20)
-      BlackFox.VsWhere (>= 1.0)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.Process (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      Fake.Core.Trace (>= 5.20)
-      Fake.IO.FileSystem (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-      MSBuild.StructuredLogger (>= 2.1.117)
-    Fake.DotNet.NuGet (5.20)
-      Fake.Core.Environment (>= 5.20)
-      Fake.Core.Process (>= 5.20)
-      Fake.Core.SemVer (>= 5.20)
-      Fake.Core.String (>= 5.20)
-      Fake.Core.Tasks (>= 5.20)
-      Fake.Core.Trace (>= 5.20)
-      Fake.Core.Xml (>= 5.20)
-      Fake.IO.FileSystem (>= 5.20)
-      Fake.Net.Http (>= 5.20)
-      FSharp.Core (>= 4.7.1)
+    Fake.DotNet.MSBuild (5.20.3)
+      BlackFox.VsWhere (>= 1.1)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.Process (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      Fake.IO.FileSystem (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+      MSBuild.StructuredLogger (>= 2.1.176)
+    Fake.DotNet.NuGet (5.20.3)
+      Fake.Core.Environment (>= 5.20.3)
+      Fake.Core.Process (>= 5.20.3)
+      Fake.Core.SemVer (>= 5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      Fake.Core.Tasks (>= 5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      Fake.Core.Xml (>= 5.20.3)
+      Fake.IO.FileSystem (>= 5.20.3)
+      Fake.Net.Http (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
       Newtonsoft.Json (>= 12.0.3)
-      NuGet.Protocol (>= 5.5.1)
-    Fake.IO.FileSystem (5.20)
-      Fake.Core.String (>= 5.20)
-      FSharp.Core (>= 4.7.1)
-    Fake.Net.Http (5.20)
-      Fake.Core.Trace (>= 5.20)
-      FSharp.Core (>= 4.7.1)
+      NuGet.Protocol (>= 5.6)
+    Fake.IO.FileSystem (5.20.3)
+      Fake.Core.String (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
+    Fake.Net.Http (5.20.3)
+      Fake.Core.Trace (>= 5.20.3)
+      FSharp.Core (>= 4.7.2)
     FParsec (1.1.1)
       FSharp.Core (>= 4.3.4)
-    FSharp.Control.Reactive (4.3)
-      FSharp.Core (>= 4.7)
-      System.Reactive (>= 4.3.2)
+    FSharp.Control.Reactive (4.4.2)
+      FSharp.Core (>= 4.7.2)
+      System.Reactive (>= 4.4.1)
     FSharp.Core (4.7.2)
-    Microsoft.Build (16.5)
-    Microsoft.Build.Framework (16.5)
-      System.Runtime.Serialization.Primitives (>= 4.1.1)
-      System.Threading.Thread (>= 4.0)
-    Microsoft.Build.Tasks.Core (16.5)
-      Microsoft.Build.Framework (>= 16.5)
-      Microsoft.Build.Utilities.Core (>= 16.5)
+    Microsoft.Build (16.8)
+    Microsoft.Build.Framework (16.8)
+      System.Security.Permissions (>= 4.7)
+    Microsoft.Build.Tasks.Core (16.8)
+      Microsoft.Build.Framework (>= 16.8)
+      Microsoft.Build.Utilities.Core (>= 16.8)
       Microsoft.Win32.Registry (>= 4.3)
       System.CodeDom (>= 4.4)
       System.Collections.Immutable (>= 1.5)
-      System.Linq.Parallel (>= 4.0.1)
-      System.Net.Http (>= 4.3.4)
       System.Reflection.Metadata (>= 1.6)
       System.Reflection.TypeExtensions (>= 4.1)
       System.Resources.Extensions (>= 4.6)
-      System.Resources.Writer (>= 4.0)
+      System.Runtime.InteropServices (>= 4.3)
+      System.Security.Cryptography.Pkcs (>= 4.7)
+      System.Security.Cryptography.Xml (>= 4.7)
+      System.Security.Permissions (>= 4.7)
       System.Threading.Tasks.Dataflow (>= 4.9)
-    Microsoft.Build.Utilities.Core (16.5)
-      Microsoft.Build.Framework (>= 16.5)
+    Microsoft.Build.Utilities.Core (16.8)
+      Microsoft.Build.Framework (>= 16.8)
       Microsoft.Win32.Registry (>= 4.3)
       System.Collections.Immutable (>= 1.5)
+      System.Security.Permissions (>= 4.7)
       System.Text.Encoding.CodePages (>= 4.0.1)
-    Microsoft.NETCore.Platforms (3.1.1)
-    Microsoft.NETCore.Targets (3.1)
-    Microsoft.Win32.Primitives (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    Microsoft.Win32.Registry (4.7)
-      System.Buffers (>= 4.5)
-      System.Memory (>= 4.5.3)
-      System.Security.AccessControl (>= 4.7)
-      System.Security.Principal.Windows (>= 4.7)
+    Microsoft.NETCore.Platforms (5.0)
+    Microsoft.NETCore.Targets (5.0)
+    Microsoft.Win32.Registry (5.0)
+      System.Buffers (>= 4.5.1)
+      System.Memory (>= 4.5.4)
+      System.Security.AccessControl (>= 5.0)
+      System.Security.Principal.Windows (>= 5.0)
     Mono.Posix.NETStandard (1.0)
-    MSBuild.StructuredLogger (2.1.133)
+    MSBuild.StructuredLogger (2.1.215)
       Microsoft.Build (>= 16.4)
       Microsoft.Build.Framework (>= 16.4)
       Microsoft.Build.Tasks.Core (>= 16.4)
       Microsoft.Build.Utilities.Core (>= 16.4)
-      System.IO.Compression (>= 4.3)
     Newtonsoft.Json (12.0.3)
-    NuGet.Common (5.6)
-      NuGet.Frameworks (>= 5.6)
-      System.Diagnostics.Process (>= 4.3)
-      System.Threading.Thread (>= 4.3)
-    NuGet.Configuration (5.6)
-      NuGet.Common (>= 5.6)
-      System.Security.Cryptography.ProtectedData (>= 4.3)
-    NuGet.Frameworks (5.6)
-    NuGet.Packaging (5.6)
+    NuGet.Common (5.8)
+      NuGet.Frameworks (>= 5.8)
+    NuGet.Configuration (5.8)
+      NuGet.Common (>= 5.8)
+      System.Security.Cryptography.ProtectedData (>= 4.4)
+    NuGet.Frameworks (5.8)
+    NuGet.Packaging (5.8)
       Newtonsoft.Json (>= 9.0.1)
-      NuGet.Configuration (>= 5.6)
-      NuGet.Versioning (>= 5.6)
-      System.Dynamic.Runtime (>= 4.3)
-    NuGet.Protocol (5.6)
-      NuGet.Packaging (>= 5.6)
-      System.Dynamic.Runtime (>= 4.3)
-    NuGet.Versioning (5.6)
-    Octokit (0.47)
-    runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.native.System (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-    runtime.native.System.IO.Compression (4.3.2)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-    runtime.native.System.Net.Http (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-    runtime.native.System.Security.Cryptography.Apple (4.3.1)
-      runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3.1)
-    runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-      runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-      runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3)
-    runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3.1)
-    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
-    runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
+      NuGet.Configuration (>= 5.8)
+      NuGet.Versioning (>= 5.8)
+      System.Security.Cryptography.Cng (>= 5.0.0-preview.3.20214.6)
+      System.Security.Cryptography.Pkcs (>= 5.0.0-preview.3.20214.6)
+    NuGet.Protocol (5.8)
+      NuGet.Packaging (>= 5.8)
+    NuGet.Versioning (5.8)
+    Octokit (0.48)
     System.Buffers (4.5.1)
-    System.CodeDom (4.7)
-    System.Collections (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Collections.Concurrent (4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Diagnostics.Tracing (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.Collections.Immutable (1.7.1)
+    System.CodeDom (5.0)
+    System.Collections.Immutable (5.0)
       System.Memory (>= 4.5.4)
-    System.Diagnostics.Debug (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Diagnostics.DiagnosticSource (4.7.1)
+    System.Formats.Asn1 (5.0)
+      System.Buffers (>= 4.5.1)
       System.Memory (>= 4.5.4)
-    System.Diagnostics.Process (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.Win32.Primitives (>= 4.3)
-      Microsoft.Win32.Registry (>= 4.3)
-      runtime.native.System (>= 4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.IO (>= 4.3)
-      System.IO.FileSystem (>= 4.3)
-      System.IO.FileSystem.Primitives (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Text.Encoding.Extensions (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-      System.Threading.Thread (>= 4.3)
-      System.Threading.ThreadPool (>= 4.3)
-    System.Diagnostics.Tracing (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Dynamic.Runtime (4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Linq (>= 4.3)
-      System.Linq.Expressions (>= 4.3)
-      System.ObjectModel (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Reflection.Emit (>= 4.3)
-      System.Reflection.Emit.ILGeneration (>= 4.3)
-      System.Reflection.Primitives (>= 4.3)
-      System.Reflection.TypeExtensions (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Threading (>= 4.3)
-    System.Globalization (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Globalization.Calendars (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Globalization (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Globalization.Extensions (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      System.Globalization (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
     System.IO (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
       System.Text.Encoding (>= 4.3)
       System.Threading.Tasks (>= 4.3)
-    System.IO.Compression (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      runtime.native.System (>= 4.3)
-      runtime.native.System.IO.Compression (>= 4.3)
-      System.Buffers (>= 4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.IO (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.IO.FileSystem (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.IO (>= 4.3)
-      System.IO.FileSystem.Primitives (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.IO.FileSystem.Primitives (4.3)
-      System.Runtime (>= 4.3)
-    System.Linq (4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-    System.Linq.Expressions (4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.IO (>= 4.3)
-      System.Linq (>= 4.3)
-      System.ObjectModel (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Reflection.Emit (>= 4.3)
-      System.Reflection.Emit.ILGeneration (>= 4.3)
-      System.Reflection.Emit.Lightweight (>= 4.3)
-      System.Reflection.Extensions (>= 4.3)
-      System.Reflection.Primitives (>= 4.3)
-      System.Reflection.TypeExtensions (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Threading (>= 4.3)
-    System.Linq.Parallel (4.3)
-      System.Collections (>= 4.3)
-      System.Collections.Concurrent (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Diagnostics.Tracing (>= 4.3)
-      System.Linq (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
     System.Memory (4.5.4)
       System.Buffers (>= 4.5.1)
       System.Numerics.Vectors (>= 4.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
-    System.Net.Http (4.3.4)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      runtime.native.System (>= 4.3)
-      runtime.native.System.Net.Http (>= 4.3)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Diagnostics.DiagnosticSource (>= 4.3)
-      System.Diagnostics.Tracing (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.Globalization.Extensions (>= 4.3)
-      System.IO (>= 4.3)
-      System.IO.FileSystem (>= 4.3)
-      System.Net.Primitives (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Security.Cryptography.Algorithms (>= 4.3)
-      System.Security.Cryptography.Encoding (>= 4.3)
-      System.Security.Cryptography.OpenSsl (>= 4.3)
-      System.Security.Cryptography.Primitives (>= 4.3)
-      System.Security.Cryptography.X509Certificates (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.Net.Primitives (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-      System.Runtime (>= 4.3.1)
-      System.Runtime.Handles (>= 4.3)
     System.Numerics.Vectors (4.5)
-    System.ObjectModel (4.3)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Threading (>= 4.3)
-    System.Reactive (4.4.1)
+    System.Reactive (5.0)
       System.Runtime.InteropServices.WindowsRuntime (>= 4.3)
       System.Threading.Tasks.Extensions (>= 4.5.4)
     System.Reflection (4.3)
@@ -857,46 +579,19 @@ NUGET
       System.IO (>= 4.3)
       System.Reflection.Primitives (>= 4.3)
       System.Runtime (>= 4.3)
-    System.Reflection.Emit (4.7)
-      System.Reflection.Emit.ILGeneration (>= 4.7)
-    System.Reflection.Emit.ILGeneration (4.7)
-    System.Reflection.Emit.Lightweight (4.7)
-      System.Reflection.Emit.ILGeneration (>= 4.7)
-    System.Reflection.Extensions (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Reflection (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Reflection.Metadata (1.8.1)
-      System.Collections.Immutable (>= 1.7.1)
+    System.Reflection.Metadata (5.0)
+      System.Collections.Immutable (>= 5.0)
     System.Reflection.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
     System.Reflection.TypeExtensions (4.7)
-    System.Resources.Extensions (4.7.1)
+    System.Resources.Extensions (5.0)
       System.Memory (>= 4.5.4)
-    System.Resources.ResourceManager (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Globalization (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Resources.Writer (4.3)
-      System.Collections (>= 4.3)
-      System.IO (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Text.Encoding (>= 4.3)
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (4.7.1)
-    System.Runtime.Extensions (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-      System.Runtime (>= 4.3.1)
+    System.Runtime.CompilerServices.Unsafe (5.0)
     System.Runtime.Handles (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
@@ -910,129 +605,42 @@ NUGET
       System.Runtime.Handles (>= 4.3)
     System.Runtime.InteropServices.WindowsRuntime (4.3)
       System.Runtime (>= 4.3)
-    System.Runtime.Numerics (4.3)
-      System.Globalization (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-    System.Runtime.Serialization.Primitives (4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Security.AccessControl (4.7)
-      System.Security.Principal.Windows (>= 4.7)
-    System.Security.Cryptography.Algorithms (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      runtime.native.System.Security.Cryptography.Apple (>= 4.3.1)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2)
-      System.Collections (>= 4.3)
-      System.IO (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Runtime.Numerics (>= 4.3)
-      System.Security.Cryptography.Encoding (>= 4.3)
-      System.Security.Cryptography.Primitives (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-    System.Security.Cryptography.Cng (4.7)
-    System.Security.Cryptography.Csp (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      System.IO (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Security.Cryptography.Algorithms (>= 4.3)
-      System.Security.Cryptography.Encoding (>= 4.3)
-      System.Security.Cryptography.Primitives (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading (>= 4.3)
-    System.Security.Cryptography.Encoding (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3)
-      System.Collections (>= 4.3)
-      System.Collections.Concurrent (>= 4.3)
-      System.Linq (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Security.Cryptography.Primitives (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-    System.Security.Cryptography.OpenSsl (4.7)
-    System.Security.Cryptography.Primitives (4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.IO (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Threading (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.Security.Cryptography.ProtectedData (4.7)
-      System.Memory (>= 4.5.3)
-    System.Security.Cryptography.X509Certificates (4.3.2)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      runtime.native.System (>= 4.3)
-      runtime.native.System.Net.Http (>= 4.3)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2)
-      System.Collections (>= 4.3)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.Globalization.Calendars (>= 4.3)
-      System.IO (>= 4.3)
-      System.IO.FileSystem (>= 4.3)
-      System.IO.FileSystem.Primitives (>= 4.3)
-      System.Resources.ResourceManager (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Runtime.Numerics (>= 4.3)
-      System.Security.Cryptography.Algorithms (>= 4.3)
-      System.Security.Cryptography.Cng (>= 4.3)
-      System.Security.Cryptography.Csp (>= 4.3)
-      System.Security.Cryptography.Encoding (>= 4.3)
-      System.Security.Cryptography.OpenSsl (>= 4.3)
-      System.Security.Cryptography.Primitives (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading (>= 4.3)
-    System.Security.Principal.Windows (4.7)
+    System.Security.AccessControl (5.0)
+      System.Security.Principal.Windows (>= 5.0)
+    System.Security.Cryptography.Cng (5.0)
+    System.Security.Cryptography.Pkcs (5.0)
+      System.Buffers (>= 4.5.1)
+      System.Formats.Asn1 (>= 5.0)
+      System.Memory (>= 4.5.4)
+      System.Security.Cryptography.Cng (>= 5.0)
+    System.Security.Cryptography.ProtectedData (5.0)
+      System.Memory (>= 4.5.4)
+    System.Security.Cryptography.Xml (5.0)
+      System.Memory (>= 4.5.4)
+      System.Security.Cryptography.Pkcs (>= 5.0)
+      System.Security.Permissions (>= 5.0)
+    System.Security.Permissions (5.0)
+      System.Security.AccessControl (>= 5.0)
+    System.Security.Principal.Windows (5.0)
     System.Text.Encoding (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Text.Encoding.CodePages (4.7.1)
-      System.Runtime.CompilerServices.Unsafe (>= 4.7.1)
-    System.Text.Encoding.Extensions (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-    System.Threading (4.3)
-      System.Runtime (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
+    System.Text.Encoding.CodePages (5.0)
+      System.Runtime.CompilerServices.Unsafe (>= 5.0)
     System.Threading.Tasks (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Threading.Tasks.Dataflow (4.11.1)
+    System.Threading.Tasks.Dataflow (5.0)
     System.Threading.Tasks.Extensions (4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
-    System.Threading.Thread (4.3)
-      System.Runtime (>= 4.3)
-    System.Threading.ThreadPool (4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Handles (>= 4.3)
 
 GROUP generator
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    Microsoft.NETCore.Platforms (3.1.1)
+    Microsoft.NETCore.Platforms (5.0)
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     OxyPlot.Core (2.0)
@@ -1040,11 +648,11 @@ NUGET
     OxyPlot.Xamarin.Forms (1.0)
       OxyPlot.Core (>= 1.0)
       Xamarin.Forms (>= 2.3.3.180)
-    Plugin.MediaManager (0.9.7)
+    Plugin.MediaManager (1.0.4)
     Plugin.MediaManager.Forms (0.9.6)
       Plugin.MediaManager (>= 0.9.6)
       Xamarin.Forms (>= 4.2.0.815419)
-    SkiaSharp (1.68.3)
+    SkiaSharp (2.80.2)
       System.Memory (>= 4.5.3)
     SkiaSharp.Views.Forms (1.68.1)
       SkiaSharp (>= 1.68.1)
@@ -1055,7 +663,7 @@ NUGET
       System.Numerics.Vectors (>= 4.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
     System.Numerics.Vectors (4.5)
-    System.Runtime.CompilerServices.Unsafe (4.7.1)
+    System.Runtime.CompilerServices.Unsafe (5.0)
     Xamarin.FFImageLoading (2.4.11.982)
     Xamarin.FFImageLoading.Forms (2.4.11.982)
       Xamarin.FFImageLoading (>= 2.4.11.982)
@@ -1070,30 +678,45 @@ GROUP gtkapp
 RESTRICTION: == net471
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
+    FSharp.Core (5.0)
     FSharp.Data (3.3.3)
       FSharp.Core (>= 4.0.0.1)
     Newtonsoft.Json (12.0.3)
-    OpenTK (3.2)
+    OpenTK (3.3.1)
     OpenTK.GLControl (3.1)
       OpenTK (>= 3.1)
-    OxyPlot.Core (1.0)
-    OxyPlot.GtkSharp (1.0)
-      OxyPlot.Core (1.0)
+    OxyPlot.Core (2.0)
     OxyPlot.Xamarin.Forms (1.0)
       OxyPlot.Core (>= 1.0)
       Xamarin.Forms (>= 2.3.3.180)
-    Plugin.MediaManager (0.9.7)
-    Plugin.MediaManager.Forms (0.9.7)
-      Plugin.MediaManager (>= 0.9.7)
-      Xamarin.Forms (>= 4.5.0.356)
+    Plugin.MediaManager (1.0.4)
+    Plugin.MediaManager.Forms (1.0.4)
+      Plugin.MediaManager (>= 1.0.4)
+      Xamarin.Forms (>= 4.5.0.657)
     SkiaSharp (1.68.3)
       System.Memory (>= 4.5.3)
+    SkiaSharp.Views (1.68.3)
+      SkiaSharp (>= 1.68.3)
+      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
+      SkiaSharp.Views.Gtk2 (>= 1.68.3)
+      SkiaSharp.Views.WindowsForms (>= 1.68.3)
+      SkiaSharp.Views.WPF (>= 1.68.3)
     SkiaSharp.Views.Desktop.Common (1.68.3)
       SkiaSharp (>= 1.68.3)
+    SkiaSharp.Views.Forms (1.68.3)
+      SkiaSharp (>= 1.68.3)
+      Xamarin.Forms (>= 4.4.0.991757)
     SkiaSharp.Views.Gtk2 (1.68.3)
       SkiaSharp (>= 1.68.3)
       SkiaSharp.Views.Desktop.Common (>= 1.68.3)
+    SkiaSharp.Views.WindowsForms (1.68.3)
+      OpenTK (>= 3.0.1)
+      OpenTK.GLControl (>= 3.0.1)
+      SkiaSharp (>= 1.68.3)
+      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
+    SkiaSharp.Views.WPF (1.68.3)
+      SkiaSharp (>= 1.68.3)
+      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
     System.Buffers (4.5.1)
     System.ComponentModel (4.3)
     System.Memory (4.5.4)
@@ -1101,39 +724,35 @@ NUGET
       System.Numerics.Vectors (>= 4.5)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
     System.Numerics.Vectors (4.5)
-    System.Runtime.CompilerServices.Unsafe (4.7.1)
+    System.Runtime.CompilerServices.Unsafe (5.0)
     Xamarin.Essentials (1.5.3.2)
       System.Numerics.Vectors (>= 4.5)
     Xamarin.FFImageLoading (2.4.11.982)
     Xamarin.FFImageLoading.Forms (2.4.11.982)
       Xamarin.FFImageLoading (>= 2.4.11.982)
       Xamarin.Forms (>= 3.3.0.912540)
-    Xamarin.Forms (4.8.0.1269)
-    Xamarin.Forms.Maps (4.8.0.1269)
-      Xamarin.Forms (>= 4.8.0.1269)
-    Xamarin.Forms.Maps.GTK (4.8.0.1269)
-      Xamarin.Forms (>= 4.8.0.1269)
-      Xamarin.Forms.Maps (>= 4.8.0.1269)
-    Xamarin.Forms.PancakeView (1.4.2)
+    Xamarin.Forms (4.8.0.1687)
+    Xamarin.Forms.Maps (4.8.0.1687)
+      Xamarin.Forms (>= 4.8.0.1687)
+    Xamarin.Forms.Maps.GTK (4.8.0.1687)
+      Xamarin.Forms (>= 4.8.0.1687)
+      Xamarin.Forms.Maps (>= 4.8.0.1687)
+    Xamarin.Forms.PancakeView (2.3.0.759)
       System.ComponentModel (>= 4.3)
-      Xamarin.Forms (>= 3.6.0.220655)
-      Xamarin.Forms.Platform.WPF (>= 3.6.0.220655)
-    Xamarin.Forms.Platform.GTK (4.8.0.1269)
-      OpenTK (>= 3.0.1)
-      Xamarin.Forms (>= 4.8.0.1269)
-    Xamarin.Forms.Platform.WPF (4.6.0.800)
+      Xamarin.Forms (>= 4.8.0.1451)
+      Xamarin.Forms.Platform.GTK (>= 4.8.0.1451)
+    Xamarin.Forms.Platform.GTK (4.8.0.1687)
       OpenTK (>= 3.0.1)
-      OpenTK.GLControl (>= 3.0.1)
-      Xamarin.Forms (>= 4.6.0.800)
+      Xamarin.Forms (>= 4.8.0.1687)
 
 GROUP iosapp
 RESTRICTION: == xamarinios
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
+    FSharp.Core (5.0)
     FSharp.Data (3.3.3)
       FSharp.Core (>= 4.3.4)
-    Microsoft.NETCore.Platforms (3.1.1)
+    Microsoft.NETCore.Platforms (5.0)
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (12.0.3)
@@ -1144,10 +763,10 @@ NUGET
       Xamarin.Forms (>= 2.3.3.180)
     OxyPlot.Xamarin.iOS (1.0)
       OxyPlot.Core (>= 1.0)
-    Plugin.MediaManager (0.9.7)
-    Plugin.MediaManager.Forms (0.9.7)
-      Plugin.MediaManager (>= 0.9.7)
-      Xamarin.Forms (>= 4.5.0.356)
+    Plugin.MediaManager (1.0.4)
+    Plugin.MediaManager.Forms (1.0.4)
+      Plugin.MediaManager (>= 1.0.4)
+      Xamarin.Forms (>= 4.5.0.657)
     SkiaSharp (1.68.3)
     SkiaSharp.Views (1.68.3)
       SkiaSharp (>= 1.68.3)
@@ -1155,6 +774,7 @@ NUGET
       SkiaSharp (>= 1.68.3)
       SkiaSharp.Views (>= 1.68.3)
       Xamarin.Forms (>= 4.4.0.991757)
+    System.Buffers (4.5.1)
     System.ComponentModel (4.3)
     WebP.Touch (1.0.8)
     Xamarin.Essentials (1.5.3.2)
@@ -1163,21 +783,21 @@ NUGET
     Xamarin.FFImageLoading.Forms (2.4.11.982)
       Xamarin.FFImageLoading (>= 2.4.11.982)
       Xamarin.Forms (>= 3.3.0.912540)
-    Xamarin.Forms (4.8.0.1269)
-    Xamarin.Forms.Maps (4.8.0.1269)
-      Xamarin.Forms (>= 4.8.0.1269)
-    Xamarin.Forms.PancakeView (1.4.2)
+    Xamarin.Forms (4.8.0.1687)
+    Xamarin.Forms.Maps (4.8.0.1687)
+      Xamarin.Forms (>= 4.8.0.1687)
+    Xamarin.Forms.PancakeView (2.3.0.759)
       System.ComponentModel (>= 4.3)
-      Xamarin.Forms (>= 3.6.0.220655)
+      Xamarin.Forms (>= 4.8.0.1451)
 
 GROUP macosapp
 RESTRICTION: == xamarinmac
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
+    FSharp.Core (5.0)
     FSharp.Data (3.3.3)
       FSharp.Core (>= 4.3.4)
-    Microsoft.NETCore.Platforms (3.1.1)
+    Microsoft.NETCore.Platforms (5.0)
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (12.0.3)
@@ -1186,10 +806,10 @@ NUGET
     OxyPlot.Xamarin.Forms (1.0)
       OxyPlot.Core (>= 1.0)
       Xamarin.Forms (>= 2.3.3.180)
-    Plugin.MediaManager (0.9.7)
-    Plugin.MediaManager.Forms (0.9.7)
-      Plugin.MediaManager (>= 0.9.7)
-      Xamarin.Forms (>= 4.5.0.356)
+    Plugin.MediaManager (1.0.4)
+    Plugin.MediaManager.Forms (1.0.4)
+      Plugin.MediaManager (>= 1.0.4)
+      Xamarin.Forms (>= 4.5.0.657)
     SkiaSharp (1.68.3)
     SkiaSharp.Views (1.68.3)
       SkiaSharp (>= 1.68.3)
@@ -1197,6 +817,7 @@ NUGET
       SkiaSharp (>= 1.68.3)
       SkiaSharp.Views (>= 1.68.3)
       Xamarin.Forms (>= 4.4.0.991757)
+    System.Buffers (4.5.1)
     System.ComponentModel (4.3)
     System.Numerics.Vectors (4.5)
     WebP.Touch (1.0.8)
@@ -1207,12 +828,12 @@ NUGET
     Xamarin.FFImageLoading.Forms (2.4.11.982)
       Xamarin.FFImageLoading (>= 2.4.11.982)
       Xamarin.Forms (>= 3.3.0.912540)
-    Xamarin.Forms (4.8.0.1269)
-    Xamarin.Forms.Maps (4.8.0.1269)
-      Xamarin.Forms (>= 4.8.0.1269)
-    Xamarin.Forms.PancakeView (1.4.2)
+    Xamarin.Forms (4.8.0.1687)
+    Xamarin.Forms.Maps (4.8.0.1687)
+      Xamarin.Forms (>= 4.8.0.1687)
+    Xamarin.Forms.PancakeView (2.3.0.759)
       System.ComponentModel (>= 4.3)
-      Xamarin.Forms (>= 3.6.0.220655)
+      Xamarin.Forms (>= 4.8.0.1451)
 
 GROUP neutral
 RESTRICTION: == netstandard2.0
@@ -1223,77 +844,4 @@ GITHUB
     src/Interpreter.fs (190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87)
     src/ProcessCommandLine.fs (190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87)
     src/ProjectCracker.fs (190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87)
-    tests/PortaCodeTests.fs (190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87)
-GROUP wpfapp
-RESTRICTION: == net472
-NUGET
-  remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.7.2)
-    FSharp.Data (3.3.3)
-      FSharp.Core (>= 4.0.0.1)
-    Microsoft.Maps.MapControl.WPF (1.0.0.3)
-    Newtonsoft.Json (12.0.3)
-    OpenTK (3.2)
-    OpenTK.GLControl (3.1)
-      OpenTK (>= 3.1)
-    OxyPlot.Core (2.0)
-    OxyPlot.Xamarin.Forms (1.0)
-      OxyPlot.Core (>= 1.0)
-      Xamarin.Forms (>= 2.3.3.180)
-    Plugin.MediaManager (0.9.7)
-    Plugin.MediaManager.Forms (0.9.7)
-      Plugin.MediaManager (>= 0.9.7)
-      Xamarin.Forms (>= 4.5.0.356)
-      Xamarin.Forms.Platform.WPF (>= 4.5.0.356)
-    SkiaSharp (1.68.3)
-      System.Memory (>= 4.5.3)
-    SkiaSharp.Views.Desktop.Common (1.68.3)
-      SkiaSharp (>= 1.68.3)
-    SkiaSharp.Views.Forms (1.68.3)
-      SkiaSharp (>= 1.68.3)
-      Xamarin.Forms (>= 4.4.0.991757)
-    SkiaSharp.Views.Forms.WPF (1.68.3)
-      OpenTK (>= 3.0.1)
-      OpenTK.GLControl (>= 3.0.1)
-      SkiaSharp (>= 1.68.3)
-      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
-      SkiaSharp.Views.Forms (>= 1.68.3)
-      SkiaSharp.Views.WindowsForms (>= 1.68.3)
-      SkiaSharp.Views.WPF (>= 1.68.3)
-      Xamarin.Forms (>= 4.4.0.991757)
-      Xamarin.Forms.Platform.WPF (>= 4.4.0.991757)
-    SkiaSharp.Views.WindowsForms (1.68.3)
-      OpenTK (>= 3.0.1)
-      OpenTK.GLControl (>= 3.0.1)
-      SkiaSharp (>= 1.68.3)
-      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
-    SkiaSharp.Views.WPF (1.68.3)
-      SkiaSharp (>= 1.68.3)
-      SkiaSharp.Views.Desktop.Common (>= 1.68.3)
-    System.Buffers (4.5.1)
-    System.ComponentModel (4.3)
-    System.Memory (4.5.4)
-      System.Buffers (>= 4.5.1)
-      System.Numerics.Vectors (>= 4.5)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
-    System.Numerics.Vectors (4.5)
-    System.Runtime.CompilerServices.Unsafe (4.7.1)
-    Xamarin.Essentials (1.5.3.2)
-      System.Numerics.Vectors (>= 4.5)
-    Xamarin.FFImageLoading (2.4.11.982)
-    Xamarin.FFImageLoading.Forms (2.4.11.982)
-      Xamarin.FFImageLoading (>= 2.4.11.982)
-      Xamarin.Forms (>= 3.3.0.912540)
-    Xamarin.Forms (4.8.0.1269)
-    Xamarin.Forms.Maps (4.8.0.1269)
-      Xamarin.Forms (>= 4.8.0.1269)
-    Xamarin.Forms.Maps.WPF (4.8.0.1269)
-      Microsoft.Maps.MapControl.WPF (>= 1.0.0.3)
-    Xamarin.Forms.PancakeView (1.4.2)
-      System.ComponentModel (>= 4.3)
-      Xamarin.Forms (>= 3.6.0.220655)
-      Xamarin.Forms.Platform.WPF (>= 3.6.0.220655)
-    Xamarin.Forms.Platform.WPF (4.8.0.1269)
-      OpenTK (>= 3.0.1)
-      OpenTK.GLControl (>= 3.0.1)
-      Xamarin.Forms (>= 4.8.0.1269)
+    tests/PortaCodeTests.fs (190a8c5b6d67de8cd4f75a9ee4197ed1f36c9b87)
\ No newline at end of file